From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 2EEFE385D94 for ; Fri, 22 May 2026 20:24:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779481463; cv=none; b=T8hI1yguhpi/q5bLvo4A6ht63ZHH+Gg94UMJNSG0M31pGuKIJpxYuQoVzOxi/TY+6wWHPR1efOsmb8R2xdJ2mJFjKwRZHTHFWJQGtHF3NiOLq99FfrzM1UAx/USkYWVd/Yc96xoHIZzYSvhUunNUlzSKEPKzjCdogli9Jg4nhfc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779481463; c=relaxed/simple; bh=AmO7W/8gXxOtZVsrp0KtqrBNzzh+t+7NWZozjr0mE5I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=eCoeZUPE7Gni8HlhMDa0rs/QvgO5K2K1ROkBOwgw1qfHRoW41R1NrZjXkK5yQ4ZMzJ4LgXNNef8d+/nyrMknqIDPuWJPDxAZZl5uU+M3FsY+lR7AaXp+uugv8wD6zW3ozH8rs7p29srvKLZfpJgwIV2H6R3NdPVBG25gDH+VB5c= 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=NXoMwwd0; arc=none smtp.client-ip=209.85.216.73 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="NXoMwwd0" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-365e70c39d0so7332458a91.0 for ; Fri, 22 May 2026 13:24:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779481458; x=1780086258; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=dMXxmfHGErf7yBzoXqh/yDUR2jlzP0FOZNAJXyHr7Dw=; b=NXoMwwd0KvadGcJFRg9LnDi0To3hwQuoszqH8QZd6P9ucAVwfHqNPWcv6PloyrDNP/ XMDLDOlyuxYtrYvNQf5pM1T5INq5YIRi9bkZZJCqwTl6dGY5RLpKHFmLAVvXDdFZCoO0 gZ6Bg0S2JuUkawtsXomAygfRAqURD1wQykOFKkKfmxzbleWGw+dgPuNvN1aptI/Hp8IY dsA2Lw1hTidfKnqIbp++h6LqAgceW7MC0xW6ewSXo3V/Xmyxz5l3xURoRv1Bo1fgHGn3 Cj4SlanpkzcJTdWdj1yCsp1POJj89JrPLxE1k0j++tJLk/9ZQWN6eyNqLHNtOUkpylod 2RhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779481458; x=1780086258; h=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; bh=dMXxmfHGErf7yBzoXqh/yDUR2jlzP0FOZNAJXyHr7Dw=; b=CFKguXV+47zO7cNWB2KeoZyS8Lba3ULMouLeUFzYtDn63lCvYk/XJHMH1CAz4jACXt LnU8QgDzBDEqjcxWEuHcpWUvsrg2AjlAHyc1VtGfUtFM0qn60yh0qxFxbWUr7RnYqvFK ZKpJRS1UaToOz3uAKT0opnsCZ5rfNFcLTXxTQbRm5HzMnXHceKT85kJLcJWl7YAzRXMa AfTvYbvaabULBIfpgPBcmvm9VtjlAJRmZDQCJWFO1LORneQ8F8gOKisIDUP2ySKH4H0c P/kDVz8/5n+zdcdmKxReOjnRRgKruJzzzFvvlnGpDHM7RJMSG89h1nqbfOVEG0TDJqvL HutA== X-Forwarded-Encrypted: i=1; AFNElJ/QzoO9L0MKu441tcyDnxoWLZq7+W71eAj6KL1btxtFRWmcvGNefRKFjKuW+K1iNMV3Rsui+xY6w2RSHug=@vger.kernel.org X-Gm-Message-State: AOJu0YzaMeTR2xAwG1UXkDQYvBROz9wAcmEIICfDm1my4kLYl8ExSozU jIJ3rQwqFTGXMw3ynSS3rmPc8kjvIWRMR9iyFSjt+4QDnBkPhaXeLu/BmiXeZ+2pvVB9ix+NLMt TwRfvj7aQosZZFA== X-Received: from pjbsz6.prod.google.com ([2002:a17:90b:2d46:b0:369:4369:c7f9]) (user=dmatlack job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3807:b0:366:10f1:3d91 with SMTP id 98e67ed59e1d1-36a6741dd88mr5140261a91.1.1779481458189; Fri, 22 May 2026 13:24:18 -0700 (PDT) Date: Fri, 22 May 2026 20:24:05 +0000 In-Reply-To: <20260522202410.3104264-1-dmatlack@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260522202410.3104264-1-dmatlack@google.com> X-Mailer: git-send-email 2.54.0.746.g67dd491aae-goog Message-ID: <20260522202410.3104264-8-dmatlack@google.com> Subject: [PATCH v6 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" Refactor the logic to match devices to pci_dev_acs_ops by factoring out the loop and device matching into its own routine. This eliminates some 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. Signed-off-by: David Matlack --- drivers/pci/quirks.c | 50 ++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index caaed1a01dc0..171caec2bc47 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5384,9 +5384,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; @@ -5406,9 +5403,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; @@ -5436,9 +5430,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; @@ -5458,22 +5449,25 @@ 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]; @@ -5481,33 +5475,29 @@ int pci_dev_specific_enable_acs(struct pci_dev *dev) 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->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.54.0.746.g67dd491aae-goog