From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.161.69 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793925783; b=D6lA30LPSpzT0rTGpdmmfH5xLcpQcbt82Hj33j4ZCreyg/lZoxT6RQjV30v3KCsUIiFM Mtokddgxd9vPrAQMpbwtpeLI5rXej0rm7vCc2Jb3V2a0JVCVyX2QI8bGluyXgkCCfDQKE BpecccbVXPkud5yT4lnton6FvCSJjv8weavKqXuaRA53NtYVmk96HGpic/ZmAcas5vRU9 2Icw0yINYfGFmYy7+hhpaG7TVDKn0vLTHA8ENSbBl3x+PcrQbb1ezc98RUymVvL3Eyty2 G+eLnIeHEtFgZ8a5QWdQ9wgygyk4+aBgsjZO1XYRdUVTcgZPs+sVT45J+qpWk0wL0RA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793925783; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=fdvOmig1mqmuQ5cGPPo+aA7C4UMwvpl0I/Lv9SSRV3g=; b=xZNAItjBYZmGrXsNJpRMMk3j4ikhIuXNeKKDxkzkVkPUMl+KMuGgtMsKKQG/vZdGViLF h+LhDts9KgKvafDV1ftRCEGHe1oQQOngpgbbfrZKrc4g9iaOZ/gbB/ZvRMqtY/zKjGtcy qbcFwkvafz9wnhJUtJ1Di6gf2UTabYSd/a9u6o2yin2613GXW0Zueono9jUhqj9Zn6qKU GnnLBOeJgGWdYLvr7RdA9zHekx61uZFUjHSjnd2OsOZKAISbuKVIR6CPolyk+RQ6KGwhL CWVmZvjjYkh3mBWowYxe3ifZQsAIOZIGzCujdw9Ghs9siXB4JfCaQh1N3+cUhChZm9A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--dmatlack.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b="cfXH/pUY"; arc=none smtp.remote-ip=209.85.161.69 Received: from mail-oo1-f69.google.com (mail-oo1-f69.google.com [209.85.161.69]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00586606D804 for ; Fri, 6 Nov 2026 00:43:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 00586606D804 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, unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=cfXH/pUY Received: by mail-oo1-f69.google.com with SMTP id 006d021491bc7-6f538c3453fso1448918eaf.1 for ; Thu, 05 Nov 2026 16:43:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1793925781; x=1794530581; 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=fdvOmig1mqmuQ5cGPPo+aA7C4UMwvpl0I/Lv9SSRV3g=; b=cfXH/pUY7fIjQWnT5nJccUKJ2b7SAnJbJzk8ouMBAWCtskW0yY1iW6KeRHBgAk+zmR W88KXloZlry3l8seJO3IGFE7v8mPn2BtkFmvRGHLdcIaGwp0WLC1EEsNPtVsHXFFV6VI Bb2ee8YYoyy3xTe73CB2sRbKWwiLxXOHpf9vTUBTAFLjXOMsXArmkmlpoQreL0j2o6dQ tTs+MOj9aTlzhRRRyaequDpb7Ct7HVFpve3Ja94zPmZnQ6Hmi4Pcz1HA70lXek5wN/iq ylhLcFIZt7QG3LlcDb3lb5ULi2FfJTwRq2a1smZ33+FDHnTyqnw6GfVPadhKu4iM9k32 185g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793925781; x=1794530581; 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=fdvOmig1mqmuQ5cGPPo+aA7C4UMwvpl0I/Lv9SSRV3g=; b=IuYFR9VUVIo+oksaY/BkXK2pgVGvWuRfh2mN2HKF0qMO3vIHjn5d24a+GWtQ5+1LzA r0lxfkrEPqj1JAOw15GJTszceZZ92XZiyXNufg9Z2vbV03MIY6axvp/ddg64xdkS4WbL NZ189kAyvPi9NG3QyffIzPRDN2shiJbFLVmXGj7/aPYxlzdVVAXGM0xcdKiRCa5q0sNQ 7kS0DFVY1dNuL6Wf1nEP7xQeME9rVSlJkes3Xz0jzC4bucothXmbi1UPrTxBR7ajYc3Q vJCOj51qoxkpfOE5eJe+z3Yb+E6LUIiaY+5pgaUztKMZpITFJ9OTCbEE3LRBWVRQdQU4 au7Q== X-Forwarded-Encrypted: i=1; AKwUvBzFncKXLIqepRfUxyPU4frTnQNtABsX2KUCmMWzHg4BwkXgpXCiMrjuKzR1ch6AjkbyLtJJua87tr4mO5U=@vger.kernel.org X-Gm-Message-State: APuU4Z9T9qPY4bDjopQhtL/ldHYT5H27jxaHBfATwVmVpteGFbJ7yAc5 P+r64xK/+9bky5b/EFsxe+kheI+lamM2KJDK8tyxKvHEBLm3xF/czFNMClY0jyb13uphbJlwDWS kH4Pp06HEC4lk3A== X-Received: from iobmm28-n2.prod.google.com ([2002:a05:6602:711c:20b0:9e0:ee3f:c3a]) (user=dmatlack job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6820:290f:b0:6d3:abd1:9b87 with SMTP id 006d021491bc7-716d221fc2emr2597233eaf.45.1793925781387; Thu, 05 Nov 2026 16:43:01 -0800 (PST) Date: Fri, 6 Nov 2026 00:42:05 +0000 In-Reply-To: <20261106004218.604799-1-dmatlack@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261106004218.604799-1-dmatlack@google.com> X-Mailer: git-send-email 2.56.0.455.g6c5a503b38-goog Message-ID: <20261106004218.604799-5-dmatlack@google.com> Subject: [PATCH v2 04/17] PCI: Save PCIe state in the saved capability store 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, linuxppc-dev@lists.ozlabs.org Cc: Alexander Graf , Alex Williamson , Bjorn Helgaas , David Matlack , Jason Gunthorpe , Jonathan Corbet , Josh Hilke , Lukas Wunner , Mahesh J Salgaonkar , Mike Rapoport , "Oliver O'Halloran" , Pasha Tatashin , Pratyush Yadav , Randy Dunlap , Samiullah Khawaja , Shuah Khan , Vipin Sharma Content-Type: text/plain; charset="UTF-8" Save and restore the PCIe capability control registers through the per-device saved capability store instead of a private pci_cap_saved_state buffer. The private buffer is an opaque array of u16s whose layout is a contract between pci_save_pcie_state() and pci_restore_pcie_state(). Anything else that needs to touch the saved state has to know that contract, e.g. pci_update_aspm_saved_state() patches the saved Link Control register with a comment reminding the reader that cap[1] is LNKCTL. Indexing the saved state by configuration space offset removes the coupling. Describe the registers to save in pcie_saved_regs[] and drive the reservation, save, and restore loops from it so that the three can no longer disagree about which register is where. Reserve the registers in pci_reserve_pcie_state(), named to match pci_save_pcie_state() and pci_restore_pcie_state(). Reserve the registers based on pci_is_pcie() rather than pci_find_capability(PCI_CAP_ID_EXP), so that a device whose capability list is broken but whose pcie_cap a quirk has fixed up gets saved state like any other PCIe device. Drop the save buffer that quirk_intel_qat_vf_cap() builds by hand, since it is no longer needed. Keep using pcie_capability_read_word() and pcie_capability_write_word() to access the hardware so that registers the device does not implement are skipped. Reserve space for all of the registers regardless; that is harmless, since an unimplemented register reads back as zero and is never written. Make pci_save_pcie_state() void, so pci_save_state() no longer fails with -ENOMEM when the PCIe save buffer is missing. A failure to allocate the store is reported once during device setup instead. No other functional change intended. Signed-off-by: David Matlack --- drivers/pci/pci.c | 92 +++++++++++++++++++++++------------------ drivers/pci/pcie/aspm.c | 16 +++---- drivers/pci/quirks.c | 30 +------------- 3 files changed, 59 insertions(+), 79 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 007f9bb289d5..fde1dcd99e94 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1795,7 +1795,20 @@ int pci_set_power_state_locked(struct pci_dev *dev, pci_power_t state) } EXPORT_SYMBOL(pci_set_power_state_locked); -#define PCI_EXP_SAVE_REGS 7 +/* + * PCIe capability registers saved and restored by the PCI core. Registers a + * device does not implement are skipped by the pcie_capability_*() accessors, + * so space is reserved for all of them regardless of the device. + */ +static const u16 pcie_saved_regs[] = { + PCI_EXP_DEVCTL, + PCI_EXP_LNKCTL, + PCI_EXP_SLTCTL, + PCI_EXP_RTCTL, + PCI_EXP_DEVCTL2, + PCI_EXP_LNKCTL2, + PCI_EXP_SLTCTL2, +}; static struct pci_cap_saved_state *_pci_find_saved_cap(struct pci_dev *pci_dev, u16 cap, bool extended) @@ -1819,41 +1832,47 @@ struct pci_cap_saved_state *pci_find_saved_ext_cap(struct pci_dev *dev, u16 cap) return _pci_find_saved_cap(dev, cap, true); } -static int pci_save_pcie_state(struct pci_dev *dev) +static void pci_save_pcie_state(struct pci_dev *dev) { - int i = 0; - struct pci_cap_saved_state *save_state; - u16 *cap; + unsigned int i; + u16 val; if (!pci_is_pcie(dev)) - return 0; + return; - save_state = pci_find_saved_cap(dev, PCI_CAP_ID_EXP); - if (!save_state) { - pci_err(dev, "buffer not found in %s\n", __func__); - return -ENOMEM; + for (i = 0; i < ARRAY_SIZE(pcie_saved_regs); i++) { + pcie_capability_read_word(dev, pcie_saved_regs[i], &val); + pci_write_saved_cap_word(dev, dev->pcie_cap + pcie_saved_regs[i], + val); } - cap = (u16 *)&save_state->cap.data[0]; - pcie_capability_read_word(dev, PCI_EXP_DEVCTL, &cap[i++]); - pcie_capability_read_word(dev, PCI_EXP_LNKCTL, &cap[i++]); - pcie_capability_read_word(dev, PCI_EXP_SLTCTL, &cap[i++]); - pcie_capability_read_word(dev, PCI_EXP_RTCTL, &cap[i++]); - pcie_capability_read_word(dev, PCI_EXP_DEVCTL2, &cap[i++]); - pcie_capability_read_word(dev, PCI_EXP_LNKCTL2, &cap[i++]); - pcie_capability_read_word(dev, PCI_EXP_SLTCTL2, &cap[i++]); - pci_save_aspm_l1ss_state(dev); pci_save_ltr_state(dev); +} - return 0; +static void pci_reserve_pcie_state(struct pci_dev *dev) +{ + unsigned int i; + int rc; + + if (!pci_is_pcie(dev)) + return; + + for (i = 0; i < ARRAY_SIZE(pcie_saved_regs); i++) { + unsigned int off = dev->pcie_cap + pcie_saved_regs[i]; + + rc = pci_reserve_saved_cap(dev, off, sizeof(u16)); + if (rc) { + pci_err(dev, "unable to reserve PCI Express save state (%pe)\n", + ERR_PTR(rc)); + return; + } + } } static void pci_restore_pcie_state(struct pci_dev *dev) { - int i = 0; - struct pci_cap_saved_state *save_state; - u16 *cap; + unsigned int i; /* * Restore max latencies (in the LTR capability) before enabling @@ -1862,8 +1881,7 @@ static void pci_restore_pcie_state(struct pci_dev *dev) pci_restore_ltr_state(dev); pci_restore_aspm_l1ss_state(dev); - save_state = pci_find_saved_cap(dev, PCI_CAP_ID_EXP); - if (!save_state) + if (!pci_is_pcie(dev)) return; /* @@ -1873,14 +1891,13 @@ static void pci_restore_pcie_state(struct pci_dev *dev) */ pci_bridge_reconfigure_ltr(dev); - cap = (u16 *)&save_state->cap.data[0]; - pcie_capability_write_word(dev, PCI_EXP_DEVCTL, cap[i++]); - pcie_capability_write_word(dev, PCI_EXP_LNKCTL, cap[i++]); - pcie_capability_write_word(dev, PCI_EXP_SLTCTL, cap[i++]); - pcie_capability_write_word(dev, PCI_EXP_RTCTL, cap[i++]); - pcie_capability_write_word(dev, PCI_EXP_DEVCTL2, cap[i++]); - pcie_capability_write_word(dev, PCI_EXP_LNKCTL2, cap[i++]); - pcie_capability_write_word(dev, PCI_EXP_SLTCTL2, cap[i++]); + for (i = 0; i < ARRAY_SIZE(pcie_saved_regs); i++) { + u16 reg = pcie_saved_regs[i]; + u16 val; + + if (pci_read_saved_cap_word(dev, dev->pcie_cap + reg, &val)) + pcie_capability_write_word(dev, reg, val); + } } static int pci_save_pcix_state(struct pci_dev *dev) @@ -1935,9 +1952,7 @@ int pci_save_state(struct pci_dev *dev) } dev->state_saved = true; - i = pci_save_pcie_state(dev); - if (i != 0) - return i; + pci_save_pcie_state(dev); i = pci_save_pcix_state(dev); if (i != 0) @@ -3733,10 +3748,7 @@ void pci_allocate_cap_save_buffers(struct pci_dev *dev) { int error; - error = pci_add_cap_save_buffer(dev, PCI_CAP_ID_EXP, - PCI_EXP_SAVE_REGS * sizeof(u16)); - if (error) - pci_err(dev, "unable to preallocate PCI Express save buffer\n"); + pci_reserve_pcie_state(dev); error = pci_add_cap_save_buffer(dev, PCI_CAP_ID_PCIX, sizeof(u16)); if (error) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 95ac34a34bd5..02922b887ec6 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -324,26 +324,20 @@ static int policy_to_clkpm_state(struct pcie_link_state *link) static void pci_update_aspm_saved_state(struct pci_dev *dev) { - struct pci_cap_saved_state *save_state; - u16 *cap, lnkctl, aspm_ctl; - - save_state = pci_find_saved_cap(dev, PCI_CAP_ID_EXP); - if (!save_state) - return; + u16 lnkctl, aspm_ctl; pcie_capability_read_word(dev, PCI_EXP_LNKCTL, &lnkctl); /* - * Update ASPM and CLKREQ bits of LNKCTL in save_state. We only + * Update ASPM and CLKREQ bits of LNKCTL in the saved state. We only * write PCI_EXP_LNKCTL_CCC during enumeration, so it shouldn't - * change after being captured in save_state. + * change after being captured in the saved state. */ aspm_ctl = lnkctl & (PCI_EXP_LNKCTL_ASPMC | PCI_EXP_LNKCTL_CLKREQ_EN); lnkctl &= ~(PCI_EXP_LNKCTL_ASPMC | PCI_EXP_LNKCTL_CLKREQ_EN); - /* Depends on pci_save_pcie_state(): cap[1] is LNKCTL */ - cap = (u16 *)&save_state->cap.data[0]; - cap[1] = lnkctl | aspm_ctl; + pci_write_saved_cap_word(dev, dev->pcie_cap + PCI_EXP_LNKCTL, + lnkctl | aspm_ctl); } static void pcie_set_clkpm_nocheck(struct pcie_link_state *link, int enable) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index e500c202d2ec..9203ffb2ff72 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5512,10 +5512,9 @@ int pci_dev_specific_disable_acs_redir(struct pci_dev *dev) */ static void quirk_intel_qat_vf_cap(struct pci_dev *pdev) { - int pos, i = 0, ret; + int pos, ret; u8 next_cap; - u16 reg16, *cap; - struct pci_cap_saved_state *state; + u16 reg16; /* Bail if the hardware bug is fixed */ if (pdev->pcie_cap || pci_find_capability(pdev, PCI_CAP_ID_EXP)) @@ -5546,10 +5545,6 @@ static void quirk_intel_qat_vf_cap(struct pci_dev *pdev) pci_read_config_word(pdev, pos, ®16); if (reg16 == (0x0000 | PCI_CAP_ID_EXP)) { u32 status; -#ifndef PCI_EXP_SAVE_REGS -#define PCI_EXP_SAVE_REGS 7 -#endif - int size = PCI_EXP_SAVE_REGS * sizeof(u16); pdev->pcie_cap = pos; pci_read_config_word(pdev, pos + PCI_EXP_FLAGS, ®16); @@ -5561,27 +5556,6 @@ static void quirk_intel_qat_vf_cap(struct pci_dev *pdev) ret = pci_read_config_dword(pdev, PCI_CFG_SPACE_SIZE, &status); if ((ret != PCIBIOS_SUCCESSFUL) || (PCI_POSSIBLE_ERROR(status))) pdev->cfg_size = PCI_CFG_SPACE_SIZE; - - if (pci_find_saved_cap(pdev, PCI_CAP_ID_EXP)) - return; - - /* Save PCIe cap */ - state = kzalloc(sizeof(*state) + size, GFP_KERNEL); - if (!state) - return; - - state->cap.cap_nr = PCI_CAP_ID_EXP; - state->cap.cap_extended = 0; - state->cap.size = size; - cap = (u16 *)&state->cap.data[0]; - pcie_capability_read_word(pdev, PCI_EXP_DEVCTL, &cap[i++]); - pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &cap[i++]); - pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, &cap[i++]); - pcie_capability_read_word(pdev, PCI_EXP_RTCTL, &cap[i++]); - pcie_capability_read_word(pdev, PCI_EXP_DEVCTL2, &cap[i++]); - pcie_capability_read_word(pdev, PCI_EXP_LNKCTL2, &cap[i++]); - pcie_capability_read_word(pdev, PCI_EXP_SLTCTL2, &cap[i++]); - hlist_add_head(&state->next, &pdev->saved_cap_space); } } DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x443, quirk_intel_qat_vf_cap); -- 2.56.0.455.g6c5a503b38-goog