From patchwork Fri Jan 26 21:09:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Salisbury X-Patchwork-Id: 1891614 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TM9Lm4g4Bz23fJ for ; Sat, 27 Jan 2024 08:09:52 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rTTSJ-0007ta-EW; Fri, 26 Jan 2024 21:09:43 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rTTS6-0007r4-8S for kernel-team@lists.ubuntu.com; Fri, 26 Jan 2024 21:09:30 +0000 Received: from smtp.gmail.com (1.general.jsalisbury.us.vpn [10.172.66.188]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id B1EB8419F2 for ; Fri, 26 Jan 2024 21:09:29 +0000 (UTC) From: Joseph Salisbury To: kernel-team@lists.ubuntu.com Subject: [SRU][bionic:linux-gcp-4.15][PATCH 1/2] PCI: Extract ATS disabling to a helper function Date: Fri, 26 Jan 2024 16:09:27 -0500 Message-Id: <20240126210928.33641-2-joseph.salisbury@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240126210928.33641-1-joseph.salisbury@canonical.com> References: <20240126210928.33641-1-joseph.salisbury@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Bartosz Pawlowski BugLink: https://bugs.launchpad.net/bugs/2049922 Introduce quirk_no_ats() helper function to provide a standard way to disable ATS capability in PCI quirks. Suggested-by: Andy Shevchenko Link: https://lore.kernel.org/r/20230908143606.685930-2-bartosz.pawlowski@intel.com Signed-off-by: Bartosz Pawlowski Signed-off-by: Bjorn Helgaas Reviewed-by: Andy Shevchenko (backported from commit f18b1137d38c091cc8c16365219f0a1d4a30b3d1) [jsalisbury: Preserved opposite return logic in quirk_amd_harvest_no_ats() found in v4.15 compared to 6.7] Signed-off-by: Joseph Salisbury --- drivers/pci/quirks.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 29e428e48d81..af6ba86cab1d 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5187,6 +5187,12 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0420, quirk_no_ext_tags); DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422, quirk_no_ext_tags); #ifdef CONFIG_PCI_ATS +static void quirk_no_ats(struct pci_dev *pdev) +{ + pci_info(pdev, "disabling ATS\n"); + pdev->ats_cap = 0; +} + /* * Some devices require additional driver setup to enable ATS. Don't use * ATS for those devices as ATS will be enabled before the driver has had a @@ -5197,9 +5203,8 @@ static void quirk_amd_harvest_no_ats(struct pci_dev *pdev) if ((pdev->device == 0x7312 && pdev->revision != 0x00) || (pdev->device == 0x7340 && pdev->revision != 0xc5)) return; - - dev_info(&pdev->dev, "disabling ATS\n"); - pdev->ats_cap = 0; + else + quirk_no_ats(pdev); } /* AMD Stoney platform GPU */