From patchwork Tue Mar 7 18:19:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65801 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2627503wrd; Tue, 7 Mar 2023 11:48:45 -0800 (PST) X-Google-Smtp-Source: AK7set+N4eqpDZaa0cv02wlHeZNxe2Xo1Y9KYMJkz8fkWps1E084BiRBshBh6uRTD4Ncinl6sW5M X-Received: by 2002:a17:906:8396:b0:8b1:1f2d:ecf1 with SMTP id p22-20020a170906839600b008b11f2decf1mr18057112ejx.67.1678218525732; Tue, 07 Mar 2023 11:48:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678218525; cv=none; d=google.com; s=arc-20160816; b=vMNtok+XDh1SHf7HlE7/ZqrRHZED6KXZkA85d8dkP4Vw224kGf/JbbAyHQh45EaVc2 CYzhuBkf9BI9ZDb+qnoC2V4BqzV9h+SYxymTGJgYkfuqUIS861Xyh7tbvVyXvUETuIa+ AZ969saiFk2BwAx6Um0Ctgu6ZmExtFgKmukhOptcdQoLJvbeulib6ACo4Mk/uzF/lohb ypf8F/RJQiKjHq3om+/Job5YCo0Zj7gTeIgTl7iQUljavMiZsYmLi0AwODAwLxC3sczs 0UegbU/op336G9GjmImN2RYGo1dHNlUufjBgEUNR0KTj9zYcjjuXWWlar2ND8ELG3lu9 quaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zKEswKtawRF1m07hDbIRh86aTCeBEdsCsDGj3BofcpI=; b=k1jMfKRBvVQS7plWYBjAKubgQTNer8Kt2Cdm92Fyg3S4QbgXsNi3ATjARfO6rPmQZp XkgPj9hJZDnhyM1eEi3uJNtQ0EMr8XR9Twg+rhtZ44xnWxXuRO2dFhajW9YRpCsoSgV8 lwCKTy8mfGxgw2Uj7FjGGk1HUg/sh66ehuSo5iQCriLhv8mILCDPtHpYSaPWLs3L3jjA dQZNk1ufvY9THpFcbcD21C2nTYaTx+U/kzcXwaTABA1piADnR74JKlWzZJXMAyVq2hOw Ns/QMyMaDCbXaV9DyBuDVNap+t+dSAzzCWEh8ZkgNbj9k+hC1QqPBdD3e2x3MMMTpHIl 6SXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iURIuRfs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f25-20020a170906049900b008df5a5088cesi2889037eja.163.2023.03.07.11.48.21; Tue, 07 Mar 2023 11:48:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iURIuRfs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232892AbjCGSZ0 (ORCPT + 99 others); Tue, 7 Mar 2023 13:25:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231354AbjCGSYe (ORCPT ); Tue, 7 Mar 2023 13:24:34 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24BF59FE51; Tue, 7 Mar 2023 10:20:09 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8C14F61546; Tue, 7 Mar 2023 18:20:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4513C4339C; Tue, 7 Mar 2023 18:20:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678213208; bh=pFPJ8Gf/UKoAjq3MFpPQ7R9lpnJErmcP6SLaIvSooH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iURIuRfsXJMsXQrZ4QCQUds072j/cgGQfquLTdhMQstz7xlhx2Zide0H8KZmYc6ub k+lwuRDfJ97HKLzcWEMRt8a20On+a2FOUPBBMTNx4h8wlZOjpP+Dc+N9Pt6qxIFdck 2m80egoZjIif/CC9ZMNGsXnE7oq33ST4hz9CYj+NsE/KK/TzdZ9+ZW+zszzv/1fIpP N+yC75cd9xY8iQLEKiN62Yom0AsoRNpMijy1CNgvYeXkbHi8v1rrkrSQfeofMbxlOF znLThsDmQOryFf/GGPIbcW139M51iH1OLFGqk/gn4lv7/q2dUuFnONGTXHAz53MsV4 Qzjl0qJfPGFNg== From: Bjorn Helgaas To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Raju Rangoju Subject: [PATCH 06/28] cxgb4: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 12:19:17 -0600 Message-Id: <20230307181940.868828-7-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307181940.868828-1-helgaas@kernel.org> References: <20230307181940.868828-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759739669032532782?= X-GMAIL-MSGID: =?utf-8?q?1759739669032532782?= From: Bjorn Helgaas pci_enable_pcie_error_reporting() enables the device to send ERR_* Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), the PCI core does this for all devices during enumeration, so the driver doesn't need to do it itself. Remove the redundant pci_enable_pcie_error_reporting() call from the driver. Also remove the corresponding pci_disable_pcie_error_reporting() from the driver .remove() path. Note that this only controls ERR_* Messages from the device. An ERR_* Message may cause the Root Port to generate an interrupt, depending on the AER Root Error Command register managed by the AER service driver. Signed-off-by: Bjorn Helgaas Cc: Raju Rangoju --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 7db2403c4c9c..f0bc7396ce2b 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include @@ -6687,7 +6686,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) goto out_free_adapter; } - pci_enable_pcie_error_reporting(pdev); pci_set_master(pdev); pci_save_state(pdev); adap_idx++; @@ -7092,7 +7090,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) out_unmap_bar0: iounmap(regs); out_disable_device: - pci_disable_pcie_error_reporting(pdev); pci_disable_device(pdev); out_release_regions: pci_release_regions(pdev); @@ -7171,7 +7168,6 @@ static void remove_one(struct pci_dev *pdev) } #endif iounmap(adapter->regs); - pci_disable_pcie_error_reporting(pdev); if ((adapter->flags & CXGB4_DEV_ENABLED)) { pci_disable_device(pdev); adapter->flags &= ~CXGB4_DEV_ENABLED;