[PATCH 4.8 02/35] scsi: hpsa: use bus 3 for legacy HBA devices

[Greg Kroah-Hartman]

4.8-stable review patch.  If anyone has any objections, please let me know.

--

From: Hannes Reinecke 

commit 7630b3a599e2c6d1c042945d32ff2debc855ad29 upstream.

Older controllers use SCSI target id '0' for the first internal disk. As
the controllers are now placed on the same bus as the internal disks
this leads to a clash with the SCSI target id of controller.  This patch
checks the SCSI revision, and moves older controller to bus '3' to be
compatible with older releases and avoid this problem.

[mkp: fixed uninitialized variable]

Fixes: 09371d623c9 ("hpsa: Change SAS transport devices to bus 0.")
Signed-off-by: Hannes Reinecke 
Acked-by: Don Brace 
Signed-off-by: Martin K. Petersen 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/scsi/hpsa.c |   16 +++-
 drivers/scsi/hpsa.h |2 ++
 2 files changed, 13 insertions(+), 5 deletions(-)

--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -2007,7 +2007,7 @@ static struct hpsa_scsi_dev_t *lookup_hp
 
 static int hpsa_slave_alloc(struct scsi_device *sdev)
 {
-   struct hpsa_scsi_dev_t *sd;
+   struct hpsa_scsi_dev_t *sd = NULL;
unsigned long flags;
struct ctlr_info *h;
 
@@ -2024,7 +2024,8 @@ static int hpsa_slave_alloc(struct scsi_
sd->target = sdev_id(sdev);
sd->lun = sdev->lun;
}
-   } else
+   }
+   if (!sd)
sd = lookup_hpsa_scsi_dev(h, sdev_channel(sdev),
sdev_id(sdev), sdev->lun);
 
@@ -3805,6 +3806,7 @@ static int hpsa_update_device_info(struc
sizeof(this_device->vendor));
memcpy(this_device->model, _buff[16],
sizeof(this_device->model));
+   this_device->rev = inq_buff[2];
memset(this_device->device_id, 0,
sizeof(this_device->device_id));
hpsa_get_device_id(h, scsi3addr, this_device->device_id, 8,
@@ -3887,10 +3889,14 @@ static void figure_bus_target_lun(struct
 
if (!is_logical_dev_addr_mode(lunaddrbytes)) {
/* physical device, target and lun filled in later */
-   if (is_hba_lunid(lunaddrbytes))
+   if (is_hba_lunid(lunaddrbytes)) {
+   int bus = HPSA_HBA_BUS;
+
+   if (!device->rev)
+   bus = HPSA_LEGACY_HBA_BUS;
hpsa_set_bus_target_lun(device,
-   HPSA_HBA_BUS, 0, lunid & 0x3fff);
-   else
+   bus, 0, lunid & 0x3fff);
+   } else
/* defer target, lun assignment for physical devices */
hpsa_set_bus_target_lun(device,
HPSA_PHYSICAL_DEVICE_BUS, -1, -1);
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -69,6 +69,7 @@ struct hpsa_scsi_dev_t {
u64 sas_address;
unsigned char vendor[8];/* bytes 8-15 of inquiry data */
unsigned char model[16];/* bytes 16-31 of inquiry data */
+   unsigned char rev;  /* byte 2 of inquiry data */
unsigned char raid_level;   /* from inquiry page 0xC1 */
unsigned char volume_offline;   /* discovered via TUR or VPD */
u16 queue_depth;/* max queue_depth for this device */
@@ -403,6 +404,7 @@ struct offline_device_entry {
 #define HPSA_RAID_VOLUME_BUS   1
 #define HPSA_EXTERNAL_RAID_VOLUME_BUS  2
 #define HPSA_HBA_BUS   0
+#define HPSA_LEGACY_HBA_BUS3
 
 /*
Send the command to the hardware

[PATCH 4.8 02/35] scsi: hpsa: use bus 3 for legacy HBA devices

[Greg Kroah-Hartman]

4.8-stable review patch.  If anyone has any objections, please let me know.

--

From: Hannes Reinecke 

commit 7630b3a599e2c6d1c042945d32ff2debc855ad29 upstream.

Older controllers use SCSI target id '0' for the first internal disk. As
the controllers are now placed on the same bus as the internal disks
this leads to a clash with the SCSI target id of controller.  This patch
checks the SCSI revision, and moves older controller to bus '3' to be
compatible with older releases and avoid this problem.

[mkp: fixed uninitialized variable]

Fixes: 09371d623c9 ("hpsa: Change SAS transport devices to bus 0.")
Signed-off-by: Hannes Reinecke 
Acked-by: Don Brace 
Signed-off-by: Martin K. Petersen 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/scsi/hpsa.c |   16 +++-
 drivers/scsi/hpsa.h |2 ++
 2 files changed, 13 insertions(+), 5 deletions(-)

--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -2007,7 +2007,7 @@ static struct hpsa_scsi_dev_t *lookup_hp
 
 static int hpsa_slave_alloc(struct scsi_device *sdev)
 {
-   struct hpsa_scsi_dev_t *sd;
+   struct hpsa_scsi_dev_t *sd = NULL;
unsigned long flags;
struct ctlr_info *h;
 
@@ -2024,7 +2024,8 @@ static int hpsa_slave_alloc(struct scsi_
sd->target = sdev_id(sdev);
sd->lun = sdev->lun;
}
-   } else
+   }
+   if (!sd)
sd = lookup_hpsa_scsi_dev(h, sdev_channel(sdev),
sdev_id(sdev), sdev->lun);
 
@@ -3805,6 +3806,7 @@ static int hpsa_update_device_info(struc
sizeof(this_device->vendor));
memcpy(this_device->model, _buff[16],
sizeof(this_device->model));
+   this_device->rev = inq_buff[2];
memset(this_device->device_id, 0,
sizeof(this_device->device_id));
hpsa_get_device_id(h, scsi3addr, this_device->device_id, 8,
@@ -3887,10 +3889,14 @@ static void figure_bus_target_lun(struct
 
if (!is_logical_dev_addr_mode(lunaddrbytes)) {
/* physical device, target and lun filled in later */
-   if (is_hba_lunid(lunaddrbytes))
+   if (is_hba_lunid(lunaddrbytes)) {
+   int bus = HPSA_HBA_BUS;
+
+   if (!device->rev)
+   bus = HPSA_LEGACY_HBA_BUS;
hpsa_set_bus_target_lun(device,
-   HPSA_HBA_BUS, 0, lunid & 0x3fff);
-   else
+   bus, 0, lunid & 0x3fff);
+   } else
/* defer target, lun assignment for physical devices */
hpsa_set_bus_target_lun(device,
HPSA_PHYSICAL_DEVICE_BUS, -1, -1);
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -69,6 +69,7 @@ struct hpsa_scsi_dev_t {
u64 sas_address;
unsigned char vendor[8];/* bytes 8-15 of inquiry data */
unsigned char model[16];/* bytes 16-31 of inquiry data */
+   unsigned char rev;  /* byte 2 of inquiry data */
unsigned char raid_level;   /* from inquiry page 0xC1 */
unsigned char volume_offline;   /* discovered via TUR or VPD */
u16 queue_depth;/* max queue_depth for this device */
@@ -403,6 +404,7 @@ struct offline_device_entry {
 #define HPSA_RAID_VOLUME_BUS   1
 #define HPSA_EXTERNAL_RAID_VOLUME_BUS  2
 #define HPSA_HBA_BUS   0
+#define HPSA_LEGACY_HBA_BUS3
 
 /*
Send the command to the hardware