PCI: Avoid putting some root ports into D3 on some Ryzen chips
PATCH v3 1/1 PCI: Avoid putting some root ports into D3 on some Ryzen chips
From: Mario Limonciello <[email protected]>
commit 9d26d3a8f1b0 ("PCI: Put PCIe ports into D3 during suspend") sets the policy that all PCIe ports are allowed to use D3. When the system is suspended if the port is not power manageable by the platform and won't be used for wakeup via a PME this sets up the policy for these ports to go into D3hot.
This policy generally makes sense from an OSPM perspective but it leads to problems with wakeup from suspend on the TUXEDO Sirius 16 Gen 1 with a specific old BIOS. This manifests as a system hang.
On the affected Device + BIOS combination, add a quirk for the PCI device ID used by the problematic root port on to ensure that these root ports are not put into D3hot at suspend.
This patch is based on
https://lore.kernel.org/linux-pci/[email protected]/
but with the added condition both in the documentation and in the code to apply only to the TUXEDO Sirius 16 Gen 1 with a specific old BIOS.
--- drivers/pci/quirks.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/pci/quirks.c +26 -0
@@ -3908,6 +3908,32 @@ static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev)DECLARE_PCI_FIXUP_SUSPEND_LATE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C , quirk_apple_poweroff_thunderbolt); + +/* +* Putting PCIe root ports on Ryzen SoCs with USB4 controllers into D3hot +* may cause problems when the system attempts wake up from s2idle. +* +* On the TUXEDO Sirius 16 Gen 1 with a specific old BIOS this manifests as +* a system hang. +*/ +static const struct dmi_system_id quirk_ryzen_rp_d3_dmi_table[] = { + { + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"TUXEDO" ), +DMI_EXACT_MATCH (DMI_BOARD_NAME ,"APX958" ), +DMI_EXACT_MATCH (DMI_BIOS_VERSION ,"V1.00A00_20240108" ), + }, + }, + {} +}; + +static void quirk_ryzen_rp_d3 (struct pci_dev *pdev) +{ +if (dmi_check_system (quirk_ryzen_rp_d3_dmi_table) && + !acpi_pci_power_manageable (pdev)) + pdev->dev_flags |=PCI_DEV_FLAGS_NO_D3 ; +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,0x14eb , quirk_ryzen_rp_d3);#endif /*
Signature · 1 line
2.43.0
Quoted 21 lines · Werner Sembach
From: Mario Limonciello <[email protected]>
commit
9d26d3a8f1b0("PCI: Put PCIe ports into D3 during suspend") sets the policy that all PCIe ports are allowed to use D3. When the system is suspended if the port is not power manageable by the platform and won't be used for wakeup via a PME this sets up the policy for these ports to go into D3hot.This policy generally makes sense from an OSPM perspective but it leads to problems with wakeup from suspend on the TUXEDO Sirius 16 Gen 1 with a specific old BIOS. This manifests as a system hang.
On the affected Device + BIOS combination, add a quirk for the PCI device ID used by the problematic root port on to ensure that these root ports are not put into D3hot at suspend.
This patch is based on
https://lore.kernel.org/linux-pci/[email protected]/
but with the added condition both in the documentation and in the code to apply only to the TUXEDO Sirius 16 Gen 1 with a specific old BIOS.
Quoted 7 lines
Co-developed-by Georg Gottleuber <[email protected]>Signed-off-by Georg Gottleuber <[email protected]>Co-developed-by Werner Sembach <[email protected]>Signed-off-by Werner Sembach <[email protected]>Cc [email protected] # 6.1+Reported-by Iain Lane <[email protected]>
These two tag (Reported-by and Closes) should be stripped because this is now for very different hardware.
Quoted 30 lines
Fixes 9d26d3a8f1b0 ("PCI: Put PCIe ports into D3 during suspend")Signed-off-by Mario Limonciello <[email protected]>--- drivers/pci/quirks.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)drivers/pci/quirks.c +16
-0@@ -3908,6 +3908,32 @@ static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev)DECLARE_PCI_FIXUP_SUSPEND_LATE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C , quirk_apple_poweroff_thunderbolt); + +/* +* Putting PCIe root ports on Ryzen SoCs with USB4 controllers into D3hot +* may cause problems when the system attempts wake up from s2idle. +* +* On the TUXEDO Sirius 16 Gen 1 with a specific old BIOS this manifests as +* a system hang. +*/ +static const struct dmi_system_id quirk_ryzen_rp_d3_dmi_table[] = { + { + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"TUXEDO" ), +DMI_EXACT_MATCH (DMI_BOARD_NAME ,"APX958" ), +DMI_EXACT_MATCH (DMI_BIOS_VERSION ,"V1.00A00_20240108" ), + }, + },
drivers/pci/quirks.c static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev) · line 3936
Quoted 10 lines
drivers/pci/quirks.c +10
-0+ {} +}; + +static void quirk_ryzen_rp_d3 (struct pci_dev *pdev) +{ +if (dmi_check_system (quirk_ryzen_rp_d3_dmi_table) && + !acpi_pci_power_manageable (pdev)) + pdev->dev_flags |=PCI_DEV_FLAGS_NO_D3 ; +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,0x14eb , quirk_ryzen_rp_d3);
So it needs to be applied to /all/ the root ports PID 0x14eb, not just one of them?
Quoted 3 lines
drivers/pci/quirks.c +0
-0#endif /*
Am 18.12.24 um 15:06 schrieb Mario Limonciello:
Quoted 31 lines · Werner Sembach
Quoted 22 lines
From: Mario Limonciello <[email protected]>
commit
9d26d3a8f1b0("PCI: Put PCIe ports into D3 during suspend") sets the policy that all PCIe ports are allowed to use D3. When the system is suspended if the port is not power manageable by the platform and won't be used for wakeup via a PME this sets up the policy for these ports to go into D3hot.This policy generally makes sense from an OSPM perspective but it leads to problems with wakeup from suspend on the TUXEDO Sirius 16 Gen 1 with a specific old BIOS. This manifests as a system hang.
On the affected Device + BIOS combination, add a quirk for the PCI device ID used by the problematic root port on to ensure that these root ports are not put into D3hot at suspend.
This patch is based on
https://lore.kernel.org/linux-pci/[email protected]/but with the added condition both in the documentation and in the code to apply only to the TUXEDO Sirius 16 Gen 1 with a specific old BIOS.
Quoted 7 lines
Co-developed-by Georg Gottleuber <[email protected]>Signed-off-by Georg Gottleuber <[email protected]>Co-developed-by Werner Sembach <[email protected]>Signed-off-by Werner Sembach <[email protected]>Cc [email protected] # 6.1+Reported-by Iain Lane <[email protected]>
Quoted 1 line
These two tag (Reported-by and Closes) should be stripped because this is now for very different hardware.
Ack will remove in next version
Quoted 36 lines
Quoted 36 lines
Fixes 9d26d3a8f1b0 ("PCI: Put PCIe ports into D3 during suspend")Signed-off-by Mario Limonciello <[email protected]>---
drivers/pci/quirks.c| 26 ++++++++++++++++++++++++++1 file changed, 26 insertions(+)drivers/pci/quirks.c +20
-0@@ -3908,6 +3908,32 @@ static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev) DECLARE_PCI_FIXUP_SUSPEND_LATE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C, quirk_apple_poweroff_thunderbolt); + +/* + * Putting PCIe root ports on Ryzen SoCs with USB4 controllers into D3hot + * may cause problems when the system attempts wake up from s2idle. + * + * On the TUXEDO Sirius 16 Gen 1 with a specific old BIOS this manifests as + * a system hang. + */ +static const struct dmi_system_id quirk_ryzen_rp_d3_dmi_table[] = { + { + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "TUXEDO"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "APX958"), + DMI_EXACT_MATCH(DMI_BIOS_VERSION, "V1.00A00_20240108"), + }, + }, + {} +}; + +static void quirk_ryzen_rp_d3(struct pci_dev *pdev)
Quoted 8 lines
drivers/pci/quirks.c static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev) · line 3936
Quoted 6 lines
drivers/pci/quirks.c +6
-0+{ + if (dmi_check_system(quirk_ryzen_rp_d3_dmi_table) && + !acpi_pci_power_manageable(pdev)) + pdev->dev_flags |= PCI_DEV_FLAGS_NO_D3; +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,0x14eb , quirk_ryzen_rp_d3);So it needs to be applied to /all/ the root ports PID
0x14eb, not just one of them?
Don't know, I will look into it (I think because of the !acpi_pci_power_manageable(pdev) it is applied to two of the three on the device)
Quoted 4 lines
Quoted 3 lines
drivers/pci/quirks.c +0
-0#endif /*
Am 18.12.24 um 16:59 schrieb Werner Sembach:
Quoted 79 lines
Am 18.12.24 um 15:06 schrieb Mario Limonciello:
Quoted 31 lines · Werner Sembach
Quoted 22 lines
From: Mario Limonciello <[email protected]>
commit
9d26d3a8f1b0("PCI: Put PCIe ports into D3 during suspend") sets the policy that all PCIe ports are allowed to use D3. When the system is suspended if the port is not power manageable by the platform and won't be used for wakeup via a PME this sets up the policy for these ports to go into D3hot.This policy generally makes sense from an OSPM perspective but it leads to problems with wakeup from suspend on the TUXEDO Sirius 16 Gen 1 with a specific old BIOS. This manifests as a system hang.
On the affected Device + BIOS combination, add a quirk for the PCI device ID used by the problematic root port on to ensure that these root ports are not put into D3hot at suspend.
This patch is based on
https://lore.kernel.org/linux-pci/[email protected]/but with the added condition both in the documentation and in the code to apply only to the TUXEDO Sirius 16 Gen 1 with a specific old BIOS.
Quoted 7 lines
Co-developed-by Georg Gottleuber <[email protected]>Signed-off-by Georg Gottleuber <[email protected]>Co-developed-by Werner Sembach <[email protected]>Signed-off-by Werner Sembach <[email protected]>Cc [email protected] # 6.1+Reported-by Iain Lane <[email protected]>Quoted 1 line
These two tag (Reported-by and Closes) should be stripped because this is now for very different hardware.
Ack will remove in next version
Quoted 36 lines
Quoted 36 lines
Fixes 9d26d3a8f1b0 ("PCI: Put PCIe ports into D3 during suspend")Signed-off-by Mario Limonciello <[email protected]>---
drivers/pci/quirks.c| 26 ++++++++++++++++++++++++++1 file changed, 26 insertions(+)drivers/pci/quirks.c +20
-0@@ -3908,6 +3908,32 @@ static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev) DECLARE_PCI_FIXUP_SUSPEND_LATE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C, quirk_apple_poweroff_thunderbolt); + +/* + * Putting PCIe root ports on Ryzen SoCs with USB4 controllers into D3hot + * may cause problems when the system attempts wake up from s2idle. + * + * On the TUXEDO Sirius 16 Gen 1 with a specific old BIOS this manifests as + * a system hang. + */ +static const struct dmi_system_id quirk_ryzen_rp_d3_dmi_table[] = { + { + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "TUXEDO"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "APX958"), + DMI_EXACT_MATCH(DMI_BIOS_VERSION, "V1.00A00_20240108"), + }, + }, + {} +}; + +static void quirk_ryzen_rp_d3(struct pci_dev *pdev)Quoted 8 lines
drivers/pci/quirks.c static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev) · line 3936
Quoted 6 lines
drivers/pci/quirks.c +6
-0+{ + if (dmi_check_system(quirk_ryzen_rp_d3_dmi_table) && + !acpi_pci_power_manageable(pdev)) + pdev->dev_flags |= PCI_DEV_FLAGS_NO_D3; +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,0x14eb , quirk_ryzen_rp_d3);So it needs to be applied to /all/ the root ports PID
0x14eb, not just one of them?
Quoted 1 line
Don't know, I will look into it (I think because of the !acpi_pci_power_manageable(pdev) it is applied to two of the three on the device)
I tried it like this now:
static void quirk_ryzen_rp_d3(struct pci_dev *pdev) {
struct pci_dev *root_pdev;
if (dmi_check_system(quirk_ryzen_rp_d3_dmi_table)) { root_pdev = pcie_find_root_port(pdev);
if (root_pdev && !acpi_pci_power_manageable(root_pdev)) root_pdev->dev_flags |= PCI_DEV_FLAGS_NO_D3;
}
}DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1668, quirk_ryzen_rp_d3); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1669, quirk_ryzen_rp_d3);
but that doesn't work.
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
drivers/pci/quirks.c +0
-0#endif /*
Quoted 99 lines · Werner Sembach
Am 18.12.24 um 16:59 schrieb Werner Sembach:
Quoted 80 lines
Am 18.12.24 um 15:06 schrieb Mario Limonciello:
Quoted 30 lines · Werner Sembach
Quoted 21 lines
From: Mario Limonciello <[email protected]>
commit
9d26d3a8f1b0("PCI: Put PCIe ports into D3 during suspend") sets the policy that all PCIe ports are allowed to use D3. When the system is suspended if the port is not power manageable by the platform and won't be used for wakeup via a PME this sets up the policy for these ports to go into D3hot.This policy generally makes sense from an OSPM perspective but it leads to problems with wakeup from suspend on the TUXEDO Sirius 16 Gen 1 with a specific old BIOS. This manifests as a system hang.
On the affected Device + BIOS combination, add a quirk for the PCI device ID used by the problematic root port on to ensure that these root ports are not put into D3hot at suspend.
This patch is based on
https://lore.kernel.org/linux-pci/20230708214457.1229-2- [email protected]/ but with the added condition both in the documentation and in the code to apply only to the TUXEDO Sirius 16 Gen 1 with a specific old BIOS.Quoted 7 lines
Co-developed-by Georg Gottleuber <[email protected]>Signed-off-by Georg Gottleuber <[email protected]>Co-developed-by Werner Sembach <[email protected]>Signed-off-by Werner Sembach <[email protected]>Cc [email protected] # 6.1+Reported-by Iain Lane <[email protected]>Closes https://forums.lenovo.com/t5/Ubuntu/Z13-can-t-resume-from- suspend-with-external-USB-keyboard/m-p/5217121Quoted 1 line
These two tag (Reported-by and Closes) should be stripped because this is now for very different hardware.
Ack will remove in next version
Quoted 38 lines
Quoted 38 lines
Fixes 9d26d3a8f1b0 ("PCI: Put PCIe ports into D3 during suspend")Signed-off-by Mario Limonciello <[email protected]>---
drivers/pci/quirks.c| 26 ++++++++++++++++++++++++++1 file changed, 26 insertions(+)drivers/pci/quirks.c +3
-0@@ -3908,6 +3908,32 @@ static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev) DECLARE_PCI_FIXUP_SUSPEND_LATE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C, quirk_apple_poweroff_thunderbolt); + +/* +* Putting PCIe root ports on Ryzen SoCs with USB4 controllers into D3hot
+ * may cause problems when the system attempts wake up from s2idle.
+ *
+ * On the TUXEDO Sirius 16 Gen 1 with a specific old BIOS this manifests as
+ * a system hang.
+ */drivers/pci/quirks.c +12
-0+static const struct dmi_system_id quirk_ryzen_rp_d3_dmi_table[] = { + { + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "TUXEDO"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "APX958"), + DMI_EXACT_MATCH(DMI_BIOS_VERSION, "V1.00A00_20240108"), + }, + }, + {} +}; + +static void quirk_ryzen_rp_d3 (struct pci_dev *pdev)Quoted 8 lines
drivers/pci/quirks.c static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev) · line 3936
Quoted 6 lines
drivers/pci/quirks.c +6
-0+{ + if (dmi_check_system(quirk_ryzen_rp_d3_dmi_table) && + !acpi_pci_power_manageable(pdev)) + pdev->dev_flags |= PCI_DEV_FLAGS_NO_D3; +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,0x14eb , quirk_ryzen_rp_d3);So it needs to be applied to /all/ the root ports PID
0x14eb, not just one of them?Quoted 1 line
Don't know, I will look into it (I think because of the !
acpi_pci_power_manageable(pdev)it is applied to two of the three on the device)I tried it like this now:
static void
quirk_ryzen_rp_d3(struct pci_dev *pdev){
structpci_dev*root_pdev;if (
dmi_check_system(quirk_ryzen_rp_d3_dmi_table)) {root_pdev=pcie_find_root_port(pdev);
if (root_pdev&& !acpi_pci_power_manageable(root_pdev))root_pdev->dev_flags|=PCI_DEV_FLAGS_NO_D3;
}
}DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1668, quirk_ryzen_rp_d3);DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1669, quirk_ryzen_rp_d3);
Quoted 1 line
but that doesn't work.
OK; that means it's more root ports indeed than just the ones above the USB4 controllers.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
#endif
/*
Am 19.12.24 um 21:54 schrieb Mario Limonciello:
Quoted 98 lines · Werner Sembach
Quoted 97 lines
Am 18.12.24 um 16:59 schrieb Werner Sembach:
Quoted 78 lines
Am 18.12.24 um 15:06 schrieb Mario Limonciello:
Quoted 30 lines · Werner Sembach
Quoted 21 lines
From: Mario Limonciello <[email protected]>
commit
9d26d3a8f1b0("PCI: Put PCIe ports into D3 during suspend") sets the policy that all PCIe ports are allowed to use D3. When the system is suspended if the port is not power manageable by the platform and won't be used for wakeup via a PME this sets up the policy for these ports to go into D3hot.This policy generally makes sense from an OSPM perspective but it leads to problems with wakeup from suspend on the TUXEDO Sirius 16 Gen 1 with a specific old BIOS. This manifests as a system hang.
On the affected Device + BIOS combination, add a quirk for the PCI device ID used by the problematic root port on to ensure that these root ports are not put into D3hot at suspend.
This patch is based on
https://lore.kernel.org/linux-pci/20230708214457.1229-2- [email protected]/ but with the added condition both in the documentation and in the code to apply only to the TUXEDO Sirius 16 Gen 1 with a specific old BIOS.Quoted 7 lines
Co-developed-by Georg Gottleuber <[email protected]>Signed-off-by Georg Gottleuber <[email protected]>Co-developed-by Werner Sembach <[email protected]>Signed-off-by Werner Sembach <[email protected]>Cc [email protected] # 6.1+Reported-by Iain Lane <[email protected]>Closes https://forums.lenovo.com/t5/Ubuntu/Z13-can-t-resume-from- suspend-with-external-USB-keyboard/m-p/5217121Quoted 1 line
These two tag (Reported-by and Closes) should be stripped because this is now for very different hardware.
Ack will remove in next version
Quoted 36 lines
Quoted 36 lines
Fixes 9d26d3a8f1b0 ("PCI: Put PCIe ports into D3 during suspend")Signed-off-by Mario Limonciello <[email protected]>---
drivers/pci/quirks.c| 26 ++++++++++++++++++++++++++1 file changed, 26 insertions(+)drivers/pci/quirks.c +20
-0@@ -3908,6 +3908,32 @@ static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev) DECLARE_PCI_FIXUP_SUSPEND_LATE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C, quirk_apple_poweroff_thunderbolt); + +/* + * Putting PCIe root ports on Ryzen SoCs with USB4 controllers into D3hot + * may cause problems when the system attempts wake up from s2idle. + * + * On the TUXEDO Sirius 16 Gen 1 with a specific old BIOS this manifests as + * a system hang. + */ +static const struct dmi_system_id quirk_ryzen_rp_d3_dmi_table[] = { + { + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "TUXEDO"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "APX958"), + DMI_EXACT_MATCH(DMI_BIOS_VERSION, "V1.00A00_20240108"), + }, + }, + {} +}; + +static void quirk_ryzen_rp_d3(struct pci_dev *pdev)Quoted 8 lines
drivers/pci/quirks.c static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev) · line 3936
Quoted 6 lines
drivers/pci/quirks.c +6
-0+{ + if (dmi_check_system(quirk_ryzen_rp_d3_dmi_table) && + !acpi_pci_power_manageable(pdev)) + pdev->dev_flags |= PCI_DEV_FLAGS_NO_D3; +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,0x14eb , quirk_ryzen_rp_d3);So it needs to be applied to /all/ the root ports PID
0x14eb, not just one of them?Quoted 1 line
Don't know, I will look into it (I think because of the !
acpi_pci_power_manageable(pdev)it is applied to two of the three on the device)I tried it like this now:
static void
quirk_ryzen_rp_d3(struct pci_dev *pdev){
structpci_dev*root_pdev;if (
dmi_check_system(quirk_ryzen_rp_d3_dmi_table)) {root_pdev=pcie_find_root_port(pdev);
if (root_pdev&& !acpi_pci_power_manageable(root_pdev))root_pdev->dev_flags|=PCI_DEV_FLAGS_NO_D3;
}
}DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1668, quirk_ryzen_rp_d3);DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1669, quirk_ryzen_rp_d3);
Quoted 3 lines
Quoted 1 line
but that doesn't work.
OK; that means it's more root ports indeed than just the ones above the USB4 controllers.
Turns out its just a different root controller and with
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1502, quirk_ryzen_rp_d3);
instead of
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1668, quirk_ryzen_rp_d3); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1669, quirk_ryzen_rp_d3);
it works.
I will now try the other fix with
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1502, quirk_ryzen_rp_d3);
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
drivers/pci/quirks.c +0
-0#endif /*
Am 20.12.24 um 12:20 schrieb Werner Sembach:
Quoted 110 lines
Am 19.12.24 um 21:54 schrieb Mario Limonciello:
Quoted 98 lines · Werner Sembach
Quoted 97 lines
Am 18.12.24 um 16:59 schrieb Werner Sembach:
Quoted 78 lines
Am 18.12.24 um 15:06 schrieb Mario Limonciello:
Quoted 30 lines · Werner Sembach
Quoted 21 lines
From: Mario Limonciello <[email protected]>
commit
9d26d3a8f1b0("PCI: Put PCIe ports into D3 during suspend") sets the policy that all PCIe ports are allowed to use D3. When the system is suspended if the port is not power manageable by the platform and won't be used for wakeup via a PME this sets up the policy for these ports to go into D3hot.This policy generally makes sense from an OSPM perspective but it leads to problems with wakeup from suspend on the TUXEDO Sirius 16 Gen 1 with a specific old BIOS. This manifests as a system hang.
On the affected Device + BIOS combination, add a quirk for the PCI device ID used by the problematic root port on to ensure that these root ports are not put into D3hot at suspend.
This patch is based on
https://lore.kernel.org/linux-pci/20230708214457.1229-2- [email protected]/ but with the added condition both in the documentation and in the code to apply only to the TUXEDO Sirius 16 Gen 1 with a specific old BIOS.Quoted 7 lines
Co-developed-by Georg Gottleuber <[email protected]>Signed-off-by Georg Gottleuber <[email protected]>Co-developed-by Werner Sembach <[email protected]>Signed-off-by Werner Sembach <[email protected]>Cc [email protected] # 6.1+Reported-by Iain Lane <[email protected]>Closes https://forums.lenovo.com/t5/Ubuntu/Z13-can-t-resume-from- suspend-with-external-USB-keyboard/m-p/5217121Quoted 1 line
These two tag (Reported-by and Closes) should be stripped because this is now for very different hardware.
Ack will remove in next version
Quoted 36 lines
Quoted 36 lines
Fixes 9d26d3a8f1b0 ("PCI: Put PCIe ports into D3 during suspend")Signed-off-by Mario Limonciello <[email protected]>---
drivers/pci/quirks.c| 26 ++++++++++++++++++++++++++1 file changed, 26 insertions(+)drivers/pci/quirks.c +20
-0@@ -3908,6 +3908,32 @@ static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev) DECLARE_PCI_FIXUP_SUSPEND_LATE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C, quirk_apple_poweroff_thunderbolt); + +/* + * Putting PCIe root ports on Ryzen SoCs with USB4 controllers into D3hot + * may cause problems when the system attempts wake up from s2idle. + * + * On the TUXEDO Sirius 16 Gen 1 with a specific old BIOS this manifests as + * a system hang. + */ +static const struct dmi_system_id quirk_ryzen_rp_d3_dmi_table[] = { + { + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "TUXEDO"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "APX958"), + DMI_EXACT_MATCH(DMI_BIOS_VERSION, "V1.00A00_20240108"), + }, + }, + {} +}; + +static void quirk_ryzen_rp_d3(struct pci_dev *pdev)Quoted 8 lines
drivers/pci/quirks.c static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev) · line 3936
Quoted 6 lines
drivers/pci/quirks.c +6
-0+{ + if (dmi_check_system(quirk_ryzen_rp_d3_dmi_table) && + !acpi_pci_power_manageable(pdev)) + pdev->dev_flags |= PCI_DEV_FLAGS_NO_D3; +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,0x14eb , quirk_ryzen_rp_d3);So it needs to be applied to /all/ the root ports PID
0x14eb, not just one of them?Quoted 1 line
Don't know, I will look into it (I think because of the !
acpi_pci_power_manageable(pdev)it is applied to two of the three on the device)I tried it like this now:
static void
quirk_ryzen_rp_d3(struct pci_dev *pdev){
structpci_dev*root_pdev;if (
dmi_check_system(quirk_ryzen_rp_d3_dmi_table)) {root_pdev=pcie_find_root_port(pdev);
if (root_pdev&& !acpi_pci_power_manageable(root_pdev))root_pdev->dev_flags|=PCI_DEV_FLAGS_NO_D3;
}
}DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1668, quirk_ryzen_rp_d3);DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1669, quirk_ryzen_rp_d3);Quoted 3 lines
Quoted 1 line
but that doesn't work.
OK; that means it's more root ports indeed than just the ones above the USB4 controllers.
Turns out its just a different root controller and with
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1502, quirk_ryzen_rp_d3);instead of
Quoted 8 lines
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1668, quirk_ryzen_rp_d3);DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1669, quirk_ryzen_rp_d3);it works.
I will now try the other fix with
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1502, quirk_ryzen_rp_d3);
nope doesn't work
so i will send a v4 of this fix
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
drivers/pci/quirks.c +0
-0#endif /*