On Wed, Feb 21, 2024 at 12:20:00PM -0600, Bjorn Helgaas wrote: > On Wed, Feb 21, 2024 at 10:49:58AM +0530, Manivannan Sadhasivam wrote: > > On Tue, Feb 20, 2024 at 04:02:40PM -0600, Bjorn Helgaas wrote: > > > On Wed, Feb 14, 2024 at 05:16:09PM +0530, Manivannan Sadhasivam wrote: > > > > Currently, PCI core will enable D3 support for PCI bridges only when the > > > > following conditions are met: > > > > > > Whenever I read "D3", I first have to figure out whether we're talking > > > about D3hot or D3cold. Please save me the effort :) > > > > Both actually, that's why I used "D3" as in the spec. I should've explicitly > > mentioned that in the commit message. > > > > > > 1. Platform is ACPI based > > > > 2. Thunderbolt controller is used > > > > 3. pcie_port_pm=force passed in cmdline > > > > > > Are these joined by "AND" or "OR"? I guess probably "OR"? > > > > > > "... all the following conditions are met" or "... one of the > > > following conditions is met" would clarify this. > > > > Will use "one of the..." > > > > > > While options 1 and 2 do not apply to most of the DT based > > > > platforms, option 3 will make the life harder for distro > > > > maintainers. Due to this, runtime PM is also not getting enabled > > > > for the bridges. > > > > > > > > To fix this, let's make use of the "supports-d3" property [1] in > > > > the bridge DT nodes to enable D3 support for the capable > > > > bridges. This will also allow the capable bridges to support > > > > runtime PM, thereby conserving power. > > > > > > Looks like "supports-d3" was added by > > > https://github.com/devicetree-org/dt-schema/commit/4548397d7522. > > > The commit log mentions "platform specific ways", which suggests maybe > > > this is D3cold, since D3hot should be supported via PMCSR without any > > > help from the platform. > > > > > > So I *guess* this really means "platform provides some non-architected > > > way to put devices in D3cold and bring them back to D0"? > > > > By reading the comments and git log of the pci_bridge_d3_possible() > > function in drivers/pci/pci.c, we can understand that some of the > > old bridges do not support both D3hot and D3cold. And to > > differentiate such bridges, platforms have to notify the OS using > > some ways. > > > > ACPI has its own implementation [1] and DT uses "supports-d3" > > property. > > > > And yes, in an ideal world PMCSR should be sufficient for D3hot, but > > you know the PCI vendors more than me ;) > > So it sounds like this is supposed to cover two cases: > > 1) D3hot doesn't work per spec. This sounds like a hardware > defect in the device that should be a quirk based on > Vendor/Device ID, not something in DT. I don't actually know if > this is common, although there are several existing quirks that > mention issues with D3. > I'd love to use quirks if we started from that. But right now, quirks are not used and there are multiple checks based on various factors [1], including relying on ACPI. So that's the reason I went with DT based approach. If quirks has to be used now, then it has to be used for both ACPI and DT based platforms. For DT it won't be an issue since nobody bothered until now, but for ACPI, we need to add quirks for all the bridges in the wild which is not feasible. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/pci/pci.c#n3116 > 2) The platform doesn't support putting the bridge in D3cold and > back to D0. I don't understand this either because I assumed DT > would describe *hardware*, and "supports-d3" might imply the > presence of hardware power control, but doesn't tell us how to > operate it, and it must be up to a native driver to know how to > do it. > "supports-d3" implies that both D3hot and D3cold works as in the spec and the OS can handle it appropriately. If this is absent, then OS should not transition the bridge to any of the D3 states. I don't understand what is the confusion here. This is similar to what we already have for ACPI (whether or not it is correct is another topic). > These are two vastly different scenarios, and I would really like to > untangle them so they aren't conflated. I see that you're extending > platform_pci_bridge_d3(), which apparently has that conflation baked > into it already, but my personal experience is that this is really > hard to maintain. > I do agree that it is not in a good shape, but there is no better solution other than making use of the DT property. If you have any better idea, please suggest. - Mani > > > > Ideally, D3 support should be enabled by default for the more recent PCI > > > > bridges, but we do not have a sane way to detect them. > > > > > > > > [1] https://github.com/devicetree-org/dt-schema/blob/main/dtschema/schemas/pci/pci-pci-bridge.yaml#L31 > > > [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/pci/pci-acpi.c#n976 > > > > > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx> > > > > --- > > > > This patch is tested on Qcom SM8450 based development board with an out-of-tree > > > > DT patch. > > > > > > > > NOTE: I will submit the DT patches adding this property for applicable bridges > > > > in Qcom SoCs separately. > > > > > > > > Changes in v3: > > > > - Fixed kdoc, used of_property_present() and dev_of_node() (Lukas) > > > > - Link to v2: https://lore.kernel.org/r/20240214-pcie-qcom-bridge-v2-1-9dd6dbb1b817@xxxxxxxxxx > > > > > > > > Changes in v2: > > > > - Switched to DT based approach as suggested by Lukas. > > > > - Link to v1: https://lore.kernel.org/r/20240202-pcie-qcom-bridge-v1-0-46d7789836c0@xxxxxxxxxx > > > > --- > > > > drivers/pci/of.c | 12 ++++++++++++ > > > > drivers/pci/pci.c | 3 +++ > > > > drivers/pci/pci.h | 6 ++++++ > > > > 3 files changed, 21 insertions(+) > > > > > > > > diff --git a/drivers/pci/of.c b/drivers/pci/of.c > > > > index 51e3dd0ea5ab..24b0107802af 100644 > > > > --- a/drivers/pci/of.c > > > > +++ b/drivers/pci/of.c > > > > @@ -786,3 +786,15 @@ u32 of_pci_get_slot_power_limit(struct device_node *node, > > > > return slot_power_limit_mw; > > > > } > > > > EXPORT_SYMBOL_GPL(of_pci_get_slot_power_limit); > > > > + > > > > +/** > > > > + * of_pci_bridge_d3 - Check if the bridge is supporting D3 states or not > > > > + * > > > > + * @node: device tree node of the bridge > > > > + * > > > > + * Return: %true if the bridge is supporting D3 states, %false otherwise. > > > > + */ > > > > +bool of_pci_bridge_d3(struct device_node *node) > > > > +{ > > > > + return of_property_present(node, "supports-d3"); > > > > +} > > > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > > > > index d8f11a078924..8678fba092bb 100644 > > > > --- a/drivers/pci/pci.c > > > > +++ b/drivers/pci/pci.c > > > > @@ -1142,6 +1142,9 @@ static inline bool platform_pci_bridge_d3(struct pci_dev *dev) > > > > if (pci_use_mid_pm()) > > > > return false; > > > > > > > > + if (dev_of_node(&dev->dev)) > > > > + return of_pci_bridge_d3(dev->dev.of_node); > > > > + > > > > return acpi_pci_bridge_d3(dev); > > > > } > > > > > > > > diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h > > > > index 2336a8d1edab..10387461b1fe 100644 > > > > --- a/drivers/pci/pci.h > > > > +++ b/drivers/pci/pci.h > > > > @@ -635,6 +635,7 @@ int of_pci_get_max_link_speed(struct device_node *node); > > > > u32 of_pci_get_slot_power_limit(struct device_node *node, > > > > u8 *slot_power_limit_value, > > > > u8 *slot_power_limit_scale); > > > > +bool of_pci_bridge_d3(struct device_node *node); > > > > int pci_set_of_node(struct pci_dev *dev); > > > > void pci_release_of_node(struct pci_dev *dev); > > > > void pci_set_bus_of_node(struct pci_bus *bus); > > > > @@ -673,6 +674,11 @@ of_pci_get_slot_power_limit(struct device_node *node, > > > > return 0; > > > > } > > > > > > > > +static inline bool of_pci_bridge_d3(struct device_node *node) > > > > +{ > > > > + return false; > > > > +} > > > > + > > > > static inline int pci_set_of_node(struct pci_dev *dev) { return 0; } > > > > static inline void pci_release_of_node(struct pci_dev *dev) { } > > > > static inline void pci_set_bus_of_node(struct pci_bus *bus) { } > > > > > > > > --- > > > > base-commit: 6613476e225e090cc9aad49be7fa504e290dd33d > > > > change-id: 20240131-pcie-qcom-bridge-b6802a9770a3 > > > > > > > > Best regards, > > > > -- > > > > Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx> > > > > > > > > -- > > மணிவண்ணன் சதாசிவம் -- மணிவண்ணன் சதாசிவம்
