Message ID | 20230307202221.880489-1-helgaas@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2649377wrd; Tue, 7 Mar 2023 12:37:43 -0800 (PST) X-Google-Smtp-Source: AK7set/VLhDvV54S9c1FkDYBKGw7CZUZ6AGkP6G1jWNBKXV4gAM7sCFeVqgNTG5VUTbhjMDwjEN+ X-Received: by 2002:aa7:c51a:0:b0:4ac:bd6f:cacc with SMTP id o26-20020aa7c51a000000b004acbd6fcaccmr13877057edq.12.1678221463402; Tue, 07 Mar 2023 12:37:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678221463; cv=none; d=google.com; s=arc-20160816; b=ORs+BDV4IdyslpmvCQpArQSrHByzAZyZmwaOe4YFMyDjtuBAxRuFODgBqBnJYgmckF OQFjanS7kkPuXclZtHJKQ1POtAD2zKBuednGgnnjzRnUOuw9+i7pRIJ9B+Ps2ObvQRTL tz7aYqdd1DL026hrA+mbEJK8ZuQBgYofZZiKmpxlryZksZBg2W43RpvOOde0zhe8e7SS qdNDE77cM+Pe8pK+9Fk/0qnEUVqLxHCfbDeitAL/PNTZzj9+a3Fr6DJStumStWJP+oYP myRJVXJeEUdOHnztBVe2Yd04OnAZWKALfSMRrZ/sS0pWUhUDwvigffKRxcdCMmXLITnJ Cn6Q== 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=DQvffp8eNzhIwlGLNBteSjHuf2tohfIPXTwRPtnx0MQ=; b=joCocjRSj5taFcAnXhajaoBFQFCNaYyiSPF/n2cjig+ce5xnNVVCPfT525fUzEjFOg h0sOC9I7iI7uN4X2WNkoWtqeY0CD6KW5OpADVsa8Xg36SdoAVFbPX+I2QOnKieXLuqWh ZkGi4RWyyvYydRakwHV86JLtXjBu0EPBUSEKUGnboRZPyOcvNH5/MfjxnXA49crCN8a0 vpH7JxAOGqW3B+wuHS09rJ1ZCJiJSLkfgD7zXV2uhsC8Jtg5ADDZRPSsoCFQ4OlDNXuG 6w/+8y0iKU0EouM6dJhihdbS9Jr1lPvfAX8AwsGkc3KIMwyGwRnXtcux1S6r3l4JndlY wacQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=lbDHl8du; 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 w3-20020a056402070300b004c01a821394si2372858edx.583.2023.03.07.12.37.19; Tue, 07 Mar 2023 12:37:43 -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=fail header.i=@kernel.org header.s=k20201202 header.b=lbDHl8du; 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 S231613AbjCGUWi (ORCPT <rfc822;toshivichauhan@gmail.com> + 99 others); Tue, 7 Mar 2023 15:22:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231761AbjCGUWf (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 7 Mar 2023 15:22:35 -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 2A65CA3B59 for <linux-kernel@vger.kernel.org>; Tue, 7 Mar 2023 12:22:33 -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 9E0B061522 for <linux-kernel@vger.kernel.org>; Tue, 7 Mar 2023 20:22:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D53CFC4339C; Tue, 7 Mar 2023 20:22:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678220552; bh=PqER2sDTG8VKpv708LoHbOx4iqEG6thQKcBSNi0LE2E=; h=From:To:Cc:Subject:Date:From; b=lbDHl8duTqlScOCaUxL+MFLThmWnR8hF6VYFeHADoj4hhevwxsRgC2ZOyDv8cpgxe f/a4AgwVjNk6mUUL+ucRq36tXtRbHXk9KOjp/0D2ZdJE1367uXLcoSL1LVsIiFh6QV 3MCcaQwEhwI1Vqm8vffhthx7Ldp5xQm+3a3HUhbwuqR8Hk0rYrYFIUSU5NQKS4epFL eL2I80mfF2YA0lVRnTpUiLYIFJCOTDVke56GQW1ADaJF4hWEUkn1ZrVKfRuLRszgZG EvjRiuQcsfr5Cx/IBbZXo9AIi4yNpAjHjS2veeFZ372oTt4sNAmOUBnArlhKHBD8sg bB3+TN+aH4qgg== From: Bjorn Helgaas <helgaas@kernel.org> To: Alex Deucher <alexander.deucher@amd.com>, =?utf-8?q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>, Pan@vger.kernel.org, Xinhui <Xinhui.Pan@amd.com>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch> Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com> Subject: [PATCH] drm/amdgpu: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 14:22:21 -0600 Message-Id: <20230307202221.880489-1-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759742749060195582?= X-GMAIL-MSGID: =?utf-8?q?1759742749060195582?= |
Series |
drm/amdgpu: Drop redundant pci_enable_pcie_error_reporting()
|
|
Commit Message
Bjorn Helgaas
March 7, 2023, 8:22 p.m. UTC
From: Bjorn Helgaas <bhelgaas@google.com> 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 <bhelgaas@google.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 -- 2 files changed, 3 deletions(-)
Comments
Applied. Thanks! Alex On Tue, Mar 7, 2023 at 3:22 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > From: Bjorn Helgaas <bhelgaas@google.com> > > 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 <bhelgaas@google.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 -- > 2 files changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 164141bc8b4a..208cebb40232 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -50,7 +50,6 @@ > #include <linux/hashtable.h> > #include <linux/dma-fence.h> > #include <linux/pci.h> > -#include <linux/aer.h> > > #include <drm/ttm/ttm_bo.h> > #include <drm/ttm/ttm_placement.h> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index c4a4e2fe6681..a5151e83a3f7 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -3773,8 +3773,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, > } > } > > - pci_enable_pcie_error_reporting(adev->pdev); > - > /* Post card if necessary */ > if (amdgpu_device_need_post(adev)) { > if (!adev->bios) { > -- > 2.25.1 >
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 164141bc8b4a..208cebb40232 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -50,7 +50,6 @@ #include <linux/hashtable.h> #include <linux/dma-fence.h> #include <linux/pci.h> -#include <linux/aer.h> #include <drm/ttm/ttm_bo.h> #include <drm/ttm/ttm_placement.h> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index c4a4e2fe6681..a5151e83a3f7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3773,8 +3773,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, } } - pci_enable_pcie_error_reporting(adev->pdev); - /* Post card if necessary */ if (amdgpu_device_need_post(adev)) { if (!adev->bios) {