lkml.org 
[lkml]   [2004]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] ppc64: Some small pci fixes
From
Date
This patch fixes a few issues in the ppc64 pci code, notably some
incorrect parsing of Open Firmware "ranges" when setting up host
bridge resources that would cause a problem with some future
platforms, a default mapping of the ISA IOs if the OF "isa" node
lacks a "ranges" property, and a safeguard in pci_scan_all_fns()
in case a pci<->OF node mapping cannot be established.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Index: linux-work/arch/ppc64/kernel/pci.c
===================================================================
--- linux-work.orig/arch/ppc64/kernel/pci.c 2004-10-25 10:36:50.724712968 +1000
+++ linux-work/arch/ppc64/kernel/pci.c 2004-10-25 11:04:50.070413616 +1000
@@ -585,9 +585,11 @@
int rlen = 0;

range = (struct isa_range *) get_property(isa_node, "ranges", &rlen);
- if (rlen < sizeof(struct isa_range)) {
- printk(KERN_ERR "unexpected isa range size: %s\n",
- __FUNCTION__);
+ if (range == NULL || (rlen < sizeof(struct isa_range))) {
+ printk(KERN_ERR "no ISA ranges or unexpected isa range size,"
+ "mapping 64k\n");
+ __ioremap_explicit(phb_io_base_phys, (unsigned long)phb_io_base_virt,
+ 0x10000, _PAGE_NO_CACHE);
return;
}

@@ -652,8 +654,7 @@
cpu_phys_addr = cpu_phys_addr << 32 | ranges[4];

size = (unsigned long)ranges[na+3] << 32 | ranges[na+4];
-
- switch (ranges[0] >> 24) {
+ switch ((ranges[0] >> 24) & 0x3) {
case 1: /* I/O space */
hose->io_base_phys = cpu_phys_addr;
hose->pci_io_size = size;
@@ -862,6 +863,9 @@
else
busdn = bus->sysdata; /* must be a phb */

+ if (busdn == NULL)
+ return 0;
+
/*
* Check to see if there is any of the 8 functions are in the
* device tree. If they are then we need to scan all the

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:07    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site