Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI updates from James Bottomley: "This patch set consists of the usual driver updates (megaraid_sas, arcmsr, be2iscsi, lpfc, mpt2sas, mpt3sas, qla2xxx, ufs) plus several assorted fixes and miscellaneous updates (including the pci_msix_enable_range() changes that have been pending for a while)" * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (202 commits) scsi: add a CONFIG_SCSI_MQ_DEFAULT option ufs: definitions for phy interface ufs: tune bkops while power managment events ufs: Add support for clock scaling using devfreq framework ufs: Add freq-table-hz property for UFS device ufs: Add support for clock gating ufs: refactor configuring power mode ufs: add UFS power management support ufs: introduce well known logical unit in ufs ufs: manually add well known logical units ufs: Active Power Mode - configuring bActiveICCLevel ufs: improve init sequence ufs: refactor query descriptor API support ufs: add voting support for host controller power ufs: Add clock initialization support ufs: Add regulator enable support ufs: Allow vendor specific initialization scsi: don't add scsi_device if its already visible scsi: fix the type for well known LUs scsi: fix comment in struct Scsi_Host definition ...
This commit is contained in:
@@ -333,6 +333,7 @@ static inline int scsi_status_is_good(int status)
|
||||
#define TYPE_RBC 0x0e
|
||||
#define TYPE_OSD 0x11
|
||||
#define TYPE_ZBC 0x14
|
||||
#define TYPE_WLUN 0x1e /* well-known logical unit */
|
||||
#define TYPE_NO_LUN 0x7f
|
||||
|
||||
/* SCSI protocols; these are taken from SPC-3 section 7.5 */
|
||||
|
||||
@@ -174,6 +174,7 @@ struct scsi_device {
|
||||
unsigned wce_default_on:1; /* Cache is ON by default */
|
||||
unsigned no_dif:1; /* T10 PI (DIF) should be disabled */
|
||||
unsigned broken_fua:1; /* Don't set FUA bit */
|
||||
unsigned lun_in_cdb:1; /* Store LUN bits in CDB[1] */
|
||||
|
||||
atomic_t disk_events_disable_depth; /* disable depth for disk events */
|
||||
|
||||
|
||||
@@ -606,7 +606,7 @@ struct Scsi_Host {
|
||||
/*
|
||||
* These three parameters can be used to allow for wide scsi,
|
||||
* and for host adapters that support multiple busses
|
||||
* The first two should be set to 1 more than the actual max id
|
||||
* The last two should be set to 1 more than the actual max id
|
||||
* or lun (e.g. 8 for SCSI parallel systems).
|
||||
*/
|
||||
unsigned int max_channel;
|
||||
@@ -680,6 +680,7 @@ struct Scsi_Host {
|
||||
unsigned no_write_same:1;
|
||||
|
||||
unsigned use_blk_mq:1;
|
||||
unsigned use_cmd_list:1;
|
||||
|
||||
/*
|
||||
* Optional work queue to be utilized by the transport
|
||||
@@ -692,6 +693,9 @@ struct Scsi_Host {
|
||||
*/
|
||||
struct workqueue_struct *tmf_work_q;
|
||||
|
||||
/* The transport requires the LUN bits NOT to be stored in CDB[1] */
|
||||
unsigned no_scsi2_lun_in_cdb:1;
|
||||
|
||||
/*
|
||||
* Value host_blocked counts down from
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user