mpt3sas: Perform additional retries if Doorbell read returns 0
Subsystems (3)
Ranjan Kumar
maintainerPATCH 1/1 mpt3sas: Perform additional retries if Doorbell read returns 0
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.
'Fixes: b899202901a8 ("mpt3sas: Add separate function for aero doorbell reads ")'
Cc: [email protected]
--- 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
Greg KH
maintainerQuoted 5 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.
'Fixes:
b899202901a8("mpt3sas: Add separate function for aero doorbell reads ")'
No ' characters here please.
Quoted 3 lines
Signed-off-by Ranjan Kumar <[email protected]>
No blank line before the signed-off-by and the other fields please.
Didn't checkpatch warn you about this?
Quoted 10 lines
--- 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 +0
-0
drivers/scsi/mpt3sas/mpt3sas_base.c module_param_call(mpt3sas_fwfault_debug, _scsih_set_fwfault_debug, · line 204
Quoted 5 lines
drivers/scsi/mpt3sas/mpt3sas_base.c +1
-1@@ -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)
Are you sure that volatile really does what you think it does here?
drivers/scsi/mpt3sas/mpt3sas_base.c module_param_call(mpt3sas_fwfault_debug, _scsih_set_fwfault_debug, · line 211
Quoted 8 lines
drivers/scsi/mpt3sas/mpt3sas_base.c +1
-1{u32 i =0 , ret_val;do { ret_val =readl (addr); i++; - }while (ret_val ==0 && i <3 ); + }while (ret_val ==0 && i < retry_count);
So newer systems will complete this failure loop faster than older ones? That feels very wrong, you will be changing this in a year or so. Use time please, not counts.
thanks,
greg k-h
Sathya Prakash Veerichetty
maintainerQuoted 23 lines · Greg KH
Quoted 5 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.
'Fixes:
b899202901a8("mpt3sas: Add separate function for aero doorbell reads ")'No ' characters here please.
Quoted 3 lines
Signed-off-by Ranjan Kumar <[email protected]>No blank line before the signed-off-by and the other fields please.
Didn't checkpatch warn you about this?
Quoted 5 lines
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 50 ++++++++++++++++------------- drivers/scsi/mpt3sas/mpt3sas_base.h | 4 ++- 2 files changed, 31 insertions(+), 23 deletions(-)
Quoted 14 lines
drivers/scsi/mpt3sas/mpt3sas_base.c module_param_call(mpt3sas_fwfault_debug, _scsih_set_fwfault_debug, · line 204
Quoted 10 lines
drivers/scsi/mpt3sas/mpt3sas_base.c +1
-1@@ -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)Are you sure that volatile really does what you think it does here?
Greg, the volatile definition is present for a long time and we don't want to change it in this patch, we will review and see whether we can remove it later.
Quoted 9 lines
drivers/scsi/mpt3sas/mpt3sas_base.c module_param_call(mpt3sas_fwfault_debug, _scsih_set_fwfault_debug, · line 211
Quoted 8 lines
drivers/scsi/mpt3sas/mpt3sas_base.c +1
-1{u32 i =0 , ret_val;do { ret_val =readl (addr); i++; - }while (ret_val ==0 && i <3 ); + }while (ret_val ==0 && i < retry_count);
Quoted 4 lines
So newer systems will complete this failure loop faster than older ones? That feels very wrong, you will be changing this in a year or so. Use time please, not counts.
This is nothing to do with the system speed, 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.
Quoted 3 lines
thanks,
greg k-h
Signature · 11 lines
This electronic communication and the information and any files transmitted with it, or attached to it, are confidential and are intended solely for the use of the individual or entity to whom it is addressed and may contain information that is confidential, legally privileged, protected by privacy laws, or otherwise restricted from disclosure to anyone else. If you are not the intended recipient or the person responsible for delivering the e-mail to the intended recipient, you are hereby notified that any use, copying, distributing, dissemination, forwarding, printing, or copying of this e-mail is strictly prohibited. If you received this e-mail in error, please return the e-mail to the sender, delete it from your computer, and destroy any printed copy of it.
Greg KH
maintainerQuoted 12 lines · Sathya Prakash Veerichetty
Signature · 11 lines
This electronic communication and the information and any files transmitted with it, or attached to it, are confidential and are intended solely for the use of the individual or entity to whom it is addressed and may contain information that is confidential, legally privileged, protected by privacy laws, or otherwise restricted from disclosure to anyone else. If you are not the intended recipient or the person responsible for delivering the e-mail to the intended recipient, you are hereby notified that any use, copying, distributing, dissemination, forwarding, printing, or copying of this e-mail is strictly prohibited. If you received this e-mail in error, please return the e-mail to the sender, delete it from your computer, and destroy any printed copy of it.
Now deleted.
Sathya Prakash Veerichetty
maintainerQuoted 15 lines · Greg KH
Quoted 4 lines · Sathya Prakash Veerichetty
--
This electronic communication and the information and any files transmitted with it, or attached to it, are confidential and are intended solely for the use of the individual or entity to whom it is addressed and may containQuoted 8 lines
information that is confidential, legally privileged, protected by privacy laws, or otherwise restricted from disclosure to anyone else. If you are not the intended recipient or the person responsible for delivering the e-mail to the intended recipient, you are hereby notified that any use, copying, distributing, dissemination, forwarding, printing, or copying of this e-mail is strictly prohibited. If you received this e-mail in error, please return the e-mail to the sender, delete it from your computer, and destroy any printed copy of it.
Quoted 1 line
Now deleted.
you didn't receive this in error, so you can keep it, not sure from when this footer is getting added, I will check on the options to remove it :(
Signature · 11 lines
This electronic communication and the information and any files transmitted with it, or attached to it, are confidential and are intended solely for the use of the individual or entity to whom it is addressed and may contain information that is confidential, legally privileged, protected by privacy laws, or otherwise restricted from disclosure to anyone else. If you are not the intended recipient or the person responsible for delivering the e-mail to the intended recipient, you are hereby notified that any use, copying, distributing, dissemination, forwarding, printing, or copying of this e-mail is strictly prohibited. If you received this e-mail in error, please return the e-mail to the sender, delete it from your computer, and destroy any printed copy of it.
Greg KH
maintainerQuoted 16 lines · Sathya Prakash Veerichetty
Quoted 15 lines · Greg KH
Quoted 12 lines · Sathya Prakash Veerichetty
--
This electronic communication and the information and any files transmitted with it, or attached to it, are confidential and are intended solely for the use of the individual or entity to whom it is addressed and may contain information that is confidential, legally privileged, protected by privacy laws, or otherwise restricted from disclosure to anyone else. If you are not the intended recipient or the person responsible for delivering the e-mail to the intended recipient, you are hereby notified that any use, copying, distributing, dissemination, forwarding, printing, or copying of this e-mail is strictly prohibited. If you received this e-mail in error, please return the e-mail to the sender, delete it from your computer, and destroy any printed copy of it.
Quoted 2 lines
Quoted 1 line
Now deleted.
you didn't receive this in error, so you can keep it,
No I can not, as this obviously is confidential, and as such, I need to delete it because that is incompatible with kernel development.
Quoted 16 lines
not sure from
when this footer is getting added, I will check on the options to remove it :(Signature · 11 lines
This electronic communication and the information and any files transmitted with it, or attached to it, are confidential and are intended solely for the use of the individual or entity to whom it is addressed and may contain information that is confidential, legally privileged, protected by privacy laws, or otherwise restricted from disclosure to anyone else. If you are not the intended recipient or the person responsible for delivering the e-mail to the intended recipient, you are hereby notified that any use, copying, distributing, dissemination, forwarding, printing, or copying of this e-mail is strictly prohibited. If you received this e-mail in error, please return the e-mail to the sender, delete it from your computer, and destroy any printed copy of it.
I'll go delete this as well.
Sathya Prakash Veerichetty
maintainerHi Greg,
The email footer issue is resolved and Ranjan has submitted a new revision of patches, we can discuss in the thread if you have further questions on the patch.
Thanks
Sathya
Greg KH
maintainerQuoted 4 lines · Sathya Prakash Veerichetty
Hi Greg,
The email footer issue is resolved and Ranjan has submitted a new revision of patches, we can discuss in the thread if you have further questions on the patch.
I have no context here at all, sorry. What in the world is this all about?
What would you do if you got a random email like this?
Remember, some of us get 1000+ emails a day to deal with...
greg k-h
Sathya Prakash Veerichetty
maintainerQuoted 23 lines · Greg KH
Quoted 5 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.
'Fixes:
b899202901a8("mpt3sas: Add separate function for aero doorbell reads ")'No ' characters here please.
Quoted 3 lines
Signed-off-by Ranjan Kumar <[email protected]>No blank line before the signed-off-by and the other fields please.
Didn't checkpatch warn you about this?
Quoted 5 lines
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 50 ++++++++++++++++------------- drivers/scsi/mpt3sas/mpt3sas_base.h | 4 ++- 2 files changed, 31 insertions(+), 23 deletions(-)
Quoted 14 lines
drivers/scsi/mpt3sas/mpt3sas_base.c module_param_call(mpt3sas_fwfault_debug, _scsih_set_fwfault_debug, · line 204
Quoted 10 lines
drivers/scsi/mpt3sas/mpt3sas_base.c +1
-1@@ -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)Are you sure that volatile really does what you think it does here?
This is taken care in the new revision of the patch
Quoted 9 lines
drivers/scsi/mpt3sas/mpt3sas_base.c module_param_call(mpt3sas_fwfault_debug, _scsih_set_fwfault_debug, · line 211
Quoted 8 lines
drivers/scsi/mpt3sas/mpt3sas_base.c +1
-1{u32 i =0 , ret_val;do { ret_val =readl (addr); i++; - }while (ret_val ==0 && i <3 ); + }while (ret_val ==0 && i < retry_count);
Quoted 4 lines
So newer systems will complete this failure loop faster than older ones? That feels very wrong, you will be changing this in a year or so. Use time please, not counts.
This is nothing to do with the system speed, 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.
Quoted 3 lines
thanks,
greg k-h
Sathya Prakash Veerichetty
maintainerQuoted 7 lines · Greg KH
Quoted 4 lines · Sathya Prakash Veerichetty
Hi Greg,
The email footer issue is resolved and Ranjan has submitted a new revision of patches, we can discuss in the thread if you have further questions on the patch.
Quoted 7 lines
I have no context here at all, sorry. What in the world is this all about?
What would you do if you got a random email like this?
Remember, some of us get 1000+ emails a day to deal with...
Sorry about that, I replied your comments on this patch and you had to delete that due to the confidentiality footer added by my company's email server, I had fixed the problem and sent the response again, we have also provided new version of the patch with one of your comment addressed,
Quoted 1 line
greg k-h