|
 |
f95c89 |
From 6f33f93474d2f2ce4c358a87236dfd597bc60e5f Mon Sep 17 00:00:00 2001
|
|
|
f95c89 |
From: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
f95c89 |
Date: Wed, 2 Oct 2019 18:23:14 -0400
|
|
|
f95c89 |
Subject: [PATCH 59/96] [netdrv] bnxt_en: Remove the -1 error return code from
|
|
|
f95c89 |
bnxt_hwrm_do_send_msg()
|
|
|
f95c89 |
|
|
|
f95c89 |
Message-id: <e2ecb6aac0f162d113a64f78a026cfaf3d2d30ed.1570027456.git.jtoppins@redhat.com>
|
|
|
f95c89 |
Patchwork-id: 276473
|
|
|
f95c89 |
O-Subject: [RHEL-8.2 PATCH 52/78] bnxt_en: Remove the -1 error return code from bnxt_hwrm_do_send_msg().
|
|
|
f95c89 |
Bugzilla: 1724766
|
|
|
f95c89 |
RH-Acked-by: John Linville <linville@redhat.com>
|
|
|
f95c89 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
f95c89 |
|
|
|
f95c89 |
Replace the non-standard -1 code with -EBUSY when there is no firmware
|
|
|
f95c89 |
response after waiting for the maximum timeout.
|
|
|
f95c89 |
|
|
|
f95c89 |
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
|
|
|
f95c89 |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
f95c89 |
(cherry picked from commit a935cb7ec449bca1adf806d7fb00f5032b63c6e0)
|
|
|
f95c89 |
Bugzilla: 1724766
|
|
|
f95c89 |
Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=23809532
|
|
|
f95c89 |
Tested: build, boot, basic ping
|
|
|
f95c89 |
Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
f95c89 |
Signed-off-by: Bruno Meneguele <bmeneg@redhat.com>
|
|
|
f95c89 |
---
|
|
|
f95c89 |
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 +++---
|
|
|
f95c89 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
f95c89 |
|
|
|
f95c89 |
Index: src/drivers/net/ethernet/broadcom/bnxt/bnxt.c
|
|
|
f95c89 |
===================================================================
|
|
|
f95c89 |
--- src.orig/drivers/net/ethernet/broadcom/bnxt/bnxt.c 2020-02-06 16:23:17.921492857 +0100
|
|
|
f95c89 |
+++ src/drivers/net/ethernet/broadcom/bnxt/bnxt.c 2020-02-06 16:23:18.179490489 +0100
|
|
|
f95c89 |
@@ -4167,7 +4167,7 @@
|
|
|
f95c89 |
if (bp->hwrm_intr_seq_id != (u16)~seq_id) {
|
|
|
f95c89 |
netdev_err(bp->dev, "Resp cmpl intr err msg: 0x%x\n",
|
|
|
f95c89 |
le16_to_cpu(req->req_type));
|
|
|
f95c89 |
- return -1;
|
|
|
f95c89 |
+ return -EBUSY;
|
|
|
f95c89 |
}
|
|
|
f95c89 |
len = (le32_to_cpu(*resp_len) & HWRM_RESP_LEN_MASK) >>
|
|
|
f95c89 |
HWRM_RESP_LEN_SFT;
|
|
|
f95c89 |
@@ -4195,7 +4195,7 @@
|
|
|
f95c89 |
HWRM_TOTAL_TIMEOUT(i),
|
|
|
f95c89 |
le16_to_cpu(req->req_type),
|
|
|
f95c89 |
le16_to_cpu(req->seq_id), len);
|
|
|
f95c89 |
- return -1;
|
|
|
f95c89 |
+ return -EBUSY;
|
|
|
f95c89 |
}
|
|
|
f95c89 |
|
|
|
f95c89 |
/* Last byte of resp contains valid bit */
|
|
|
f95c89 |
@@ -4213,7 +4213,7 @@
|
|
|
f95c89 |
HWRM_TOTAL_TIMEOUT(i),
|
|
|
f95c89 |
le16_to_cpu(req->req_type),
|
|
|
f95c89 |
le16_to_cpu(req->seq_id), len, *valid);
|
|
|
f95c89 |
- return -1;
|
|
|
f95c89 |
+ return -EBUSY;
|
|
|
f95c89 |
}
|
|
|
f95c89 |
}
|
|
|
f95c89 |
|