From patchwork Fri Dec 20 11:35:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Werner Sembach X-Patchwork-Id: 13916654 X-Patchwork-Delegate: kw@linux.com 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 2D32F182B4; Fri, 20 Dec 2024 11:36:22 +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=1734694587; cv=none; b=aMOecp9llJNNiOb0XSJ8zJFyTVI16NZf4inArNb4MUWvIj0pVsuucI0cRtDdN7MtXr2Sh2YFcIP5nk3bSvoOFQ/pKB0bYPxx4kOaKbJH5Jxm4HfcyneKUpitmsIp9dqtRgKsd5uPCIkWdFbPzU3/cBpiT+HEHoSxYvTW+xjrKC4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734694587; c=relaxed/simple; bh=R1DKOscdtKnLsA718HdWuRCt5ZBVTa7/pVlcMrkSMlE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=PHubJWG5gRz4IzAcNVZCcXhZ59h8C52+wg0rXbiRkSJg8pjSS1Ne7aunnFjutXa/O6OoaVayCa8ev52AV0Oj6HOdlJ8NrpLOAqmeOWv8av4jMsfVrgHJBfSs++iNKcRaN8cR1PQTpk977bq9wpIB2F/zkC7TvwatFIT6FXADJUc= 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=a7mQ5CaM; 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="a7mQ5CaM" Received: from wse-pc.fritz.box (p5de4533f.dip0.t-ipconnect.de [93.228.83.63]) (Authenticated sender: wse@tuxedocomputers.com) by mail.tuxedocomputers.com (Postfix) with ESMTPA id 723082FC0061; Fri, 20 Dec 2024 12:36:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxedocomputers.com; s=default; t=1734694580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UsB6Z9SYnN5xCOmLE1N2D1gxd61HCbtzz8c7uR1QEqo=; b=a7mQ5CaM3N4SdNXZLSCcahO99F/z4pUTFxQwVlAzuGXGMLSJzkOsvf5xvKjkkl6tGHotLU xIK10X7z2Okvt9aN0ABtbHlKN1NENR9knaLdll418LDc+hX+8YtU05ETNZ/DCJJaZgOEgc ZHXlq6mkyDNCKxJDtufgpTjC6YkYowg= Authentication-Results: mail.tuxedocomputers.com; auth=pass smtp.auth=wse@tuxedocomputers.com smtp.mailfrom=wse@tuxedocomputers.com From: Werner Sembach To: Bjorn Helgaas , "Rafael J. Wysocki" , Mika Westerberg Cc: Mario Limonciello , Werner Sembach , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4] PCI: Avoid putting some root ports into D3 on TUXEDO Sirius Gen1 Date: Fri, 20 Dec 2024 12:35:54 +0100 Message-ID: <20241220113618.779699-1-wse@tuxedocomputers.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 root port of the problematic controller 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 and only the affected root ports. 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+ Fixes: 9d26d3a8f1b0 ("PCI: Put PCIe ports into D3 during suspend") Signed-off-by: Mario Limonciello --- drivers/pci/quirks.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 76f4df75b08a1..d2f45c3e24c0a 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -3908,6 +3908,36 @@ 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) +{ + 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, 0x1502, quirk_ryzen_rp_d3); #endif /*