From patchwork Tue Mar 7 18:19:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65783 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2624640wrd; Tue, 7 Mar 2023 11:41:38 -0800 (PST) X-Google-Smtp-Source: AK7set/Igum4PLxk9ZrNRBmDb15DeQPvw1t8x74DvIl93MA89i0PLiT9/QOphcWQhLU5oFXC5q0j X-Received: by 2002:a17:906:6882:b0:8b1:75a0:57fa with SMTP id n2-20020a170906688200b008b175a057famr15268875ejr.43.1678218098787; Tue, 07 Mar 2023 11:41:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678218098; cv=none; d=google.com; s=arc-20160816; b=EkBUGl+mqlO5wp25VQc8IMAn0A5twEaM+yz4Re/js4MBaS9JQLKop720eAIZCkDHF2 P4ZRaNHH0TuMDeBnfTPHkTZJ5iwxfUOUJnNkpC5SUkd2OXUeq/YsNOPo+yEL0nwTqhS/ EyF0NvtM5VHOiBOp89bHebRK7W4nO6bq8HODvRWhDbfyFzdi7Wza7b5aZ9DPutOxOInB OZ7lq1b5adOv/kEEp81NnWH5d1crPLMTFs1dWR96ZZcV9yE71eGnxHNMmakPldp93iHt Q1nG180LS342dXAnx3m4PFfMnV5hMkMt3zM8HSyAoV4bGew7Mq6ZtRk/5Xmsf0rrZbnJ liyA== 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=h9rw/zutkdnBDp5gXiOieOfo7ykSModMZ0r6RDDsJqM=; b=WFqfcyENsj2aWlKcJWPNbMPhfntwAFIxgMtD/+ucFzepnC1qdC8AiQKNQr7MsF6FLi 9kFA3z5GYAPHz25s11bmeI1pldLpKAT+8Owyj2X6ZUyeWksPJjVg+atKF61sPn7rWEX4 Wb0nfbM/khHHYhlbEH0zV1zSnszmeTcknEe/3GAwNU48E4YC11ilroGDt298wFSBVJJa Bwd1uJtBWNfSy7mQ6y00BzTsyS7wBdjc0A/jrbvsiJ9gX5APIEu0+BFhviW6rZUWZcFY FgstOzmm4Odn6Ti11WIFOJJ0KBZzDG066FPVI7J8I855BInyydjN2LAoAjPNmw2zRZCx zSqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NotFv3R6; 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 nd17-20020a170907629100b008d0d82ecd2csi18342605ejc.353.2023.03.07.11.41.15; Tue, 07 Mar 2023 11:41:38 -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=NotFv3R6; 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 S232955AbjCGS07 (ORCPT + 99 others); Tue, 7 Mar 2023 13:26:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230013AbjCGSZo (ORCPT ); Tue, 7 Mar 2023 13:25:44 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 642419FBE2; Tue, 7 Mar 2023 10:20:24 -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 sin.source.kernel.org (Postfix) with ESMTPS id C64ECCE1C83; Tue, 7 Mar 2023 18:20:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BCD57C433D2; Tue, 7 Mar 2023 18:20:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678213221; bh=L40C2NsmiT5sjeEnSWj72p21BipE9CnM7NZNqckWFdI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NotFv3R6nlW7TCPqWDdY++YMdVT5NNa6K3LpUqhjc9F15D09eae85fK2IH7rxRvOF EoIEWTJdKaQ1sD/+c9bz90rBjuM5AURrPtAM1s3eGbg0zWJyan4JLJR+k6Ds576KwR eTW1Qn5CFfp8cICZ9up6ubCga1a2/wAOs1TYYnrLM2lWxGHAAVtD0C/01BtTR1bH5H do5sH5r1gzpIFPT6N2YUFIIJAQkWfU9ZThVYwmWmjvdneE7blwmHfsLdRcLMkFqQF4 WvrdReCZOFIftgVA+q1Ud/VrX+U38z4VAUSFS+GDejUSLKUBlePDNS/1RW+WVqjsOL KfC6hziMqAr/w== 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 , Shahed Shaikh , Manish Chopra , GR-Linux-NIC-Dev@marvell.com Subject: [PATCH 13/28] qlcnic: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 12:19:24 -0600 Message-Id: <20230307181940.868828-14-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=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1759739221148176418?= X-GMAIL-MSGID: =?utf-8?q?1759739221148176418?= 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: Shahed Shaikh Cc: Manish Chopra Cc: GR-Linux-NIC-Dev@marvell.com --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 ---- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 1 - 2 files changed, 5 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 44dac3c0908e..90df4a0909fa 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -2445,7 +2444,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out_disable_pdev; pci_set_master(pdev); - pci_enable_pcie_error_reporting(pdev); ahw = kzalloc(sizeof(struct qlcnic_hardware_context), GFP_KERNEL); if (!ahw) { @@ -2675,7 +2673,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) kfree(ahw); err_out_free_res: - pci_disable_pcie_error_reporting(pdev); pci_release_regions(pdev); err_out_disable_pdev: @@ -2757,7 +2754,6 @@ static void qlcnic_remove(struct pci_dev *pdev) qlcnic_release_firmware(adapter); - pci_disable_pcie_error_reporting(pdev); pci_release_regions(pdev); pci_disable_device(pdev); diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c index 5c2edb715d3e..74125188beb8 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #ifdef CONFIG_QLCNIC_HWMON #include