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 CCFAFC54F56 for ; Tue, 28 Jul 2026 22:10:35 +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=eD4DOqSzYhDJFPWVLbqkFG2KNi5FrgpbXUF+ODWdEds=; b=gOh3u7yVnFa/9N/I0ONx5yG9Pt nhSeII96l7jA4ItjPfr4gUSOKo1M2/CKc5/wxZbPpluZBTVf/cxOluPcUABv+5Onf4FaBYJpHb+aT +tBTa3B3XR+shn/wm+QCK0+pODe/ffXN/wE1rE8w+xNfZ5LPlQd9kSx4rcHVE/+vvm558YGFXJ7ye FLEj9bGc9bVsUgHlKgPZkbco3odhfeQ8XsB/lZOx7GtxSgLnxRopO4ZWLVB1J6ucy4TW0RxGyqh5r 5TD+ySdnp/zfDgZ8DLXx6+QdbKYk8PfuMT1GcbLJTGTQZMrYvenfSjECgQueIUHt4W69lkCKaOHPW dAPRPdzg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1woq0Q-00000006Nxl-2nDu; Tue, 28 Jul 2026 22:10:34 +0000 Received: from mail-pf1-x446.google.com ([2607:f8b0:4864:20::446]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1woq0L-00000006NrB-0arK for kexec@lists.infradead.org; Tue, 28 Jul 2026 22:10:30 +0000 Received: by mail-pf1-x446.google.com with SMTP id d2e1a72fcca58-84842381150so453620b3a.3 for ; Tue, 28 Jul 2026 15:10:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785276627; x=1785881427; 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=eD4DOqSzYhDJFPWVLbqkFG2KNi5FrgpbXUF+ODWdEds=; b=frwMxYOq3kDsQ84Fv61E1wi3+b8HMF+DhRO2OL+6NAwF51ZSAogHljTDmzHYp1GOMS 8KMrtt0chyF1lsIJkDfJYUeLBgIanY/bURRcJkPDGWpbgHUr6cVO019jdB89hW7MAj7u uYXHc4yg1lw5IHAFQYzJtj9HCN+/J4GXIAeh3p5CD1z3PpMSILyoLkvJKWi0oGVjC4qw U+tQOa+LU8Q+dRtUDSPDT2Kk67bd1kbCEtE4jYLGR/QEAxy4LAj/rmfzQAYnKlh+/nxk Bqtw08XR77y7ehU/gwYOl4/DuJfR0iGZJmcmUpHlpkh5+udKU7qgagmT8TXXSCSnQrjb ljNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785276627; x=1785881427; 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=eD4DOqSzYhDJFPWVLbqkFG2KNi5FrgpbXUF+ODWdEds=; b=ifMn6fZTn7OHGg3cARBA9NR5XypuxaGyOPTRYVAZv78K+y4rvc5OIi0YNbxBvbBZlo fW+j5QkpCxacU4MfWeazir8GK7y9eoLbvXZH3xtZ0Lnn60T8Bdlg354ZmQCXyBVnteSS 58EgbbT+/FVi2YleAdB0sLRHsCfpD2IAzLALJUvcIUg1051Um05dxdL8DBkUJ53961JQ IsHZSU+D2msoVsQ5n2FtFRfWp9TgPcGoFB/pXLRCxEHE/r971nNNcGhfeSZewj1RBM7o 54uWv5VoqGd3QsCRUeTLmArGj+dO5Qr7WiGXYgyJUBPGfOM6zS36Df0VhrXHN8fBOIPn K1IA== X-Gm-Message-State: AOJu0YxOPoYMY6Q5t4h1AsAOpKqNFLt1bs3dpUyZWyuiA1wJKi9wWjUb ZbMt7xzxZNuW0+H6eCgAEkVwoJWIOqTZul7+YzBSSBMkg7kVKYXgHiWtk/6QL+bZBGiyNsxCB2f Jn74pDRb+2xvF/cC+CdTTZX24jFx4CWk6SjJayGPjTSLPAltDnEYdbk5IlpVB2NVV1j0iJPxT95 D4/4aNi4sc16XRpZZLpzUsaNFEmU6X384QtTm6zVdscYTWiVgWBSk= X-Received: from pfoa1.prod.google.com ([2002:aa7:8641:0:b0:845:ebfa:4051]) (user=dmatlack job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:23cb:b0:845:363e:12d9 with SMTP id d2e1a72fcca58-84e931f6a77mr4252240b3a.3.1785276626749; Tue, 28 Jul 2026 15:10:26 -0700 (PDT) Date: Tue, 28 Jul 2026 22:10:01 +0000 In-Reply-To: <20260728221007.2098560-1-dmatlack@google.com> Mime-Version: 1.0 References: <20260728221007.2098560-1-dmatlack@google.com> X-Mailer: git-send-email 2.55.0.487.gaf234c4eb3-goog Message-ID: <20260728221007.2098560-8-dmatlack@google.com> Subject: [PATCH v8 07/12] 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 , 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-20260728_151029_196771_CB481B99 X-CRM114-Status: GOOD ( 16.10 ) 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 b09f27f7846f..7ac39ec2843e 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5374,9 +5374,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; @@ -5396,9 +5393,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; @@ -5426,9 +5420,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; @@ -5448,56 +5439,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.487.gaf234c4eb3-goog