From patchwork Tue Mar 7 18:19:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65765 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2591250wrd; Tue, 7 Mar 2023 10:28:37 -0800 (PST) X-Google-Smtp-Source: AK7set8b4g8RdWPCyxhZXXkmNPqXZJg4sFHeN/jm45jn2410QsrfjIAGMS2s+EG8+oT/RgWZqhVg X-Received: by 2002:a17:90b:4f4a:b0:237:8417:d9e3 with SMTP id pj10-20020a17090b4f4a00b002378417d9e3mr16310458pjb.15.1678213717523; Tue, 07 Mar 2023 10:28:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678213717; cv=none; d=google.com; s=arc-20160816; b=Dcg0JisQgCbrq80/s91mtXlohxrEcO3mWsWW3kk8B80g9y/gfga4WF3slARGIYXYbG 6tNNZQI/bzHjl4DgIS4FrEGqiYDIsxF93RrBR8U12BPkL/mXjVvN9gQZ5x8/sdaWVoLA VjfsV0xP/SX9GMoLEPLJFZMDrqbevqCWDBL7BXLr23kvm3waarr7m/6KDNBjQ2wvD9cQ Uy1KhbBbyjPW1+M04lKJJejyb4D7L4WmITxRZJuTtkkJ2+YuPczLhx0aGBY2DreYp0hC JPsW+8FS6+l8Tmm4mWz2AZOwr2pp0VdVTNHFsUHpqQQWgWa9BelVwHF3DKLI0HXOVgo7 jRyw== 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=iYK6wXvgPXI/6NOXqX2mWTuMCtUsHRXIfHFFvCl4OVM=; b=Cp9qrJftCBiIfcfzw+EhCgzoh9c272hZGLX+srlPWTd8AlLl2DhWf49L/amivjjPor 0HsdX3OjDZ/RJ7KgDctSmZ1XR4BwIsHNrWugUTO2jAXyt1hGmpFCk7RjV5jaH1eiYSqQ qxCxzj53+/39sgEeBkCv5Z9z6ap5Kuqxz8RRdAL+vlAV+NxOjw/2dERbVr29CpzjMJdQ bzN0OLaUNQIK4F26N4QwBjg2uZ5LffS7iU6OaST3A5EoUMrxF51stokys2R5chVfFrfg Z/Pgmwq+ZmTrw8r4X5g6x8QP87KZFLZO4sZ+kwuztEqPkzfdnaEPH5K0vwnT1p1oDzH2 Nq0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OL7VNPNR; 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 e65-20020a17090a6fc700b002376d8568e1si15717345pjk.114.2023.03.07.10.28.23; Tue, 07 Mar 2023 10:28:37 -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=OL7VNPNR; 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 S233024AbjCGS14 (ORCPT + 99 others); Tue, 7 Mar 2023 13:27:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232613AbjCGS0E (ORCPT ); Tue, 7 Mar 2023 13:26:04 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDA2DACBB2; Tue, 7 Mar 2023 10:20:34 -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 7904F6154D; Tue, 7 Mar 2023 18:20:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE61DC433D2; Tue, 7 Mar 2023 18:20:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678213233; bh=MunmSilf1uIvYwkUne62rZ2OB+MTJPaCa6o/fBaY2ww=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OL7VNPNRmW497PB7a+2AZN+2qDuYEp2t6VwUwfrSnPlxUH9CH8RIfXh3QIn1tFtsc 4IXPWVzGdx0Q4cw84ny1sEEgnA734DOVvoxC99FDPZ4hz21SYxobqRORsY131PUaGS Mx4a2gOJ1zFs6UiR3c9RXP6WWw5hKso9cKjTawtZobVlHLGiTUcnrJMRq9UJ+wgcb7 7MSvm87neFbyoQwvOZXFfxSWTgirSoERrJ+vtPqwq/iiyfrvsQMUMeJmZ7YgJa08kF kxg5D3zHX4+Jxjh+3OscgiXT+h/pCvQLda3Jl/p/4S62PcEc80eyfX7BOpDQP+aUmr +EGoDvfy/avJA== 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 , Jiawen Wu , Mengyuan Lou Subject: [PATCH 20/28] net: txgbe: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 12:19:31 -0600 Message-Id: <20230307181940.868828-21-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?1759734627431651667?= X-GMAIL-MSGID: =?utf-8?q?1759734627431651667?= 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: Jiawen Wu Cc: Mengyuan Lou --- drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c index 6c0a98230557..859feaafd350 100644 --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include @@ -538,7 +537,6 @@ static int txgbe_probe(struct pci_dev *pdev, goto err_pci_disable_dev; } - pci_enable_pcie_error_reporting(pdev); pci_set_master(pdev); netdev = devm_alloc_etherdev_mqs(&pdev->dev, @@ -698,7 +696,6 @@ static int txgbe_probe(struct pci_dev *pdev, err_free_mac_table: kfree(wx->mac_table); err_pci_release_regions: - pci_disable_pcie_error_reporting(pdev); pci_release_selected_regions(pdev, pci_select_bars(pdev, IORESOURCE_MEM)); err_pci_disable_dev: @@ -729,8 +726,6 @@ static void txgbe_remove(struct pci_dev *pdev) kfree(wx->mac_table); wx_clear_interrupt_scheme(wx); - pci_disable_pcie_error_reporting(pdev); - pci_disable_device(pdev); }