From patchwork Wed Jan 18 23:46:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 45544 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp39124wrn; Wed, 18 Jan 2023 15:50:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXuMrqpprrOE7gIfL/vYNMwoiT+y+oZF98/h62BLpNOQF0u458WIuFSUrlIe6xt/P6BjBsLP X-Received: by 2002:a17:90a:7347:b0:226:b52e:f1b8 with SMTP id j7-20020a17090a734700b00226b52ef1b8mr8955080pjs.24.1674085846177; Wed, 18 Jan 2023 15:50:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674085846; cv=none; d=google.com; s=arc-20160816; b=FyC64ohlCNVTyIrgwaSL0l4RTPNnrkNr+cIozcc7rhIt+Vef6Bb/1Mc9sm4c2/0Pj5 ZmgOR1VjOQhXBL3IZU4UsMTQZr8qtmhCMC17zNWjNPIzvwg6YDg62lsOsGfs4CNu+7qJ JNBh0v/9+8JZ/G6mYWgmLwPzYp+W+hZXKwbVIYBFld2LXRfFs3YrjNcyhV8Y7O9cURHG LI2rg3LsljsOqvHf2pXUT3Znjml3DE+K01YjkkPUNlxozPKgxfNp6jE2xDj3Nexr0gFe 9okon/rAOvc94v3mxEqDzv6KeHfYodS+FFtjanwQfrRSr8X2RQj96OmHBRBgu2/sXo27 Re4A== 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=5d727LOM4a3YBpk/txjr0zyzRoCEX5TTC9qVnxACo94=; b=yJ53kn3/5fDNpl/nzpKeX8AdklLQZytH4TtVjIDHC93p4G/QwVmEuzE+j23WnIagIP Qa29RgC/Hku0SJyABBDO7maRrAVOmXG3VMsran7iOC7F1tzxtNDNHKWkIaqNlcyH2ClD zm+WhmhapmpxzzfhcfYW12VHy4yRfjZocRAZ4kml67dJzVSja/jSsYfdm2rOk3WtPlsX qoiJpByWcX0P2f9bV+TzkYFuZ/YoN/IPuZeroc9k+twbXAz83IolrRZ0nLRWVctr9n2j PsYWkJSMGY0PGn7s64K/lbi+Q/ngDnbXB9rq5vWg2RIFUDaiaZXmSVoLUlr81Jn/weyU 59/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Y7PPT4Vs; 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 lw15-20020a17090b180f00b002213d3227d1si3869513pjb.169.2023.01.18.15.50.34; Wed, 18 Jan 2023 15:50:46 -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=Y7PPT4Vs; 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 S230208AbjARXsC (ORCPT + 99 others); Wed, 18 Jan 2023 18:48:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230188AbjARXr3 (ORCPT ); Wed, 18 Jan 2023 18:47:29 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7530458A4; Wed, 18 Jan 2023 15:47:14 -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 0630661AC4; Wed, 18 Jan 2023 23:47:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42631C433D2; Wed, 18 Jan 2023 23:47:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674085624; bh=pLbQ/HGmJ0E41EsVj1qrzz7ZQK/1deMQHyH8FrWG9c8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y7PPT4VstGXz7JfMrERSl7oaxAJY3RMktbR01aCo+HyYqZ9D2WZJviA16585gX9bp Z3o29/mZMxhs+Uq8V6YqtIWyxQDqFji5V79Xew/JblsbBoNcUiIDIN4EMUSdpCI/CC HYarjE0Y6q2IbZ8iqFE/1WNbGYRVYGXf6FxNgPeJqNsLeqcvBSrsijazrc+os6G+L7 Zuf//lsgWYMME5bhkdlxLUi7nnwG2umUJSUZqMaIbhJTNuD1Cna6VvzQjAa7aXcOvE UXWwGwEb/j9k6vMknIpjxQKwfGJrxcM+ELewyuPWOG7zANRIUmnNYA0C/yzykvFpyb 5kW1Gcz0QhwiA== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Bjorn Helgaas , Jesse Brandeburg , Tony Nguyen , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [PATCH 9/9] ixgbe: Remove redundant pci_enable_pcie_error_reporting() Date: Wed, 18 Jan 2023 17:46:12 -0600 Message-Id: <20230118234612.272916-10-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230118234612.272916-1-helgaas@kernel.org> References: <20230118234612.272916-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?1755406240592287880?= X-GMAIL-MSGID: =?utf-8?q?1755406240592287880?= 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. 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 doesn't control interrupt generation by the Root Port; that is controlled by the AER Root Error Command register, which is managed by the AER service driver. Signed-off-by: Bjorn Helgaas Cc: Jesse Brandeburg Cc: Tony Nguyen Cc: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org Reviewed-by: Tony Nguyen Tested-by: Gurucharan G (A Contingent worker at Intel) --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index ab8370c413f3..cb718c6216fc 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -10808,8 +10808,6 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_pci_reg; } - pci_enable_pcie_error_reporting(pdev); - pci_set_master(pdev); pci_save_state(pdev); @@ -11237,7 +11235,6 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) disable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state); free_netdev(netdev); err_alloc_etherdev: - pci_disable_pcie_error_reporting(pdev); pci_release_mem_regions(pdev); err_pci_reg: err_dma: @@ -11326,8 +11323,6 @@ static void ixgbe_remove(struct pci_dev *pdev) disable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state); free_netdev(netdev); - pci_disable_pcie_error_reporting(pdev); - if (disable_dev) pci_disable_device(pdev); }