lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 511/639] bnxt_en: Fix handling FRAG_ERR when NVM_INSTALL_UPDATE cmd fails
    Date
    From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>

    [ Upstream commit dd2ebf3404c7c295014bc025dea23960960ceb1a ]

    If FW returns FRAG_ERR in response error code, driver is resending the
    command only when HWRM command returns success. Fix the code to resend
    NVM_INSTALL_UPDATE command with DEFRAG install flags, if FW returns
    FRAG_ERR in its response error code.

    Fixes: cb4d1d626145 ("bnxt_en: Retry failed NVM_INSTALL_UPDATE with defragmentation flag enabled.")
    Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
    Signed-off-by: Michael Chan <michael.chan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 +++++-------
    1 file changed, 5 insertions(+), 7 deletions(-)

    diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
    index dc63d269f01dc..cdbb8940a4ae5 100644
    --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
    +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
    @@ -1778,21 +1778,19 @@ static int bnxt_flash_package_from_file(struct net_device *dev,
    mutex_lock(&bp->hwrm_cmd_lock);
    hwrm_err = _hwrm_send_message(bp, &install, sizeof(install),
    INSTALL_PACKAGE_TIMEOUT);
    - if (hwrm_err)
    - goto flash_pkg_exit;
    -
    - if (resp->error_code) {
    + if (hwrm_err) {
    u8 error_code = ((struct hwrm_err_output *)resp)->cmd_err;

    - if (error_code == NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR) {
    + if (resp->error_code && error_code ==
    + NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR) {
    install.flags |= cpu_to_le16(
    NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG);
    hwrm_err = _hwrm_send_message(bp, &install,
    sizeof(install),
    INSTALL_PACKAGE_TIMEOUT);
    - if (hwrm_err)
    - goto flash_pkg_exit;
    }
    + if (hwrm_err)
    + goto flash_pkg_exit;
    }

    if (resp->result) {
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:39    [W:5.162 / U:0.860 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site