powerpc/PCI: Add pcibios_device_change_notifier for powerpc
PATCH v2 1/2 powerpc/PCI: Add pcibios_device_change_notifier for powerpc
pcibios_setup_bus_devices which sets DMA and IRQs of PCI device is called only when boot, so DMA and IRQs of PCI device will not set when hotplug. This patch adds pcibios_device_change_notifier which sets DMA and IRQs of PCI device when PCI device adds, so DMA and IRQs of PCI device will be set when boot and hotplug.
* Not patched pciehp message on powerpc platform
# echo 1 > /sys/bus/pci/slots/1/power <snip> pcieport 0000:02:01.0: PCI bridge to [bus 03-03] pcieport 0000:02:01.0: bridge window [io 0xff7ee000-0xff7eefff] pcieport 0000:02:01.0: bridge window [mem 0xa0100000-0xa01fffff] pcieport 0000:02:01.0: bridge window [mem 0xa0200000-0xa02fffff 64bit pref] pci 0000:03:00.0: no hotplug settings from platform e1000e 0000:03:00.0: Disabling ASPM L1 e1000e 0000:03:00.0: enabling device (0000 -> 0002) e1000e 0000:03:00.0: No usable DMA configuration, aborting e1000e: probe of 0000:03:00.0 failed with error -5
* Patched pciehp message on powerpc platform
# echo 1 > /sys/bus/pci/slots/1/power <snip> pcieport 0000:02:01.0: PCI bridge to [bus 03-03] pcieport 0000:02:01.0: bridge window [io 0xff7ee000-0xff7eefff] pcieport 0000:02:01.0: bridge window [mem 0xa0100000-0xa01fffff] pcieport 0000:02:01.0: bridge window [mem 0xa0200000-0xa02fffff 64bit pref] pci 0000:03:00.0: no hotplug settings from platform e1000e 0000:03:00.0: Disabling ASPM L1 e1000e 0000:03:00.0: enabling device (0000 -> 0002) irq: irq 6 on host /soc@ffe00000/msi@41600 mapped to virtual irq 27 e1000e 0000:03:00.0: eth0: (PCI Express:2.5GT/s:Width x1) 00:15:17:bf:c0:c9 e1000e 0000:03:00.0: eth0: Intel(R) PRO/1000 Network Connection e1000e 0000:03:00.0: eth0: MAC: 1, PHY: 4, PBA No: D50861-003
--- arch/powerpc/include/asm/pci.h | 2 +- arch/powerpc/kernel/pci-common.c | 87 ++++++++++++++-------------- arch/powerpc/kernel/pci_32.c | 2 + arch/powerpc/kernel/pci_64.c | 2 + arch/powerpc/kernel/pci_of_scan.c | 1 - arch/powerpc/platforms/pseries/pci_dlpar.c | 1 - drivers/pci/pci.c | 5 -- drivers/pcmcia/cardbus.c | 3 +- include/linux/pci.h | 3 - 9 files changed, 49 insertions(+), 57 deletions(-)
arch/powerpc/include/asm/pci.h +1 -1
@@ -190,10 +190,10 @@ extern void pci_resource_to_user(const struct pci_dev *dev, int bar,const struct resource *rsrc, resource_size_t *start, resource_size_t *end); -extern void pcibios_setup_bus_devices (struct pci_bus *bus);extern void pcibios_setup_bus_self (struct pci_bus *bus);extern void pcibios_setup_phb_io_space (struct pci_controller *hose);extern void pcibios_scan_phb (struct pci_controller *hose); +extern void pcibios_setup_bus_notifier (void );#endif /* __KERNEL__ */ #endif /* __ASM_POWERPC_PCI_H */
arch/powerpc/kernel/pci-common.c +43 -44
108 lines not on this page · raw message
arch/powerpc/kernel/pci_32.c +2 -0
@@ -231,6 +231,8 @@ static int __init pcibios_init(void)printk (KERN_INFO "PCI: Probing PCI hardware\n" ); +pcibios_setup_bus_notifier (); +if (pci_has_flag (PCI_REASSIGN_ALL_BUS )) pci_assign_all_buses =1 ;
arch/powerpc/kernel/pci_64.c +2 -0
@@ -50,6 +50,8 @@ static int __init pcibios_init(void)printk (KERN_INFO "PCI: Probing PCI hardware\n" ); +pcibios_setup_bus_notifier (); +/* For now, override phys_mem_access_prot. If we need it,g * later, we may move that initialization to each ppc_md */
arch/powerpc/kernel/pci_of_scan.c +0 -1
@@ -329,7 +329,6 @@ static void __devinit __of_scan_bus(struct device_node *node,*/ if (!rescan_existing)pcibios_setup_bus_self (bus); -pcibios_setup_bus_devices (bus);/* Now scan child busses */ list_for_each_entry (dev, &bus->devices, bus_list) {
arch/powerpc/platforms/pseries/pci_dlpar.c +0 -1
@@ -120,7 +120,6 @@ void pcibios_add_pci_devices(struct pci_bus * bus) num =pci_scan_slot (bus,PCI_DEVFN (slotno,0 ));if (!num)return ; -pcibios_setup_bus_devices (bus); max = bus->secondary;for (pass=0 ; pass <2 ; pass++)list_for_each_entry (dev, &bus->devices, bus_list) {
drivers/pci/pci.c +0 -5
@@ -3698,11 +3698,6 @@ int __attribute__ ((weak)) pci_ext_cfg_avail(struct pci_dev *dev)return 1 ; } -void __weak pci_fixup_cardbus (struct pci_bus *bus) -{ -} -EXPORT_SYMBOL (pci_fixup_cardbus); -static int __init pci_setup (char *str) {while (str) {
drivers/pcmcia/cardbus.c +1 -2
@@ -71,7 +71,6 @@ int __ref cb_alloc(struct pcmcia_socket *s)unsigned int max, pass; s->functions =pci_scan_slot (bus,PCI_DEVFN (0 ,0 )); -pci_fixup_cardbus (bus); max = bus->secondary;for (pass =0 ; pass <2 ; pass++)
@@ -85,7 +84,6 @@ int __ref cb_alloc(struct pcmcia_socket *s)*/ pci_bus_size_bridges (bus);pci_bus_assign_resources (bus); -cardbus_config_irq_and_cls (bus, s->pci_irq);/* socket specific tune function */ if (s->tune_bridge)
@@ -93,6 +91,7 @@ int __ref cb_alloc(struct pcmcia_socket *s)pci_enable_bridges (bus);pci_bus_add_devices (bus); +cardbus_config_irq_and_cls (bus, s->pci_irq);return 0 ; }
include/linux/pci.h +0 -3
@@ -651,9 +651,6 @@ resource_size_t pcibios_align_resource(void *, const struct resource *, resource_size_t);void pcibios_update_irq (struct pci_dev *,int irq); -/* Weak but can be overriden by arch */ -void pci_fixup_cardbus (struct pci_bus *); -/* Generic PCI functions used internally */ void pcibios_scan_specific_bus (int busn);
Signature · 1 line
1.7.3.4
arch/powerpc/kernel/pci-common.c void __devinit pcibios_scan_phb(struct pci_controller *hose) · line 1726
Quoted 5 lines · Hiroo Matsumoto
arch/powerpc/kernel/pci-common.c +5
-0+static int pcibios_device_change_notifier (struct notifier_block *nb, +unsigned long action,void *data) +{ +struct pci_dev *dev =to_pci_dev (data); +
In the general case, we don't know what *data contains until we evaluate 'action'. This conversion should probably be moved inside the case:
statement.
Quoted 22 lines
arch/powerpc/kernel/pci-common.c +22
-0+switch (action) { +case BUS_NOTIFY_ADD_DEVICE : +/* Setup OF node pointer in the device */ + dev->dev.of_node =pci_device_to_OF_node (dev); + +/* Fixup NUMA node as it may not be setup yet by the generic +* code and is needed by the DMA init +*/ +set_dev_node (&dev->dev,pcibus_to_node (dev->bus)); + +/* Hook up default DMA ops */ +set_dma_ops (&dev->dev, pci_dma_ops); +set_dma_offset (&dev->dev,PCI_DRAM_OFFSET ); + +/* Additional platform DMA/iommu setup */ +if (ppc_md.pci_dma_dev_setup) + ppc_md.pci_dma_dev_setup (dev); + +/* Read default IRQs and fixup if necessary */ +pci_read_irq_line (dev); +if (ppc_md.pci_irq_fixup) + ppc_md.pci_irq_fixup (dev);
arch/powerpc/kernel/pci-common.c void __devinit pcibios_scan_phb(struct pci_controller *hose) · line 1758
Quoted 10 lines
arch/powerpc/kernel/pci-common.c +10
-0+ +break ; + } + +return 0 ; +} + +static struct notifier_block device_nb = { + .notifier_call = pcibios_device_change_notifier, +};
This is just a nit pick, but I think the naming of pcibios_device_change_notifier() is a bit misleading. It doesn't actually notify anything, but instead it *handles* notifications. Perhaps a better name would be pcibios_device_change_handler() or pcibios_device_change_callback()?
Sincerely,
Jesse Larrew
Software Engineer, Linux on Power Kernel Team
IBM Linux Technology Center
Phone: (512) 973-2052 (T/L: 363-2052)
[email protected]
Bjorn Helgaas
maintainerQuoted 13 lines · Jesse Larrew
arch/powerpc/kernel/pci-common.c void __devinit pcibios_scan_phb(struct pci_controller *hose) · line 1726
Quoted 5 lines · Hiroo Matsumoto
arch/powerpc/kernel/pci-common.c +5
-0+static int pcibios_device_change_notifier (struct notifier_block *nb, + unsigned long action, void *data) +{ + struct pci_dev *dev = to_pci_dev(data); +In the general case, we don't know what *data contains until we evaluate 'action'. This conversion should probably be moved inside the case:
statement.
We registered it with "bus_register_notifier(&pci_bus_type, ...)" and every user of the bus_notifier change passes a "struct device *", so I think we do know that we have a PCI device.
A future bus_notifier user *could* pass something other than a "struct device *", but the pattern Hiroo used here ("struct pci_dev *dev = to_pci_dev(data);" before looking at "action") seems pretty common, so I don't think it's likely.
Quoted 35 lines
Quoted 22 lines
+ switch (action) {
+ caseBUS_NOTIFY_ADD_DEVICE:
+ /* Setup OF node pointer in the device */
+dev->dev.of_node=pci_device_to_OF_node(dev);arch/powerpc/kernel/pci-common.c +18
-0+ + /* Fixup NUMA node as it may not be setup yet by the generic + * code and is needed by the DMA init + */ + set_dev_node(&dev->dev, pcibus_to_node(dev->bus)); + + /* Hook up default DMA ops */ + set_dma_ops(&dev->dev, pci_dma_ops); + set_dma_offset(&dev->dev, PCI_DRAM_OFFSET); + + /* Additional platform DMA/iommu setup */ + if (ppc_md.pci_dma_dev_setup) + ppc_md.pci_dma_dev_setup(dev); + + /* Read default IRQs and fixup if necessary */ + pci_read_irq_line(dev); + if (ppc_md.pci_irq_fixup) + ppc_md.pci_irq_fixup(dev);arch/powerpc/kernel/pci-common.c void __devinit pcibios_scan_phb(struct pci_controller *hose) · line 1758
Quoted 10 lines
arch/powerpc/kernel/pci-common.c +10
-0+ + break; + } + + return 0; +} + +static struct notifier_block device_nb = { + .notifier_call = pcibios_device_change_notifier, +};
Quoted 5 lines
This is just a nit pick, but I think the naming of
pcibios_device_change_notifier()is a bit misleading. It doesn't actually notify anything, but instead it *handles* notifications. Perhaps a better name would bepcibios_device_change_handler()orpcibios_device_change_callback()?
Good point. "_notify()" seems to be a common name, how about pci_bus_notify()? It's static to the file, so it doesn't have to be very unique.
I happened to be merging these patches just now, so I'll make this change provisionally, pending any more discussion.
Thanks a lot for reviewing this!
Bjorn