PCI: vmd: Enable PCIe ASPM and LTR on select
Subsystems (3)
v8 cover PCI: vmd: Enable PCIe ASPM and LTR on select
This series adds a work around for enabling PCIe ASPM and for setting PCIe LTR values on VMD reserved root ports on select platforms. While configuration of these capabilities is usually done by BIOS, on these platforms these capabilities will not be configured because the ports are not visible to BIOS. This was part of an initial design that expected the driver to completely handle the ports, including power management. However on Linux those ports are still managed by the PCIe core, which has the expectation that they adhere to device standards including BIOS configuration, leading to this problem.
The target platforms are Tiger Lake, Alder Lake, and Raptor Lake though the latter has already implemented support for configuring the LTR values. Meteor Lake is expected add BIOS ASPM support, eliminating the future need for this work around.
Note, the driver programs the LTRs because BIOS would also normally do this for devices that do not set them by default. Without this, SoC power management would be blocked on those platform. This SoC specific value is the maximum latency required to allow the SoC to enter the deepest power state.
This patch addresses the following open bugzillas on VMD enabled laptops that cannot enter low power states.
David E. Box (3):
PCI: vmd: Use PCI_VDEVICE in device list
PCI: vmd: Create feature grouping for client products
PCI: vmd: Add quirk to configure PCIe ASPM and LTR
Michael Bottini (1):
PCI/ASPM: Add pci_enable_link_state()
drivers/pci/controller/vmd.c | 96 ++++++++++++++++++++++++++---------- drivers/pci/pcie/aspm.c | 54 ++++++++++++++++++++ include/linux/pci.h | 7 +++ 3 files changed, 131 insertions(+), 26 deletions(-)
base-commit: 094226ad94f471a9f19e8f8e7140a09c2625abaa
Signature · 1 line
2.34.1
PATCH RESEND v8 1/4 PCI/ASPM: Add pci_enable_link_state()
From: Michael Bottini <[email protected]>
Add pci_enable_link_state() to allow devices to change the default BIOS configured states. Clears the BIOS default settings then sets the new states and reconfigures the link under the semaphore. Also add PCIE_LINK_STATE_ALL macro for convenience for callers that want to enable all link states.
---
V8
- No change
V7
- Fix description as suggested by Bjorn
- Rename function to pci_enable_link_state
V6
- No change
V5
- Rename to pci_enable_default_link_state and model after pci_disable_link_state() as suggested by Bjorn.
- Add helper PCIE_LINK_STATE_ALL which sets bits for all links states and clock pm.
- Clarify commit language to indicate the function changes the default link states (not ASPM policy).
V4
- Refactor vmd_enable_apsm() to exit early, making the lines shorter and more readable. Suggested by Christoph.
V3
- No changes
V2
- Use return status to print pci_info message if ASPM cannot be enabled.
- Add missing static declaration, caught by [email protected]
drivers/pci/pcie/aspm.c | 54 +++++++++++++++++++++++++++++++++++++++++ include/linux/pci.h | 7 ++++++ 2 files changed, 61 insertions(+)
drivers/pci/pcie/aspm.c +54 -0
@@ -1181,6 +1181,60 @@ int pci_disable_link_state(struct pci_dev *pdev, int state) }EXPORT_SYMBOL (pci_disable_link_state); +/** +* pci_enable_link_state - Clear and set the default device link state so that +* the link may be allowed to enter the specified states. Note that if the +* BIOS didn't grant ASPM control to the OS, this does nothing because we can't +* touch the LNKCTL register. Also note that this does not enable states +* disabled by pci_disable_link_state(). Return 0 or a negative errno. +* +* @pdev: PCI device +* @state: Mask of ASPM link states to enable +*/ +int pci_enable_link_state (struct pci_dev *pdev,int state) +{ +struct pcie_link_state *link =pcie_aspm_get_link (pdev); + +if (!link) +return -EINVAL ; +/* +* A driver requested that ASPM be enabled on this device, but +* if we don't have permission to manage ASPM (e.g., on ACPI +* systems we have to observe the FADT ACPI_FADT_NO_ASPM bit and +* the _OSC method), we can't honor that request. +*/ +if (aspm_disabled) { +pci_warn (pdev,"can't override BIOS ASPM; OS doesn't have ASPM control\n" ); +return -EPERM ; + } + +down_read (&pci_bus_sem); +mutex_lock (&aspm_lock); + link->aspm_default =0 ; +if (state &PCIE_LINK_STATE_L0S ) + link->aspm_default |=ASPM_STATE_L0S ; +if (state &PCIE_LINK_STATE_L1 ) +/* L1 PM substates require L1 */ + link->aspm_default |=ASPM_STATE_L1 |ASPM_STATE_L1SS ; +if (state &PCIE_LINK_STATE_L1_1 ) + link->aspm_default |=ASPM_STATE_L1_1 ; +if (state &PCIE_LINK_STATE_L1_2 ) + link->aspm_default |=ASPM_STATE_L1_2 ; +if (state &PCIE_LINK_STATE_L1_1_PCIPM ) + link->aspm_default |=ASPM_STATE_L1_1_PCIPM ; +if (state &PCIE_LINK_STATE_L1_2_PCIPM ) + link->aspm_default |=ASPM_STATE_L1_2_PCIPM ; +pcie_config_aspm_link (link,policy_to_aspm_state (link)); + + link->clkpm_default = (state &PCIE_LINK_STATE_CLKPM ) ?1 :0 ; +pcie_set_clkpm (link,policy_to_clkpm_state (link)); +mutex_unlock (&aspm_lock); +up_read (&pci_bus_sem); + +return 0 ; +} +EXPORT_SYMBOL (pci_enable_link_state); +static int pcie_aspm_set_policy (const char *val,const struct kernel_param *kp) {
include/linux/pci.h +7 -0
@@ -1651,10 +1651,15 @@ extern bool pcie_ports_native;#define PCIE_LINK_STATE_L1_2 BIT(4)#define PCIE_LINK_STATE_L1_1_PCIPM BIT(5)#define PCIE_LINK_STATE_L1_2_PCIPM BIT(6) +#define PCIE_LINK_STATE_ALL (PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |\ + PCIE_LINK_STATE_CLKPM | PCIE_LINK_STATE_L1_1 |\ + PCIE_LINK_STATE_L1_2 | PCIE_LINK_STATE_L1_1_PCIPM |\ + PCIE_LINK_STATE_L1_2_PCIPM)#ifdef CONFIG_PCIEASPM int pci_disable_link_state (struct pci_dev *pdev,int state);int pci_disable_link_state_locked (struct pci_dev *pdev,int state); +int pci_enable_link_state (struct pci_dev *pdev,int state);void pcie_no_aspm (void );bool pcie_aspm_support_enabled (void );bool pcie_aspm_enabled (struct pci_dev *pdev);
@@ -1663,6 +1668,8 @@ static inline int pci_disable_link_state(struct pci_dev *pdev, int state) {return 0 ; }static inline int pci_disable_link_state_locked (struct pci_dev *pdev,int state) {return 0 ; } +static inline int pci_enable_link_state (struct pci_dev *pdev,int state) +{return 0 ; }static inline void pcie_no_aspm (void ) { }static inline bool pcie_aspm_support_enabled (void ) {return false; }static inline bool pcie_aspm_enabled (struct pci_dev *pdev) {return false; }
Signature · 1 line
2.34.1
Re: [PATCH V8 RESEND 1/4] PCI/ASPM: Add pci_enable_link_state()
Hi,
Quoted 92 lines · David E. Box
From: Michael Bottini <[email protected]>
Add
pci_enable_link_state()to allow devices to change the default BIOS configured states. Clears the BIOS default settings then sets the new states and reconfigures the link under the semaphore. Also addPCIE_LINK_STATE_ALLmacro for convenience for callers that want to enable all link states.Signed-off-by Michael Bottini <[email protected]>Signed-off-by David E. Box <[email protected]>Acked-by Bjorn Helgaas <[email protected]>---
V8
- No changeV7
- Fix description as suggested by Bjorn
- Rename function topci_enable_link_stateV6
- No change
V5
- Rename topci_enable_default_link_stateand model afterpci_disable_link_state()as suggested by Bjorn.
- Add helperPCIE_LINK_STATE_ALLwhich sets bits for all links states and clock pm.
- Clarify commit language to indicate the function changes the default link states (not ASPM policy).
V4
- Refactorvmd_enable_apsm()to exit early, making the lines shorter and more readable. Suggested by Christoph.
V3
- No changes
V2
- Use return status to printpci_infomessage if ASPM cannot be enabled.
- Add missing static declaration, caught by [email protected]drivers/pci/pcie/aspm.c | 54 +++++++++++++++++++++++++++++++++++++++++ include/linux/pci.h | 7 ++++++ 2 files changed, 61 insertions(+)drivers/pci/pcie/aspm.c +43
-0@@ -1181,6 +1181,60 @@ int pci_disable_link_state(struct pci_dev *pdev, int state) }EXPORT_SYMBOL (pci_disable_link_state); +/** +* pci_enable_link_state - Clear and set the default device link state so that +* the link may be allowed to enter the specified states. Note that if the +* BIOS didn't grant ASPM control to the OS, this does nothing because we can't +* touch the LNKCTL register. Also note that this does not enable states +* disabled by pci_disable_link_state(). Return 0 or a negative errno. +* +* @pdev: PCI device +* @state: Mask of ASPM link states to enable +*/ +int pci_enable_link_state (struct pci_dev *pdev,int state) +{ +struct pcie_link_state *link =pcie_aspm_get_link (pdev); + +if (!link) +return -EINVAL ; +/* +* A driver requested that ASPM be enabled on this device, but +* if we don't have permission to manage ASPM (e.g., on ACPI +* systems we have to observe the FADT ACPI_FADT_NO_ASPM bit and +* the _OSC method), we can't honor that request. +*/ +if (aspm_disabled) { +pci_warn (pdev,"can't override BIOS ASPM; OS doesn't have ASPM control\n" ); +return -EPERM ; + } + +down_read (&pci_bus_sem); +mutex_lock (&aspm_lock); + link->aspm_default =0 ; +if (state &PCIE_LINK_STATE_L0S ) + link->aspm_default |=ASPM_STATE_L0S ; +if (state &PCIE_LINK_STATE_L1 ) +/* L1 PM substates require L1 */ + link->aspm_default |=ASPM_STATE_L1 |ASPM_STATE_L1SS ; +if (state &PCIE_LINK_STATE_L1_1 ) + link->aspm_default |=ASPM_STATE_L1_1 ; +if (state &PCIE_LINK_STATE_L1_2 ) + link->aspm_default |=ASPM_STATE_L1_2 ; +if (state &PCIE_LINK_STATE_L1_1_PCIPM ) + link->aspm_default |=ASPM_STATE_L1_1_PCIPM ; +if (state &PCIE_LINK_STATE_L1_2_PCIPM ) + link->aspm_default |=ASPM_STATE_L1_2_PCIPM ;
drivers/pci/pcie/aspm.c int pci_disable_link_state(struct pci_dev *pdev, int state) · line 1236
Quoted 10 lines
drivers/pci/pcie/aspm.c +10
-0+pcie_config_aspm_link (link,policy_to_aspm_state (link)); + + link->clkpm_default = (state &PCIE_LINK_STATE_CLKPM ) ?1 :0 ; +pcie_set_clkpm (link,policy_to_clkpm_state (link)); +mutex_unlock (&aspm_lock); +up_read (&pci_bus_sem); + +return 0 ; +} +EXPORT_SYMBOL (pci_enable_link_state);
I see that this function and __pci_disable_link_state() are very similar. Can this be merged? something like __pci_config_link_state(enable or disable)?
Quoted 33 lines
drivers/pci/pcie/aspm.c +1
-0+static int pcie_aspm_set_policy (const char *val,const struct kernel_param *kp) {include/linux/pci.h +7
-0@@ -1651,10 +1651,15 @@ extern bool pcie_ports_native;#define PCIE_LINK_STATE_L1_2 BIT(4)#define PCIE_LINK_STATE_L1_1_PCIPM BIT(5)#define PCIE_LINK_STATE_L1_2_PCIPM BIT(6) +#define PCIE_LINK_STATE_ALL (PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |\ + PCIE_LINK_STATE_CLKPM | PCIE_LINK_STATE_L1_1 |\ + PCIE_LINK_STATE_L1_2 | PCIE_LINK_STATE_L1_1_PCIPM |\ + PCIE_LINK_STATE_L1_2_PCIPM)#ifdef CONFIG_PCIEASPM int pci_disable_link_state (struct pci_dev *pdev,int state);int pci_disable_link_state_locked (struct pci_dev *pdev,int state); +int pci_enable_link_state (struct pci_dev *pdev,int state);void pcie_no_aspm (void );bool pcie_aspm_support_enabled (void );bool pcie_aspm_enabled (struct pci_dev *pdev);@@ -1663,6 +1668,8 @@ static inline int pci_disable_link_state(struct pci_dev *pdev, int state) {return 0 ; }static inline int pci_disable_link_state_locked (struct pci_dev *pdev,int state) {return 0 ; } +static inline int pci_enable_link_state (struct pci_dev *pdev,int state) +{return 0 ; }static inline void pcie_no_aspm (void ) { }static inline bool pcie_aspm_support_enabled (void ) {return false; }static inline bool pcie_aspm_enabled (struct pci_dev *pdev) {return false; }
Signature · 2 lines
Sathyanarayanan Kuppuswamy Linux Kernel Developer
PATCH RESEND v8 2/4 PCI: vmd: Use PCI_VDEVICE in device list
In reply to David E. BoxRefactor the PCI ID list to use PCI_VDEVICE.
---
V8 - No change
V7 - New Patch. Separate patch suggested by Lorenzo
drivers/pci/controller/vmd.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/pci/controller/vmd.c +8 -8
@@ -994,33 +994,33 @@ static int vmd_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(vmd_dev_pm_ops, vmd_suspend, vmd_resume);static const struct pci_device_id vmd_ids[] = { - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_VMD_201D ), + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_VMD_201D ), .driver_data =VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP ,}, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_VMD_28C0 ), + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_VMD_28C0 ), .driver_data =VMD_FEAT_HAS_MEMBAR_SHADOW |VMD_FEAT_HAS_BUS_RESTRICTIONS |VMD_FEAT_CAN_BYPASS_MSI_REMAP ,}, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x467f ), + {PCI_VDEVICE (INTEL ,0x467f ), .driver_data =VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |VMD_FEAT_HAS_BUS_RESTRICTIONS |VMD_FEAT_OFFSET_FIRST_VECTOR ,}, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x4c3d ), + {PCI_VDEVICE (INTEL ,0x4c3d ), .driver_data =VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |VMD_FEAT_HAS_BUS_RESTRICTIONS |VMD_FEAT_OFFSET_FIRST_VECTOR ,}, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0xa77f ), + {PCI_VDEVICE (INTEL ,0xa77f ), .driver_data =VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |VMD_FEAT_HAS_BUS_RESTRICTIONS |VMD_FEAT_OFFSET_FIRST_VECTOR ,}, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x7d0b ), + {PCI_VDEVICE (INTEL ,0x7d0b ), .driver_data =VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |VMD_FEAT_HAS_BUS_RESTRICTIONS |VMD_FEAT_OFFSET_FIRST_VECTOR ,}, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0xad0b ), + {PCI_VDEVICE (INTEL ,0xad0b ), .driver_data =VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |VMD_FEAT_HAS_BUS_RESTRICTIONS |VMD_FEAT_OFFSET_FIRST_VECTOR ,}, - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_VMD_9A0B ), + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_VMD_9A0B ), .driver_data =VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |VMD_FEAT_HAS_BUS_RESTRICTIONS |VMD_FEAT_OFFSET_FIRST_VECTOR ,},
Signature · 1 line
2.34.1
PATCH RESEND v8 3/4 PCI: vmd: Create feature grouping for client products
In reply to David E. BoxSimplify the device ID list by creating a grouping of features shared by client products.
---
V8 - New patch.
drivers/pci/controller/vmd.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-)
drivers/pci/controller/vmd.c +10 -18
@@ -68,6 +68,10 @@ enum vmd_features { VMD_FEAT_CAN_BYPASS_MSI_REMAP = (1 << 4), }; +#define VMD_FEATS_CLIENT (VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | \ + VMD_FEAT_HAS_BUS_RESTRICTIONS | \ + VMD_FEAT_OFFSET_FIRST_VECTOR) +static DEFINE_IDA (vmd_instance_ida);/*
@@ -1001,29 +1005,17 @@ static const struct pci_device_id vmd_ids[] = { VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_CAN_BYPASS_MSI_REMAP,}, {PCI_VDEVICE(INTEL, 0x467f), - .driver_data =VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | -VMD_FEAT_HAS_BUS_RESTRICTIONS | - VMD_FEAT_OFFSET_FIRST_VECTOR,}, + .driver_data = VMD_FEATS_CLIENT,}, {PCI_VDEVICE(INTEL, 0x4c3d), - .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | -VMD_FEAT_HAS_BUS_RESTRICTIONS | - VMD_FEAT_OFFSET_FIRST_VECTOR,}, + .driver_data = VMD_FEATS_CLIENT,}, {PCI_VDEVICE(INTEL, 0xa77f), - .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | -VMD_FEAT_HAS_BUS_RESTRICTIONS | - VMD_FEAT_OFFSET_FIRST_VECTOR,}, + .driver_data = VMD_FEATS_CLIENT,}, {PCI_VDEVICE(INTEL, 0x7d0b), - .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | -VMD_FEAT_HAS_BUS_RESTRICTIONS | - VMD_FEAT_OFFSET_FIRST_VECTOR,}, + .driver_data = VMD_FEATS_CLIENT,}, {PCI_VDEVICE(INTEL, 0xad0b), - .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | -VMD_FEAT_HAS_BUS_RESTRICTIONS | - VMD_FEAT_OFFSET_FIRST_VECTOR,}, + .driver_data = VMD_FEATS_CLIENT,}, {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_9A0B), - .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | -VMD_FEAT_HAS_BUS_RESTRICTIONS | - VMD_FEAT_OFFSET_FIRST_VECTOR,}, + .driver_data = VMD_FEATS_CLIENT,}, {0,} };MODULE_DEVICE_TABLE (pci, vmd_ids);
Signature · 1 line
2.34.1
Re: [PATCH V8 RESEND 3/4] PCI: vmd: Create feature grouping for client products
Quoted 7 lines · David E. Box
Simplify the device ID list by creating a grouping of features shared by client products.
Suggested-by Jon Derrick <[email protected]>Signed-off-by David E. Box <[email protected]>---
Looks good to me.
Quoted 56 lines
V8 - New patch.
drivers/pci/controller/vmd.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-)drivers/pci/controller/vmd.c +10
-18@@ -68,6 +68,10 @@ enum vmd_features { VMD_FEAT_CAN_BYPASS_MSI_REMAP = (1 << 4), }; +#define VMD_FEATS_CLIENT (VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | \ + VMD_FEAT_HAS_BUS_RESTRICTIONS | \ + VMD_FEAT_OFFSET_FIRST_VECTOR) +static DEFINE_IDA (vmd_instance_ida);/* @@ -1001,29 +1005,17 @@ static const struct pci_device_id vmd_ids[] = { VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_CAN_BYPASS_MSI_REMAP,}, {PCI_VDEVICE(INTEL, 0x467f), - .driver_data =VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | -VMD_FEAT_HAS_BUS_RESTRICTIONS | - VMD_FEAT_OFFSET_FIRST_VECTOR,}, + .driver_data = VMD_FEATS_CLIENT,}, {PCI_VDEVICE(INTEL, 0x4c3d), - .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | -VMD_FEAT_HAS_BUS_RESTRICTIONS | - VMD_FEAT_OFFSET_FIRST_VECTOR,}, + .driver_data = VMD_FEATS_CLIENT,}, {PCI_VDEVICE(INTEL, 0xa77f), - .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | -VMD_FEAT_HAS_BUS_RESTRICTIONS | - VMD_FEAT_OFFSET_FIRST_VECTOR,}, + .driver_data = VMD_FEATS_CLIENT,}, {PCI_VDEVICE(INTEL, 0x7d0b), - .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | -VMD_FEAT_HAS_BUS_RESTRICTIONS | - VMD_FEAT_OFFSET_FIRST_VECTOR,}, + .driver_data = VMD_FEATS_CLIENT,}, {PCI_VDEVICE(INTEL, 0xad0b), - .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | -VMD_FEAT_HAS_BUS_RESTRICTIONS | - VMD_FEAT_OFFSET_FIRST_VECTOR,}, + .driver_data = VMD_FEATS_CLIENT,}, {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_9A0B), - .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | -VMD_FEAT_HAS_BUS_RESTRICTIONS | - VMD_FEAT_OFFSET_FIRST_VECTOR,}, + .driver_data = VMD_FEATS_CLIENT,}, {0,} };MODULE_DEVICE_TABLE (pci, vmd_ids);
Signature · 2 lines
Sathyanarayanan Kuppuswamy Linux Kernel Developer
PATCH RESEND v8 4/4 PCI: vmd: Add quirk to configure PCIe ASPM and LTR
In reply to David E. BoxPCIe ports reserved for VMD use are not visible to BIOS and therefore not configured to enable PCIe ASPM or LTR values (which BIOS will configure if they are not set). Lack of this programming results in high power consumption on laptops as reported in bugzilla. For affected products use pci_enable_link_state to set the allowed link states for devices on the root ports. Also set the LTR value to the maximum value needed for the SoC.
This is a workaround for products from Rocket Lake through Alder Lake. Raptor Lake, the latest product at this time, has already implemented LTR configuring in BIOS. Future products will move ASPM configuration back to BIOS as well. As this solution is intended for laptops, support is not added for hotplug or for devices downstream of a switch on the root port.
---
V8
- Removed struct vmd_device_data patch. Instead use #define for the LTR value which is the same across all products needing the quirk.
V7
- No change
V6
- Set ASPM first before setting LTR. This is needed because some devices may only have LTR set by BIOS and not ASPM
- Skip setting the LTR if the current LTR in non-zero.
V5
- Provide the LTR value as driver data.
- Use DWORD for the config space write to avoid PCI WORD access bug.
- Set ASPM links firsts, enabling all link states, before setting a default LTR if the capability is present
- Add kernel message that VMD is setting the device LTR.
V4
- Refactor vmd_enable_apsm() to exit early, making the lines shorter and more readable. Suggested by Christoph.
V3
- No changes
V2
- Use return status to print pci_info message if ASPM cannot be enabled.
- Add missing static declaration, caught by [email protected]
drivers/pci/controller/vmd.c | 64 ++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 6 deletions(-)
drivers/pci/controller/vmd.c +58 -6
@@ -66,12 +66,22 @@ enum vmd_features {* interrupt handling. */ VMD_FEAT_CAN_BYPASS_MSI_REMAP = (1 <<4 ), + +/* +* Enable ASPM on the PCIE root ports and set the default LTR of the +* storage devices on platforms where these values are not configured by +* BIOS. This is needed for laptops, which require these settings for +* proper power management of the SoC. +*/ + VMD_FEAT_BIOS_PM_QUIRK = (1 << 5), };#define VMD_FEATS_CLIENT (VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | \ VMD_FEAT_HAS_BUS_RESTRICTIONS | \ VMD_FEAT_OFFSET_FIRST_VECTOR) +#define VMD_BIOS_PM_QUIRK_LTR 0x1003/* 3145728 ns */ +static DEFINE_IDA (vmd_instance_ida);/*
@@ -713,6 +723,46 @@ static void vmd_copy_host_bridge_flags(struct pci_host_bridge *root_bridge, vmd_bridge->native_dpc = root_bridge->native_dpc; } +/* +* Enable ASPM and LTR settings on devices that aren't configured by BIOS. +*/ +static int vmd_pm_enable_quirk (struct pci_dev *pdev,void *userdata) +{ +unsigned long features = *(unsigned long *)userdata; +u16 ltr =VMD_BIOS_PM_QUIRK_LTR ; +u32 ltr_reg; +int pos; + +if (!(features &VMD_FEAT_BIOS_PM_QUIRK )) +return 0 ; + +pci_enable_link_state (pdev,PCIE_LINK_STATE_ALL ); + + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_LTR ); +if (!pos) +return 0 ; + +/* +* Skip if the max snoop LTR is non-zero, indicating BIOS has set it +* so the LTR quirk is not needed. +*/ +pci_read_config_dword (pdev, pos +PCI_LTR_MAX_SNOOP_LAT , <r_reg); +if (!!(ltr_reg & (PCI_LTR_VALUE_MASK |PCI_LTR_SCALE_MASK ))) +return 0 ; + +/* +* Set the default values to the maximum required by the platform to +* allow the deepest power management savings. Write as a DWORD where +* the lower word is the max snoop latency and the upper word is the +* max non-snoop latency. +*/ + ltr_reg = (ltr <<16 ) | ltr; +pci_write_config_dword (pdev, pos +PCI_LTR_MAX_SNOOP_LAT , ltr_reg); +pci_info (pdev,"VMD: Default LTR value set by driver\n" ); + +return 0 ; +} +static int vmd_enable_domain (struct vmd_dev *vmd,unsigned long features) {struct pci_sysdata *sd = &vmd->sysdata;
@@ -867,6 +917,8 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)pci_reset_bus (child->self);pci_assign_unassigned_bus_resources (vmd->bus); +pci_walk_bus (vmd->bus, vmd_pm_enable_quirk, &features); +/* * VMD root buses are virtual and don't return true on pci_is_pcie() * and will fail pcie_bus_configure_settings() early. It can instead be
@@ -1005,17 +1057,17 @@ static const struct pci_device_id vmd_ids[] = { VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_CAN_BYPASS_MSI_REMAP,}, {PCI_VDEVICE(INTEL, 0x467f), - .driver_data = VMD_FEATS_CLIENT,}, + .driver_data = VMD_FEATS_CLIENT | VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0x4c3d), - .driver_data = VMD_FEATS_CLIENT,}, + .driver_data = VMD_FEATS_CLIENT | VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0xa77f), - .driver_data = VMD_FEATS_CLIENT,}, + .driver_data = VMD_FEATS_CLIENT | VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0x7d0b), - .driver_data = VMD_FEATS_CLIENT,}, + .driver_data = VMD_FEATS_CLIENT | VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0xad0b), - .driver_data = VMD_FEATS_CLIENT,}, + .driver_data = VMD_FEATS_CLIENT | VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_9A0B), - .driver_data = VMD_FEATS_CLIENT,}, + .driver_data = VMD_FEATS_CLIENT | VMD_FEAT_BIOS_PM_QUIRK,}, {0,} };MODULE_DEVICE_TABLE (pci, vmd_ids);
Signature · 1 line
2.34.1
Re: [PATCH V8 RESEND 4/4] PCI: vmd: Add quirk to configure PCIe ASPM and LTR
HI,
Quoted 143 lines · David E. Box
PCIe ports reserved for VMD use are not visible to BIOS and therefore not configured to enable PCIe ASPM or LTR values (which BIOS will configure if they are not set). Lack of this programming results in high power consumption on laptops as reported in bugzilla. For affected products use
pci_enable_link_stateto set the allowed link states for devices on the root ports. Also set the LTR value to the maximum value needed for the SoC.This is a workaround for products from Rocket Lake through Alder Lake. Raptor Lake, the latest product at this time, has already implemented LTR configuring in BIOS. Future products will move ASPM configuration back to BIOS as well. As this solution is intended for laptops, support is not added for hotplug or for devices downstream of a switch on the root port.
Signed-off-by Michael Bottini <[email protected]>Signed-off-by David E. Box <[email protected]>Reviewed-by Jon Derrick <[email protected]>Reviewed-by Nirmal Patel <[email protected]>---
V8
- Removed structvmd_device_datapatch. Instead use #define for the LTR value which is the same across all products needing the quirk.
V7
- No change
V6
- Set ASPM first before setting LTR. This is needed because some devices may only have LTR set by BIOS and not ASPM
- Skip setting the LTR if the current LTR in non-zero.
V5
- Provide the LTR value as driver data.
- Use DWORD for the config space write to avoid PCI WORD access bug.
- Set ASPM links firsts, enabling all link states, before setting a default LTR if the capability is present
- Add kernel message that VMD is setting the device LTR.
V4
- Refactorvmd_enable_apsm()to exit early, making the lines shorter and more readable. Suggested by Christoph.
V3
- No changes
V2
- Use return status to printpci_infomessage if ASPM cannot be enabled.
- Add missing static declaration, caught by [email protected]drivers/pci/controller/vmd.c | 64 ++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 6 deletions(-)drivers/pci/controller/vmd.c +54
-3@@ -66,12 +66,22 @@ enum vmd_features {* interrupt handling. */ VMD_FEAT_CAN_BYPASS_MSI_REMAP = (1 <<4 ), + +/* +* Enable ASPM on the PCIE root ports and set the default LTR of the +* storage devices on platforms where these values are not configured by +* BIOS. This is needed for laptops, which require these settings for +* proper power management of the SoC. +*/ + VMD_FEAT_BIOS_PM_QUIRK = (1 << 5), };#define VMD_FEATS_CLIENT (VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | \ VMD_FEAT_HAS_BUS_RESTRICTIONS | \ VMD_FEAT_OFFSET_FIRST_VECTOR) +#define VMD_BIOS_PM_QUIRK_LTR 0x1003/* 3145728 ns */ +static DEFINE_IDA (vmd_instance_ida);/* @@ -713,6 +723,46 @@ static void vmd_copy_host_bridge_flags(struct pci_host_bridge *root_bridge, vmd_bridge->native_dpc = root_bridge->native_dpc; } +/* +* Enable ASPM and LTR settings on devices that aren't configured by BIOS. +*/ +static int vmd_pm_enable_quirk (struct pci_dev *pdev,void *userdata) +{ +unsigned long features = *(unsigned long *)userdata; +u16 ltr =VMD_BIOS_PM_QUIRK_LTR ; +u32 ltr_reg; +int pos; + +if (!(features &VMD_FEAT_BIOS_PM_QUIRK )) +return 0 ; + +pci_enable_link_state (pdev,PCIE_LINK_STATE_ALL ); + + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_LTR ); +if (!pos) +return 0 ; + +/* +* Skip if the max snoop LTR is non-zero, indicating BIOS has set it +* so the LTR quirk is not needed. +*/ +pci_read_config_dword (pdev, pos +PCI_LTR_MAX_SNOOP_LAT , <r_reg); +if (!!(ltr_reg & (PCI_LTR_VALUE_MASK |PCI_LTR_SCALE_MASK ))) +return 0 ; + +/* +* Set the default values to the maximum required by the platform to +* allow the deepest power management savings. Write as a DWORD where +* the lower word is the max snoop latency and the upper word is the +* max non-snoop latency. +*/ + ltr_reg = (ltr <<16 ) | ltr; +pci_write_config_dword (pdev, pos +PCI_LTR_MAX_SNOOP_LAT , ltr_reg); +pci_info (pdev,"VMD: Default LTR value set by driver\n" ); + +return 0 ; +} +static int vmd_enable_domain (struct vmd_dev *vmd,unsigned long features) {struct pci_sysdata *sd = &vmd->sysdata;@@ -867,6 +917,8 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)pci_reset_bus (child->self);pci_assign_unassigned_bus_resources (vmd->bus); +pci_walk_bus (vmd->bus, vmd_pm_enable_quirk, &features); +/* * VMD root buses are virtual and don't return true on pci_is_pcie() * and will fail pcie_bus_configure_settings() early. It can instead be @@ -1005,17 +1057,17 @@ static const struct pci_device_id vmd_ids[] = {VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_CAN_BYPASS_MSI_REMAP,}, {PCI_VDEVICE(INTEL, 0x467f), - .driver_data = VMD_FEATS_CLIENT,}, + .driver_data = VMD_FEATS_CLIENT | VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0x4c3d), - .driver_data = VMD_FEATS_CLIENT,}, + .driver_data = VMD_FEATS_CLIENT | VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0xa77f), - .driver_data = VMD_FEATS_CLIENT,},
drivers/pci/controller/vmd.c static const struct pci_device_id vmd_ids[] = { · line 1070
Quoted 10 lines
drivers/pci/controller/vmd.c +4
-3+ .driver_data = VMD_FEATS_CLIENT | VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0x7d0b), - .driver_data = VMD_FEATS_CLIENT,}, + .driver_data = VMD_FEATS_CLIENT | VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0xad0b), - .driver_data = VMD_FEATS_CLIENT,}, + .driver_data = VMD_FEATS_CLIENT | VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_9A0B), - .driver_data = VMD_FEATS_CLIENT,}, + .driver_data = VMD_FEATS_CLIENT | VMD_FEAT_BIOS_PM_QUIRK,},
Why not add VMD_FEAT_BIOS_PM_QUIRK part of VMD_FEATS_CLIENT?
Quoted 3 lines
drivers/pci/controller/vmd.c +0
-0{0,} };MODULE_DEVICE_TABLE (pci, vmd_ids);
Signature · 2 lines
Sathyanarayanan Kuppuswamy Linux Kernel Developer
Re: [PATCH V8 RESEND 4/4] PCI: vmd: Add quirk to configure PCIe ASPM and LTR
Quoted 156 lines · Sathyanarayanan Kuppuswamy
HI,
Quoted 153 lines · David E. Box
PCIe ports reserved for VMD use are not visible to BIOS and therefore not configured to enable PCIe ASPM or LTR values (which BIOS will configure if they are not set). Lack of this programming results in high power consumption on laptops as reported in bugzilla. For affected products use
pci_enable_link_stateto set the allowed link states for devices on the root ports. Also set the LTR value to the maximum value needed for the SoC.This is a workaround for products from Rocket Lake through Alder Lake. Raptor Lake, the latest product at this time, has already implemented LTR configuring in BIOS. Future products will move ASPM configuration back to BIOS as well. As this solution is intended for laptops, support is not added for hotplug or for devices downstream of a switch on the root port.
Signed-off-by Michael Bottini <[email protected]>Signed-off-by David E. Box <[email protected]>Reviewed-by Jon Derrick <[email protected]>Reviewed-by Nirmal Patel <[email protected]>---
V8
- Removed structvmd_device_datapatch. Instead use #define for the LTR value which is the same across all products needing the quirk. V7
- No change
V6
- Set ASPM first before setting LTR. This is needed because some devices may only have LTR set by BIOS and not ASPM
- Skip setting the LTR if the current LTR in non-zero.
V5
- Provide the LTR value as driver data.
- Use DWORD for the config space write to avoid PCI WORD access bug.
- Set ASPM links firsts, enabling all link states, before setting a default LTR if the capability is present
- Add kernel message that VMD is setting the device LTR.
V4
- Refactorvmd_enable_apsm()to exit early, making the lines shorter and more readable. Suggested by Christoph.
V3
- No changes
V2
- Use return status to printpci_infomessage if ASPM cannot be enabled.
- Add missing static declaration, caught by [email protected]drivers/pci/controller/vmd.c | 64 ++++++++++++++++++++++++++++++++----
1 file changed, 58 insertions(+), 6 deletions(-)drivers/pci/controller/vmd.c +4
-0@@ -66,12 +66,22 @@ enum vmd_features {* interrupt handling. */ VMD_FEAT_CAN_BYPASS_MSI_REMAP = (1 << 4), + + /* +* Enable ASPM on the PCIE root ports and set the default LTR of the +* storage devices on platforms where these values are not configured by
+ * BIOS. This is needed for laptops, which require these settings for
+ * proper power management of the SoC.
+ */
+ VMD_FEAT_BIOS_PM_QUIRK = (1 << 5),
};
#define VMD_FEATS_CLIENT (VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | \
VMD_FEAT_HAS_BUS_RESTRICTIONS| \
VMD_FEAT_OFFSET_FIRST_VECTOR)drivers/pci/controller/vmd.c +2
-0+#define VMD_BIOS_PM_QUIRK_LTR 0x1003/* 3145728 ns */ +static
DEFINE_IDA(vmd_instance_ida);
/*drivers/pci/controller/vmd.c +0
-0@@ -713,6 +723,46 @@ static void vmd_copy_host_bridge_flags(structpci_host_bridge *root_bridge, vmd_bridge->native_dpc = root_bridge->native_dpc; }drivers/pci/controller/vmd.c +30
-0+/* +* Enable ASPM and LTR settings on devices that aren't configured by BIOS. +*/ +static int vmd_pm_enable_quirk (struct pci_dev *pdev,void *userdata) +{ + unsigned long features = *(unsigned long *)userdata; + u16 ltr = VMD_BIOS_PM_QUIRK_LTR; + u32 ltr_reg; + int pos; + + if (!(features & VMD_FEAT_BIOS_PM_QUIRK)) + return 0; + + pci_enable_link_state(pdev, PCIE_LINK_STATE_ALL); + + pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_LTR); + if (!pos) + return 0; + + /* + * Skip if the max snoop LTR is non-zero, indicating BIOS has set it + * so the LTR quirk is not needed. + */ + pci_read_config_dword(pdev, pos + PCI_LTR_MAX_SNOOP_LAT, <r_reg); + if (!!(ltr_reg & (PCI_LTR_VALUE_MASK | PCI_LTR_SCALE_MASK))) + return 0; + + /* +* Set the default values to the maximum required by the platform to +* allow the deepest power management savings. Write as a DWORD where
+ * the lower word is the max snoop latency and the upper word is the + * max non-snoop latency.
+ */
+ ltr_reg = (ltr << 16) | ltr;
+ pci_write_config_dword(pdev, pos +PCI_LTR_MAX_SNOOP_LAT,ltr_reg); + pci_info(pdev, "VMD: Default LTR value set by driver\n");drivers/pci/controller/vmd.c +4
-0+ + return 0; +} +static int
vmd_enable_domain(struct vmd_dev *vmd, unsigned long features){
structpci_sysdata*sd =&vmd->sysdata;drivers/pci/controller/vmd.c +0
-0@@ -867,6 +917,8 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) pci_reset_bus(child->self); pci_assign_unassigned_bus_resources(vmd->bus);
+ pci_walk_bus(vmd->bus,vmd_pm_enable_quirk, &features); +
/*
* VMD root buses are virtual and don't return true onpci_is_pcie()
* and will failpcie_bus_configure_settings()early. It can instead bedrivers/pci/controller/vmd.c +0
-0@@ -1005,17 +1057,17 @@ static const struct pci_device_id vmd_ids[] = {VMD_FEAT_HAS_BUS_RESTRICTIONS |
VMD_FEAT_CAN_BYPASS_MSI_REMAP,}, {PCI_VDEVICE(INTEL, 0x467f),
- .driver_data =VMD_FEATS_CLIENT,},
+ .driver_data =VMD_FEATS_CLIENT|VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0x4c3d),
- .driver_data =VMD_FEATS_CLIENT,},
+ .driver_data =VMD_FEATS_CLIENT|VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0xa77f),
- .driver_data =VMD_FEATS_CLIENT,},
+ .driver_data =VMD_FEATS_CLIENT|VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0x7d0b),
- .driver_data =VMD_FEATS_CLIENT,},
+ .driver_data =VMD_FEATS_CLIENT|VMD_FEAT_BIOS_PM_QUIRK,},
Quoted 8 lines
Quoted 6 lines
{PCI_VDEVICE(INTEL,
0xad0b),
- .driver_data =VMD_FEATS_CLIENT,},
+ .driver_data =VMD_FEATS_CLIENT|VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_9A0B),
- .driver_data =VMD_FEATS_CLIENT,},
+ .driver_data =VMD_FEATS_CLIENT|VMD_FEAT_BIOS_PM_QUIRK,},Why not add
VMD_FEAT_BIOS_PM_QUIRKpart ofVMD_FEATS_CLIENT?
Because our VMD team is in the middle of removing the need for the current on next gen.
David
Quoted 5 lines
Quoted 4 lines
{0,}
};
MODULE_DEVICE_TABLE(pci,vmd_ids);
Re: [PATCH V8 RESEND 4/4] PCI: vmd: Add quirk to configure PCIe ASPM and LTR
Quoted 37 lines · David E. Box
Quoted 29 lines
Quoted 29 lines
+
static intvmd_enable_domain(struct vmd_dev *vmd, unsigned long features){
structpci_sysdata*sd =&vmd->sysdata;drivers/pci/controller/vmd.c +0
-0@@ -867,6 +917,8 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) pci_reset_bus(child->self); pci_assign_unassigned_bus_resources(vmd->bus);
+ pci_walk_bus(vmd->bus,vmd_pm_enable_quirk, &features); +
/*
* VMD root buses are virtual and don't return true onpci_is_pcie()
* and will failpcie_bus_configure_settings()early. It can instead be(quoted diff) +0
-0@@ -1005,17 +1057,17 @@ static const struct pci_device_id vmd_ids[] = {VMD_FEAT_HAS_BUS_RESTRICTIONS |
VMD_FEAT_CAN_BYPASS_MSI_REMAP,}, {PCI_VDEVICE(INTEL, 0x467f),
- .driver_data =VMD_FEATS_CLIENT,},
+ .driver_data =VMD_FEATS_CLIENT|VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0x4c3d),
- .driver_data =VMD_FEATS_CLIENT,},
+ .driver_data =VMD_FEATS_CLIENT|VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0xa77f),
- .driver_data =VMD_FEATS_CLIENT,},
+ .driver_data =VMD_FEATS_CLIENT|VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0x7d0b),
- .driver_data =VMD_FEATS_CLIENT,},Quoted 8 lines
Quoted 7 lines
+ .driver_data =
VMD_FEATS_CLIENT|VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, 0xad0b),
- .driver_data =VMD_FEATS_CLIENT,},
+ .driver_data =VMD_FEATS_CLIENT|VMD_FEAT_BIOS_PM_QUIRK,}, {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_9A0B),
- .driver_data =VMD_FEATS_CLIENT,},
+ .driver_data =VMD_FEATS_CLIENT|VMD_FEAT_BIOS_PM_QUIRK,},Why not add
VMD_FEAT_BIOS_PM_QUIRKpart ofVMD_FEATS_CLIENT?
Quoted 2 lines
Because our VMD team is in the middle of removing the need for the current on next gen.
You mean you may not need this quirk support from next gen?
It looks like you are adding this quirk to all occurances of VMD_FEATS_CLIENT. So I am still not clear why we can't add it directly to that macro?
Signature · 2 lines
Sathyanarayanan Kuppuswamy Linux Kernel Developer