diff mbox series

[v2,1/7] Revert "scsi: qla2xxx: Fix response queue handler reading stale packets"

Message ID 20220826102559.17474-2-njavali@marvell.com (mailing list archive)
State Accepted
Headers show
Series qla2xxx driver features | expand

Commit Message

Nilesh Javali Aug. 26, 2022, 10:25 a.m. UTC 
From: Arun Easi <aeasi@marvell.com>

Reverting this patch so that a fixed up patch, without adding new module
parameters, could be submitted.

    Link: https://lore.kernel.org/stable/166039743723771@kroah.com/

This reverts commit b1f707146923335849fb70237eec27d4d1ae7d62.

Cc: stable@vger.kernel.org
Signed-off-by: Arun Easi <aeasi@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
---
 drivers/scsi/qla2xxx/qla_gbl.h |  2 --
 drivers/scsi/qla2xxx/qla_isr.c | 25 ++-----------------------
 drivers/scsi/qla2xxx/qla_os.c  | 10 ----------
 3 files changed, 2 insertions(+), 35 deletions(-)

Comments

Himanshu Madhani Aug. 29, 2022, 4:09 p.m. UTC | #1 
> On Aug 26, 2022, at 3:25 AM, Nilesh Javali <njavali@marvell.com> wrote:
> 
> From: Arun Easi <aeasi@marvell.com>
> 
> Reverting this patch so that a fixed up patch, without adding new module
> parameters, could be submitted.
> 
>    Link: https://lore.kernel.org/stable/166039743723771@kroah.com/
> 
> This reverts commit b1f707146923335849fb70237eec27d4d1ae7d62.
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Arun Easi <aeasi@marvell.com>
> Signed-off-by: Nilesh Javali <njavali@marvell.com>
> ---
> drivers/scsi/qla2xxx/qla_gbl.h |  2 --
> drivers/scsi/qla2xxx/qla_isr.c | 25 ++-----------------------
> drivers/scsi/qla2xxx/qla_os.c  | 10 ----------
> 3 files changed, 2 insertions(+), 35 deletions(-)
> 
> diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
> index 5dd2932382ee..bb69fa8b956a 100644
> --- a/drivers/scsi/qla2xxx/qla_gbl.h
> +++ b/drivers/scsi/qla2xxx/qla_gbl.h
> @@ -193,8 +193,6 @@ extern int ql2xsecenable;
> extern int ql2xenforce_iocb_limit;
> extern int ql2xabts_wait_nvme;
> extern u32 ql2xnvme_queues;
> -extern int ql2xrspq_follow_inptr;
> -extern int ql2xrspq_follow_inptr_legacy;
> 
> extern int qla2x00_loop_reset(scsi_qla_host_t *);
> extern void qla2x00_abort_all_cmds(scsi_qla_host_t *, int);
> diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
> index 76e79f350a22..ede76357ccb6 100644
> --- a/drivers/scsi/qla2xxx/qla_isr.c
> +++ b/drivers/scsi/qla2xxx/qla_isr.c
> @@ -3763,8 +3763,7 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
> 	struct qla_hw_data *ha = vha->hw;
> 	struct purex_entry_24xx *purex_entry;
> 	struct purex_item *pure_item;
> -	u16 rsp_in = 0, cur_ring_index;
> -	int follow_inptr, is_shadow_hba;
> +	u16 cur_ring_index;
> 
> 	if (!ha->flags.fw_started)
> 		return;
> @@ -3774,25 +3773,7 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
> 		qla_cpu_update(rsp->qpair, smp_processor_id());
> 	}
> 
> -#define __update_rsp_in(_update, _is_shadow_hba, _rsp, _rsp_in)		\
> -	do {								\
> -		if (_update) {						\
> -			_rsp_in = _is_shadow_hba ? *(_rsp)->in_ptr :	\
> -				rd_reg_dword_relaxed((_rsp)->rsp_q_in);	\
> -		}							\
> -	} while (0)
> -
> -	is_shadow_hba = IS_SHADOW_REG_CAPABLE(ha);
> -	follow_inptr = is_shadow_hba ? ql2xrspq_follow_inptr :
> -				ql2xrspq_follow_inptr_legacy;
> -
> -	__update_rsp_in(follow_inptr, is_shadow_hba, rsp, rsp_in);
> -
> -	while ((likely(follow_inptr &&
> -		       rsp->ring_index != rsp_in &&
> -		       rsp->ring_ptr->signature != RESPONSE_PROCESSED)) ||
> -		       (!follow_inptr &&
> -			rsp->ring_ptr->signature != RESPONSE_PROCESSED)) {
> +	while (rsp->ring_ptr->signature != RESPONSE_PROCESSED) {
> 		pkt = (struct sts_entry_24xx *)rsp->ring_ptr;
> 		cur_ring_index = rsp->ring_index;
> 
> @@ -3906,8 +3887,6 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
> 				}
> 				pure_item = qla27xx_copy_fpin_pkt(vha,
> 							  (void **)&pkt, &rsp);
> -				__update_rsp_in(follow_inptr, is_shadow_hba,
> -						rsp, rsp_in);
> 				if (!pure_item)
> 					break;
> 				qla24xx_queue_purex_item(vha, pure_item,
> diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
> index 0bd0fd1042df..1c7fb6484db2 100644
> --- a/drivers/scsi/qla2xxx/qla_os.c
> +++ b/drivers/scsi/qla2xxx/qla_os.c
> @@ -338,16 +338,6 @@ module_param(ql2xdelay_before_pci_error_handling, uint, 0644);
> MODULE_PARM_DESC(ql2xdelay_before_pci_error_handling,
> 	"Number of seconds delayed before qla begin PCI error self-handling (default: 5).\n");
> 
> -int ql2xrspq_follow_inptr = 1;
> -module_param(ql2xrspq_follow_inptr, int, 0644);
> -MODULE_PARM_DESC(ql2xrspq_follow_inptr,
> -		 "Follow RSP IN pointer for RSP updates for HBAs 27xx and newer (default: 1).");
> -
> -int ql2xrspq_follow_inptr_legacy = 1;
> -module_param(ql2xrspq_follow_inptr_legacy, int, 0644);
> -MODULE_PARM_DESC(ql2xrspq_follow_inptr_legacy,
> -		 "Follow RSP IN pointer for RSP updates for HBAs older than 27XX. (default: 1).");
> -
> static void qla2x00_clear_drv_active(struct qla_hw_data *);
> static void qla2x00_free_device(scsi_qla_host_t *);
> static int qla2xxx_map_queues(struct Scsi_Host *shost);
> -- 
> 2.19.0.rc0
> 

Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
diff mbox series

Patch

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 5dd2932382ee..bb69fa8b956a 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -193,8 +193,6 @@  extern int ql2xsecenable;
 extern int ql2xenforce_iocb_limit;
 extern int ql2xabts_wait_nvme;
 extern u32 ql2xnvme_queues;
-extern int ql2xrspq_follow_inptr;
-extern int ql2xrspq_follow_inptr_legacy;
 
 extern int qla2x00_loop_reset(scsi_qla_host_t *);
 extern void qla2x00_abort_all_cmds(scsi_qla_host_t *, int);
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 76e79f350a22..ede76357ccb6 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -3763,8 +3763,7 @@  void qla24xx_process_response_queue(struct scsi_qla_host *vha,
 	struct qla_hw_data *ha = vha->hw;
 	struct purex_entry_24xx *purex_entry;
 	struct purex_item *pure_item;
-	u16 rsp_in = 0, cur_ring_index;
-	int follow_inptr, is_shadow_hba;
+	u16 cur_ring_index;
 
 	if (!ha->flags.fw_started)
 		return;
@@ -3774,25 +3773,7 @@  void qla24xx_process_response_queue(struct scsi_qla_host *vha,
 		qla_cpu_update(rsp->qpair, smp_processor_id());
 	}
 
-#define __update_rsp_in(_update, _is_shadow_hba, _rsp, _rsp_in)		\
-	do {								\
-		if (_update) {						\
-			_rsp_in = _is_shadow_hba ? *(_rsp)->in_ptr :	\
-				rd_reg_dword_relaxed((_rsp)->rsp_q_in);	\
-		}							\
-	} while (0)
-
-	is_shadow_hba = IS_SHADOW_REG_CAPABLE(ha);
-	follow_inptr = is_shadow_hba ? ql2xrspq_follow_inptr :
-				ql2xrspq_follow_inptr_legacy;
-
-	__update_rsp_in(follow_inptr, is_shadow_hba, rsp, rsp_in);
-
-	while ((likely(follow_inptr &&
-		       rsp->ring_index != rsp_in &&
-		       rsp->ring_ptr->signature != RESPONSE_PROCESSED)) ||
-		       (!follow_inptr &&
-			rsp->ring_ptr->signature != RESPONSE_PROCESSED)) {
+	while (rsp->ring_ptr->signature != RESPONSE_PROCESSED) {
 		pkt = (struct sts_entry_24xx *)rsp->ring_ptr;
 		cur_ring_index = rsp->ring_index;
 
@@ -3906,8 +3887,6 @@  void qla24xx_process_response_queue(struct scsi_qla_host *vha,
 				}
 				pure_item = qla27xx_copy_fpin_pkt(vha,
 							  (void **)&pkt, &rsp);
-				__update_rsp_in(follow_inptr, is_shadow_hba,
-						rsp, rsp_in);
 				if (!pure_item)
 					break;
 				qla24xx_queue_purex_item(vha, pure_item,
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 0bd0fd1042df..1c7fb6484db2 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -338,16 +338,6 @@  module_param(ql2xdelay_before_pci_error_handling, uint, 0644);
 MODULE_PARM_DESC(ql2xdelay_before_pci_error_handling,
 	"Number of seconds delayed before qla begin PCI error self-handling (default: 5).\n");
 
-int ql2xrspq_follow_inptr = 1;
-module_param(ql2xrspq_follow_inptr, int, 0644);
-MODULE_PARM_DESC(ql2xrspq_follow_inptr,
-		 "Follow RSP IN pointer for RSP updates for HBAs 27xx and newer (default: 1).");
-
-int ql2xrspq_follow_inptr_legacy = 1;
-module_param(ql2xrspq_follow_inptr_legacy, int, 0644);
-MODULE_PARM_DESC(ql2xrspq_follow_inptr_legacy,
-		 "Follow RSP IN pointer for RSP updates for HBAs older than 27XX. (default: 1).");
-
 static void qla2x00_clear_drv_active(struct qla_hw_data *);
 static void qla2x00_free_device(scsi_qla_host_t *);
 static int qla2xxx_map_queues(struct Scsi_Host *shost);