From patchwork Tue Mar 3 17:41:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 230061 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92EDFC3F2D1 for ; Tue, 3 Mar 2020 17:44:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6193120CC7 for ; Tue, 3 Mar 2020 17:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257486; bh=hQwEbvFE4SFXvXgDuGGdCJh7c1fW/rXtBRKlLMASIQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=apqPbtXHKtjXoZ0a/aDrvcQ82j8dExhuAT5GYE8bvYywNHJsC+u3Sy356Q03s1aaU F6GF+sLXMnCMFvYPGd4Jpx0tqYeTmLynLSkzAngOuwSfdn6msG4KnT23ouPMgoRWJz YwAR7xlCNZaxGQZCxD88/2oyga0RLxY+n63WRLfw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730800AbgCCRop (ORCPT ); Tue, 3 Mar 2020 12:44:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:50400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729311AbgCCRop (ORCPT ); Tue, 3 Mar 2020 12:44:45 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 07F5F208C3; Tue, 3 Mar 2020 17:44:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257484; bh=hQwEbvFE4SFXvXgDuGGdCJh7c1fW/rXtBRKlLMASIQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bFsQg2Q6w0ZgQeWBuEmrIoImM5tTcaIEiO27n/Y/dRfNZQSGTr22bE+ntgbo2p1vu /0hWRKcBa7Ke00Wux12+Vhr1H5x3qKEt6S99CA7fw3QPY0PNZEZGPA9TDV+99c6Nms Dn6f9T4b0jAV03ll5z3w3CYjvPka9HbmZvxVS+c8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vasundhara Volam , Michael Chan , "David S. Miller" Subject: [PATCH 5.5 014/176] bnxt_en: Improve device shutdown method. Date: Tue, 3 Mar 2020 18:41:18 +0100 Message-Id: <20200303174306.228177249@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174304.593872177@linuxfoundation.org> References: <20200303174304.593872177@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vasundhara Volam [ Upstream commit 5567ae4a8d569d996d0d88d0eceb76205e4c7ce5 ] Especially when bnxt_shutdown() is called during kexec, we need to disable MSIX and disable Bus Master to completely quiesce the device. Make these 2 calls unconditionally in the shutdown method. Fixes: c20dc142dd7b ("bnxt_en: Disable bus master during PCI shutdown and driver unload.") Signed-off-by: Vasundhara Volam Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -11972,10 +11972,10 @@ static void bnxt_shutdown(struct pci_dev dev_close(dev); bnxt_ulp_shutdown(bp); + bnxt_clear_int_mode(bp); + pci_disable_device(pdev); if (system_state == SYSTEM_POWER_OFF) { - bnxt_clear_int_mode(bp); - pci_disable_device(pdev); pci_wake_from_d3(pdev, bp->wol); pci_set_power_state(pdev, PCI_D3hot); }