From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AC256C982E0 for ; Fri, 18 Sep 2026 20:07:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NNhCAqWpdqP/8unoyYkwhtURYEVhgOr7+m0jRabjXBA=; b=SuE5altw4pXab78UXQhquiGDtU CfrV9YIDXCpd/vOGJjyRuKz+rXU+AHWYwDZg6Uzi8CiBjUZAHry5GbrsNf+21A3RKtTw2T8fmVRAs F9cD9moIbCrXajXf04KLC3M9dw1wlmnfa5y5fLJ/Thip6v0jrd/rRZgj7E4tdewnm/JDoYs8aVUOd brT5rISksApqfV7AYNWwM6HwWsYWfHRLae9o0N7C8CZkKSQeSxdiEW3KVLtHpDC3PFEa27BD/TozE gMLZZOpi93vw/vHgJoJFCJSgOPuGZvFCTQqYs14dUdk+GxBdtMNbwUvWA6iYaRGGEIwscgFpHsgzU yENJiPqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x7erV-0000000FTSt-3UVF; Fri, 18 Sep 2026 20:07:09 +0000 Received: from mail-pl1-x645.google.com ([2607:f8b0:4864:20::645]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x7erO-0000000FTLH-2hye for kexec@lists.infradead.org; Fri, 18 Sep 2026 20:07:04 +0000 Received: by mail-pl1-x645.google.com with SMTP id d9443c01a7336-2d6df0a1e18so19896445ad.1 for ; Fri, 18 Sep 2026 13:07:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789762020; x=1790366820; darn=lists.infradead.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=NNhCAqWpdqP/8unoyYkwhtURYEVhgOr7+m0jRabjXBA=; b=dc5L6dTMaM+X/kcmoErpIh5lXXLiwXotLM/x1Zwdllr7PY2b5YRj6O6yHgIqy1LfOU 84OLyKkvzxW8Ajx3sbUKazInI8G6p7ltpw4BuWHG1+zCY2+SOMhryZN/T+7J93rfqQjf qf/av217Ln1M6Ji5SvyS/WBh4hwP+BBjsW3pkNhO1SNBMeOmVqDTvBwLgEMRNbnvIJaF uQ8sRjgZtOpubOxN6H4eUVzSZdaeQaQi3koWomAN41x8JOJGmox/awdR/dcmWHGrL7+D RmMoIcoa+HXDmviFns5YF2oCNwKnNHNWNdsQXOC0updgPGHYJ7scF6yPKxJXiskU7Aos xWdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789762020; x=1790366820; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=NNhCAqWpdqP/8unoyYkwhtURYEVhgOr7+m0jRabjXBA=; b=dsedFc8MbRkmmh1bOuG5UsgdJiBGxklzQkcp+6ilKwltEzPDMYjYV2n1OBsvimJGRa p/XXEIF/Iy1Vt8nqB1WJpznAui4UaELZ1EYpNJAqxUtnuIXxXR4iC4slKzatNyz6R3T8 XM25IEmjjc7+7Prv4i5Wxie9RULy/2ma3RGKzyDTfWE9xOM8qSFjKrT5ufwFBqpNRVSn F3YvMI0urH91id6zWFoZh5O7etdukd/jXtVBDpWhW6oPGnwdR19BVdjqxpBv86IsD9g5 UOIRA6/GPaCmrjt7cyNrWpz4jHAa9QlvZy8Xb0fHStpUqvYEyPCpw9uDLxpCB3VUFY0E mR3A== X-Gm-Message-State: AFuF++mFeva+gMe4lS3ITESEymRJcGcu3pZ/ZVUEFkxD3gfxSQLz5Ee7 JerNl0XkhI02uWdxj8aLGzpp2NzsQUTgsb49GrHZAjI7xoQYmikS3syszHNDWPPcBV86mtMnHX6 1ugaBioo6+38+mTSSsG/d9mVCRM79CeBom5TJPxL+0bAS4ziyNJLy8lgaoPcNgUTE5lMF+R3TtK p3jxpryFfNIKz2n4tU3/XUccWf8JjD4gHPtWjX652zrtrfhcgzsc4= X-Received: from plec5.prod.google.com ([2002:a17:902:f305:b0:2dd:2f59:daa8]) (user=dmatlack job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:9cf:b0:2dd:c053:e662 with SMTP id d9443c01a7336-2ddc053e6aemr12608265ad.40.1789762019617; Fri, 18 Sep 2026 13:06:59 -0700 (PDT) Date: Fri, 18 Sep 2026 20:06:33 +0000 In-Reply-To: <20260918200640.887030-1-dmatlack@google.com> Mime-Version: 1.0 References: <20260918200640.887030-1-dmatlack@google.com> X-Mailer: git-send-email 2.55.0.1082.g2b9226bbc0-goog Message-ID: <20260918200640.887030-8-dmatlack@google.com> Subject: [PATCH v9 07/13] PCI: Refactor matching logic for pci_dev_acs_ops From: David Matlack To: kexec@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-pci@vger.kernel.org Cc: Adithya Jayachandran , Alexander Graf , Alex Williamson , Bjorn Helgaas , Chris Li , David Matlack , David Rientjes , Jacob Pan , Jason Gunthorpe , Jonathan Corbet , Josh Hilke , Leon Romanovsky , Lukas Wunner , Mike Rapoport , Parav Pandit , Pasha Tatashin , Pranjal Shrivastava , Pratyush Yadav , Randy Dunlap , Saeed Mahameed , Samiullah Khawaja , Shuah Khan , Vipin Sharma , William Tu , Yi Liu Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260918_130702_702163_5310FA00 X-CRM114-Status: GOOD ( 15.49 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org Refactor the logic to match devices to pci_dev_acs_ops by factoring out the device matching loop into its own routine, pci_dev_acs_ops_get(). This eliminates duplicate code between pci_dev_specific_enable_acs() and pci_dev_specific_disable_acs_redir(), and will also be used in a subsequent commit to check if a device requires device-specific enable_acs() during a Live Update. No functional change intended. Reviewed-by: Pranjal Shrivastava Reviewed-by: Pasha Tatashin Reviewed-by: Bjorn Helgaas Signed-off-by: David Matlack --- drivers/pci/quirks.c | 51 ++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index de9bbccda21f..7aee30734303 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5377,9 +5377,6 @@ static void pci_quirk_enable_intel_rp_mpc_acs(struct pci_dev *dev) */ static int pci_quirk_enable_intel_pch_acs(struct pci_dev *dev) { - if (!pci_quirk_intel_pch_acs_match(dev)) - return -ENOTTY; - if (pci_quirk_enable_intel_lpc_acs(dev)) { pci_warn(dev, "Failed to enable Intel PCH ACS quirk\n"); return 0; @@ -5399,9 +5396,6 @@ static int pci_quirk_enable_intel_spt_pch_acs(struct pci_dev *dev) int pos; u32 cap, ctrl; - if (!pci_quirk_intel_spt_pch_acs_match(dev)) - return -ENOTTY; - pos = dev->acs_cap; if (!pos) return -ENOTTY; @@ -5429,9 +5423,6 @@ static int pci_quirk_disable_intel_spt_pch_acs_redir(struct pci_dev *dev) int pos; u32 cap, ctrl; - if (!pci_quirk_intel_spt_pch_acs_match(dev)) - return -ENOTTY; - pos = dev->acs_cap; if (!pos) return -ENOTTY; @@ -5451,56 +5442,56 @@ static int pci_quirk_disable_intel_spt_pch_acs_redir(struct pci_dev *dev) static const struct pci_dev_acs_ops { u16 vendor; u16 device; + bool (*match)(struct pci_dev *dev); int (*enable_acs)(struct pci_dev *dev); int (*disable_acs_redir)(struct pci_dev *dev); } pci_dev_acs_ops[] = { { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, + .match = pci_quirk_intel_pch_acs_match, .enable_acs = pci_quirk_enable_intel_pch_acs, }, { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, + .match = pci_quirk_intel_spt_pch_acs_match, .enable_acs = pci_quirk_enable_intel_spt_pch_acs, .disable_acs_redir = pci_quirk_disable_intel_spt_pch_acs_redir, }, }; -int pci_dev_specific_enable_acs(struct pci_dev *dev) +static const struct pci_dev_acs_ops *pci_dev_acs_ops_get(struct pci_dev *dev) { const struct pci_dev_acs_ops *p; - int i, ret; + int i; for (i = 0; i < ARRAY_SIZE(pci_dev_acs_ops); i++) { p = &pci_dev_acs_ops[i]; if ((p->vendor == dev->vendor || p->vendor == (u16)PCI_ANY_ID) && (p->device == dev->device || - p->device == (u16)PCI_ANY_ID) && - p->enable_acs) { - ret = p->enable_acs(dev); - if (ret >= 0) - return ret; + p->device == (u16)PCI_ANY_ID)) { + if (!p->match || p->match(dev)) + return p; } } + return NULL; +} + +int pci_dev_specific_enable_acs(struct pci_dev *dev) +{ + const struct pci_dev_acs_ops *p = pci_dev_acs_ops_get(dev); + + if (p && p->enable_acs) + return p->enable_acs(dev); + return -ENOTTY; } int pci_dev_specific_disable_acs_redir(struct pci_dev *dev) { - const struct pci_dev_acs_ops *p; - int i, ret; + const struct pci_dev_acs_ops *p = pci_dev_acs_ops_get(dev); - for (i = 0; i < ARRAY_SIZE(pci_dev_acs_ops); i++) { - p = &pci_dev_acs_ops[i]; - if ((p->vendor == dev->vendor || - p->vendor == (u16)PCI_ANY_ID) && - (p->device == dev->device || - p->device == (u16)PCI_ANY_ID) && - p->disable_acs_redir) { - ret = p->disable_acs_redir(dev); - if (ret >= 0) - return ret; - } - } + if (p && p->disable_acs_redir) + return p->disable_acs_redir(dev); return -ENOTTY; } -- 2.55.0.1082.g2b9226bbc0-goog