From patchwork Tue Mar 7 19:26:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 13164657 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 56AF3C6FD20 for ; Tue, 7 Mar 2023 19:40:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231290AbjCGTkr (ORCPT ); Tue, 7 Mar 2023 14:40:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231643AbjCGTk3 (ORCPT ); Tue, 7 Mar 2023 14:40:29 -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 BEDC9A8811; Tue, 7 Mar 2023 11:27:07 -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 0943BB818C4; Tue, 7 Mar 2023 19:27:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0317C433D2; Tue, 7 Mar 2023 19:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678217222; bh=PBKx560qNe8SnH7l569PMqQ0gHZ8kT097OdmdKuoVds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cVzu7GyBTNvnhQ+BDcyMOBD5vxDwAxhYNF4PydRfeVB2Pt8vRSoZe4DA6MiICz4tG YThKxWvAPjzBDVBMIIz9PnzMKmfHdFXAjCVvR9m6cjgQ2gO3WO+8KsMPofoPB99ROv oNw3Y36IFkH17+/e9/Pywydg546M98tKPyibI6AubtZt1q8JdFHuBJnebF788w276p 6HXLF8vjfLBo2G0v+164zfSgSv64wQe1sRdGDDjWbaa5uCIT5c1x1S4DU35fhL13lM +5NS37WGHUsIxEijS3ucTqNLH4E4DUIlfxXGA1H920CFP5SYkn8xQ6AuFYuXh7jUZu LQTctTZWmT9RA== From: Bjorn Helgaas To: Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 1/2] dmaengine: ioat: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 13:26:54 -0600 Message-Id: <20230307192655.874008-2-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307192655.874008-1-helgaas@kernel.org> References: <20230307192655.874008-1-helgaas@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: dmaengine@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. 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 Acked-by: Dave Jiang --- drivers/dma/ioat/init.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c index 5d707ff63554..6ca62edf47bd 100644 --- a/drivers/dma/ioat/init.c +++ b/drivers/dma/ioat/init.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include "dma.h" #include "registers.h" @@ -1380,15 +1379,11 @@ static int ioat_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (is_skx_ioat(pdev)) device->version = IOAT_VER_3_2; err = ioat3_dma_probe(device, ioat_dca_enabled); - - if (device->version >= IOAT_VER_3_3) - pci_enable_pcie_error_reporting(pdev); } else return -ENODEV; if (err) { dev_err(dev, "Intel(R) I/OAT DMA Engine init failed\n"); - pci_disable_pcie_error_reporting(pdev); return -ENODEV; } @@ -1411,7 +1406,6 @@ static void ioat_remove(struct pci_dev *pdev) device->dca = NULL; } - pci_disable_pcie_error_reporting(pdev); ioat_dma_remove(device); } From patchwork Tue Mar 7 19:26:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 13164658 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 A3236C6FD1E for ; Tue, 7 Mar 2023 19:40:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229935AbjCGTkt (ORCPT ); Tue, 7 Mar 2023 14:40:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232036AbjCGTka (ORCPT ); Tue, 7 Mar 2023 14:40:30 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B2EC7E79D; Tue, 7 Mar 2023 11:27: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 4743A61518; Tue, 7 Mar 2023 19:27:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DC44C433D2; Tue, 7 Mar 2023 19:27:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678217224; bh=rffBK/cmJusylWS6PUrzcOSzwk1o9RC+zuh589MfdC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hvpKij3f3hfUhNK4xgM7ZJdiEYz1vvjJdUfn7UuefjWY+t/Dufsy28uHfrOiZoY5J XX21sYnk/Meg3vP198fDFUKJPxvGa9ShQSXe58t3s7yF+tzWeTJEre14ItAAC9JmQL T7LsXgWaP9dJXp/6yT2eA5mJasbLA2PvHItzRiuQ343zzrgMf0cVUjr8TzWbKDz+xe KJ3LycXhy4t6wauyn9yFRSRYeb0cu3ha5s6xcdqO8EuVnvPMuhoSe0JxzVi+iCrfm9 DiRMX2AMPwSzFL1ar+4pfCubTTOMqXcTfnN4ebwQgIgeNppSuJDVLY7aY64eQ3sijd Cd82dIYvYmXmQ== From: Bjorn Helgaas To: Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Fenghua Yu , Dave Jiang Subject: [PATCH 2/2] dmaengine: idxd: Remove unnecessary aer.h include Date: Tue, 7 Mar 2023 13:26:55 -0600 Message-Id: <20230307192655.874008-3-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307192655.874008-1-helgaas@kernel.org> References: <20230307192655.874008-1-helgaas@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org From: Bjorn Helgaas is unused, so remove it. Signed-off-by: Bjorn Helgaas Cc: Fenghua Yu Cc: Dave Jiang Acked-by: Dave Jiang Acked-by: Fenghua Yu --- drivers/dma/idxd/init.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c index 640d3048368e..a85efcda7095 100644 --- a/drivers/dma/idxd/init.c +++ b/drivers/dma/idxd/init.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include