Commit 7dd4746d authored by Paul Mackerras's avatar Paul Mackerras Committed by Linus Torvalds

[PATCH] ppc64: pci_dn cleanups

This patch just cleans up arch/ppc64/kernel/pci_dn.c a bit, including:
	- remove it from the iSeries build completely
	- small changes to Makefile
	- remove the "post" parameter from traverse_pci_devices as
	  noone used it
	- make traverse_all_pci_devices static
	- remove CONFIG_PPC_PSERIES tests as we no longer build for iSeries
	- some reformatting (closer to "standard")
	- remove some of pointer casts

This has been built (with default config) on pSeries and pmac and built and
run on iSeries.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 660d0f29
...@@ -15,14 +15,11 @@ obj-y := setup.o entry.o traps.o irq.o idle.o dma.o \ ...@@ -15,14 +15,11 @@ obj-y := setup.o entry.o traps.o irq.o idle.o dma.o \
obj-$(CONFIG_PPC_OF) += of_device.o obj-$(CONFIG_PPC_OF) += of_device.o
obj-$(CONFIG_PCI) += pci.o pci_dn.o pci_iommu.o pci-obj-$(CONFIG_PPC_ISERIES) += iSeries_pci.o iSeries_pci_reset.o \
ifdef CONFIG_PPC_ISERIES
obj-$(CONFIG_PCI) += iSeries_pci.o iSeries_pci_reset.o \
iSeries_IoMmTable.o iSeries_IoMmTable.o
else pci-obj-$(CONFIG_PPC_PSERIES) += pci_dn.o pci_dma_direct.o
obj-$(CONFIG_PCI) += pci_dma_direct.o
endif obj-$(CONFIG_PCI) += pci.o pci_iommu.o $(pci-obj-y)
obj-$(CONFIG_PPC_ISERIES) += iSeries_irq.o \ obj-$(CONFIG_PPC_ISERIES) += iSeries_irq.o \
iSeries_VpdInfo.o XmPciLpEvent.o \ iSeries_VpdInfo.o XmPciLpEvent.o \
......
...@@ -618,7 +618,7 @@ void __init eeh_init(void) ...@@ -618,7 +618,7 @@ void __init eeh_init(void)
info.buid_lo = BUID_LO(buid); info.buid_lo = BUID_LO(buid);
info.buid_hi = BUID_HI(buid); info.buid_hi = BUID_HI(buid);
traverse_pci_devices(phb, early_enable_eeh, NULL, &info); traverse_pci_devices(phb, early_enable_eeh, &info);
} }
if (eeh_subsystem_enabled) { if (eeh_subsystem_enabled) {
......
...@@ -34,8 +34,8 @@ extern struct pci_dev *ppc64_isabridge_dev; /* may be NULL if no ISA bus */ ...@@ -34,8 +34,8 @@ extern struct pci_dev *ppc64_isabridge_dev; /* may be NULL if no ISA bus */
*******************************************************************/ *******************************************************************/
struct device_node; struct device_node;
typedef void *(*traverse_func)(struct device_node *me, void *data); typedef void *(*traverse_func)(struct device_node *me, void *data);
void *traverse_pci_devices(struct device_node *start, traverse_func pre, traverse_func post, void *data); void *traverse_pci_devices(struct device_node *start, traverse_func pre,
void *traverse_all_pci_devices(traverse_func pre); void *data);
void pci_devs_phb_init(void); void pci_devs_phb_init(void);
void pci_fix_bus_sysdata(void); void pci_fix_bus_sysdata(void);
......
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <linux/config.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -40,20 +38,20 @@ ...@@ -40,20 +38,20 @@
#include "pci.h" #include "pci.h"
/* Traverse_func that inits the PCI fields of the device node. /*
* Traverse_func that inits the PCI fields of the device node.
* NOTE: this *must* be done before read/write config to the device. * NOTE: this *must* be done before read/write config to the device.
*/ */
static void * __init static void * __init update_dn_pci_info(struct device_node *dn, void *data)
update_dn_pci_info(struct device_node *dn, void *data)
{ {
#ifdef CONFIG_PPC_PSERIES struct pci_controller *phb = data;
struct pci_controller *phb = (struct pci_controller *)data;
u32 *regs; u32 *regs;
char *device_type = get_property(dn, "device_type", NULL); char *device_type = get_property(dn, "device_type", NULL);
char *model; char *model;
dn->phb = phb; dn->phb = phb;
if (device_type && strcmp(device_type, "pci") == 0 && get_property(dn, "class-code", NULL) == 0) { if (device_type && (strcmp(device_type, "pci") == 0) &&
(get_property(dn, "class-code", NULL) == 0)) {
/* special case for PHB's. Sigh. */ /* special case for PHB's. Sigh. */
regs = (u32 *)get_property(dn, "bus-range", NULL); regs = (u32 *)get_property(dn, "bus-range", NULL);
dn->busno = regs[0]; dn->busno = regs[0];
...@@ -72,57 +70,47 @@ update_dn_pci_info(struct device_node *dn, void *data) ...@@ -72,57 +70,47 @@ update_dn_pci_info(struct device_node *dn, void *data)
dn->devfn = (regs[0] >> 8) & 0xff; dn->devfn = (regs[0] >> 8) & 0xff;
} }
} }
#endif
return NULL; return NULL;
} }
/****************************************************************** /*
* Traverse a device tree stopping each PCI device in the tree. * Traverse a device tree stopping each PCI device in the tree.
* This is done depth first. As each node is processed, a "pre" * This is done depth first. As each node is processed, a "pre"
* function is called, the children are processed recursively, and * function is called and the children are processed recursively.
* then a "post" function is called.
* *
* The "pre" and "post" funcs return a value. If non-zero * The "pre" func returns a value. If non-zero is returned from
* is returned from the "pre" func, the traversal stops and this * the "pre" func, the traversal stops and this value is returned.
* value is returned. The return value from "post" is not used. * This return value is useful when using traverse as a method of
* This return value is useful when using traverse as * finding a device.
* a method of finding a device.
* *
* NOTE: we do not run the funcs for devices that do not appear to * NOTE: we do not run the func for devices that do not appear to
* be PCI except for the start node which we assume (this is good * be PCI except for the start node which we assume (this is good
* because the start node is often a phb which may be missing PCI * because the start node is often a phb which may be missing PCI
* properties). * properties).
* We use the class-code as an indicator. If we run into * We use the class-code as an indicator. If we run into
* one of these nodes we also assume its siblings are non-pci for * one of these nodes we also assume its siblings are non-pci for
* performance. * performance.
* */
******************************************************************/ void *traverse_pci_devices(struct device_node *start, traverse_func pre,
void *traverse_pci_devices(struct device_node *start, traverse_func pre, traverse_func post, void *data) void *data)
{ {
struct device_node *dn, *nextdn; struct device_node *dn, *nextdn;
void *ret; void *ret;
if (pre && (ret = pre(start, data)) != NULL) if (pre && ((ret = pre(start, data)) != NULL))
return ret; return ret;
for (dn = start->child; dn; dn = nextdn) { for (dn = start->child; dn; dn = nextdn) {
nextdn = NULL; nextdn = NULL;
#ifdef CONFIG_PPC_PSERIES
if (get_property(dn, "class-code", NULL)) { if (get_property(dn, "class-code", NULL)) {
if (pre && (ret = pre(dn, data)) != NULL) if (pre && ((ret = pre(dn, data)) != NULL))
return ret; return ret;
if (dn->child) { if (dn->child)
/* Depth first...do children */ /* Depth first...do children */
nextdn = dn->child; nextdn = dn->child;
} else if (dn->sibling) { else if (dn->sibling)
/* ok, try next sibling instead. */ /* ok, try next sibling instead. */
nextdn = dn->sibling; nextdn = dn->sibling;
} else {
/* no more children or siblings...call "post" */
if (post)
post(dn, data);
} }
}
#endif
if (!nextdn) { if (!nextdn) {
/* Walk up to next valid sibling. */ /* Walk up to next valid sibling. */
do { do {
...@@ -136,31 +124,35 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre, travers ...@@ -136,31 +124,35 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre, travers
return NULL; return NULL;
} }
/* Same as traverse_pci_devices except this does it for all phbs. /*
* Same as traverse_pci_devices except this does it for all phbs.
*/ */
void *traverse_all_pci_devices(traverse_func pre) static void *traverse_all_pci_devices(traverse_func pre)
{ {
struct pci_controller* phb; struct pci_controller *phb;
void *ret; void *ret;
for (phb=hose_head;phb;phb=phb->next)
if ((ret = traverse_pci_devices((struct device_node *)phb->arch_data, pre, NULL, phb)) != NULL) for (phb = hose_head; phb; phb = phb->next)
if ((ret = traverse_pci_devices(phb->arch_data, pre, phb))
!= NULL)
return ret; return ret;
return NULL; return NULL;
} }
/* Traversal func that looks for a <busno,devfcn> value. /*
* Traversal func that looks for a <busno,devfcn> value.
* If found, the device_node is returned (thus terminating the traversal). * If found, the device_node is returned (thus terminating the traversal).
*/ */
static void * static void *is_devfn_node(struct device_node *dn, void *data)
is_devfn_node(struct device_node *dn, void *data)
{ {
int busno = ((unsigned long)data >> 8) & 0xff; int busno = ((unsigned long)data >> 8) & 0xff;
int devfn = ((unsigned long)data) & 0xff; int devfn = ((unsigned long)data) & 0xff;
return (devfn == dn->devfn && busno == dn->busno) ? dn : NULL; return ((devfn == dn->devfn) && (busno == dn->busno)) ? dn : NULL;
} }
/* This is the "slow" path for looking up a device_node from a /*
* This is the "slow" path for looking up a device_node from a
* pci_dev. It will hunt for the device under its parent's * pci_dev. It will hunt for the device under its parent's
* phb and then update sysdata for a future fastpath. * phb and then update sysdata for a future fastpath.
* *
...@@ -174,14 +166,14 @@ is_devfn_node(struct device_node *dn, void *data) ...@@ -174,14 +166,14 @@ is_devfn_node(struct device_node *dn, void *data)
*/ */
struct device_node *fetch_dev_dn(struct pci_dev *dev) struct device_node *fetch_dev_dn(struct pci_dev *dev)
{ {
struct device_node *orig_dn = (struct device_node *)dev->sysdata; struct device_node *orig_dn = dev->sysdata;
struct pci_controller *phb = orig_dn->phb; /* assume same phb as orig_dn */ struct pci_controller *phb = orig_dn->phb; /* assume same phb as orig_dn */
struct device_node *phb_dn; struct device_node *phb_dn;
struct device_node *dn; struct device_node *dn;
unsigned long searchval = (dev->bus->number << 8) | dev->devfn; unsigned long searchval = (dev->bus->number << 8) | dev->devfn;
phb_dn = (struct device_node *)(phb->arch_data); phb_dn = phb->arch_data;
dn = (struct device_node *)traverse_pci_devices(phb_dn, is_devfn_node, NULL, (void *)searchval); dn = traverse_pci_devices(phb_dn, is_devfn_node, (void *)searchval);
if (dn) { if (dn) {
dev->sysdata = dn; dev->sysdata = dn;
/* ToDo: call some device init hook here */ /* ToDo: call some device init hook here */
...@@ -191,25 +183,23 @@ struct device_node *fetch_dev_dn(struct pci_dev *dev) ...@@ -191,25 +183,23 @@ struct device_node *fetch_dev_dn(struct pci_dev *dev)
EXPORT_SYMBOL(fetch_dev_dn); EXPORT_SYMBOL(fetch_dev_dn);
/****************************************************************** /*
* Actually initialize the phbs. * Actually initialize the phbs.
* The buswalk on this phb has not happened yet. * The buswalk on this phb has not happened yet.
******************************************************************/ */
void __init void __init pci_devs_phb_init(void)
pci_devs_phb_init(void)
{ {
/* This must be done first so the device nodes have valid pci info! */ /* This must be done first so the device nodes have valid pci info! */
traverse_all_pci_devices(update_dn_pci_info); traverse_all_pci_devices(update_dn_pci_info);
} }
static void __init static void __init pci_fixup_bus_sysdata_list(struct list_head *bus_list)
pci_fixup_bus_sysdata_list(struct list_head *bus_list)
{ {
struct list_head *ln; struct list_head *ln;
struct pci_bus *bus; struct pci_bus *bus;
for (ln=bus_list->next; ln != bus_list; ln=ln->next) { for (ln = bus_list->next; ln != bus_list; ln = ln->next) {
bus = pci_bus_b(ln); bus = pci_bus_b(ln);
if (bus->self) if (bus->self)
bus->sysdata = bus->self->sysdata; bus->sysdata = bus->self->sysdata;
...@@ -217,7 +207,7 @@ pci_fixup_bus_sysdata_list(struct list_head *bus_list) ...@@ -217,7 +207,7 @@ pci_fixup_bus_sysdata_list(struct list_head *bus_list)
} }
} }
/****************************************************************** /*
* Fixup the bus->sysdata ptrs to point to the bus' device_node. * Fixup the bus->sysdata ptrs to point to the bus' device_node.
* This is done late in pcibios_init(). We do this mostly for * This is done late in pcibios_init(). We do this mostly for
* sanity, but pci_dma.c uses these at DMA time so they must be * sanity, but pci_dma.c uses these at DMA time so they must be
...@@ -225,9 +215,8 @@ pci_fixup_bus_sysdata_list(struct list_head *bus_list) ...@@ -225,9 +215,8 @@ pci_fixup_bus_sysdata_list(struct list_head *bus_list)
* To do this we recurse down the bus hierarchy. Note that PHB's * To do this we recurse down the bus hierarchy. Note that PHB's
* have bus->self == NULL, but fortunately bus->sysdata is already * have bus->self == NULL, but fortunately bus->sysdata is already
* correct in this case. * correct in this case.
******************************************************************/ */
void __init void __init pci_fix_bus_sysdata(void)
pci_fix_bus_sysdata(void)
{ {
pci_fixup_bus_sysdata_list(&pci_root_buses); pci_fixup_bus_sysdata_list(&pci_root_buses);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment