From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.tuxedocomputers.com (mail.tuxedocomputers.com [157.90.84.7]) (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 EF56E182B4; Fri, 20 Dec 2024 11:34:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=157.90.84.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734694492; cv=none; b=NhwvwoqmUtbRtgKTuyvXDSeWAsWy0F+DF8H/LtT+InXv8sOb7LI/cwV7R8LkZAkH6lrL8ch9YKVWfX8n07ghlID0QIpNFVKmSUN6FK0K8CRqQyb0XyOjnl2bCeDMv8SgC+cdGSdAfT2LwTaKZiKiqqbMsJwDe3qRq7o8wZO3C7M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734694492; c=relaxed/simple; bh=/wdSrHX01idK0Wa4TIPXwbZ1KlKa2bvdg9/5a1qDpWE=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=N5aQaYcBRM7o6yyPtl/8mmGd87k4rVD46Sdp5A4H8wE8/Iz7QIefmXKkWYPZDtdZbVWOiefJW0pPAydXnXTgG/NTtZ2GYlYy+kVEt1tlqF38L8ujNAyjRkhkqtUnw5vDCUnOQ3F4lBxBJqHTX5cDNVQFu+7pAMOXnsq/uAYZ72g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=tuxedocomputers.com; spf=pass smtp.mailfrom=tuxedocomputers.com; dkim=pass (1024-bit key) header.d=tuxedocomputers.com header.i=@tuxedocomputers.com header.b=aj98v0th; arc=none smtp.client-ip=157.90.84.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=tuxedocomputers.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tuxedocomputers.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=tuxedocomputers.com header.i=@tuxedocomputers.com header.b="aj98v0th" Received: from [192.168.42.116] (p5de4533f.dip0.t-ipconnect.de [93.228.83.63]) (Authenticated sender: wse@tuxedocomputers.com) by mail.tuxedocomputers.com (Postfix) with ESMTPSA id ACFE32FC0061; Fri, 20 Dec 2024 12:34:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxedocomputers.com; s=default; t=1734694486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SO4fcNVuPGH/KjzRgJc3BGHHMujtCuygPCXl8xzKGmo=; b=aj98v0th5ROyRScykYyURBwTQu6/vn7nwRtcqFirt9x8BC8pKBSLKcm60fxGZRvQ3Yt9mR JgoOHymNd+cNX8x/KfbNwBMaCod37zz2PxLkGJ5IVcGe2ICX74NCrV9zdIk91OCewia+JH +52JPLQejuoVh5wGEUR9n73r7y8D5+A= Authentication-Results: mail.tuxedocomputers.com; auth=pass smtp.auth=wse@tuxedocomputers.com smtp.mailfrom=wse@tuxedocomputers.com Message-ID: <2c5d49d3-90ce-4604-848a-110114b18a94@tuxedocomputers.com> Date: Fri, 20 Dec 2024 12:34:46 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] PCI: Avoid putting some root ports into D3 on some Ryzen chips From: Werner Sembach To: Mario Limonciello , Bjorn Helgaas , Mika Westerberg , "Rafael J. Wysocki" Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org References: <20241218103433.384027-1-wse@tuxedocomputers.com> <85537504-f107-44aa-9b6d-f61eb067b330@amd.com> <9487791a-784e-451b-a88c-7c578a6ead2e@tuxedocomputers.com> <0ab38bf7-874d-43cb-8236-1f46697df3a5@amd.com> <2b5b05e4-5913-45ee-846d-9980e17d4df6@tuxedocomputers.com> Content-Language: en-US In-Reply-To: <2b5b05e4-5913-45ee-846d-9980e17d4df6@tuxedocomputers.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Am 20.12.24 um 12:20 schrieb Werner Sembach: > > Am 19.12.24 um 21:54 schrieb Mario Limonciello: >> On 12/19/2024 14:46, Werner Sembach wrote: >>> >>> Am 18.12.24 um 16:59 schrieb Werner Sembach: >>>> >>>> Am 18.12.24 um 15:06 schrieb Mario Limonciello: >>>>> On 12/18/2024 04:34, Werner Sembach wrote: >>>>>> From: Mario Limonciello >>>>>> >>>>>> 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- >>>>>> mario.limonciello@amd.com/ >>>>>> 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. >>>>>> >>>>>> Co-developed-by: Georg Gottleuber >>>>>> Signed-off-by: Georg Gottleuber >>>>>> Co-developed-by: Werner Sembach >>>>>> Signed-off-by: Werner Sembach >>>>>> Cc: stable@vger.kernel.org # 6.1+ >>>>>> Reported-by: Iain Lane >>>>>> Closes: https://forums.lenovo.com/t5/Ubuntu/Z13-can-t-resume-from- >>>>>> suspend-with-external-USB-keyboard/m-p/5217121 >>>>> >>>>> These two tag (Reported-by and Closes) should be stripped because this is >>>>> now for very different hardware. >>>> Ack will remove in next version >>>>> >>>>>> Fixes: 9d26d3a8f1b0 ("PCI: Put PCIe ports into D3 during suspend") >>>>>> Signed-off-by: Mario Limonciello >>>>>> --- >>>>>>   drivers/pci/quirks.c | 26 ++++++++++++++++++++++++++ >>>>>>   1 file changed, 26 insertions(+) >>>>>> >>>>>> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c >>>>>> index 76f4df75b08a1..68075a6a5283c 100644 >>>>>> --- a/drivers/pci/quirks.c >>>>>> +++ b/drivers/pci/quirks.c >>>>>> @@ -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); >>>>> >>>>> 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) >>> >>> 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. >> >> 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); nope doesn't work so i will send a v4 of this fix > >> >>> >>>>> >>>>>>   #endif >>>>>>     /* >>>>> >>