mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge /spare/repo/linux-2.6/
This commit is contained in:
commit
165415f700
1822 changed files with 108485 additions and 85133 deletions
|
|
@ -178,8 +178,8 @@ static inline struct scsi_target *scsi_target(struct scsi_device *sdev)
|
|||
|
||||
extern struct scsi_device *__scsi_add_device(struct Scsi_Host *,
|
||||
uint, uint, uint, void *hostdata);
|
||||
#define scsi_add_device(host, channel, target, lun) \
|
||||
__scsi_add_device(host, channel, target, lun, NULL)
|
||||
extern int scsi_add_device(struct Scsi_Host *host, uint channel,
|
||||
uint target, uint lun);
|
||||
extern void scsi_remove_device(struct scsi_device *);
|
||||
extern int scsi_device_cancel(struct scsi_device *, int);
|
||||
|
||||
|
|
|
|||
|
|
@ -439,4 +439,12 @@ int fc_remote_port_block(struct fc_rport *rport);
|
|||
void fc_remote_port_unblock(struct fc_rport *rport);
|
||||
int scsi_is_fc_rport(const struct device *);
|
||||
|
||||
static inline u64 wwn_to_u64(u8 *wwn)
|
||||
{
|
||||
return (u64)wwn[0] << 56 | (u64)wwn[1] << 48 |
|
||||
(u64)wwn[2] << 40 | (u64)wwn[3] << 32 |
|
||||
(u64)wwn[4] << 24 | (u64)wwn[5] << 16 |
|
||||
(u64)wwn[6] << 8 | (u64)wwn[7];
|
||||
}
|
||||
|
||||
#endif /* SCSI_TRANSPORT_FC_H */
|
||||
|
|
|
|||
100
include/scsi/scsi_transport_sas.h
Normal file
100
include/scsi/scsi_transport_sas.h
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
#ifndef SCSI_TRANSPORT_SAS_H
|
||||
#define SCSI_TRANSPORT_SAS_H
|
||||
|
||||
#include <linux/transport_class.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
struct scsi_transport_template;
|
||||
struct sas_rphy;
|
||||
|
||||
|
||||
enum sas_device_type {
|
||||
SAS_PHY_UNUSED,
|
||||
SAS_END_DEVICE,
|
||||
SAS_EDGE_EXPANDER_DEVICE,
|
||||
SAS_FANOUT_EXPANDER_DEVICE,
|
||||
};
|
||||
|
||||
enum sas_protocol {
|
||||
SAS_PROTOCOL_SATA = 0x01,
|
||||
SAS_PROTOCOL_SMP = 0x02,
|
||||
SAS_PROTOCOL_STP = 0x04,
|
||||
SAS_PROTOCOL_SSP = 0x08,
|
||||
};
|
||||
|
||||
enum sas_linkrate {
|
||||
SAS_LINK_RATE_UNKNOWN,
|
||||
SAS_PHY_DISABLED,
|
||||
SAS_LINK_RATE_FAILED,
|
||||
SAS_SATA_SPINUP_HOLD,
|
||||
SAS_SATA_PORT_SELECTOR,
|
||||
SAS_LINK_RATE_1_5_GBPS,
|
||||
SAS_LINK_RATE_3_0_GBPS,
|
||||
SAS_LINK_VIRTUAL,
|
||||
};
|
||||
|
||||
struct sas_identify {
|
||||
enum sas_device_type device_type;
|
||||
enum sas_protocol initiator_port_protocols;
|
||||
enum sas_protocol target_port_protocols;
|
||||
u64 sas_address;
|
||||
u8 phy_identifier;
|
||||
};
|
||||
|
||||
/* The functions by which the transport class and the driver communicate */
|
||||
struct sas_function_template {
|
||||
};
|
||||
|
||||
struct sas_phy {
|
||||
struct device dev;
|
||||
int number;
|
||||
struct sas_identify identify;
|
||||
enum sas_linkrate negotiated_linkrate;
|
||||
enum sas_linkrate minimum_linkrate_hw;
|
||||
enum sas_linkrate minimum_linkrate;
|
||||
enum sas_linkrate maximum_linkrate_hw;
|
||||
enum sas_linkrate maximum_linkrate;
|
||||
u8 port_identifier;
|
||||
struct sas_rphy *rphy;
|
||||
};
|
||||
|
||||
#define dev_to_phy(d) \
|
||||
container_of((d), struct sas_phy, dev)
|
||||
#define transport_class_to_phy(cdev) \
|
||||
dev_to_phy((cdev)->dev)
|
||||
#define phy_to_shost(phy) \
|
||||
dev_to_shost((phy)->dev.parent)
|
||||
|
||||
struct sas_rphy {
|
||||
struct device dev;
|
||||
struct sas_identify identify;
|
||||
struct list_head list;
|
||||
u32 scsi_target_id;
|
||||
};
|
||||
|
||||
#define dev_to_rphy(d) \
|
||||
container_of((d), struct sas_rphy, dev)
|
||||
#define transport_class_to_rphy(cdev) \
|
||||
dev_to_rphy((cdev)->dev)
|
||||
#define rphy_to_shost(rphy) \
|
||||
dev_to_shost((rphy)->dev.parent)
|
||||
|
||||
extern void sas_remove_host(struct Scsi_Host *);
|
||||
|
||||
extern struct sas_phy *sas_phy_alloc(struct device *, int);
|
||||
extern void sas_phy_free(struct sas_phy *);
|
||||
extern int sas_phy_add(struct sas_phy *);
|
||||
extern void sas_phy_delete(struct sas_phy *);
|
||||
extern int scsi_is_sas_phy(const struct device *);
|
||||
|
||||
extern struct sas_rphy *sas_rphy_alloc(struct sas_phy *);
|
||||
void sas_rphy_free(struct sas_rphy *);
|
||||
extern int sas_rphy_add(struct sas_rphy *);
|
||||
extern void sas_rphy_delete(struct sas_rphy *);
|
||||
extern int scsi_is_sas_rphy(const struct device *);
|
||||
|
||||
extern struct scsi_transport_template *
|
||||
sas_attach_transport(struct sas_function_template *);
|
||||
extern void sas_release_transport(struct scsi_transport_template *);
|
||||
|
||||
#endif /* SCSI_TRANSPORT_SAS_H */
|
||||
Loading…
Reference in a new issue