PCI: Support Immediate Readiness on devices without PM capabilities
PATCH v2 1/1 PCI: Support Immediate Readiness on devices without PM capabilities
Query support for Immediate Readiness irrespective of whether or not the device supports PM capabilities, as nothing in the PCIe spec suggests that Immediate Readiness is in any way dependent on PM functionality.
---
v2: Move logic to pci_init_capabilities() instead of piggybacking the
PM initialization code. [Vipin, Bjorn]
v1 [RFC]: https://lore.kernel.org/all/[email protected]
drivers/pci/pci.c | 4 ---- drivers/pci/probe.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/pci/pci.c +0 -4
@@ -3205,7 +3205,6 @@ void pci_pm_power_up_and_verify_state(struct pci_dev *pci_dev)void pci_pm_init (struct pci_dev *dev) {int pm; -u16 status;u16 pmc;device_enable_async_suspend (&dev->dev);
@@ -3266,9 +3265,6 @@ void pci_pm_init(struct pci_dev *dev)pci_pme_active (dev, false); } -pci_read_config_word (dev,PCI_STATUS , &status); -if (status &PCI_STATUS_IMM_READY ) - dev->imm_ready =1 ; poweron:pci_pm_power_up_and_verify_state (dev);pm_runtime_forbid (&dev->dev);
drivers/pci/probe.c +10 -0
@@ -2595,6 +2595,15 @@ void pcie_report_downtraining(struct pci_dev *dev)__pcie_print_link_status (dev, false); } +static void pci_imm_ready_init (struct pci_dev *dev) +{ +u16 status; + +pci_read_config_word (dev,PCI_STATUS , &status); +if (status &PCI_STATUS_IMM_READY ) + dev->imm_ready =1 ; +} +static void pci_init_capabilities (struct pci_dev *dev) {pci_ea_init (dev);/* Enhanced Allocation */
@@ -2604,6 +2613,7 @@ static void pci_init_capabilities(struct pci_dev *dev)/* Buffers for saving PCIe and PCI-X capabilities */ pci_allocate_cap_save_buffers (dev); +pci_imm_ready_init (dev);/* Immediate Ready */ pci_pm_init (dev);/* Power Management */ pci_vpd_init (dev);/* Vital Product Data */ pci_configure_ari (dev);/* Alternative Routing-ID Forwarding */
base-commit: 89be9a83ccf1f88522317ce02f854f30d6115c41
Signature · 1 line
2.50.0.727.gbf7dc18ff4-goog
Bjorn Helgaas
AppliedQuoted 9 lines · Sean Christopherson
Query support for Immediate Readiness irrespective of whether or not the device supports PM capabilities, as nothing in the PCIe spec suggests that Immediate Readiness is in any way dependent on PM functionality.
Fixes d6112f8def51 ("PCI: Add support for Immediate Readiness")Cc David Matlack <[email protected]>Cc Vipin Sharma <[email protected]>Cc Aaron Lewis <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Applied to pci/enumeration for v6.17, thanks!
Quoted 66 lines
---
v2: Move logic to
pci_init_capabilities()instead of piggybacking the
PM initialization code. [Vipin, Bjorn]v1 [RFC]: https://lore.kernel.org/all/[email protected]
drivers/pci/pci.c | 4 ---- drivers/pci/probe.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-)drivers/pci/pci.c +0
-4@@ -3205,7 +3205,6 @@ void pci_pm_power_up_and_verify_state(struct pci_dev *pci_dev)void pci_pm_init (struct pci_dev *dev) {int pm; -u16 status;u16 pmc;device_enable_async_suspend (&dev->dev);@@ -3266,9 +3265,6 @@ void pci_pm_init(struct pci_dev *dev)pci_pme_active (dev, false); } -pci_read_config_word (dev,PCI_STATUS , &status); -if (status &PCI_STATUS_IMM_READY ) - dev->imm_ready =1 ; poweron:pci_pm_power_up_and_verify_state (dev);pm_runtime_forbid (&dev->dev);drivers/pci/probe.c +10
-0@@ -2595,6 +2595,15 @@ void pcie_report_downtraining(struct pci_dev *dev)__pcie_print_link_status (dev, false); } +static void pci_imm_ready_init (struct pci_dev *dev) +{ +u16 status; + +pci_read_config_word (dev,PCI_STATUS , &status); +if (status &PCI_STATUS_IMM_READY ) + dev->imm_ready =1 ; +} +static void pci_init_capabilities (struct pci_dev *dev) {pci_ea_init (dev);/* Enhanced Allocation */ @@ -2604,6 +2613,7 @@ static void pci_init_capabilities(struct pci_dev *dev)/* Buffers for saving PCIe and PCI-X capabilities */ pci_allocate_cap_save_buffers (dev); +pci_imm_ready_init (dev);/* Immediate Ready */ pci_pm_init (dev);/* Power Management */ pci_vpd_init (dev);/* Vital Product Data */ pci_configure_ari (dev);/* Alternative Routing-ID Forwarding */ base-commit:
89be9a83ccf1f88522317ce02f854f30d6115c41Signature · 1 line
2.50.0.727.gbf7dc18ff4-goog