diff options
| author | David S. Miller <[email protected]> | 2019-08-30 14:02:19 -0700 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2019-08-30 14:02:19 -0700 |
| commit | 1f99fc7fffa5beab7b5dddf666b8036ba95f95c5 (patch) | |
| tree | 831153b592c08b411d29e07caad8c1f2f8e4cd6b /drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | |
| parent | 19828bd3d1a05ea23fc93d1add606173055e118e (diff) | |
| parent | acfb50e4e773c9a5755a3c265c7c20d37a8642e5 (diff) | |
Merge branch 'bnxt_en-health-and-error-recovery'
Michael Chan says:
====================
bnxt_en: health and error recovery.
This patchset implements adapter health and error recovery. The status
is reported through several devlink reporters and the driver will
initiate and complete the recovery process using the devlink infrastructure.
v2: Added 4 patches at the beginning of the patchset to clean up error code
handling related to firmware messages and to convert to use standard
error codes.
Removed the dropping of rtnl_lock in bnxt_close().
Broke up the patches some more for better patch organization and
future bisection.
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c index fc77caf0a076..b2c160947fc8 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c @@ -226,6 +226,9 @@ static int bnxt_send_msg(struct bnxt_en_dev *edev, int ulp_id, struct input *req; int rc; + if (ulp_id != BNXT_ROCE_ULP && bp->fw_reset_state) + return -EBUSY; + mutex_lock(&bp->hwrm_cmd_lock); req = fw_msg->msg; req->resp_addr = cpu_to_le64(bp->hwrm_cmd_resp_dma_addr); |