mpt3sas: Contains Defect
Subsystems (3)
Ranjan Kumar
maintainerPATCH 1/2 mpt3sas: Perform additional retries if Doorbell read returns 0
In reply to Ranjan KumarDoorbell and Host diagnostic registers could return 0 even after 3 retries and that leads to occasional resets of the controllers, hence increased the retry count to thirty.
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 50 ++++++++++++++++------------- drivers/scsi/mpt3sas/mpt3sas_base.h | 4 ++- 2 files changed, 31 insertions(+), 23 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +28 -22
@@ -201,20 +201,20 @@ module_param_call(mpt3sas_fwfault_debug, _scsih_set_fwfault_debug,* while reading the system interface register. */ static inline u32 -_base_readl_aero (const volatile void __iomem *addr) +_base_readl_aero (const volatile void __iomem *addr,u8 retry_count) {u32 i =0 , ret_val;do { ret_val =readl (addr); i++; - }while (ret_val ==0 && i <3 ); + }while (ret_val ==0 && i < retry_count);return ret_val; }static inline u32 -_base_readl (const volatile void __iomem *addr) +_base_readl (const volatile void __iomem *addr,u8 retry_count) {return readl (addr); }
@@ -940,7 +940,7 @@ mpt3sas_halt_firmware(struct MPT3SAS_ADAPTER *ioc)dump_stack (); - doorbell = ioc->base_readl (&ioc->chip->Doorbell); + doorbell = ioc->base_readl (&ioc->chip->Doorbell,READL_RETRY_COUNT_OF_THIRTY );if ((doorbell &MPI2_IOC_STATE_MASK ) ==MPI2_IOC_STATE_FAULT ) {mpt3sas_print_fault_code (ioc, doorbell &MPI2_DOORBELL_DATA_MASK );
@@ -1617,10 +1617,10 @@ mpt3sas_base_mask_interrupts(struct MPT3SAS_ADAPTER *ioc)u32 him_register; ioc->mask_interrupts =1 ; - him_register = ioc->base_readl (&ioc->chip->HostInterruptMask); + him_register = ioc->base_readl (&ioc->chip->HostInterruptMask,READL_RETRY_COUNT_OF_THREE ); him_register |=MPI2_HIM_DIM +MPI2_HIM_RIM +MPI2_HIM_RESET_IRQ_MASK ;writel (him_register, &ioc->chip->HostInterruptMask); - ioc->base_readl (&ioc->chip->HostInterruptMask); + ioc->base_readl (&ioc->chip->HostInterruptMask,READL_RETRY_COUNT_OF_THREE ); }/**
@@ -1634,7 +1634,7 @@ mpt3sas_base_unmask_interrupts(struct MPT3SAS_ADAPTER *ioc) {u32 him_register; - him_register = ioc->base_readl (&ioc->chip->HostInterruptMask); + him_register = ioc->base_readl (&ioc->chip->HostInterruptMask,READL_RETRY_COUNT_OF_THREE ); him_register &= ~MPI2_HIM_RIM ;writel (him_register, &ioc->chip->HostInterruptMask); ioc->mask_interrupts =0 ;
@@ -6686,7 +6686,7 @@ mpt3sas_base_get_iocstate(struct MPT3SAS_ADAPTER *ioc, int cooked) {u32 s, sc; - s = ioc->base_readl (&ioc->chip->Doorbell); + s = ioc->base_readl (&ioc->chip->Doorbell,READL_RETRY_COUNT_OF_THIRTY ); sc = s &MPI2_IOC_STATE_MASK ;return cooked ? sc : s; }
@@ -6760,7 +6760,8 @@ _base_wait_for_doorbell_int(struct MPT3SAS_ADAPTER *ioc, int timeout) count =0 ; cntdn =1000 * timeout; do { - int_status = ioc->base_readl(&ioc->chip->HostInterruptStatus); + int_status = ioc->base_readl(&ioc->chip->HostInterruptStatus, + READL_RETRY_COUNT_OF_THREE); if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) { dhsprintk(ioc, ioc_info(ioc, "%s: successful count(%d), timeout(%d)\n",
@@ -6786,7 +6787,8 @@ _base_spin_on_doorbell_int(struct MPT3SAS_ADAPTER *ioc, int timeout) count =0 ; cntdn =2000 * timeout; do { - int_status = ioc->base_readl(&ioc->chip->HostInterruptStatus); + int_status = ioc->base_readl(&ioc->chip->HostInterruptStatus, + READL_RETRY_COUNT_OF_THREE); if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) { dhsprintk(ioc, ioc_info(ioc, "%s: successful count(%d), timeout(%d)\n",
@@ -6824,14 +6826,16 @@ _base_wait_for_doorbell_ack(struct MPT3SAS_ADAPTER *ioc, int timeout) count =0 ; cntdn =1000 * timeout; do { - int_status = ioc->base_readl(&ioc->chip->HostInterruptStatus); + int_status = ioc->base_readl(&ioc->chip->HostInterruptStatus, + READL_RETRY_COUNT_OF_THREE); if (!(int_status & MPI2_HIS_SYS2IOC_DB_STATUS)) { dhsprintk(ioc, ioc_info(ioc, "%s: successful count(%d), timeout(%d)\n", __func__, count, timeout)); return 0; } else if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) { - doorbell = ioc->base_readl(&ioc->chip->Doorbell); + doorbell = ioc->base_readl(&ioc->chip->Doorbell, + READL_RETRY_COUNT_OF_THIRTY); if ((doorbell & MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_FAULT) { mpt3sas_print_fault_code(ioc, doorbell);
@@ -6871,7 +6875,7 @@ _base_wait_for_doorbell_not_used(struct MPT3SAS_ADAPTER *ioc, int timeout) count =0 ; cntdn =1000 * timeout; do { - doorbell_reg = ioc->base_readl(&ioc->chip->Doorbell); + doorbell_reg = ioc->base_readl(&ioc->chip->Doorbell, READL_RETRY_COUNT_OF_THIRTY); if (!(doorbell_reg & MPI2_DOORBELL_USED)) { dhsprintk(ioc, ioc_info(ioc, "%s: successful count(%d), timeout(%d)\n",
@@ -7019,13 +7023,13 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes,__le32 *mfp;/* make sure doorbell is not in use */ -if ((ioc->base_readl (&ioc->chip->Doorbell) &MPI2_DOORBELL_USED )) { +if ((ioc->base_readl (&ioc->chip->Doorbell,READL_RETRY_COUNT_OF_THIRTY ) &MPI2_DOORBELL_USED )) {ioc_err (ioc,"doorbell is in use (line=%d)\n" , __LINE__);return -EFAULT ; }/* clear pending doorbell interrupts from previous state changes */ -if (ioc->base_readl (&ioc->chip->HostInterruptStatus) & +if (ioc->base_readl (&ioc->chip->HostInterruptStatus,READL_RETRY_COUNT_OF_THREE ) &MPI2_HIS_IOC2SYS_DB_STATUS )writel (0 , &ioc->chip->HostInterruptStatus);
@@ -7068,7 +7072,7 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, }/* read the first two 16-bits, it gives the total length of the reply */ - reply[0 ] =le16_to_cpu (ioc->base_readl (&ioc->chip->Doorbell) + reply[0 ] =le16_to_cpu (ioc->base_readl (&ioc->chip->Doorbell,READL_RETRY_COUNT_OF_THIRTY ) &MPI2_DOORBELL_DATA_MASK );writel (0 , &ioc->chip->HostInterruptStatus);if ((_base_wait_for_doorbell_int (ioc,5 ))) {
@@ -7076,7 +7080,7 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, __LINE__);return -EFAULT ; } - reply[1 ] =le16_to_cpu (ioc->base_readl (&ioc->chip->Doorbell) + reply[1 ] =le16_to_cpu (ioc->base_readl (&ioc->chip->Doorbell,READL_RETRY_COUNT_OF_THIRTY ) &MPI2_DOORBELL_DATA_MASK );writel (0 , &ioc->chip->HostInterruptStatus);
@@ -7087,10 +7091,10 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes,return -EFAULT ; }if (i >= reply_bytes/2 )/* overflow case */ - ioc->base_readl (&ioc->chip->Doorbell); + ioc->base_readl (&ioc->chip->Doorbell,READL_RETRY_COUNT_OF_THIRTY );else reply[i] =le16_to_cpu ( - ioc->base_readl (&ioc->chip->Doorbell) + ioc->base_readl (&ioc->chip->Doorbell,READL_RETRY_COUNT_OF_THIRTY ) &MPI2_DOORBELL_DATA_MASK );writel (0 , &ioc->chip->HostInterruptStatus); }
@@ -7949,14 +7953,15 @@ _base_diag_reset(struct MPT3SAS_ADAPTER *ioc) goto out; } - host_diagnostic = ioc->base_readl (&ioc->chip->HostDiagnostic); + host_diagnostic = ioc->base_readl (&ioc->chip->HostDiagnostic, +READL_RETRY_COUNT_OF_THIRTY );drsprintk (ioc,ioc_info (ioc,"wrote magic sequence: count(%d), host_diagnostic(0x%08x)\n" , count, host_diagnostic)); }while ((host_diagnostic &MPI2_DIAG_DIAG_WRITE_ENABLE ) ==0 ); - hcb_size = ioc->base_readl (&ioc->chip->HCBSize); + hcb_size = ioc->base_readl (&ioc->chip->HCBSize,READL_RETRY_COUNT_OF_THREE );drsprintk (ioc,ioc_info (ioc,"diag reset: issued\n" )); writel(host_diagnostic | MPI2_DIAG_RESET_ADAPTER,
@@ -7969,7 +7974,8 @@ _base_diag_reset(struct MPT3SAS_ADAPTER *ioc)for (count =0 ; count < (300000000 /MPI2_HARD_RESET_PCIE_SECOND_READ_DELAY_MICRO_SEC ); count++) { - host_diagnostic = ioc->base_readl (&ioc->chip->HostDiagnostic); + host_diagnostic = ioc->base_readl (&ioc->chip->HostDiagnostic, +READL_RETRY_COUNT_OF_THIRTY );if (host_diagnostic ==0xFFFFFFFF ) { ioc_info(ioc,
drivers/scsi/mpt3sas/mpt3sas_base.h +3 -1
@@ -160,6 +160,8 @@#define IOC_OPERATIONAL_WAIT_COUNT 10 +#define READL_RETRY_COUNT_OF_THIRTY 30 +#define READL_RETRY_COUNT_OF_THREE 3/* * NVMe defines */
@@ -994,7 +996,7 @@ typedef void (*NVME_BUILD_PRP)(struct MPT3SAS_ADAPTER *ioc, u16 smid,typedef void (*PUT_SMID_IO_FP_HIP ) (struct MPT3SAS_ADAPTER *ioc,u16 smid,u16 funcdep);typedef void (*PUT_SMID_DEFAULT ) (struct MPT3SAS_ADAPTER *ioc,u16 smid); -typedef u32 (*BASE_READ_REG ) (const volatile void __iomem *addr); +typedef u32 (*BASE_READ_REG ) (const volatile void __iomem *addr,u8 retry_count);/* * To get high iops reply queue's msix index when high iops mode is enabled * else get the msix index of general reply queues.
Signature · 1 line
2.31.1
Ranjan Kumar
maintainerPATCH 2/2 mpt3sas: Removing volatile qualifier
In reply to Ranjan KumarRemoving reduntant volatile qualifier
--- drivers/scsi/mpt3sas/mpi/mpi2.h | 2 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 4 ++-- drivers/scsi/mpt3sas/mpt3sas_base.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/mpt3sas/mpi/mpi2.h +1 -1
@@ -199,7 +199,7 @@* *****************************************************************************/ -typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS { +typedef struct _MPI2_SYSTEM_INTERFACE_REGS { U32 Doorbell; /*0x00 */ U32 WriteSequence; /*0x04 */ U32 HostDiagnostic; /*0x08 */
drivers/scsi/mpt3sas/mpt3sas_base.c +2 -2
@@ -201,7 +201,7 @@ module_param_call(mpt3sas_fwfault_debug, _scsih_set_fwfault_debug,* while reading the system interface register. */ static inline u32 -_base_readl_aero (const volatile void __iomem *addr,u8 retry_count) +_base_readl_aero (const void __iomem *addr,u8 retry_count) {u32 i =0 , ret_val;
@@ -214,7 +214,7 @@ _base_readl_aero(const volatile void __iomem *addr, u8 retry_count) }static inline u32 -_base_readl (const volatile void __iomem *addr,u8 retry_count) +_base_readl (const void __iomem *addr,u8 retry_count) {return readl (addr); }
drivers/scsi/mpt3sas/mpt3sas_base.h +1 -1
@@ -996,7 +996,7 @@ typedef void (*NVME_BUILD_PRP)(struct MPT3SAS_ADAPTER *ioc, u16 smid,typedef void (*PUT_SMID_IO_FP_HIP ) (struct MPT3SAS_ADAPTER *ioc,u16 smid,u16 funcdep);typedef void (*PUT_SMID_DEFAULT ) (struct MPT3SAS_ADAPTER *ioc,u16 smid); -typedef u32 (*BASE_READ_REG ) (const volatile void __iomem *addr,u8 retry_count); +typedef u32 (*BASE_READ_REG ) (const void __iomem *addr,u8 retry_count);/* * To get high iops reply queue's msix index when high iops mode is enabled * else get the msix index of general reply queues.
Signature · 1 line
2.31.1
Ranjan Kumar
maintainercover mpt3sas: Contains Defect
Defect and removal of non required volatile qualifier of mpt3sas driver.
Ranjan Kumar (2):
mpt3sas: Perform additional retries if Doorbell read returns 0
mpt3sas: Removing volatile qualifier
drivers/scsi/mpt3sas/mpi/mpi2.h | 2 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 50 ++++++++++++++++------------- drivers/scsi/mpt3sas/mpt3sas_base.h | 4 ++- 3 files changed, 32 insertions(+), 24 deletions(-)
Signature · 1 line
2.31.1
Re: [PATCH 1/2] mpt3sas: Perform additional retries if Doorbell read returns 0
In reply to Ranjan KumarQuoted 3 lines · Ranjan Kumar
Doorbell and Host diagnostic registers could return 0 even after 3 retries and that leads to occasional resets of the controllers, hence increased the retry count to thirty.
The magic value "3" for retry count was already that, magic. Why would things work better with 30 ? What is the reasoning ? Isn't a udelay needed to avoid that many retries ?
Quoted 4 lines
Fixes b899202901a8 ("mpt3sas: Add separate function for aero doorbell reads ")Signed-off-by Ranjan Kumar <[email protected]>
[..]
drivers/scsi/mpt3sas/mpt3sas_base.h line 164
Quoted 10 lines
drivers/scsi/mpt3sas/mpt3sas_base.h +2
-0@@ -160,6 +160,8 @@#define IOC_OPERATIONAL_WAIT_COUNT 10 +#define READL_RETRY_COUNT_OF_THIRTY 30 +#define READL_RETRY_COUNT_OF_THREE 3
Less than ideal naming I think. If the values need to be changed again, a lot of code will need to change. What about soemthing like:
#define READL_RETRY_COUNT 30
#define READL_RETRY_SHORT_COUNT 3
Quoted 12 lines
drivers/scsi/mpt3sas/mpt3sas_base.h +1
-1/* * NVMe defines */ @@ -994,7 +996,7 @@ typedef void (*NVME_BUILD_PRP)(struct MPT3SAS_ADAPTER *ioc, u16 smid,typedef void (*PUT_SMID_IO_FP_HIP ) (struct MPT3SAS_ADAPTER *ioc,u16 smid,u16 funcdep);typedef void (*PUT_SMID_DEFAULT ) (struct MPT3SAS_ADAPTER *ioc,u16 smid); -typedef u32 (*BASE_READ_REG ) (const volatile void __iomem *addr); +typedef u32 (*BASE_READ_REG ) (const volatile void __iomem *addr,u8 retry_count);/* * To get high iops reply queue's msix index when high iops mode is enabled * else get the msix index of general reply queues.
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH 1/2] mpt3sas: Perform additional retries if Doorbell read returns 0
In reply to a message not in the archiveQuoted 6 lines · Ranjan kumar
Hi Damien,
Regarding delay:
As Sathya already mentioned as this is our hardware specific behavior and we are confident that the increased retry count
is sufficient from our hardware perspective for any new systems too. So, we want to go with this change .
Fine. Adding a comment above the macro definitions to explain something like that would be nice.
Quoted 4 lines
Apart from that, I will change the name as suggested .
Thanks & Regards,
Ranjan
Please avoid top posting.
Quoted 64 lines · Damien Le Moal
Quoted 62 lines · Ranjan Kumar
Quoted 3 lines
Doorbell and Host diagnostic registers could return 0 even after 3 retries and that leads to occasional resets of the controllers, hence increased the retry count to thirty.
The magic value "3" for retry count was already that, magic. Why would things
work better with 30 ? What is the reasoning ? Isn't a udelay needed to avoid
that many retries ?Quoted 2 lines
Fixes b899202901a8 ("mpt3sas: Add separate function for aero doorbellreads ")
Quoted 2 lines
Signed-off-by Ranjan Kumar <[email protected]>[..]
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/scsi/mpt3sas/mpt3sas_base.hdrivers/scsi/mpt3sas/mpt3sas_base.h line 164
Quoted 9 lines
index
05364aa15ecd..3b8ec4fd2d21100644drivers/scsi/mpt3sas/mpt3sas_base.h +2
-0@@ -160,6 +160,8 @@#define IOC_OPERATIONAL_WAIT_COUNT 10 +#define READL_RETRY_COUNT_OF_THIRTY 30 +#define READL_RETRY_COUNT_OF_THREE 3Less than ideal naming I think. If the values need to be changed again, a lot of
code will need to change. What about soemthing like:#define
READL_RETRY_COUNT30
#defineREADL_RETRY_SHORT_COUNT3drivers/scsi/mpt3sas/mpt3sas_base.h typedef void (*NVME_BUILD_PRP)(struct
Quoted 4 lines
drivers/scsi/mpt3sas/mpt3sas_base.h +0
-0/* * NVMe defines */ @@ -994,7 +996,7 @@ typedef void (*NVME_BUILD_PRP)(struct
MPT3SAS_ADAPTER*ioc, u16 smid,drivers/scsi/mpt3sas/mpt3sas_base.h typedef void (*NVME_BUILD_PRP)(struct · line 996
Quoted 1 line
drivers/scsi/mpt3sas/mpt3sas_base.h +0
-0typedef void (*PUT_SMID_IO_FP_HIP) (struct MPT3SAS_ADAPTER *ioc, u16smid,
drivers/scsi/mpt3sas/mpt3sas_base.h typedef void (*NVME_BUILD_PRP)(struct · line 998
Quoted 2 lines
drivers/scsi/mpt3sas/mpt3sas_base.h +0
-0u16 funcdep); typedef void (*PUT_SMID_DEFAULT) (struct MPT3SAS_ADAPTER *ioc, u16smid);
drivers/scsi/mpt3sas/mpt3sas_base.h typedef void (*NVME_BUILD_PRP)(struct · line 999
Quoted 2 lines
drivers/scsi/mpt3sas/mpt3sas_base.h +1
-1-typedef u32 (*BASE_READ_REG ) (const volatile void __iomem *addr); +typedef u32 (*BASE_READ_REG) (const volatile void __iomem *addr, u8
retry_count);drivers/scsi/mpt3sas/mpt3sas_base.h typedef void (*NVME_BUILD_PRP)(struct · line 1001
Quoted 2 lines
drivers/scsi/mpt3sas/mpt3sas_base.h +0
-0/* * To get high iops reply queue's msix index when high iops mode is enabled
drivers/scsi/mpt3sas/mpt3sas_base.h typedef void (*NVME_BUILD_PRP)(struct MPT3SAS_ADAPTER *ioc, u16 smid, · line 1002
Quoted 1 line
drivers/scsi/mpt3sas/mpt3sas_base.h +0
-0* else get the msix index of general reply queues. --
Damien Le Moal
Western Digital Research
Signature · 2 lines
Damien Le Moal Western Digital Research