From patchwork Thu Feb 21 00:07:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 1045639 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=broadcom.com header.i=@broadcom.com header.b="fWeRplR0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 444ZYF0bZBz9s8m for ; Thu, 21 Feb 2019 11:07:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726776AbfBUAHn (ORCPT ); Wed, 20 Feb 2019 19:07:43 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:44389 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726016AbfBUAHm (ORCPT ); Wed, 20 Feb 2019 19:07:42 -0500 Received: by mail-pg1-f194.google.com with SMTP id y1so12749408pgk.11 for ; Wed, 20 Feb 2019 16:07:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NUGW+Lyim4fzpLt+uBBn2CtVc/Usu0Sj5GGJoII7VLg=; b=fWeRplR0sgOfaJah2kM0BwG/y9hgyX/hPXQ3zdJ7YoU2ytVEPqzPUbvIqwwkQuD+nw e4tapZVI/iBT4uOHTE80I0Y+7uLD4rOf8tl9fRCcH0gYmJrSWxGPox57hnJDlcseg+9W G0omStFzMdCgalU0oQDMIDGYq5KC2JwsZ24gI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NUGW+Lyim4fzpLt+uBBn2CtVc/Usu0Sj5GGJoII7VLg=; b=RaCJL04N2jYCkw47El4ZFOTuRF7q6KKUdPCEp+H2rls8WXUuzUl8VG4FWlhGoR6vuu ARnZM37yMboJjg4olOAgfrPiZRimHID17NCSe1zSXhdKnYPrrgU1r+rlkhxtHlLLWPkj XyxPtOVedToafxB30iWzSKUiy9/zBgeM4nqeevLTzGBicyarfDBN+8UCQx2byQMPTa9y 7TgDRs6n50h3SnQR6NaAVsM2DP3YXUzZCusEt3upMSQGbRSQUH6CkEfdePKxTvoopyer PqFZktshY3jsINa5hOuuYdY/UWa3D6JE/wgU0aMsAZ5QYDemCEOLU7aTWq82PmBa2XTO lwwA== X-Gm-Message-State: AHQUAuZM7Ujd2dAt1Lvrq+icGMKRdaUXgIz0fK93CeHK0ri7UYFqrRN9 djtMRhXNxgPQMei7pNLy3k30zA== X-Google-Smtp-Source: AHgI3IZiWXqy00mYNBnpRF1O/SEJAj7AlTh7QgCD7ULUz5dFawzntcfkp2nsKy4e8nwlImLwi/m0+Q== X-Received: by 2002:a63:1322:: with SMTP id i34mr8193952pgl.208.1550707661659; Wed, 20 Feb 2019 16:07:41 -0800 (PST) Received: from localhost.dhcp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id h13sm16013673pfn.114.2019.02.20.16.07.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Feb 2019 16:07:41 -0800 (PST) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH net 1/2] bnxt_en: Fix typo in firmware message timeout logic. Date: Wed, 20 Feb 2019 19:07:31 -0500 Message-Id: <1550707652-14747-2-git-send-email-michael.chan@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550707652-14747-1-git-send-email-michael.chan@broadcom.com> References: <1550707652-14747-1-git-send-email-michael.chan@broadcom.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The logic that polls for the firmware message response uses a shorter sleep interval for the first few passes. But there was a typo so it was using the wrong counter (larger counter) for these short sleep passes. The result is a slightly shorter timeout period for these firmware messages than intended. Fix it by using the proper counter. Fixes: 9751e8e71487 ("bnxt_en: reduce timeout on initial HWRM calls") Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 8bc7e49..1ddd672 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -3903,7 +3903,7 @@ static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len, if (len) break; /* on first few passes, just barely sleep */ - if (i < DFLT_HWRM_CMD_TIMEOUT) + if (i < HWRM_SHORT_TIMEOUT_COUNTER) usleep_range(HWRM_SHORT_MIN_TIMEOUT, HWRM_SHORT_MAX_TIMEOUT); else