Skip to content

Commit

Permalink
[PATCH] dlpar enable for OF pci probe
Browse files Browse the repository at this point in the history
This patch contains the arch/ppc64 bits for enabling DLPAR and PCI
Hotplug for the new OF-based PCI probe mechanism.  This code path is
currently broken.

Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
John Rose authored and Paul Mackerras committed Nov 7, 2005
1 parent f912696 commit ead8371
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 13 deletions.
17 changes: 9 additions & 8 deletions arch/ppc64/kernel/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,8 @@ static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev)
}
}

static struct pci_dev *of_create_pci_dev(struct device_node *node,
struct pci_bus *bus, int devfn)
struct pci_dev *of_create_pci_dev(struct device_node *node,
struct pci_bus *bus, int devfn)
{
struct pci_dev *dev;
const char *type;
Expand Down Expand Up @@ -354,10 +354,9 @@ static struct pci_dev *of_create_pci_dev(struct device_node *node,

return dev;
}
EXPORT_SYMBOL(of_create_pci_dev);

static void of_scan_pci_bridge(struct device_node *node, struct pci_dev *dev);

static void __devinit of_scan_bus(struct device_node *node,
void __devinit of_scan_bus(struct device_node *node,
struct pci_bus *bus)
{
struct device_node *child = NULL;
Expand All @@ -381,9 +380,10 @@ static void __devinit of_scan_bus(struct device_node *node,

do_bus_setup(bus);
}
EXPORT_SYMBOL(of_scan_bus);

static void __devinit of_scan_pci_bridge(struct device_node *node,
struct pci_dev *dev)
void __devinit of_scan_pci_bridge(struct device_node *node,
struct pci_dev *dev)
{
struct pci_bus *bus;
u32 *busrange, *ranges;
Expand Down Expand Up @@ -464,9 +464,10 @@ static void __devinit of_scan_pci_bridge(struct device_node *node,
else if (mode == PCI_PROBE_NORMAL)
pci_scan_child_bus(bus);
}
EXPORT_SYMBOL(of_scan_pci_bridge);
#endif /* CONFIG_PPC_MULTIPLATFORM */

static void __devinit scan_phb(struct pci_controller *hose)
void __devinit scan_phb(struct pci_controller *hose)
{
struct pci_bus *bus;
struct device_node *node = hose->arch_data;
Expand Down
6 changes: 1 addition & 5 deletions arch/ppc64/kernel/rtas_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,6 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
struct device_node *root = of_find_node_by_path("/");
unsigned int root_size_cells = 0;
struct pci_controller *phb;
struct pci_bus *bus;
int primary;

root_size_cells = prom_n_size_cells(root);
Expand All @@ -456,10 +455,7 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
of_node_put(root);

pci_devs_phb_init_dynamic(phb);
phb->last_busno = 0xff;
bus = pci_scan_bus(phb->first_busno, phb->ops, phb->arch_data);
phb->bus = bus;
phb->last_busno = bus->subordinate;
scan_phb(phb);

return phb;
}
Expand Down
1 change: 1 addition & 0 deletions include/asm-powerpc/ppc-pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre,

void pci_devs_phb_init(void);
void pci_devs_phb_init_dynamic(struct pci_controller *phb);
void __devinit scan_phb(struct pci_controller *hose);

/* PCI address cache management routines */
void pci_addr_cache_insert_device(struct pci_dev *dev);
Expand Down
8 changes: 8 additions & 0 deletions include/asm-ppc64/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,14 @@ pcibios_fixup_device_resources(struct pci_dev *dev, struct pci_bus *bus);

extern struct pci_controller *init_phb_dynamic(struct device_node *dn);

extern struct pci_dev *of_create_pci_dev(struct device_node *node,
struct pci_bus *bus, int devfn);

extern void of_scan_pci_bridge(struct device_node *node,
struct pci_dev *dev);

extern void of_scan_bus(struct device_node *node, struct pci_bus *bus);

extern int pci_read_irq_line(struct pci_dev *dev);

extern void pcibios_add_platform_entries(struct pci_dev *dev);
Expand Down

0 comments on commit ead8371

Please sign in to comment.