[PATCH 04/15] hpsa: move hpsa_hba_inquiry after scsi_add_host()

Hannes Reinecke
2021-11-25T15:15:06Z

Move hpsa_hba_inquiry to after scsi_add_host() so that the host
is fully initialized.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Tested-by: Don Brace <don.brace@microchip.com>
---
drivers/scsi/hpsa.c | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index cdf3328cc065..d0a7d1086c74 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5877,6 +5877,22 @@ static int hpsa_scsi_host_alloc(struct ctlr_info *h)
return 0;
}

+static void hpsa_hba_inquiry(struct ctlr_info *h)
+{
+ int rc;
+
+#define HBA_INQUIRY_BYTE_COUNT 64
+ h->hba_inquiry_data = kmalloc(HBA_INQUIRY_BYTE_COUNT, GFP_KERNEL);
+ if (!h->hba_inquiry_data)
+ return;
+ rc = hpsa_scsi_do_inquiry(h, RAID_CTLR_LUNID, 0,
+ h->hba_inquiry_data, HBA_INQUIRY_BYTE_COUNT);
+ if (rc != 0) {
+ kfree(h->hba_inquiry_data);
+ h->hba_inquiry_data = NULL;
+ }
+}
+
static int hpsa_scsi_add_host(struct ctlr_info *h)
{
int rv;
@@ -5886,6 +5902,9 @@ static int hpsa_scsi_add_host(struct ctlr_info *h)
dev_err(&h->pdev->dev, "scsi_add_host failed\n");
return rv;
}
+
+ hpsa_hba_inquiry(h);
+
scsi_scan_host(h->scsi_host);
return 0;
}
@@ -7952,22 +7971,6 @@ static int hpsa_pci_init(struct ctlr_info *h)
return err;
}

-static void hpsa_hba_inquiry(struct ctlr_info *h)
-{
- int rc;
-
-#define HBA_INQUIRY_BYTE_COUNT 64
- h->hba_inquiry_data = kmalloc(HBA_INQUIRY_BYTE_COUNT, GFP_KERNEL);
- if (!h->hba_inquiry_data)
- return;
- rc = hpsa_scsi_do_inquiry(h, RAID_CTLR_LUNID, 0,
- h->hba_inquiry_data, HBA_INQUIRY_BYTE_COUNT);
- if (rc != 0) {
- kfree(h->hba_inquiry_data);
- h->hba_inquiry_data = NULL;
- }
-}
-
static int hpsa_init_reset_devices(struct pci_dev *pdev, u32 board_id)
{
int rc, i;
@@ -8872,8 +8875,6 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
/* Turn the interrupts on so we can service requests */
h->access.set_intr_mask(h, HPSA_INTR_ON);

- hpsa_hba_inquiry(h);
-
h->lastlogicals = kzalloc(sizeof(*(h->lastlogicals)), GFP_KERNEL);
if (!h->lastlogicals)
dev_info(&h->pdev->dev,
--
2.29.2