From patchwork Tue Mar 7 20:32:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65861 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2650360wrd; Tue, 7 Mar 2023 12:40:10 -0800 (PST) X-Google-Smtp-Source: AK7set9ac1G0psFW1nP6MlHJlP2Hf9lVCM1mORNbngvSvV/uBGFO0D9VeO+3jWsocrw9I3dKRHmW X-Received: by 2002:a17:906:d51:b0:886:50d:be8d with SMTP id r17-20020a1709060d5100b00886050dbe8dmr18117093ejh.13.1678221610595; Tue, 07 Mar 2023 12:40:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678221610; cv=none; d=google.com; s=arc-20160816; b=B2/cOhVBaoltOIg1M5BK1ijrZafd+GvwLfxRpk1KjIVTVlShTQLrUgpEmSvNddSi9l TI543odAX4PMMdaFuZ5KZbQ/z66NDVONSMl2YP6GqhodfLUFl66GZ3lMWNmfl2jxK4fY gLTvjF3QVm/E6ykLvy6Zwrzk1KJBhtQamyOAqjkxrkF4r8TfPXWKtt/KTXLaPevOAHeZ W85I+pP30WtEFyQ/SnUYgKfTEEE/eNUFPU0/Dv5jUGa5ZRpgepzGpxT1rl9Gx9anadiJ cXVegOKPYv8Uzrl9J2Ls4B394irwWSa9GVE9d4zzwPVn4nc64cGdFFF3gg7NEQ7iEuWP NKug== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Gxfk7DErXqJylOQ62Ty+VgbNgF9YFiRAze69ZvPyN6w=; b=EcWpDoPAF6ahizlItsrdhLpK6RUkcDi9Z2gVWS5iSPauOjBgI8JI7YyyRwkNE58Ba9 c5Zm4l3j1Afk4kkdwBznXvi0KHPmu3bNWGfM0Q98Ef33iQz3zLwEmQppBlI8SR5U4wS8 Olqa1ATRj5Dgt6JCLG+gwV8skpgnvuhlfcIDmgkywm1nAyonzzvebuN7yc/HG5prNFkn uLLxz1FY8R+HlmtTWmwci5xLNaU3QgwnKauEn2hmv6yz8RIH4lqe/8oJ0Onnhizb68Jc 2LzNBl9k2OmNcoW9LYr1fVJ/f3n0hWwOAh+UOSmbWGN3ytLwAY3yUfJVbdeN9/r8I0dT 8ZfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=b8gZp7QE; 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 qw29-20020a1709066a1d00b008c1ecaddec4si17990433ejc.34.2023.03.07.12.39.46; Tue, 07 Mar 2023 12:40:10 -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=b8gZp7QE; 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 S229789AbjCGUcz (ORCPT + 99 others); Tue, 7 Mar 2023 15:32:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229757AbjCGUcw (ORCPT ); Tue, 7 Mar 2023 15:32:52 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84B6AA7AA8 for ; Tue, 7 Mar 2023 12:32:48 -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 2091061544 for ; Tue, 7 Mar 2023 20:32:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DE08C433EF; Tue, 7 Mar 2023 20:32:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678221167; bh=dOTQs3qUPCCs/2oObN0aBuTrcl21WTjanP9C3iDpiNw=; h=From:To:Cc:Subject:Date:From; b=b8gZp7QE+PyHxvTNOOtZ1stvmH6lZipLHmGOjZrPqwF/uXGgLFFgFgQ8wpGlpVh11 bBkDFG6dLwUebSLXJusVcnneeife93sgDFzR1Z1Mt+r7odTsJgh2y85e+/MqYML8ip yfRPLWc5BZI3bK6PSPcBdX1FhWRlTa4YTTxrGe4fwANjwaW6l4E48tCm3GldloB4qz 2Z9IVQBh8KDfRN5f/0ezwX3rz6GI4qsai8czdb7FXQ62JDuJdI+UuAloxSqrqweiWA RUrMhAktDlwo2Nb/WJk0afDLRbUfOOtLCDRUHTg0KYat/ylfYDFjJoXoZOhb/jyy8W tndSFbtYtw/4g== From: Bjorn Helgaas To: Christoph Hellwig Cc: Keith Busch , Jens Axboe , Sagi Grimberg , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH] nvme-pci: drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 14:32:43 -0600 Message-Id: <20230307203243.882202-1-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 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?1759742903935570795?= X-GMAIL-MSGID: =?utf-8?q?1759742903935570795?= 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 Reviewed-by: Chaitanya Kulkarni --- drivers/nvme/host/pci.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 5b95c94ee40f..593f86323e25 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -5,7 +5,6 @@ */ #include -#include #include #include #include @@ -2535,7 +2534,6 @@ static int nvme_pci_enable(struct nvme_dev *dev) nvme_map_cmb(dev); - pci_enable_pcie_error_reporting(pdev); pci_save_state(pdev); result = nvme_pci_configure_admin_queue(dev); @@ -2600,10 +2598,8 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) nvme_suspend_io_queues(dev); nvme_suspend_queue(dev, 0); pci_free_irq_vectors(pdev); - if (pci_is_enabled(pdev)) { - pci_disable_pcie_error_reporting(pdev); + if (pci_is_enabled(pdev)) pci_disable_device(pdev); - } nvme_reap_pending_cqes(dev); nvme_cancel_tagset(&dev->ctrl);