From patchwork Tue Nov 26 23:17:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 13886393 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 AB67C1DFE32 for ; Tue, 26 Nov 2024 23:17:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732663047; cv=none; b=L5+3NU3Jm2nOPvU2APgk1YL4S5+iXCdlCMjZ7/mrwbK53fRuxrt6eOcbAMoCKXlrwbQytAuqwSReGPIKWx5dQ1i/TWUiEyLEqKMsRvPf5/i5c/9O76kxQ6HoiHQmN3MeO1QBLI6906a/2k1TxU7ZKeaC1J/ErkBNlaDKgRYJNl4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732663047; c=relaxed/simple; bh=QNbYR62kxSihfmWFMFWaLTedOh3rb9Jygh9RH/srjeA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=SlqSdhLZ2UajAI1BdY6fFqUYbM0F83J8G3RGKGFNkwvI3g9IHr2O7GEvHpsgMTl8XDh92ydX4AaVQJzMqRXYrMCnY4N+IrpnMKGVRjvyEPTGfjmyrg17SnYndBsRcuwtsdLUGmwEFBMCThkzoUCqwQL8lyuGeg1vvxH8cB1VBaA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=m2PrvhjS; arc=none smtp.client-ip=209.85.210.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="m2PrvhjS" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7242f559a9fso5934932b3a.1 for ; Tue, 26 Nov 2024 15:17:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732663045; x=1733267845; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hgCywYrQljSdmItAV6QYlktlpASShyLs3PqDhCmMUsc=; b=m2PrvhjSoByxMiBRVShFI+V1jlKlo9c6pwHm8HB+W28cT1qFskemlNTJIpRwknpxDe nnpDLipU2fJJVPcBQcia5xEuNb+u+oOfHjt35SLtUIBfg1TWXThkz6x35FiQCDrERt8i CZooR1ASBhqsRm4LsSeopFQHTia8njbm2tdpo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732663045; x=1733267845; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hgCywYrQljSdmItAV6QYlktlpASShyLs3PqDhCmMUsc=; b=Qp2qpk2dGxY1StK82u2XKFwKRiCSLxNqYdkhcsLFPe6WOe6HaHs8Amh2G6W73RaaD7 zZbXt8e0vJPKUSQVVRd+V7VpA8X7uVEhY/RNE9zjqWiqJwIXkGoNqUan+LwLNVBVjHTc a/zG5nhOz0+RL08Zla3t6yO3YNttYJsnibuUwdu6SKYHv99vtu7A3I0b0vzWjBwEktJO UD5mWA0NXCMTIdp6OIEDyh3Q5cjXmmvl6GtQ0TZVGaPSgZWa/lk3rtHTaAwxfd19uTbX wPjfBkKa7U4Ir1bISjTLwj2Ql4RiPLKVdO+FV5CN+GhYlXU2zgd2RUx+z8LYX3TI+gq6 SxPQ== X-Forwarded-Encrypted: i=1; AJvYcCVdalggCw+Fwjpb4P98iCPxxQ8g/J/WZd1n0ivd485Ss8Je8+Z6vLPbJxxUCGNgbh8ZNRCQmxFtWwrr@vger.kernel.org X-Gm-Message-State: AOJu0Yzs14oPByQm/NF/cR4braT6doHmDYZEZZ9SQJRJA9yF8MknnhqB zO2Fif6eymUiSOFVBuDtWQR29YgsNTZdFW24z67ijP4eJ1v7dOPZ/jVhaX5YwQ== X-Gm-Gg: ASbGncs9rHhYJm+9Ui22CGKYs7BfqDAZWlcvKFzqVJ9JjSAtzqC2ivVatVyAWjktsl9 D7d6Ah5CsDHRJGpEyUXms7lo1EvabG+NFb+FpxgS3jqT1oVcnHlMPiusLvC6Y+1MM26BxW6imDJ tfdyNFFRIHVox8Di5nod7kz7pW3R5gXIBwK7bft0yOlLwEJot7iqHxLB42TaX8KWn2G2c8pUV6Y B4ghnqBQv3X8jV/5Pk8kjkVqHOoVnA0V9qjCq+AdymyNn5ft+a7lOQUGMvIZ8bc2RBQXotbkfU5 46kUYp46eUo= X-Google-Smtp-Source: AGHT+IFrllr2WVrew7Crqeczu1EEMEaxU7u5juTJ2m/FXo18xyEAoy25l2UGzRWh1AwvTk9GJ4EBUw== X-Received: by 2002:a17:90b:38cd:b0:2ea:853a:99f7 with SMTP id 98e67ed59e1d1-2ee08e9d4f9mr1396473a91.2.1732663044988; Tue, 26 Nov 2024 15:17:24 -0800 (PST) Received: from localhost ([2a00:79e0:2e14:7:c93f:3da4:a2a:71ec]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2ee0fad041csm96130a91.34.2024.11.26.15.17.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Nov 2024 15:17:24 -0800 (PST) From: Brian Norris To: Bjorn Helgaas , "Rafael J. Wysocki" , Len Brown Cc: Hsin-Yi Wang , linux-kernel@vger.kernel.org, mika.westerberg@linux.intel.com, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, lukas@wunner.de, Manivannan Sadhasivam , Brian Norris Subject: [PATCH v5] PCI: Allow PCI bridges to go to D3Hot on all Devicetree based platforms Date: Tue, 26 Nov 2024 15:17:11 -0800 Message-ID: <20241126151711.v5.1.Id0a0e78ab0421b6bce51c4b0b87e6aebdfc69ec7@changeid> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Manivannan Sadhasivam Unlike ACPI based platforms, there are no known issues with D3Hot for the PCI bridges in Device Tree based platforms. Past discussions (Link [1]) determined the restrictions around D3 should be relaxed for all Device Tree systems. So let's allow the PCI bridges to go to D3Hot during runtime. To match devm_pci_alloc_host_bridge() -> devm_of_pci_bridge_init(), we look at the host bridge's parent when determining whether this is a Device Tree based platform. Not all bridges have their own node, but the parent (controller) should. Link: https://lore.kernel.org/linux-pci/20240227225442.GA249898@bhelgaas/ [1] Link: https://lore.kernel.org/linux-pci/20240828210705.GA37859@bhelgaas/ [2] Signed-off-by: Manivannan Sadhasivam [Brian: look at host bridge's parent, not bridge node; rewrite description] Signed-off-by: Brian Norris --- Based on prior work by Manivannan Sadhasivam that was part of a bigger series that stalled: [PATCH v5 4/4] PCI: Allow PCI bridges to go to D3Hot on all Devicetree based platforms https://lore.kernel.org/linux-pci/20240802-pci-bridge-d3-v5-4-2426dd9e8e27@linaro.org/ I'm resubmitting this single patch, since it's useful and seemingly had agreement. I massaged it a bit to relax some restrictions on how the Device Tree should look. Changes in v5: - Pulled out of the larger series, as there were more controversial changes in there, while this one had agreement (Link [2]). - Rewritten with a relaxed set of rules, because the above patch required us to modify many device trees to add bridge nodes. drivers/pci/pci.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index e278861684bc..5d898f5ea155 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3018,6 +3018,8 @@ static const struct dmi_system_id bridge_d3_blacklist[] = { */ bool pci_bridge_d3_possible(struct pci_dev *bridge) { + struct pci_host_bridge *host_bridge; + if (!pci_is_pcie(bridge)) return false; @@ -3038,6 +3040,15 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge) if (pci_bridge_d3_force) return true; + /* + * Allow D3 for all Device Tree based systems. We assume a host + * bridge's parent will have a device node, even if this bridge + * may not have its own. + */ + host_bridge = pci_find_host_bridge(bridge->bus); + if (dev_of_node(host_bridge->dev.parent)) + return true; + /* Even the oldest 2010 Thunderbolt controller supports D3. */ if (bridge->is_thunderbolt) return true;