| Message ID | 20230206143540.15325-1-ron.lee@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | [v3] PCI: Fix up L1SS capability for Intel Apollo Lake PCIe bridge | expand |
On Mon, Feb 06, 2023 at 10:35:40PM +0800, Ron Lee wrote: > On Google Coral and Reef family Chromebooks with Intel Apollo Lake > SoC, the PCIe bridge lost its L1 PM Substates capability after resumed > from D3cold. This patch save the capability header and the pointer > offset to the L1SS capability after this bridge initialized, and > recover them every time resuming from D3cold. > > Link:https://lore.kernel.org/linux-pci/CAFJ_xbq0cxcH-cgpXLU4Mjk30+muWyWm1aUZGK7iG53yaLBaQg@mail.gmail.com/T/#u > Signed-off-by: Ron Lee <ron.lee@intel.com> > --- > Change from v2: traverse the capability link list to find the L1SS capability header > and pointer offset to the L1SS capability, save them after the bridge initialized and > restore them after resuming from D3cold. > > drivers/pci/quirks.c | 41 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 41 insertions(+) > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index 285acc4aaccc..4e1c8c4c7e9a 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -5992,3 +5992,44 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2d, dpc_log_size); > DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2f, dpc_log_size); > DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a31, dpc_log_size); > #endif > + > +#ifdef CONFIG_PCIEASPM > +static u16 pos_to_l1ss; > +static u32 l1ss_header; > +static void chromeos_save_apl_pci_l1ss_capability(struct pci_dev *pdev) > +{ > + u32 header; > + int pos = PCI_CFG_SPACE_SIZE; > + > + while (pos) { > + pci_read_config_dword(pdev, pos, &header); > + if (PCI_EXT_CAP_NEXT(header) == pdev->l1ss) > + pos_to_l1ss = pos; > + else if (PCI_EXT_CAP_ID(header) == PCI_EXT_CAP_ID_L1SS) > + l1ss_header = header; > + > + pos = PCI_EXT_CAP_NEXT(header); > + } > +} > + > +static void chromeos_fixup_apl_pci_l1ss_capability(struct pci_dev *pdev) > +{ > + u32 header; > + > + if (!pos_to_l1ss || !l1ss_header) > + return; > + > + pci_info(pdev, "Fixup L1SS Capability\n"); > + /* Fixup the header of L1SS Capability if missing */ > + pci_read_config_dword(pdev, pdev->l1ss, &header); > + if (PCI_EXT_CAP_ID(header) != PCI_EXT_CAP_ID_L1SS) > + pci_write_config_dword(pdev, pdev->l1ss, l1ss_header); > + > + /* Fixup the link to L1SS Capability if missing*/ > + pci_read_config_dword(pdev, pos_to_l1ss, &header); > + if (PCI_EXT_CAP_NEXT(header) != pdev->l1ss) > + pci_write_config_dword(pdev, pos_to_l1ss, pdev->l1ss << 20); > +} > +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x5ad6, chromeos_save_apl_pci_l1ss_capability); > +DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, 0x5ad6, chromeos_fixup_apl_pci_l1ss_capability); > +#endif What do you think of the possible revision below? - Moved to arch/x86/pci/fixup.c since this is x86-only. - Save prev cap offset & header, L1SS offset & header. This means we can fix up even when CONFIG_PCIEASPM is not enabled, we can restore the entire previous cap header (not just the link), and should be safe since only one device per system should match the Device ID. Bjorn commit e082cb8ab59f ("PCI: Fix up L1SS capability for Intel Apollo Lake Root Port") parent 52589007b243 Author: Ron Lee <ron.lee.intel@gmail.com> Date: Mon Apr 3 16:30:16 2023 -0500 PCI: Fix up L1SS capability for Intel Apollo Lake Root Port On Google Coral and Reef family Chromebooks with Intel Apollo Lake SoC, firmware clobbers the headers of the L1 PM Substates capability and the previous capability when returning from D3cold to D0. Save those headers at enumeration-time and restore them at resume. Link: https://lore.kernel.org/linux-pci/CAFJ_xbq0cxcH-cgpXLU4Mjk30+muWyWm1aUZGK7iG53yaLBaQg@mail.gmail.com/T/#u diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index 615a76d70019..ad0dfb22b4a6 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c @@ -824,3 +824,61 @@ static void rs690_fix_64bit_dma(struct pci_dev *pdev) DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7910, rs690_fix_64bit_dma); #endif + +/* + * When returning from D3cold to D0, firmware on some Google Coral and Reef + * family Chromebooks with Intel Apollo Lake SoC clobbers the headers of + * both the L1 PM Substates capability and the previous capability for the + * "Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port B #1". + * + * Save those values at enumeration-time and restore them at resume. + */ + +static u16 prev_cap, l1ss_cap; +static u32 prev_header, l1ss_header; + +static void chromeos_save_apl_pci_l1ss_capability(struct pci_dev *dev) +{ + int pos = PCI_CFG_SPACE_SIZE, prev = 0; + u32 header, pheader = 0; + + while (pos) { + pci_read_config_dword(dev, pos, &header); + if (PCI_EXT_CAP_ID(header) == PCI_EXT_CAP_ID_L1SS) { + prev_cap = prev; + prev_header = pheader; + l1ss_cap = pos; + l1ss_header = header; + } + + prev = pos; + prev_header = header; + pos = PCI_EXT_CAP_NEXT(header); + } +} + +static void chromeos_fixup_apl_pci_l1ss_capability(struct pci_dev *dev) +{ + u32 header; + + if (!prev_cap || !prev_header || !l1ss_cap || !l1ss_header) + return; + + /* Fixup the header of L1SS Capability if missing */ + pci_read_config_dword(dev, l1ss_cap, &header); + if (header != l1ss_header) { + pci_write_config_dword(dev, l1ss_cap, l1ss_header); + pci_info(dev, "restore L1SS Capability header (was %#010x now %#010x)\n", + header, l1ss_header); + } + + /* Fixup the link to L1SS Capability if missing */ + pci_read_config_dword(dev, prev_cap, &header); + if (header != prev_header) { + pci_write_config_dword(dev, prev_cap, prev_header); + pci_info(dev, "restore previous Capability header (was %#010x now %#010x)\n", + header, prev_header); + } +} +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x5ad6, chromeos_save_apl_pci_l1ss_capability); +DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, 0x5ad6, chromeos_fixup_apl_pci_l1ss_capability);
> What do you think of the possible revision below? > > - Moved to arch/x86/pci/fixup.c since this is x86-only. > - Save prev cap offset & header, L1SS offset & header. This means > we can fix up even when CONFIG_PCIEASPM is not enabled, we can > restore the entire previous cap header (not just the link), and > should be safe since only one device per system should match the > Device ID. > > Bjorn > Hi Bjorn, Thank you revise this patch, it is more concise and make sense moving to arch/x86/pci/fixup.c I corrected the following statement in the loop. > + prev_header = header; BTW, I add "return" to stop traversal once L1SS capability was found, will submit the v4 patch later for you review. + while (pos) { + pci_read_config_dword(dev, pos, &header); + if (PCI_EXT_CAP_ID(header) == PCI_EXT_CAP_ID_L1SS) { + prev_cap = prev; + prev_header = pheader; + l1ss_cap = pos; + l1ss_header = header; + return; + } + + prev = pos; + pheader = header; + pos = PCI_EXT_CAP_NEXT(header); + } > commit e082cb8ab59f ("PCI: Fix up L1SS capability for Intel Apollo Lake Root > Port") parent 52589007b243 > Author: Ron Lee <ron.lee.intel@gmail.com> > Date: Mon Apr 3 16:30:16 2023 -0500 > > PCI: Fix up L1SS capability for Intel Apollo Lake Root Port > > On Google Coral and Reef family Chromebooks with Intel Apollo Lake > SoC, firmware clobbers the headers of the L1 PM Substates capability and > the previous capability when returning from D3cold to D0. > > Save those headers at enumeration-time and restore them at resume. > > Link: https://lore.kernel.org/linux-pci/CAFJ_xbq0cxcH- > cgpXLU4Mjk30+muWyWm1aUZGK7iG53yaLBaQg@mail.gmail.com/T/#u > > diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index > 615a76d70019..ad0dfb22b4a6 100644 > --- a/arch/x86/pci/fixup.c > +++ b/arch/x86/pci/fixup.c > @@ -824,3 +824,61 @@ static void rs690_fix_64bit_dma(struct pci_dev *pdev) > DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7910, > rs690_fix_64bit_dma); > > #endif > + > +/* > + * When returning from D3cold to D0, firmware on some Google Coral and > +Reef > + * family Chromebooks with Intel Apollo Lake SoC clobbers the headers > +of > + * both the L1 PM Substates capability and the previous capability for > +the > + * "Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port B #1". > + * > + * Save those values at enumeration-time and restore them at resume. > + */ > + > +static u16 prev_cap, l1ss_cap; > +static u32 prev_header, l1ss_header; > + > +static void chromeos_save_apl_pci_l1ss_capability(struct pci_dev *dev) > +{ > + int pos = PCI_CFG_SPACE_SIZE, prev = 0; > + u32 header, pheader = 0; > + > + while (pos) { > + pci_read_config_dword(dev, pos, &header); > + if (PCI_EXT_CAP_ID(header) == PCI_EXT_CAP_ID_L1SS) { > + prev_cap = prev; > + prev_header = pheader; > + l1ss_cap = pos; > + l1ss_header = header; > + } > + > + prev = pos; > + prev_header = header; > + pos = PCI_EXT_CAP_NEXT(header); > + } > +} > + > +static void chromeos_fixup_apl_pci_l1ss_capability(struct pci_dev *dev) > +{ > + u32 header; > + > + if (!prev_cap || !prev_header || !l1ss_cap || !l1ss_header) > + return; > + > + /* Fixup the header of L1SS Capability if missing */ > + pci_read_config_dword(dev, l1ss_cap, &header); > + if (header != l1ss_header) { > + pci_write_config_dword(dev, l1ss_cap, l1ss_header); > + pci_info(dev, "restore L1SS Capability header (was %#010x now > %#010x)\n", > + header, l1ss_header); > + } > + > + /* Fixup the link to L1SS Capability if missing */ > + pci_read_config_dword(dev, prev_cap, &header); > + if (header != prev_header) { > + pci_write_config_dword(dev, prev_cap, prev_header); > + pci_info(dev, "restore previous Capability header (was %#010x > now %#010x)\n", > + header, prev_header); > + } > +} > +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x5ad6, > +chromeos_save_apl_pci_l1ss_capability); > +DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, 0x5ad6, > +chromeos_fixup_apl_pci_l1ss_capability);
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 285acc4aaccc..4e1c8c4c7e9a 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5992,3 +5992,44 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2d, dpc_log_size); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2f, dpc_log_size); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a31, dpc_log_size); #endif + +#ifdef CONFIG_PCIEASPM +static u16 pos_to_l1ss; +static u32 l1ss_header; +static void chromeos_save_apl_pci_l1ss_capability(struct pci_dev *pdev) +{ + u32 header; + int pos = PCI_CFG_SPACE_SIZE; + + while (pos) { + pci_read_config_dword(pdev, pos, &header); + if (PCI_EXT_CAP_NEXT(header) == pdev->l1ss) + pos_to_l1ss = pos; + else if (PCI_EXT_CAP_ID(header) == PCI_EXT_CAP_ID_L1SS) + l1ss_header = header; + + pos = PCI_EXT_CAP_NEXT(header); + } +} + +static void chromeos_fixup_apl_pci_l1ss_capability(struct pci_dev *pdev) +{ + u32 header; + + if (!pos_to_l1ss || !l1ss_header) + return; + + pci_info(pdev, "Fixup L1SS Capability\n"); + /* Fixup the header of L1SS Capability if missing */ + pci_read_config_dword(pdev, pdev->l1ss, &header); + if (PCI_EXT_CAP_ID(header) != PCI_EXT_CAP_ID_L1SS) + pci_write_config_dword(pdev, pdev->l1ss, l1ss_header); + + /* Fixup the link to L1SS Capability if missing*/ + pci_read_config_dword(pdev, pos_to_l1ss, &header); + if (PCI_EXT_CAP_NEXT(header) != pdev->l1ss) + pci_write_config_dword(pdev, pos_to_l1ss, pdev->l1ss << 20); +} +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x5ad6, chromeos_save_apl_pci_l1ss_capability); +DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, 0x5ad6, chromeos_fixup_apl_pci_l1ss_capability); +#endif
On Google Coral and Reef family Chromebooks with Intel Apollo Lake SoC, the PCIe bridge lost its L1 PM Substates capability after resumed from D3cold. This patch save the capability header and the pointer offset to the L1SS capability after this bridge initialized, and recover them every time resuming from D3cold. Link:https://lore.kernel.org/linux-pci/CAFJ_xbq0cxcH-cgpXLU4Mjk30+muWyWm1aUZGK7iG53yaLBaQg@mail.gmail.com/T/#u Signed-off-by: Ron Lee <ron.lee@intel.com> --- Change from v2: traverse the capability link list to find the L1SS capability header and pointer offset to the L1SS capability, save them after the bridge initialized and restore them after resuming from D3cold. drivers/pci/quirks.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)