[PATCH 1/2] scsi: aacraid: Get correct lun count

[PATCH 1/2] scsi: aacraid: Get correct lun count

[Raghava Aditya Renukunta]

The correct lun count needs to be divided by 24, missed it in the previous
patch set.

Fixes: 4b00022753550055 (scsi: aacraid: Create helper functions to get lun info)
Signed-off-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
---
 drivers/scsi/aacraid/aachba.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index a2bdd79..4c65991 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1868,7 +1868,7 @@ static int aac_get_safw_ciss_luns(struct aac_dev *dev)
 
 static inline u32 aac_get_safw_phys_lun_count(struct aac_dev *dev)
 {
-	return get_unaligned_be32(&dev->safw_phys_luns->list_length[0]);
+	return get_unaligned_be32(&dev->safw_phys_luns->list_length[0])/24;
 }
 
 static inline u32 aac_get_safw_phys_bus(struct aac_dev *dev, int lun)
-- 
2.9.4

[PATCH 2/2] scsi: aacraid: Delay for rescan worker needs to be 10 seconds

[Raghava Aditya Renukunta]

The delay for the rescan worker needs to 10 seconds, missed the HZ in
there.

Fixes: a1367e4adee207fe (scsi: aacraid: Reschedule host scan in case of failure)
Signed-off-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
---
 drivers/scsi/aacraid/aacraid.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 3e8bfcf..3ab3231 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -1340,7 +1340,7 @@ struct fib {
 #define AAC_DEVTYPE_ARC_RAW		2
 #define AAC_DEVTYPE_NATIVE_RAW		3
 
-#define AAC_SAFW_RESCAN_DELAY  10
+#define AAC_SAFW_RESCAN_DELAY		(10 * HZ)
 
 struct aac_hba_map_info {
 	__le32	rmw_nexus;		/* nexus for native HBA devices */
-- 
2.9.4

Re: [PATCH 1/2] scsi: aacraid: Get correct lun count

[Martin K. Petersen]

Raghava,

> The correct lun count needs to be divided by 24, missed it in the previous
> patch set.

Peculiar number.

Applied to 4.16/scsi-queue.

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH 2/2] scsi: aacraid: Delay for rescan worker needs to be 10 seconds

[Martin K. Petersen]

Raghava,

> The delay for the rescan worker needs to 10 seconds, missed the HZ in
> there.

Applied to 4.16/scsi-queue.

-- 
Martin K. Petersen	Oracle Linux Engineering