Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-03-20 13:48:19 +0100
committerTakashi Iwai <tiwai@suse.de>2019-03-20 13:48:19 +0100
commita2aa8feccd4e9af54bb677ec33450dac71a2ccbf (patch)
treeb667de9985afe04e6cab788c9a2b95ad94f12cc8
parent604f34a5b14cf3e4fb576c02704c671bec3c8f8d (diff)
parenta34b660c637a0bd7e46ab4bac6fd9ef435ae3c22 (diff)
Merge branch 'users/hare/SLE15/for-next' into SLE15
Pull scsi fix from Hannes Reinecke
-rw-r--r--patches.fixes/scsi-mptsas-Fixup-device-hotplug-for-VMWare-ESXi.patch45
-rw-r--r--series.conf1
2 files changed, 46 insertions, 0 deletions
diff --git a/patches.fixes/scsi-mptsas-Fixup-device-hotplug-for-VMWare-ESXi.patch b/patches.fixes/scsi-mptsas-Fixup-device-hotplug-for-VMWare-ESXi.patch
new file mode 100644
index 0000000000..33c12b0249
--- /dev/null
+++ b/patches.fixes/scsi-mptsas-Fixup-device-hotplug-for-VMWare-ESXi.patch
@@ -0,0 +1,45 @@
+From: Hannes Reinecke <hare@suse.de>
+Date: Thu, 24 Aug 2017 14:52:43 +0200
+Subject: [PATCH] scsi: mptsas: Fixup device hotplug for VMWare ESXi
+Git-commit: ee3e2d8392f695343d2fdfd43e881d14fb406d24
+Patch-Mainline: v4.14-rc1
+References: bsc#1129046
+
+VMWare ESXi emulates an mptsas HBA, but exposes all drives as
+direct-attached SAS drives. This it not how the driver originally
+envisioned things; SAS drives were supposed to be connected via an
+expander, and only SATA drives would be direct attached. As such, any
+hotplug event for direct-attach SAS drives was silently ignored, and the
+guest failed to detect new drives from within a VMWare ESXi environment.
+
+[mkp: typos]
+
+Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1030850
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+---
+ drivers/message/fusion/mptsas.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
+index f6308ad35b19..42ee70c23d9f 100644
+--- a/drivers/message/fusion/mptsas.c
++++ b/drivers/message/fusion/mptsas.c
+@@ -4352,11 +4352,10 @@ mptsas_hotplug_work(MPT_ADAPTER *ioc, struct fw_event_work *fw_event,
+ return;
+
+ phy_info = mptsas_refreshing_device_handles(ioc, &sas_device);
+- /* Only For SATA Device ADD */
+- if (!phy_info && (sas_device.device_info &
+- MPI_SAS_DEVICE_INFO_SATA_DEVICE)) {
++ /* Device hot plug */
++ if (!phy_info) {
+ devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT
+- "%s %d SATA HOT PLUG: "
++ "%s %d HOT PLUG: "
+ "parent handle of device %x\n", ioc->name,
+ __func__, __LINE__, sas_device.handle_parent));
+ port_info = mptsas_find_portinfo_by_handle(ioc,
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index b7c0ef1fe1..4fd505f60e 100644
--- a/series.conf
+++ b/series.conf
@@ -6513,6 +6513,7 @@
patches.drivers/scsi-libsas-move-bus_reset_handler-to-target_reset_h.patch
patches.drivers/scsi-qedf-drop-bus-reset-handler.patch
patches.drivers/scsi-megaraid_mbox-drop-duplicate-bus-reset-and-devi.patch
+ patches.fixes/scsi-mptsas-Fixup-device-hotplug-for-VMWare-ESXi.patch
patches.fixes/scsi-ses-Fix-racy-cleanup-of-sys-in-remove_dev.patch
patches.fixes/scsi-Fix-the-kerneldoc-for-scsi_initialize_rq.patch
patches.drivers/scsi-cxlflash-23-Remove-unnecessary-existence-check.patch