From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DF0851CF79 for ; Tue, 13 Oct 2026 16:25:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.200 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791908747; cv=none; b=LH62wpvtWOZtZdlu6YMolfwi1vbiUG0BkJCVqoOFRBPRCwZDwr3H9kEK0/9xiRrXqD0ZA/tzQNJRZIEBXoPJlMHDLw6vb17ZyJQ30LzMSPcjmEGQ+TRqIdK7BV+hA7Jicgr/McMEZrhoRywa6B7XUTWI8Vv7lD/PoD0bboWfLFw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791908747; c=relaxed/simple; bh=pRK/S9Ha9T/f2Rc2+jytr6ZJUdBm0CMIFhq8yvVR348=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=i1/sQG7rCF3/AHWH2VK9Ai+8Y15ecMJsYZ+4HTZXLVcCh55hYMqXLfjapESpdFdcSawohDOycswlWHjckHw6/lJLVvoZeadnODdF74zOXlsUyrmmoQBgGkbhqxz0yRYnQHt5sVJ3B0OaIIA8xyr5aOOyxwjP2VDRC944rDS4icQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--dmatlack.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=EgXBda1P; arc=none smtp.client-ip=209.85.214.200 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--dmatlack.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="EgXBda1P" Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2e8ad8c5f80so35953745ad.0 for ; Tue, 13 Oct 2026 09:25:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1791908744; x=1792513544; darn=vger.kernel.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=xeOaWY8G0RyJWpiIZt4rGXklqrMOz8YRWSRZ+Jyg5IA=; b=EgXBda1P31pDucPHDAHr1wJzOKOZv1E39m5Zvu+zRgeFMWiXR7VIxB5D5X+FBWszsa eg4k2TwssATwWmrh9cAt4ldn2MgBPYtW+POmEcLe9AGCIK87Qj0eCqCI1pky6a0yLlWE fL99iQHkx/qB1Uri2wD+Wc/cT4FXQ/agMeL0xTAS7GwLmamK4o1q51RTkn+nInihGo5l 63R2mi6sEIE3b4+pHyHdkkH6bIkZ//r4StKu9+yprPcjWlu3z540tWSOYnAoC2pEKM0z yV4GROVz24Atc1elL5w8B4bQ2y7VlUs2sJlW6J9iswZWFckdPiMKbOgMREOq+gnMU1yV iC0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791908744; x=1792513544; 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=xeOaWY8G0RyJWpiIZt4rGXklqrMOz8YRWSRZ+Jyg5IA=; b=d6DAs2wnDedSOcnA74zc2Xt6FERxFCJi1Tk21VBKVrB8fYz95mPpoQXGM1SvE9Bbpf UgPe4ZPWHK8QO3q+uBcKEVHCilH7TdOTOkeMBfhM8a6Vav0M2939WsIuzqBNRTHPEYxv LV0nVSVetGELgYebIu2SofkbRUdJUEoZXxAYoKB2WJ3zayDy4fCUfTv/T0nTJdywH8yY CDIlnNm78jlW17mfqSOjpjf0UzR0wX6b1ZSm6nVZe1dr2zvyARvy6pz8102Icd8zxMi5 blg6QnwgNcy1hzhx7b8Is/Q4AQqUGMLXSDDLy71+WaJzGCCjJHw2nNUZSvcFp4oqMaMy ws6Q== X-Forwarded-Encrypted: i=1; AKwUvBwuYfnjfeGLsLT/1wOxcihhf6/tDnrdTl3U+H669FWCL4D8Pm/31EU+lcSGUdotks2/3oAEzyQi2KQ=@vger.kernel.org X-Gm-Message-State: AFq9FYKJXHYuexYj1N9pk6qboCDBgrRn//5o4H6FCdoqE20P3gjvERUd FWxY1DtDLNkazm2wavV2ChW417SC9eff2WenLDODRPlq/+gcmtw9/xSw1tZeE19szcx595gASWY vy061BUZTE9TA9Q== X-Received: from pllt11.prod.google.com ([2002:a17:902:dccb:b0:2e5:b835:73c5]) (user=dmatlack job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:41d2:b0:2e4:cc75:2707 with SMTP id d9443c01a7336-2e84280e7a2mr118758025ad.7.1791908743529; Tue, 13 Oct 2026 09:25:43 -0700 (PDT) Date: Tue, 13 Oct 2026 16:25:23 +0000 In-Reply-To: <20261013162529.1928093-1-dmatlack@google.com> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20261013162529.1928093-1-dmatlack@google.com> X-Mailer: git-send-email 2.56.0.385.gd3acb90ef8-goog Message-ID: <20261013162529.1928093-8-dmatlack@google.com> Subject: [PATCH v10 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" 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.56.0.385.gd3acb90ef8-goog