Home| summaryrefslogtreecommitdiff |
diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-06-13 15:19:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-06-13 15:19:07 +0200 |
| commit | 31b9888b0358aa10be2fafd5d334c12991bd2575 (patch) | |
| tree | addba530abdf10e08d78df39ec06e77241456a7e | |
| parent | a8a2b3d59c5842ded2b73ef895415ce24b5151eb (diff) | |
| parent | 097a8f9ddfbcab59c780697de18bba039c64938a (diff) | |
Merge branch 'users/hare/SLE12-SP2/for-next' into SLE12-SP2rpm-4.4.13-45
Pull scsi fixes from Hannes Reinecke.
| -rw-r--r-- | patches.fixes/scsi-Add-Marvell-configuration-device-to-VPD-blacklist.patch | 28 | ||||
| -rw-r--r-- | patches.fixes/scsi-disable-VPD-page-check-on-error.patch | 45 | ||||
| -rw-r--r-- | series.conf | 2 |
3 files changed, 75 insertions, 0 deletions
diff --git a/patches.fixes/scsi-Add-Marvell-configuration-device-to-VPD-blacklist.patch b/patches.fixes/scsi-Add-Marvell-configuration-device-to-VPD-blacklist.patch new file mode 100644 index 0000000000..0fc3cf7f57 --- /dev/null +++ b/patches.fixes/scsi-Add-Marvell-configuration-device-to-VPD-blacklist.patch @@ -0,0 +1,28 @@ +From: Todd Fujinaka <todd.fujinaka@intel.com> +Date: Tue, 9 Feb 2016 21:02:07 -0500 +Subject: SCSI: Add Marvell configuration device to VPD blacklist +Git-commit: fb2d65d28918ef4f0caa1de3d8c7416949c28b41 +Patch-mainline: v4.7 +References: bsc#981954 + +The Marvell 91xx configuration device also needs to be on the VPD +blacklist. + +[mkp: Match all revisions] + +Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com> +Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Acked-by: Hannes Reinecke <hare@suse.com> + +diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c +index 8204166..a63099f 100644 +--- a/drivers/scsi/scsi_devinfo.c ++++ b/drivers/scsi/scsi_devinfo.c +@@ -206,6 +206,7 @@ static struct { + {"iRiver", "iFP Mass Driver", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36}, + {"LASOUND", "CDX7405", "3.10", BLIST_MAX5LUN | BLIST_SINGLELUN}, + {"Marvell", "Console", NULL, BLIST_SKIP_VPD_PAGES}, ++ {"Marvell", "91xx Config", "1.01", BLIST_SKIP_VPD_PAGES}, + {"MATSHITA", "PD-1", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, + {"MATSHITA", "DMC-LC5", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36}, + {"MATSHITA", "DMC-LC40", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36}, diff --git a/patches.fixes/scsi-disable-VPD-page-check-on-error.patch b/patches.fixes/scsi-disable-VPD-page-check-on-error.patch new file mode 100644 index 0000000000..943b54bddf --- /dev/null +++ b/patches.fixes/scsi-disable-VPD-page-check-on-error.patch @@ -0,0 +1,45 @@ +From: Hannes Reinecke <hare@suse.de> +Date: Mon, 13 Jun 2016 12:07:05 +0200 +Subject: scsi: disable VPD page check on error +References: bsc#981954 +Patch-Mainline: submitted linux-scsi, 2016/06/13 + +If we encounter an error during VPD page scanning we should be +setting the 'skip_vpd_pages' bit to avoid further accesses. + +Signed-off-by: Hannes Reinecke <hare@suse.com> +--- + drivers/scsi/scsi.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c +index 4543d3c..00f922e 100644 +--- a/drivers/scsi/scsi.c ++++ b/drivers/scsi/scsi.c +@@ -796,6 +796,7 @@ retry_pg0: + result = scsi_vpd_inquiry(sdev, vpd_buf, 0, vpd_len); + if (result < 0) { + kfree(vpd_buf); ++ sdev->skip_vpd_pages = true; + return; + } + if (result > vpd_len) { +@@ -823,6 +824,7 @@ retry_pg80: + result = scsi_vpd_inquiry(sdev, vpd->buf, 0x80, vpd_len); + if (result < 0) { + kfree(vpd); ++ sdev->skip_vpd_pages = true; + return; + } + if (result > vpd_len) { +@@ -852,6 +854,7 @@ retry_pg83: + result = scsi_vpd_inquiry(sdev, vpd->buf, 0x83, vpd_len); + if (result < 0) { + kfree(vpd); ++ sdev->skip_vpd_pages = true; + return; + } + if (result > vpd_len) { +-- +1.8.5.6 + diff --git a/series.conf b/series.conf index 162ee4698d..37ab0bfb6b 100644 --- a/series.conf +++ b/series.conf @@ -1853,6 +1853,8 @@ patches.fixes/scsi-trace-define-ZBC_IN-and-ZBC_OUT.patch patches.fixes/scsi_lib-Decode-T10-vendor-IDs.patch patches.fixes/scsi-Centralise-ssp-frame-information-units.patch + patches.fixes/scsi-Add-Marvell-configuration-device-to-VPD-blacklist.patch + patches.fixes/scsi-disable-VPD-page-check-on-error.patch patches.suse/fcoe-reduce-max_sectors patches.fixes/libfc-Update-rport-reference-counting.patch |