Merge remote-tracking branch 'mkp-scsi/4.8/scsi-fixes' into fixes
This commit is contained in:
commit
14a5916e0c
@ -361,8 +361,9 @@ static const char * const snstext[] = {
|
|||||||
|
|
||||||
/* Get sense key string or NULL if not available */
|
/* Get sense key string or NULL if not available */
|
||||||
const char *
|
const char *
|
||||||
scsi_sense_key_string(unsigned char key) {
|
scsi_sense_key_string(unsigned char key)
|
||||||
if (key <= 0xE)
|
{
|
||||||
|
if (key < ARRAY_SIZE(snstext))
|
||||||
return snstext[key];
|
return snstext[key];
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -246,6 +246,10 @@ static struct {
|
|||||||
{"IBM", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
|
{"IBM", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
|
||||||
{"SUN", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
|
{"SUN", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
|
||||||
{"DELL", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
|
{"DELL", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
|
||||||
|
{"STK", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
|
||||||
|
{"NETAPP", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
|
||||||
|
{"LSI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
|
||||||
|
{"ENGENIO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
|
||||||
{"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36},
|
{"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36},
|
||||||
{"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN},
|
{"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN},
|
||||||
{"SONY", "TSL", NULL, BLIST_FORCELUN}, /* DDS3 & DDS4 autoloaders */
|
{"SONY", "TSL", NULL, BLIST_FORCELUN}, /* DDS3 & DDS4 autoloaders */
|
||||||
|
@ -340,22 +340,6 @@ static int do_sas_phy_delete(struct device *dev, void *data)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* is_sas_attached - check if device is SAS attached
|
|
||||||
* @sdev: scsi device to check
|
|
||||||
*
|
|
||||||
* returns true if the device is SAS attached
|
|
||||||
*/
|
|
||||||
int is_sas_attached(struct scsi_device *sdev)
|
|
||||||
{
|
|
||||||
struct Scsi_Host *shost = sdev->host;
|
|
||||||
|
|
||||||
return shost->transportt->host_attrs.ac.class ==
|
|
||||||
&sas_host_class.class;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(is_sas_attached);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sas_remove_children - tear down a devices SAS data structures
|
* sas_remove_children - tear down a devices SAS data structures
|
||||||
* @dev: device belonging to the sas object
|
* @dev: device belonging to the sas object
|
||||||
|
@ -587,7 +587,7 @@ static void ses_match_to_enclosure(struct enclosure_device *edev,
|
|||||||
|
|
||||||
ses_enclosure_data_process(edev, to_scsi_device(edev->edev.parent), 0);
|
ses_enclosure_data_process(edev, to_scsi_device(edev->edev.parent), 0);
|
||||||
|
|
||||||
if (is_sas_attached(sdev))
|
if (scsi_is_sas_rphy(&sdev->sdev_gendev))
|
||||||
efd.addr = sas_get_address(sdev);
|
efd.addr = sas_get_address(sdev);
|
||||||
|
|
||||||
if (efd.addr) {
|
if (efd.addr) {
|
||||||
|
@ -11,12 +11,12 @@ struct sas_rphy;
|
|||||||
struct request;
|
struct request;
|
||||||
|
|
||||||
#if !IS_ENABLED(CONFIG_SCSI_SAS_ATTRS)
|
#if !IS_ENABLED(CONFIG_SCSI_SAS_ATTRS)
|
||||||
static inline int is_sas_attached(struct scsi_device *sdev)
|
static inline int scsi_is_sas_rphy(const struct device *sdev)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
extern int is_sas_attached(struct scsi_device *sdev);
|
extern int scsi_is_sas_rphy(const struct device *);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static inline int sas_protocol_ata(enum sas_protocol proto)
|
static inline int sas_protocol_ata(enum sas_protocol proto)
|
||||||
@ -202,7 +202,6 @@ extern int sas_rphy_add(struct sas_rphy *);
|
|||||||
extern void sas_rphy_remove(struct sas_rphy *);
|
extern void sas_rphy_remove(struct sas_rphy *);
|
||||||
extern void sas_rphy_delete(struct sas_rphy *);
|
extern void sas_rphy_delete(struct sas_rphy *);
|
||||||
extern void sas_rphy_unlink(struct sas_rphy *);
|
extern void sas_rphy_unlink(struct sas_rphy *);
|
||||||
extern int scsi_is_sas_rphy(const struct device *);
|
|
||||||
|
|
||||||
struct sas_port *sas_port_alloc(struct device *, int);
|
struct sas_port *sas_port_alloc(struct device *, int);
|
||||||
struct sas_port *sas_port_alloc_num(struct device *);
|
struct sas_port *sas_port_alloc_num(struct device *);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user