scsi: qla2xxx: use MBX_TOV_SECONDS for mailbox command timeout values
diff mbox series

Message ID 20200805200546.22497-1-ematsumiya@suse.de
State Mainlined
Commit c314a014b1802d30f1dc50db18b2e7f5a77d19c6
Headers show
Series
  • scsi: qla2xxx: use MBX_TOV_SECONDS for mailbox command timeout values
Related show

Commit Message

Enzo Matsumiya Aug. 5, 2020, 8:05 p.m. UTC
Improves readability of qla_mbx.c

Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
---
 drivers/scsi/qla2xxx/qla_mbx.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Himanshu Madhani Aug. 12, 2020, 7:49 p.m. UTC | #1
> On Aug 5, 2020, at 3:05 PM, Enzo Matsumiya <ematsumiya@suse.de> wrote:
> 
> Improves readability of qla_mbx.c
> 
> Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
> ---
> drivers/scsi/qla2xxx/qla_mbx.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
> index df31ee0d59b2..b99eed55eb4a 100644
> --- a/drivers/scsi/qla2xxx/qla_mbx.c
> +++ b/drivers/scsi/qla2xxx/qla_mbx.c
> @@ -5190,7 +5190,7 @@ qla2x00_read_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t *data)
> 	mcp->mb[8] = MSW(risc_addr);
> 	mcp->out_mb = MBX_8|MBX_1|MBX_0;
> 	mcp->in_mb = MBX_3|MBX_2|MBX_0;
> -	mcp->tov = 30;
> +	mcp->tov = MBX_TOV_SECONDS;
> 	mcp->flags = 0;
> 	rval = qla2x00_mailbox_command(vha, mcp);
> 	if (rval != QLA_SUCCESS) {
> @@ -5378,7 +5378,7 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)
> 	mcp->mb[8] = MSW(risc_addr);
> 	mcp->out_mb = MBX_8|MBX_3|MBX_2|MBX_1|MBX_0;
> 	mcp->in_mb = MBX_1|MBX_0;
> -	mcp->tov = 30;
> +	mcp->tov = MBX_TOV_SECONDS;
> 	mcp->flags = 0;
> 	rval = qla2x00_mailbox_command(vha, mcp);
> 	if (rval != QLA_SUCCESS) {
> @@ -5650,7 +5650,7 @@ qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority,
> 	mcp->mb[9] = vha->vp_idx;
> 	mcp->out_mb = MBX_9|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
> 	mcp->in_mb = MBX_4|MBX_3|MBX_1|MBX_0;
> -	mcp->tov = 30;
> +	mcp->tov = MBX_TOV_SECONDS;
> 	mcp->flags = 0;
> 	rval = qla2x00_mailbox_command(vha, mcp);
> 	if (mb != NULL) {
> @@ -5737,7 +5737,7 @@ qla82xx_mbx_intr_enable(scsi_qla_host_t *vha)
> 
> 	mcp->out_mb = MBX_1|MBX_0;
> 	mcp->in_mb = MBX_0;
> -	mcp->tov = 30;
> +	mcp->tov = MBX_TOV_SECONDS;
> 	mcp->flags = 0;
> 
> 	rval = qla2x00_mailbox_command(vha, mcp);
> @@ -5772,7 +5772,7 @@ qla82xx_mbx_intr_disable(scsi_qla_host_t *vha)
> 
> 	mcp->out_mb = MBX_1|MBX_0;
> 	mcp->in_mb = MBX_0;
> -	mcp->tov = 30;
> +	mcp->tov = MBX_TOV_SECONDS;
> 	mcp->flags = 0;
> 
> 	rval = qla2x00_mailbox_command(vha, mcp);
> @@ -5964,7 +5964,7 @@ qla81xx_set_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
> 	if (IS_QLA8031(ha))
> 		mcp->out_mb |= MBX_6|MBX_5|MBX_4|MBX_3;
> 	mcp->in_mb = MBX_0;
> -	mcp->tov = 30;
> +	mcp->tov = MBX_TOV_SECONDS;
> 	mcp->flags = 0;
> 
> 	rval = qla2x00_mailbox_command(vha, mcp);
> @@ -6000,7 +6000,7 @@ qla81xx_get_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
> 	mcp->in_mb = MBX_2|MBX_1|MBX_0;
> 	if (IS_QLA8031(ha))
> 		mcp->in_mb |= MBX_6|MBX_5|MBX_4|MBX_3;
> -	mcp->tov = 30;
> +	mcp->tov = MBX_TOV_SECONDS;
> 	mcp->flags = 0;
> 
> 	rval = qla2x00_mailbox_command(vha, mcp);
> -- 
> 2.28.0
> 

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

--
Himanshu Madhani	 Oracle Linux Engineering
Roman Bolshakov Aug. 13, 2020, 7 a.m. UTC | #2
On Wed, Aug 05, 2020 at 05:05:46PM -0300, Enzo Matsumiya wrote:
> Improves readability of qla_mbx.c
> 
> Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
> ---
>  drivers/scsi/qla2xxx/qla_mbx.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 

Reviewed-by: Roman Bolshakov <r.bolshakov@yadro.com>

Thanks,
Roman
Martin K. Petersen Aug. 18, 2020, 3:12 a.m. UTC | #3
On Wed, 5 Aug 2020 17:05:46 -0300, Enzo Matsumiya wrote:

> Improves readability of qla_mbx.c

Applied to 5.9/scsi-fixes, thanks!

[1/1] scsi: qla2xxx: Use MBX_TOV_SECONDS for mailbox command timeout values
      https://git.kernel.org/mkp/scsi/c/c314a014b180

Patch
diff mbox series

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index df31ee0d59b2..b99eed55eb4a 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -5190,7 +5190,7 @@  qla2x00_read_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t *data)
 	mcp->mb[8] = MSW(risc_addr);
 	mcp->out_mb = MBX_8|MBX_1|MBX_0;
 	mcp->in_mb = MBX_3|MBX_2|MBX_0;
-	mcp->tov = 30;
+	mcp->tov = MBX_TOV_SECONDS;
 	mcp->flags = 0;
 	rval = qla2x00_mailbox_command(vha, mcp);
 	if (rval != QLA_SUCCESS) {
@@ -5378,7 +5378,7 @@  qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)
 	mcp->mb[8] = MSW(risc_addr);
 	mcp->out_mb = MBX_8|MBX_3|MBX_2|MBX_1|MBX_0;
 	mcp->in_mb = MBX_1|MBX_0;
-	mcp->tov = 30;
+	mcp->tov = MBX_TOV_SECONDS;
 	mcp->flags = 0;
 	rval = qla2x00_mailbox_command(vha, mcp);
 	if (rval != QLA_SUCCESS) {
@@ -5650,7 +5650,7 @@  qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority,
 	mcp->mb[9] = vha->vp_idx;
 	mcp->out_mb = MBX_9|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
 	mcp->in_mb = MBX_4|MBX_3|MBX_1|MBX_0;
-	mcp->tov = 30;
+	mcp->tov = MBX_TOV_SECONDS;
 	mcp->flags = 0;
 	rval = qla2x00_mailbox_command(vha, mcp);
 	if (mb != NULL) {
@@ -5737,7 +5737,7 @@  qla82xx_mbx_intr_enable(scsi_qla_host_t *vha)
 
 	mcp->out_mb = MBX_1|MBX_0;
 	mcp->in_mb = MBX_0;
-	mcp->tov = 30;
+	mcp->tov = MBX_TOV_SECONDS;
 	mcp->flags = 0;
 
 	rval = qla2x00_mailbox_command(vha, mcp);
@@ -5772,7 +5772,7 @@  qla82xx_mbx_intr_disable(scsi_qla_host_t *vha)
 
 	mcp->out_mb = MBX_1|MBX_0;
 	mcp->in_mb = MBX_0;
-	mcp->tov = 30;
+	mcp->tov = MBX_TOV_SECONDS;
 	mcp->flags = 0;
 
 	rval = qla2x00_mailbox_command(vha, mcp);
@@ -5964,7 +5964,7 @@  qla81xx_set_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
 	if (IS_QLA8031(ha))
 		mcp->out_mb |= MBX_6|MBX_5|MBX_4|MBX_3;
 	mcp->in_mb = MBX_0;
-	mcp->tov = 30;
+	mcp->tov = MBX_TOV_SECONDS;
 	mcp->flags = 0;
 
 	rval = qla2x00_mailbox_command(vha, mcp);
@@ -6000,7 +6000,7 @@  qla81xx_get_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
 	mcp->in_mb = MBX_2|MBX_1|MBX_0;
 	if (IS_QLA8031(ha))
 		mcp->in_mb |= MBX_6|MBX_5|MBX_4|MBX_3;
-	mcp->tov = 30;
+	mcp->tov = MBX_TOV_SECONDS;
 	mcp->flags = 0;
 
 	rval = qla2x00_mailbox_command(vha, mcp);