* [PATCH] qla2xxx: Fix sparse warnings triggered by the PCI state checking code
@ 2019-12-19 0:44 Bart Van Assche
2019-12-19 8:09 ` Daniel Wagner
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Bart Van Assche @ 2019-12-19 0:44 UTC (permalink / raw)
To: Martin K . Petersen, James E . J . Bottomley
Cc: linux-scsi, Christoph Hellwig, Bart Van Assche, Himanshu Madhani,
Quinn Tran, Martin Wilck, Daniel Wagner, Roman Bolshakov
This patch fixes the following sparse warnings:
drivers/scsi/qla2xxx/qla_mbx.c:120:21: warning: restricted pci_channel_state_t degrades to integer
drivers/scsi/qla2xxx/qla_mbx.c:120:37: warning: restricted pci_channel_state_t degrades to integer
This patch does not change any functionality. From include/linux/pci.h:
enum pci_channel_state {
/* I/O channel is in normal state */
pci_channel_io_normal = (__force pci_channel_state_t) 1,
/* I/O to channel is blocked */
pci_channel_io_frozen = (__force pci_channel_state_t) 2,
/* PCI card is dead */
pci_channel_io_perm_failure = (__force pci_channel_state_t) 3,
};
Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Quinn Tran <qutran@marvell.com>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Daniel Wagner <dwagner@suse.de>
Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/qla2xxx/qla_mbx.c | 5 ++---
drivers/scsi/qla2xxx/qla_mr.c | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index b7c1108c48e2..935af77e519f 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -117,10 +117,9 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
ql_dbg(ql_dbg_mbx, vha, 0x1000, "Entered %s.\n", __func__);
- if (ha->pdev->error_state > pci_channel_io_frozen) {
+ if (ha->pdev->error_state == pci_channel_io_perm_failure) {
ql_log(ql_log_warn, vha, 0x1001,
- "error_state is greater than pci_channel_io_frozen, "
- "exiting.\n");
+ "PCI channel failed permanently, exiting.\n");
return QLA_FUNCTION_TIMEOUT;
}
diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index 605b59c76c90..5f7efdb0cce7 100644
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -53,10 +53,9 @@ qlafx00_mailbox_command(scsi_qla_host_t *vha, struct mbx_cmd_32 *mcp)
struct qla_hw_data *ha = vha->hw;
scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
- if (ha->pdev->error_state > pci_channel_io_frozen) {
+ if (ha->pdev->error_state == pci_channel_io_perm_failure) {
ql_log(ql_log_warn, vha, 0x115c,
- "error_state is greater than pci_channel_io_frozen, "
- "exiting.\n");
+ "PCI channel failed permanently, exiting.\n");
return QLA_FUNCTION_TIMEOUT;
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] qla2xxx: Fix sparse warnings triggered by the PCI state checking code
2019-12-19 0:44 [PATCH] qla2xxx: Fix sparse warnings triggered by the PCI state checking code Bart Van Assche
@ 2019-12-19 8:09 ` Daniel Wagner
2019-12-19 22:39 ` [EXT] " Himanshu Madhani
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Daniel Wagner @ 2019-12-19 8:09 UTC (permalink / raw)
To: Bart Van Assche
Cc: Martin K . Petersen, James E . J . Bottomley, linux-scsi,
Christoph Hellwig, Himanshu Madhani, Quinn Tran, Martin Wilck,
Roman Bolshakov
On Wed, Dec 18, 2019 at 04:44:12PM -0800, Bart Van Assche wrote:
> This patch fixes the following sparse warnings:
>
> drivers/scsi/qla2xxx/qla_mbx.c:120:21: warning: restricted pci_channel_state_t degrades to integer
> drivers/scsi/qla2xxx/qla_mbx.c:120:37: warning: restricted pci_channel_state_t degrades to integer
>
> This patch does not change any functionality. From include/linux/pci.h:
>
> enum pci_channel_state {
> /* I/O channel is in normal state */
> pci_channel_io_normal = (__force pci_channel_state_t) 1,
>
> /* I/O to channel is blocked */
> pci_channel_io_frozen = (__force pci_channel_state_t) 2,
>
> /* PCI card is dead */
> pci_channel_io_perm_failure = (__force pci_channel_state_t) 3,
> };
>
> Cc: Himanshu Madhani <hmadhani@marvell.com>
> Cc: Quinn Tran <qutran@marvell.com>
> Cc: Martin Wilck <mwilck@suse.com>
> Cc: Daniel Wagner <dwagner@suse.de>
> Cc: Roman Bolshakov <r.bolshakov@yadro.com>
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
> ---
> drivers/scsi/qla2xxx/qla_mbx.c | 5 ++---
> drivers/scsi/qla2xxx/qla_mr.c | 5 ++---
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
> index b7c1108c48e2..935af77e519f 100644
> --- a/drivers/scsi/qla2xxx/qla_mbx.c
> +++ b/drivers/scsi/qla2xxx/qla_mbx.c
> @@ -117,10 +117,9 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
>
> ql_dbg(ql_dbg_mbx, vha, 0x1000, "Entered %s.\n", __func__);
>
> - if (ha->pdev->error_state > pci_channel_io_frozen) {
> + if (ha->pdev->error_state == pci_channel_io_perm_failure) {
> ql_log(ql_log_warn, vha, 0x1001,
> - "error_state is greater than pci_channel_io_frozen, "
> - "exiting.\n");
> + "PCI channel failed permanently, exiting.\n");
> return QLA_FUNCTION_TIMEOUT;
> }
>
> diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
> index 605b59c76c90..5f7efdb0cce7 100644
> --- a/drivers/scsi/qla2xxx/qla_mr.c
> +++ b/drivers/scsi/qla2xxx/qla_mr.c
> @@ -53,10 +53,9 @@ qlafx00_mailbox_command(scsi_qla_host_t *vha, struct mbx_cmd_32 *mcp)
> struct qla_hw_data *ha = vha->hw;
> scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
>
> - if (ha->pdev->error_state > pci_channel_io_frozen) {
> + if (ha->pdev->error_state == pci_channel_io_perm_failure) {
> ql_log(ql_log_warn, vha, 0x115c,
> - "error_state is greater than pci_channel_io_frozen, "
> - "exiting.\n");
> + "PCI channel failed permanently, exiting.\n");
> return QLA_FUNCTION_TIMEOUT;
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [EXT] [PATCH] qla2xxx: Fix sparse warnings triggered by the PCI state checking code
2019-12-19 0:44 [PATCH] qla2xxx: Fix sparse warnings triggered by the PCI state checking code Bart Van Assche
2019-12-19 8:09 ` Daniel Wagner
@ 2019-12-19 22:39 ` Himanshu Madhani
2019-12-19 23:05 ` Roman Bolshakov
2019-12-19 23:55 ` Martin K. Petersen
3 siblings, 0 replies; 5+ messages in thread
From: Himanshu Madhani @ 2019-12-19 22:39 UTC (permalink / raw)
To: Bart Van Assche, Martin K . Petersen, James E . J . Bottomley
Cc: linux-scsi, Christoph Hellwig, Quinn Tran, Martin Wilck,
Daniel Wagner, Roman Bolshakov
On 12/18/19, 6:44 PM, "Bart Van Assche" <bvanassche@acm.org> wrote:
External Email
----------------------------------------------------------------------
This patch fixes the following sparse warnings:
drivers/scsi/qla2xxx/qla_mbx.c:120:21: warning: restricted pci_channel_state_t degrades to integer
drivers/scsi/qla2xxx/qla_mbx.c:120:37: warning: restricted pci_channel_state_t degrades to integer
This patch does not change any functionality. From include/linux/pci.h:
enum pci_channel_state {
/* I/O channel is in normal state */
pci_channel_io_normal = (__force pci_channel_state_t) 1,
/* I/O to channel is blocked */
pci_channel_io_frozen = (__force pci_channel_state_t) 2,
/* PCI card is dead */
pci_channel_io_perm_failure = (__force pci_channel_state_t) 3,
};
Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Quinn Tran <qutran@marvell.com>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Daniel Wagner <dwagner@suse.de>
Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/qla2xxx/qla_mbx.c | 5 ++---
drivers/scsi/qla2xxx/qla_mr.c | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index b7c1108c48e2..935af77e519f 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -117,10 +117,9 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
ql_dbg(ql_dbg_mbx, vha, 0x1000, "Entered %s.\n", __func__);
- if (ha->pdev->error_state > pci_channel_io_frozen) {
+ if (ha->pdev->error_state == pci_channel_io_perm_failure) {
ql_log(ql_log_warn, vha, 0x1001,
- "error_state is greater than pci_channel_io_frozen, "
- "exiting.\n");
+ "PCI channel failed permanently, exiting.\n");
return QLA_FUNCTION_TIMEOUT;
}
diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index 605b59c76c90..5f7efdb0cce7 100644
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -53,10 +53,9 @@ qlafx00_mailbox_command(scsi_qla_host_t *vha, struct mbx_cmd_32 *mcp)
struct qla_hw_data *ha = vha->hw;
scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
- if (ha->pdev->error_state > pci_channel_io_frozen) {
+ if (ha->pdev->error_state == pci_channel_io_perm_failure) {
ql_log(ql_log_warn, vha, 0x115c,
- "error_state is greater than pci_channel_io_frozen, "
- "exiting.\n");
+ "PCI channel failed permanently, exiting.\n");
return QLA_FUNCTION_TIMEOUT;
}
Looks Good.
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] qla2xxx: Fix sparse warnings triggered by the PCI state checking code
2019-12-19 0:44 [PATCH] qla2xxx: Fix sparse warnings triggered by the PCI state checking code Bart Van Assche
2019-12-19 8:09 ` Daniel Wagner
2019-12-19 22:39 ` [EXT] " Himanshu Madhani
@ 2019-12-19 23:05 ` Roman Bolshakov
2019-12-19 23:55 ` Martin K. Petersen
3 siblings, 0 replies; 5+ messages in thread
From: Roman Bolshakov @ 2019-12-19 23:05 UTC (permalink / raw)
To: Bart Van Assche
Cc: Martin K . Petersen, James E . J . Bottomley, linux-scsi,
Christoph Hellwig, Himanshu Madhani, Quinn Tran, Martin Wilck,
Daniel Wagner
On Wed, Dec 18, 2019 at 04:44:12PM -0800, Bart Van Assche wrote:
> This patch fixes the following sparse warnings:
>
> drivers/scsi/qla2xxx/qla_mbx.c:120:21: warning: restricted pci_channel_state_t degrades to integer
> drivers/scsi/qla2xxx/qla_mbx.c:120:37: warning: restricted pci_channel_state_t degrades to integer
>
> This patch does not change any functionality. From include/linux/pci.h:
>
> enum pci_channel_state {
> /* I/O channel is in normal state */
> pci_channel_io_normal = (__force pci_channel_state_t) 1,
>
> /* I/O to channel is blocked */
> pci_channel_io_frozen = (__force pci_channel_state_t) 2,
>
> /* PCI card is dead */
> pci_channel_io_perm_failure = (__force pci_channel_state_t) 3,
> };
>
> Cc: Himanshu Madhani <hmadhani@marvell.com>
> Cc: Quinn Tran <qutran@marvell.com>
> Cc: Martin Wilck <mwilck@suse.com>
> Cc: Daniel Wagner <dwagner@suse.de>
> Cc: Roman Bolshakov <r.bolshakov@yadro.com>
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
> drivers/scsi/qla2xxx/qla_mbx.c | 5 ++---
> drivers/scsi/qla2xxx/qla_mr.c | 5 ++---
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
Hi Bart,
Reviewed-by: Roman Bolshakov <r.bolshakov@yadro.com>
Thank you,
Roman
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] qla2xxx: Fix sparse warnings triggered by the PCI state checking code
2019-12-19 0:44 [PATCH] qla2xxx: Fix sparse warnings triggered by the PCI state checking code Bart Van Assche
` (2 preceding siblings ...)
2019-12-19 23:05 ` Roman Bolshakov
@ 2019-12-19 23:55 ` Martin K. Petersen
3 siblings, 0 replies; 5+ messages in thread
From: Martin K. Petersen @ 2019-12-19 23:55 UTC (permalink / raw)
To: Bart Van Assche
Cc: Martin K . Petersen, James E . J . Bottomley, linux-scsi,
Christoph Hellwig, Himanshu Madhani, Quinn Tran, Martin Wilck,
Daniel Wagner, Roman Bolshakov
Bart,
> This patch fixes the following sparse warnings:
>
> drivers/scsi/qla2xxx/qla_mbx.c:120:21: warning: restricted pci_channel_state_t degrades to integer
> drivers/scsi/qla2xxx/qla_mbx.c:120:37: warning: restricted pci_channel_state_t degrades to integer
Applied to 5.6/scsi-queue, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-12-19 23:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-19 0:44 [PATCH] qla2xxx: Fix sparse warnings triggered by the PCI state checking code Bart Van Assche
2019-12-19 8:09 ` Daniel Wagner
2019-12-19 22:39 ` [EXT] " Himanshu Madhani
2019-12-19 23:05 ` Roman Bolshakov
2019-12-19 23:55 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).