From patchwork Tue Mar 7 19:32:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 13164661 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97C5FC6FD1E for ; Tue, 7 Mar 2023 19:44:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231751AbjCGToA (ORCPT ); Tue, 7 Mar 2023 14:44:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231708AbjCGTnh (ORCPT ); Tue, 7 Mar 2023 14:43:37 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B90EC65A2; Tue, 7 Mar 2023 11:32:17 -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 5557761538; Tue, 7 Mar 2023 19:32:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EBDEC4339B; Tue, 7 Mar 2023 19:32:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678217536; bh=54NM9OALq0MKWDH1qGbReeL8UC7AaboBAt1Fx0XokNI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JFEvuejqICQ/3s0OPFdMkg/RqVVpCpjTqimTfVJfDI/az2hV5ZUatETMz+0xgppr1 TOrWSfl0hBg5mgqVSQPeTAIHweqySNbUM2HP3A1m+6TOKuuWxgFAoZVJjTD6ksdc4q o03+qPG9qSqbZNY8VyLu8SODGeEj3y9fZyAKGyqeTNlesHK3bhDH26GaL5fKR/e97T FHJp5bg5igb6hoKRj3x/RmiUF7GE4Qd1ZuBQ5KYJ1QbNwI14iAzlDcUYdsgfwwUyIb LQSTHhcpR+nB6fNik6XEsv1iOokHbP0x+Kvydb5RA1UcMWRJjCbIagFcytd/7IlBLI 8JrO30yGsZyUA== From: Bjorn Helgaas To: Jason Gunthorpe , Leon Romanovsky Cc: Dennis Dalessandro , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 1/2] IB/hfi1: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 13:32:10 -0600 Message-Id: <20230307193211.874747-2-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307193211.874747-1-helgaas@kernel.org> References: <20230307193211.874747-1-helgaas@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org 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. 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: Dennis Dalessandro Reviewed-by: Dennis Dalessandro --- drivers/infiniband/hw/hfi1/pcie.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c index a0802332c8cb..08732e1ac966 100644 --- a/drivers/infiniband/hw/hfi1/pcie.c +++ b/drivers/infiniband/hw/hfi1/pcie.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include "hfi.h" @@ -65,7 +64,6 @@ int hfi1_pcie_init(struct hfi1_devdata *dd) } pci_set_master(pdev); - (void)pci_enable_pcie_error_reporting(pdev); return 0; bail: From patchwork Tue Mar 7 19:32:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 13164662 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02B91C742A7 for ; Tue, 7 Mar 2023 19:44:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231795AbjCGToB (ORCPT ); Tue, 7 Mar 2023 14:44:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230459AbjCGTni (ORCPT ); Tue, 7 Mar 2023 14:43:38 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85CD8171D; Tue, 7 Mar 2023 11:32:21 -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 ams.source.kernel.org (Postfix) with ESMTPS id 1EE8AB81A13; Tue, 7 Mar 2023 19:32:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F8E4C433D2; Tue, 7 Mar 2023 19:32:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678217538; bh=0ajafqK3qaohYJkjyLboaiQW2r1fsUha7ulM5WFkbtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IHImR542j4zo6XPBVPwjD3nawD4qlgyD9P0u2/pmaMvMieE2fEhjeVlJ85ILgF7lp E2NwD4Zykb9Jv/N9X99mMF103MSBd70vBpAqlbjtruZmztKJF1Jjgntqp3iXIFuRoA BYSwuRLVUdX1sqLy2pEpjzf/ZAX/Lr8Xyo3j6SWtFPBOpAGdSVtkhhfXdEFcWn3qPN teX+xlmFVdgLxSNivOlQ6ft40SRaHV6MNctLBWvdFWdriHTO9ePmZDN0IjNKWSswbn E3dPjZf3wILNViD+HrEE2nqwoom3p1sV8jQiOy0SfOaHMFr3+vnkyWtbsO1cOGNhVp mdVHlpuOad5OA== From: Bjorn Helgaas To: Jason Gunthorpe , Leon Romanovsky Cc: Dennis Dalessandro , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 2/2] IB/qib: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 13:32:11 -0600 Message-Id: <20230307193211.874747-3-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307193211.874747-1-helgaas@kernel.org> References: <20230307193211.874747-1-helgaas@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org 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. 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: Dennis Dalessandro Reviewed-by: Dennis Dalessandro --- drivers/infiniband/hw/qib/qib_pcie.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c index 692b64efad97..47bf64ace05c 100644 --- a/drivers/infiniband/hw/qib/qib_pcie.c +++ b/drivers/infiniband/hw/qib/qib_pcie.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include "qib.h" @@ -105,13 +104,6 @@ int qib_pcie_init(struct pci_dev *pdev, const struct pci_device_id *ent) } pci_set_master(pdev); - ret = pci_enable_pcie_error_reporting(pdev); - if (ret) { - qib_early_err(&pdev->dev, - "Unable to enable pcie error reporting: %d\n", - ret); - ret = 0; - } goto done; bail: