| Message ID | 20191118065553.30362-1-oohall@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | 9d72dcef891030545f39ad386a30cf91df517fb2 |
| Headers | show |
| Series | [v2] powerpc/powernv: Disable native PCIe port management | expand |
On Mon, 2019-11-18 at 06:55:53 UTC, Oliver O'Halloran wrote: > On PowerNV the PCIe topology is (currently) managed by the powernv platform > code in Linux in cooperation with the platform firmware. Linux's native > PCIe port service drivers operate independently of both and this can cause > problems. > > The main issue is that the portbus driver will conflict with the platform > specific hotplug driver (pnv_php) over ownership of the MSI used to notify > the host when a hotplug event occurs. The portbus driver claims this MSI on > behalf of the individual port services because the same interrupt is used > for hotplug events, PMEs (on root ports), and link bandwidth change > notifications. The portbus driver will always claim the interrupt even if > the individual port service drivers, such as pciehp, are compiled out. > > The second, bigger, problem is that the hotplug port service driver > fundamentally does not work on PowerNV. The platform assumes that all > PCI devices have a corresponding arch-specific handle derived from the DT > node for the device (pci_dn) and without one the platform will not allow > a PCI device to be enabled. This problem is largely due to historical > baggage, but it can't be resolved without significant re-factoring of the > platform PCI support. > > We can fix these problems in the interim by setting the > "pcie_ports_disabled" flag during platform initialisation. The flag > indicates the platform owns the PCIe ports which stops the portbus driver > from being registered. > > This does have the side effect of disabling all port services drivers > that is: AER, PME, BW notifications, hotplug, and DPC. However, this is > not a huge disadvantage on PowerNV since these services are either unused > or handled through other means. > > Cc: Sergey Miroshnichenko <s.miroshnichenko@yadro.com> > Fixes: 66725152fb9f ("PCI/hotplug: PowerPC PowerNV PCI hotplug driver") > Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/9d72dcef891030545f39ad386a30cf91df517fb2 cheers
diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c index 2825d00..c0bea75a 100644 --- a/arch/powerpc/platforms/powernv/pci.c +++ b/arch/powerpc/platforms/powernv/pci.c @@ -945,6 +945,23 @@ void __init pnv_pci_init(void) if (!firmware_has_feature(FW_FEATURE_OPAL)) return; +#ifdef CONFIG_PCIEPORTBUS + /* + * On PowerNV PCIe devices are (currently) managed in cooperation + * with firmware. This isn't *strictly* required, but there's enough + * assumptions baked into both firmware and the platform code that + * it's unwise to allow the portbus services to be used. + * + * We need to fix this eventually, but for now set this flag to disable + * the portbus driver. The AER service isn't required since that AER + * events are handled via EEH. The pciehp hotplug driver can't work + * without kernel changes (and portbus binding breaks pnv_php). The + * other services also require some thinking about how we're going + * to integrate them. + */ + pcie_ports_disabled = true; +#endif + /* Look for IODA IO-Hubs. */ for_each_compatible_node(np, NULL, "ibm,ioda-hub") { pnv_pci_init_ioda_hub(np);
On PowerNV the PCIe topology is (currently) managed by the powernv platform code in Linux in cooperation with the platform firmware. Linux's native PCIe port service drivers operate independently of both and this can cause problems. The main issue is that the portbus driver will conflict with the platform specific hotplug driver (pnv_php) over ownership of the MSI used to notify the host when a hotplug event occurs. The portbus driver claims this MSI on behalf of the individual port services because the same interrupt is used for hotplug events, PMEs (on root ports), and link bandwidth change notifications. The portbus driver will always claim the interrupt even if the individual port service drivers, such as pciehp, are compiled out. The second, bigger, problem is that the hotplug port service driver fundamentally does not work on PowerNV. The platform assumes that all PCI devices have a corresponding arch-specific handle derived from the DT node for the device (pci_dn) and without one the platform will not allow a PCI device to be enabled. This problem is largely due to historical baggage, but it can't be resolved without significant re-factoring of the platform PCI support. We can fix these problems in the interim by setting the "pcie_ports_disabled" flag during platform initialisation. The flag indicates the platform owns the PCIe ports which stops the portbus driver from being registered. This does have the side effect of disabling all port services drivers that is: AER, PME, BW notifications, hotplug, and DPC. However, this is not a huge disadvantage on PowerNV since these services are either unused or handled through other means. Cc: Sergey Miroshnichenko <s.miroshnichenko@yadro.com> Fixes: 66725152fb9f ("PCI/hotplug: PowerPC PowerNV PCI hotplug driver") Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- Sergey, just FYI. I'll try sort out the rest of the hotplug trainwreck in 5.6. The Fixes: here is for the patch that added pnv_php in 4.8. It's been a problem since then, but wasn't noticed until people started testing it after the EEH fixes in commit 799abe283e51 ("powerpc/eeh: Clean up EEH PEs after recovery finishes") went in earlier in the 5.4 cycle. --- v2: Moved setting the flag until after we check for OPAL support. No actual functional change since we've already probed the platform, but it looks neater. Re-wrote the commit message. --- arch/powerpc/platforms/powernv/pci.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)