Re: [PATCH v8 24/45] powerpc/pci: Rename pcibios_{add,remove}_pci_devices()
On 04/20/2016 11:23 AM, Gavin Shan wrote: On Tue, Apr 19, 2016 at 03:28:36PM +1000, Alexey Kardashevskiy wrote: On 02/17/2016 02:44 PM, Gavin Shan wrote: This renames pcibios_{add,remove}_pci_devices() to avoid conflicts with names of the weak functions in PCI subsystem, which have the prefix "pcibios". No logical changes introduced. Signed-off-by: Gavin Shan--- arch/powerpc/include/asm/pci-bridge.h | 4 ++-- arch/powerpc/kernel/eeh_driver.c | 12 ++-- arch/powerpc/kernel/pci-hotplug.c | 15 +++ drivers/pci/hotplug/rpadlpar_core.c | 2 +- drivers/pci/hotplug/rpaphp_core.c | 4 ++-- drivers/pci/hotplug/rpaphp_pci.c | 2 +- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index 4dd6ef4..c817f38 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h @@ -263,10 +263,10 @@ static inline struct eeh_dev *pdn_to_eeh_dev(struct pci_dn *pdn) extern struct pci_bus *pcibios_find_pci_bus(struct device_node *dn); /** Remove all of the PCI devices under this bus */ -extern void pcibios_remove_pci_devices(struct pci_bus *bus); +extern void pci_remove_pci_devices(struct pci_bus *bus); pci_lala_pci_lala() ("pci" is used twice) looks weird, if the prefix is "pci", what other device types can they handle?... May be pcihp_add_devices(), pcihp_remove_devices() as these as defined in pci-hotplug.c? I assume you're talking about drivers/pci/hotplug/pci_hotplug_core.c. No, the helpers you are renaming are in pci-hotplug.c which uses "pci_" as a prefix even though the file is supposed to be about hotplug. pci_hotplug_core.c uses pci_hp_ prefix rather than pcihp_. I will rename them to pci_hp_*() in next revision. Anyway, this will work too. gwshan@gwshan:~/sandbox/linux$ find . -name pci-hotplug.c ./arch/powerpc/kernel/pci-hotplug.c gwshan@gwshan:~/sandbox/linux$ grep pci*hp arch/powerpc/kernel/pci-hotplug.c /** Discover new pci devices under this bus, and add them */ -extern void pcibios_add_pci_devices(struct pci_bus *bus); +extern void pci_add_pci_devices(struct pci_bus *bus); extern void isa_bridge_find_early(struct pci_controller *hose); diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c index fb6207d..59e53fe 100644 --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c @@ -621,7 +621,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, * We don't remove the corresponding PE instances because * we need the information afterwords. The attached EEH * devices are expected to be attached soon when calling -* into pcibios_add_pci_devices(). +* into pci_add_pci_devices(). */ eeh_pe_state_mark(pe, EEH_PE_KEEP); if (bus) { @@ -630,7 +630,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, } else { eeh_pe_state_clear(pe, EEH_PE_PRI_BUS); pci_lock_rescan_remove(); - pcibios_remove_pci_devices(bus); + pci_remove_pci_devices(bus); pci_unlock_rescan_remove(); } } else if (frozen_bus) { @@ -681,7 +681,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, if (pe->type & EEH_PE_VF) eeh_add_virt_device(edev, NULL); else - pcibios_add_pci_devices(bus); + pci_add_pci_devices(bus); } else if (frozen_bus && rmv_data->removed) { pr_info("EEH: Sleep 5s ahead of partial hotplug\n"); ssleep(5); @@ -691,7 +691,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, if (pe->type & EEH_PE_VF) eeh_add_virt_device(edev, NULL); else - pcibios_add_pci_devices(frozen_bus); + pci_add_pci_devices(frozen_bus); } eeh_pe_state_clear(pe, EEH_PE_KEEP); @@ -896,7 +896,7 @@ perm_error: eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED); pci_lock_rescan_remove(); - pcibios_remove_pci_devices(frozen_bus); + pci_remove_pci_devices(frozen_bus); pci_unlock_rescan_remove(); } } @@ -981,7 +981,7 @@ static void eeh_handle_special_event(void) bus = eeh_pe_bus_get(phb_pe); eeh_pe_dev_traverse(pe, eeh_report_failure, NULL); - pcibios_remove_pci_devices(bus); + pci_remove_pci_devices(bus); }
Re: [PATCH v8 24/45] powerpc/pci: Rename pcibios_{add,remove}_pci_devices()
On Tue, Apr 19, 2016 at 03:28:36PM +1000, Alexey Kardashevskiy wrote: >On 02/17/2016 02:44 PM, Gavin Shan wrote: >>This renames pcibios_{add,remove}_pci_devices() to avoid conflicts >>with names of the weak functions in PCI subsystem, which have the >>prefix "pcibios". No logical changes introduced. >> >>Signed-off-by: Gavin Shan>>--- >> arch/powerpc/include/asm/pci-bridge.h | 4 ++-- >> arch/powerpc/kernel/eeh_driver.c | 12 ++-- >> arch/powerpc/kernel/pci-hotplug.c | 15 +++ >> drivers/pci/hotplug/rpadlpar_core.c | 2 +- >> drivers/pci/hotplug/rpaphp_core.c | 4 ++-- >> drivers/pci/hotplug/rpaphp_pci.c | 2 +- >> 6 files changed, 19 insertions(+), 20 deletions(-) >> >>diff --git a/arch/powerpc/include/asm/pci-bridge.h >>b/arch/powerpc/include/asm/pci-bridge.h >>index 4dd6ef4..c817f38 100644 >>--- a/arch/powerpc/include/asm/pci-bridge.h >>+++ b/arch/powerpc/include/asm/pci-bridge.h >>@@ -263,10 +263,10 @@ static inline struct eeh_dev *pdn_to_eeh_dev(struct >>pci_dn *pdn) >> extern struct pci_bus *pcibios_find_pci_bus(struct device_node *dn); >> >> /** Remove all of the PCI devices under this bus */ >>-extern void pcibios_remove_pci_devices(struct pci_bus *bus); >>+extern void pci_remove_pci_devices(struct pci_bus *bus); > > >pci_lala_pci_lala() ("pci" is used twice) looks weird, if the prefix is >"pci", what other device types can they handle?... > >May be pcihp_add_devices(), pcihp_remove_devices() as these as defined in >pci-hotplug.c? > I assume you're talking about drivers/pci/hotplug/pci_hotplug_core.c. pci_hotplug_core.c uses pci_hp_ prefix rather than pcihp_. I will rename them to pci_hp_*() in next revision. gwshan@gwshan:~/sandbox/linux$ find . -name pci-hotplug.c ./arch/powerpc/kernel/pci-hotplug.c gwshan@gwshan:~/sandbox/linux$ grep pci*hp arch/powerpc/kernel/pci-hotplug.c > >> >> /** Discover new pci devices under this bus, and add them */ >>-extern void pcibios_add_pci_devices(struct pci_bus *bus); >>+extern void pci_add_pci_devices(struct pci_bus *bus); >> >> >> extern void isa_bridge_find_early(struct pci_controller *hose); >>diff --git a/arch/powerpc/kernel/eeh_driver.c >>b/arch/powerpc/kernel/eeh_driver.c >>index fb6207d..59e53fe 100644 >>--- a/arch/powerpc/kernel/eeh_driver.c >>+++ b/arch/powerpc/kernel/eeh_driver.c >>@@ -621,7 +621,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct >>pci_bus *bus, >> * We don't remove the corresponding PE instances because >> * we need the information afterwords. The attached EEH >> * devices are expected to be attached soon when calling >>- * into pcibios_add_pci_devices(). >>+ * into pci_add_pci_devices(). >> */ >> eeh_pe_state_mark(pe, EEH_PE_KEEP); >> if (bus) { >>@@ -630,7 +630,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct >>pci_bus *bus, >> } else { >> eeh_pe_state_clear(pe, EEH_PE_PRI_BUS); >> pci_lock_rescan_remove(); >>- pcibios_remove_pci_devices(bus); >>+ pci_remove_pci_devices(bus); >> pci_unlock_rescan_remove(); >> } >> } else if (frozen_bus) { >>@@ -681,7 +681,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct >>pci_bus *bus, >> if (pe->type & EEH_PE_VF) >> eeh_add_virt_device(edev, NULL); >> else >>- pcibios_add_pci_devices(bus); >>+ pci_add_pci_devices(bus); >> } else if (frozen_bus && rmv_data->removed) { >> pr_info("EEH: Sleep 5s ahead of partial hotplug\n"); >> ssleep(5); >>@@ -691,7 +691,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct >>pci_bus *bus, >> if (pe->type & EEH_PE_VF) >> eeh_add_virt_device(edev, NULL); >> else >>- pcibios_add_pci_devices(frozen_bus); >>+ pci_add_pci_devices(frozen_bus); >> } >> eeh_pe_state_clear(pe, EEH_PE_KEEP); >> >>@@ -896,7 +896,7 @@ perm_error: >> eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED); >> >> pci_lock_rescan_remove(); >>- pcibios_remove_pci_devices(frozen_bus); >>+ pci_remove_pci_devices(frozen_bus); >> pci_unlock_rescan_remove(); >> } >> } >>@@ -981,7 +981,7 @@ static void eeh_handle_special_event(void) >> bus = eeh_pe_bus_get(phb_pe); >> eeh_pe_dev_traverse(pe, >> eeh_report_failure, NULL); >>- pcibios_remove_pci_devices(bus); >>+ pci_remove_pci_devices(bus); >> } >> pci_unlock_rescan_remove(); >> } >>diff --git a/arch/powerpc/kernel/pci-hotplug.c
Re: [PATCH v8 24/45] powerpc/pci: Rename pcibios_{add,remove}_pci_devices()
On 02/17/2016 02:44 PM, Gavin Shan wrote: This renames pcibios_{add,remove}_pci_devices() to avoid conflicts with names of the weak functions in PCI subsystem, which have the prefix "pcibios". No logical changes introduced. Signed-off-by: Gavin Shan--- arch/powerpc/include/asm/pci-bridge.h | 4 ++-- arch/powerpc/kernel/eeh_driver.c | 12 ++-- arch/powerpc/kernel/pci-hotplug.c | 15 +++ drivers/pci/hotplug/rpadlpar_core.c | 2 +- drivers/pci/hotplug/rpaphp_core.c | 4 ++-- drivers/pci/hotplug/rpaphp_pci.c | 2 +- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index 4dd6ef4..c817f38 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h @@ -263,10 +263,10 @@ static inline struct eeh_dev *pdn_to_eeh_dev(struct pci_dn *pdn) extern struct pci_bus *pcibios_find_pci_bus(struct device_node *dn); /** Remove all of the PCI devices under this bus */ -extern void pcibios_remove_pci_devices(struct pci_bus *bus); +extern void pci_remove_pci_devices(struct pci_bus *bus); pci_lala_pci_lala() ("pci" is used twice) looks weird, if the prefix is "pci", what other device types can they handle?... May be pcihp_add_devices(), pcihp_remove_devices() as these as defined in pci-hotplug.c? /** Discover new pci devices under this bus, and add them */ -extern void pcibios_add_pci_devices(struct pci_bus *bus); +extern void pci_add_pci_devices(struct pci_bus *bus); extern void isa_bridge_find_early(struct pci_controller *hose); diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c index fb6207d..59e53fe 100644 --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c @@ -621,7 +621,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, * We don't remove the corresponding PE instances because * we need the information afterwords. The attached EEH * devices are expected to be attached soon when calling -* into pcibios_add_pci_devices(). +* into pci_add_pci_devices(). */ eeh_pe_state_mark(pe, EEH_PE_KEEP); if (bus) { @@ -630,7 +630,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, } else { eeh_pe_state_clear(pe, EEH_PE_PRI_BUS); pci_lock_rescan_remove(); - pcibios_remove_pci_devices(bus); + pci_remove_pci_devices(bus); pci_unlock_rescan_remove(); } } else if (frozen_bus) { @@ -681,7 +681,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, if (pe->type & EEH_PE_VF) eeh_add_virt_device(edev, NULL); else - pcibios_add_pci_devices(bus); + pci_add_pci_devices(bus); } else if (frozen_bus && rmv_data->removed) { pr_info("EEH: Sleep 5s ahead of partial hotplug\n"); ssleep(5); @@ -691,7 +691,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, if (pe->type & EEH_PE_VF) eeh_add_virt_device(edev, NULL); else - pcibios_add_pci_devices(frozen_bus); + pci_add_pci_devices(frozen_bus); } eeh_pe_state_clear(pe, EEH_PE_KEEP); @@ -896,7 +896,7 @@ perm_error: eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED); pci_lock_rescan_remove(); - pcibios_remove_pci_devices(frozen_bus); + pci_remove_pci_devices(frozen_bus); pci_unlock_rescan_remove(); } } @@ -981,7 +981,7 @@ static void eeh_handle_special_event(void) bus = eeh_pe_bus_get(phb_pe); eeh_pe_dev_traverse(pe, eeh_report_failure, NULL); - pcibios_remove_pci_devices(bus); + pci_remove_pci_devices(bus); } pci_unlock_rescan_remove(); } diff --git a/arch/powerpc/kernel/pci-hotplug.c b/arch/powerpc/kernel/pci-hotplug.c index 59c4361..78bf2a1 100644 --- a/arch/powerpc/kernel/pci-hotplug.c +++ b/arch/powerpc/kernel/pci-hotplug.c @@ -38,20 +38,20 @@ void pcibios_release_device(struct pci_dev *dev) } /** - * pcibios_remove_pci_devices - remove all devices under this bus + * pci_remove_pci_devices - remove all devices under this bus * @bus: the indicated PCI bus * * Remove all of the PCI devices under this bus both from the * linux pci device tree, and from the powerpc EEH address cache. */ -void
[PATCH v8 24/45] powerpc/pci: Rename pcibios_{add, remove}_pci_devices()
This renames pcibios_{add,remove}_pci_devices() to avoid conflicts with names of the weak functions in PCI subsystem, which have the prefix "pcibios". No logical changes introduced. Signed-off-by: Gavin Shan--- arch/powerpc/include/asm/pci-bridge.h | 4 ++-- arch/powerpc/kernel/eeh_driver.c | 12 ++-- arch/powerpc/kernel/pci-hotplug.c | 15 +++ drivers/pci/hotplug/rpadlpar_core.c | 2 +- drivers/pci/hotplug/rpaphp_core.c | 4 ++-- drivers/pci/hotplug/rpaphp_pci.c | 2 +- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index 4dd6ef4..c817f38 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h @@ -263,10 +263,10 @@ static inline struct eeh_dev *pdn_to_eeh_dev(struct pci_dn *pdn) extern struct pci_bus *pcibios_find_pci_bus(struct device_node *dn); /** Remove all of the PCI devices under this bus */ -extern void pcibios_remove_pci_devices(struct pci_bus *bus); +extern void pci_remove_pci_devices(struct pci_bus *bus); /** Discover new pci devices under this bus, and add them */ -extern void pcibios_add_pci_devices(struct pci_bus *bus); +extern void pci_add_pci_devices(struct pci_bus *bus); extern void isa_bridge_find_early(struct pci_controller *hose); diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c index fb6207d..59e53fe 100644 --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c @@ -621,7 +621,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, * We don't remove the corresponding PE instances because * we need the information afterwords. The attached EEH * devices are expected to be attached soon when calling -* into pcibios_add_pci_devices(). +* into pci_add_pci_devices(). */ eeh_pe_state_mark(pe, EEH_PE_KEEP); if (bus) { @@ -630,7 +630,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, } else { eeh_pe_state_clear(pe, EEH_PE_PRI_BUS); pci_lock_rescan_remove(); - pcibios_remove_pci_devices(bus); + pci_remove_pci_devices(bus); pci_unlock_rescan_remove(); } } else if (frozen_bus) { @@ -681,7 +681,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, if (pe->type & EEH_PE_VF) eeh_add_virt_device(edev, NULL); else - pcibios_add_pci_devices(bus); + pci_add_pci_devices(bus); } else if (frozen_bus && rmv_data->removed) { pr_info("EEH: Sleep 5s ahead of partial hotplug\n"); ssleep(5); @@ -691,7 +691,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, if (pe->type & EEH_PE_VF) eeh_add_virt_device(edev, NULL); else - pcibios_add_pci_devices(frozen_bus); + pci_add_pci_devices(frozen_bus); } eeh_pe_state_clear(pe, EEH_PE_KEEP); @@ -896,7 +896,7 @@ perm_error: eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED); pci_lock_rescan_remove(); - pcibios_remove_pci_devices(frozen_bus); + pci_remove_pci_devices(frozen_bus); pci_unlock_rescan_remove(); } } @@ -981,7 +981,7 @@ static void eeh_handle_special_event(void) bus = eeh_pe_bus_get(phb_pe); eeh_pe_dev_traverse(pe, eeh_report_failure, NULL); - pcibios_remove_pci_devices(bus); + pci_remove_pci_devices(bus); } pci_unlock_rescan_remove(); } diff --git a/arch/powerpc/kernel/pci-hotplug.c b/arch/powerpc/kernel/pci-hotplug.c index 59c4361..78bf2a1 100644 --- a/arch/powerpc/kernel/pci-hotplug.c +++ b/arch/powerpc/kernel/pci-hotplug.c @@ -38,20 +38,20 @@ void pcibios_release_device(struct pci_dev *dev) } /** - * pcibios_remove_pci_devices - remove all devices under this bus + * pci_remove_pci_devices - remove all devices under this bus * @bus: the indicated PCI bus * * Remove all of the PCI devices under this bus both from the * linux pci device tree, and from the powerpc EEH address cache. */ -void pcibios_remove_pci_devices(struct pci_bus *bus) +void pci_remove_pci_devices(struct pci_bus *bus) { struct pci_dev *dev, *tmp; struct pci_bus *child_bus; /* First go down child busses */ list_for_each_entry(child_bus, >children, node) -