diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-06 12:32:34 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-06 12:32:34 -0700 |
commit | 06e95b99b13a1639907774c3ba60fc88bfbd6b5b (patch) | |
tree | aa3505893d9a533c22eb5e7ed5080a041024e538 /pci | |
parent | 032f99bec84d1c3ee1cef8512d99c8c8f1779e72 (diff) | |
download | patches-06e95b99b13a1639907774c3ba60fc88bfbd6b5b.tar.gz |
more pci 64bit resource patches
Diffstat (limited to 'pci')
4 files changed, 273 insertions, 0 deletions
diff --git a/pci/pci-64-bit-resources-arch-powerpc-changes.patch b/pci/pci-64-bit-resources-arch-powerpc-changes.patch new file mode 100644 index 0000000000000..b7f34bf795f2a --- /dev/null +++ b/pci/pci-64-bit-resources-arch-powerpc-changes.patch @@ -0,0 +1,152 @@ +From akpm@osdl.org Tue Mar 28 14:47:47 2006 +Message-Id: <200603282247.k2SMladA029564@shell0.pdx.osdl.net> +From: Vivek Goyal <vgoyal@in.ibm.com> +Subject: PCI: 64 bit resources arch powerpc changes +To: vgoyal@in.ibm.com, greg@kroah.com, mm-commits@vger.kernel.org +Date: Tue, 28 Mar 2006 14:47:30 -0800 + +From: Vivek Goyal <vgoyal@in.ibm.com> + +- powerpc cross-compilation with CONFIG_PPC=32 resulted in more warnings for + 64bit resources. This patch fixes it. + +- Contains changes for arch/powerpc/* dir. + +Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com> +Signed-off-by: Andrew Morton <akpm@osdl.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + arch/powerpc/kernel/pci_32.c | 15 ++++++++------- + arch/powerpc/platforms/83xx/pci.c | 5 +++-- + arch/powerpc/platforms/85xx/pci.c | 5 +++-- + arch/powerpc/platforms/chrp/pci.c | 4 ++-- + arch/powerpc/platforms/maple/pci.c | 5 +++-- + arch/powerpc/platforms/powermac/pci.c | 5 +++-- + 6 files changed, 22 insertions(+), 17 deletions(-) + +--- gregkh-2.6.orig/arch/powerpc/kernel/pci_32.c ++++ gregkh-2.6/arch/powerpc/kernel/pci_32.c +@@ -173,8 +173,8 @@ EXPORT_SYMBOL(pcibios_bus_to_resource); + * but we want to try to avoid allocating at 0x2900-0x2bff + * which might have be mirrored at 0x0100-0x03ff.. + */ +-void pcibios_align_resource(void *data, struct resource *res, unsigned long size, +- unsigned long align) ++void pcibios_align_resource(void *data, struct resource *res, u64 size, ++ u64 align) + { + struct pci_dev *dev = data; + +@@ -183,7 +183,7 @@ void pcibios_align_resource(void *data, + + if (size > 0x100) { + printk(KERN_ERR "PCI: I/O Region %s/%d too large" +- " (%ld bytes)\n", pci_name(dev), ++ " (%lld bytes)\n", pci_name(dev), + dev->resource - res, size); + } + +@@ -367,8 +367,9 @@ pci_relocate_bridge_resource(struct pci_ + return -1; /* "can't happen" */ + } + update_bridge_base(bus, i); +- printk(KERN_INFO "PCI: bridge %d resource %d moved to %lx..%lx\n", +- bus->number, i, res->start, res->end); ++ printk(KERN_INFO "PCI: bridge %d resource %d moved to %llx..%llx\n", ++ bus->number, i, (unsigned long long)res->start, ++ (unsigned long long)res->end); + return 0; + } + +@@ -1573,8 +1574,8 @@ static pgprot_t __pci_mmap_set_pgprot(st + else + prot |= _PAGE_GUARDED; + +- printk("PCI map for %s:%lx, prot: %lx\n", pci_name(dev), rp->start, +- prot); ++ printk("PCI map for %s:%llx, prot: %lx\n", pci_name(dev), ++ (unsigned long long)rp->start, prot); + + return __pgprot(prot); + } +--- gregkh-2.6.orig/arch/powerpc/platforms/83xx/pci.c ++++ gregkh-2.6/arch/powerpc/platforms/83xx/pci.c +@@ -91,9 +91,10 @@ int __init add_bridge(struct device_node + mpc83xx_pci2_busno = hose->first_busno; + } + +- printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%08lx. " ++ printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%016llx. " + "Firmware bus number: %d->%d\n", +- rsrc.start, hose->first_busno, hose->last_busno); ++ (unsigned long long)rsrc.start, hose->first_busno, ++ hose->last_busno); + + DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n", + hose, hose->cfg_addr, hose->cfg_data); +--- gregkh-2.6.orig/arch/powerpc/platforms/85xx/pci.c ++++ gregkh-2.6/arch/powerpc/platforms/85xx/pci.c +@@ -79,9 +79,10 @@ int __init add_bridge(struct device_node + mpc85xx_pci2_busno = hose->first_busno; + } + +- printk(KERN_INFO "Found MPC85xx PCI host bridge at 0x%08lx. " ++ printk(KERN_INFO "Found MPC85xx PCI host bridge at 0x%016llx. " + "Firmware bus number: %d->%d\n", +- rsrc.start, hose->first_busno, hose->last_busno); ++ (unsigned long long)rsrc.start, hose->first_busno, ++ hose->last_busno); + + DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n", + hose, hose->cfg_addr, hose->cfg_data); +--- gregkh-2.6.orig/arch/powerpc/platforms/chrp/pci.c ++++ gregkh-2.6/arch/powerpc/platforms/chrp/pci.c +@@ -141,7 +141,7 @@ hydra_init(void) + if (np == NULL || of_address_to_resource(np, 0, &r)) + return 0; + Hydra = ioremap(r.start, r.end-r.start); +- printk("Hydra Mac I/O at %lx\n", r.start); ++ printk("Hydra Mac I/O at %llx\n", (unsigned long long)r.start); + printk("Hydra Feature_Control was %x", + in_le32(&Hydra->Feature_Control)); + out_le32(&Hydra->Feature_Control, (HYDRA_FC_SCC_CELL_EN | +@@ -265,7 +265,7 @@ chrp_find_bridges(void) + bus_range[0], bus_range[1]); + printk(" controlled by %s", dev->type); + if (!is_longtrail) +- printk(" at %lx", r.start); ++ printk(" at %llx", (unsigned long long)r.start); + printk("\n"); + + hose = pcibios_alloc_controller(); +--- gregkh-2.6.orig/arch/powerpc/platforms/maple/pci.c ++++ gregkh-2.6/arch/powerpc/platforms/maple/pci.c +@@ -376,9 +376,10 @@ static void __init maple_fixup_phb_resou + unsigned long offset = (unsigned long)hose->io_base_virt - pci_io_base; + hose->io_resource.start += offset; + hose->io_resource.end += offset; +- printk(KERN_INFO "PCI Host %d, io start: %lx; io end: %lx\n", ++ printk(KERN_INFO "PCI Host %d, io start: %llx; io end: %llx\n", + hose->global_number, +- hose->io_resource.start, hose->io_resource.end); ++ (unsigned long long)hose->io_resource.start, ++ (unsigned long long)hose->io_resource.end); + } + } + +--- gregkh-2.6.orig/arch/powerpc/platforms/powermac/pci.c ++++ gregkh-2.6/arch/powerpc/platforms/powermac/pci.c +@@ -939,9 +939,10 @@ static int __init add_bridge(struct devi + disp_name = "Chaos"; + primary = 0; + } +- printk(KERN_INFO "Found %s PCI host bridge at 0x%08lx. " ++ printk(KERN_INFO "Found %s PCI host bridge at 0x%016llx. " + "Firmware bus number: %d->%d\n", +- disp_name, rsrc.start, hose->first_busno, hose->last_busno); ++ disp_name, (unsigned long long)rsrc.start, hose->first_busno, ++ hose->last_busno); + #endif /* CONFIG_PPC32 */ + + DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n", diff --git a/pci/pci-64-bit-resources-drivers-pci-changes-sparc32-fix.patch b/pci/pci-64-bit-resources-drivers-pci-changes-sparc32-fix.patch new file mode 100644 index 0000000000000..a8a182590dc23 --- /dev/null +++ b/pci/pci-64-bit-resources-drivers-pci-changes-sparc32-fix.patch @@ -0,0 +1,33 @@ +From akpm@osdl.org Tue Apr 4 00:19:26 2006 +Message-Id: <200604040718.k347IxMq018140@shell0.pdx.osdl.net> +From: Andrew Morton <akpm@osdl.org> +Subject: PCI: 64 bit resources drivers pci changes sparc32 fix +To: akpm@osdl.org, greg@kroah.com, vgoyal@in.ibm.com, mm-commits@vger.kernel.org +Date: Tue, 04 Apr 2006 00:18:09 -0700 + + +From: Andrew Morton <akpm@osdl.org> + +arch/sparc/kernel/pcic.c:863: error: conflicting types for `pcibios_align_resource' +include/linux/pci.h:407: error: previous declaration of `pcibios_align_resource' + +Cc: Vivek Goyal <vgoyal@in.ibm.com> +Signed-off-by: Andrew Morton <akpm@osdl.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + + +--- + arch/sparc/kernel/pcic.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- gregkh-2.6.orig/arch/sparc/kernel/pcic.c ++++ gregkh-2.6/arch/sparc/kernel/pcic.c +@@ -859,7 +859,7 @@ char * __init pcibios_setup(char *str) + } + + void pcibios_align_resource(void *data, struct resource *res, +- unsigned long size, unsigned long align) ++ u64 size, u64 align) + { + } + diff --git a/pci/pci-64-bit-resources-more-drivers-others-changes.patch b/pci/pci-64-bit-resources-more-drivers-others-changes.patch new file mode 100644 index 0000000000000..50e785d4fd1a5 --- /dev/null +++ b/pci/pci-64-bit-resources-more-drivers-others-changes.patch @@ -0,0 +1,37 @@ +From akpm@osdl.org Tue Mar 28 14:47:47 2006 +Message-Id: <200603282247.k2SMlcVG029567@shell0.pdx.osdl.net> +From: Vivek Goyal <vgoyal@in.ibm.com> +Subject: PCI: 64 bit resources more drivers others changes +To: vgoyal@in.ibm.com, greg@kroah.com, mm-commits@vger.kernel.org +Date: Tue, 28 Mar 2006 14:47:32 -0800 + +From: Vivek Goyal <vgoyal@in.ibm.com> + +- Changes required to fix compilation warnings for drivers/* dir for 64bit + resources. These changes came up due to cross-compilation on powerpc with + CONFIG_PPC=32 + +Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com> +Signed-off-by: Andrew Morton <akpm@osdl.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + + +--- + drivers/macintosh/macio_asic.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- gregkh-2.6.orig/drivers/macintosh/macio_asic.c ++++ gregkh-2.6/drivers/macintosh/macio_asic.c +@@ -428,10 +428,10 @@ static struct macio_dev * macio_add_one_ + + /* MacIO itself has a different reg, we use it's PCI base */ + if (np == chip->of_node) { +- sprintf(dev->ofdev.dev.bus_id, "%1d.%08lx:%.*s", ++ sprintf(dev->ofdev.dev.bus_id, "%1d.%016llx:%.*s", + chip->lbus.index, + #ifdef CONFIG_PCI +- pci_resource_start(chip->lbus.pdev, 0), ++ (unsigned long long)pci_resource_start(chip->lbus.pdev, 0), + #else + 0, /* NuBus may want to do something better here */ + #endif diff --git a/pci/pci-64-bit-resources-more-sound-changes.patch b/pci/pci-64-bit-resources-more-sound-changes.patch new file mode 100644 index 0000000000000..3afdb0604fe7f --- /dev/null +++ b/pci/pci-64-bit-resources-more-sound-changes.patch @@ -0,0 +1,51 @@ +From akpm@osdl.org Tue Mar 28 14:47:55 2006 +Message-Id: <200603282247.k2SMleVc029572@shell0.pdx.osdl.net> +From: Vivek Goyal <vgoyal@in.ibm.com> +Subject: PCI: 64 bit resources more sound changes +To: vgoyal@in.ibm.com, greg@kroah.com, mm-commits@vger.kernel.org +Date: Tue, 28 Mar 2006 14:47:34 -0800 + +From: Vivek Goyal <vgoyal@in.ibm.com> + +- Changes required to fix compilation warnings for sound/* dir for 64bit + resources. These changes came up due to cross-compilation on powerpc with + CONFIG_PPC32=y + +Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com> +Signed-off-by: Andrew Morton <akpm@osdl.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + sound/ppc/pmac.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +--- gregkh-2.6.orig/sound/ppc/pmac.c ++++ gregkh-2.6/sound/ppc/pmac.c +@@ -1198,9 +1198,10 @@ int __init snd_pmac_new(struct snd_card + chip->rsrc[i].start + 1, + rnames[i]) == NULL) { + printk(KERN_ERR "snd: can't request rsrc " +- " %d (%s: 0x%08lx:%08lx)\n", +- i, rnames[i], chip->rsrc[i].start, +- chip->rsrc[i].end); ++ " %d (%s: 0x%016llx:%016llx)\n", ++ i, rnames[i], ++ (unsigned long long)chip->rsrc[i].start, ++ (unsigned long long)chip->rsrc[i].end); + err = -ENODEV; + goto __error; + } +@@ -1229,9 +1230,10 @@ int __init snd_pmac_new(struct snd_card + chip->rsrc[i].start + 1, + rnames[i]) == NULL) { + printk(KERN_ERR "snd: can't request rsrc " +- " %d (%s: 0x%08lx:%08lx)\n", +- i, rnames[i], chip->rsrc[i].start, +- chip->rsrc[i].end); ++ " %d (%s: 0x%016llx:%016llx)\n", ++ i, rnames[i], ++ (unsigned long long)chip->rsrc[i].start, ++ (unsigned long long)chip->rsrc[i].end); + err = -ENODEV; + goto __error; + } |