| Message ID | 20120309144645.5b5997d2@kryten (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Fri, 9 Mar 2012 14:46:45 +1100 Anton Blanchard <anton@samba.org> wrote: > > Hi Ben, > > > Looks like something that got fixed but the new patches from Bjorn > > aren't in next yet. I'll fwd you the patch separately to apply on > > top of what you have see if that helps (to confirm that's indeed the > > issue). > > Thanks, confirmed that it fixes it. Patch below in case anyone else is > hitting it. > > Anton > > -- > > On Sat, 2012-03-03 at 08:52 +1100, Benjamin Herrenschmidt wrote: > > > Or give me a chance to dig :-) I'll have a look next week. > > This is indeed what bjorn suspected on irc, this patch fixes it: > > (Bjorn, please fold it in the original offending patch) Thanks guys; I'll push the fixes to -next when I get to a real network (at the airport now about to run out of battery with a crappy connection). Jesse
Hi Jesse, On Fri, 9 Mar 2012 10:28:46 -0800 Jesse Barnes <jbarnes@virtuousgeek.org> wrote: > > On Fri, 9 Mar 2012 14:46:45 +1100 > Anton Blanchard <anton@samba.org> wrote: > > > > Looks like something that got fixed but the new patches from Bjorn > > > aren't in next yet. I'll fwd you the patch separately to apply on > > > top of what you have see if that helps (to confirm that's indeed the > > > issue). > > > > Thanks, confirmed that it fixes it. Patch below in case anyone else is > > hitting it. > > > > -- > > > > On Sat, 2012-03-03 at 08:52 +1100, Benjamin Herrenschmidt wrote: > > > > > Or give me a chance to dig :-) I'll have a look next week. > > > > This is indeed what bjorn suspected on irc, this patch fixes it: > > > > (Bjorn, please fold it in the original offending patch) > > Thanks guys; I'll push the fixes to -next when I get to a real network > (at the airport now about to run out of battery with a crappy > connection). Ping? I am also still carrying the build fix for arch/powerpc/kernel/pci-common.c since Feb 27.
Stephen Rothwell <sfr@canb.auug.org.au> wrote: >Hi Jesse, > >On Fri, 9 Mar 2012 10:28:46 -0800 Jesse Barnes ><jbarnes@virtuousgeek.org> wrote: >> >> On Fri, 9 Mar 2012 14:46:45 +1100 >> Anton Blanchard <anton@samba.org> wrote: >> >> > > Looks like something that got fixed but the new patches from >Bjorn >> > > aren't in next yet. I'll fwd you the patch separately to apply on >> > > top of what you have see if that helps (to confirm that's indeed >the >> > > issue). >> > >> > Thanks, confirmed that it fixes it. Patch below in case anyone else >is >> > hitting it. >> > >> > -- >> > >> > On Sat, 2012-03-03 at 08:52 +1100, Benjamin Herrenschmidt wrote: >> > >> > > Or give me a chance to dig :-) I'll have a look next week. >> > >> > This is indeed what bjorn suspected on irc, this patch fixes it: >> > >> > (Bjorn, please fold it in the original offending patch) >> >> Thanks guys; I'll push the fixes to -next when I get to a real >network >> (at the airport now about to run out of battery with a crappy >> connection). > >Ping? > >I am also still carrying the build fix for >arch/powerpc/kernel/pci-common.c >since Feb 27. > >-- >Cheers, >Stephen Rothwell sfr@canb.auug.org.au >http://www.canb.auug.org.au/~sfr/ Arg yeah I'll apply the fixups before sending the pull req. This trip has been a nightmare (14+ hour work days and no connectivity and a week longer than expected) but it's finally over, and just in time! Jesse
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c index b37d0b5..5dd63f1 100644 --- a/arch/powerpc/kernel/pci_of_scan.c +++ b/arch/powerpc/kernel/pci_of_scan.c @@ -75,6 +75,7 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev) { u64 base, size; unsigned int flags; + struct pci_bus_region region; struct resource *res; const u32 *addrs; u32 i; @@ -106,10 +107,12 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev) printk(KERN_ERR "PCI: bad cfg reg num 0x%x\n", i); continue; } - res->start = base; - res->end = base + size - 1; + res->flags = flags; res->name = pci_name(dev); + region.start = base; + region.end = base + size - 1; + pcibios_bus_to_resource(dev, res, ®ion); } } @@ -209,6 +212,7 @@ void __devinit of_scan_pci_bridge(struct pci_dev *dev) struct pci_bus *bus; const u32 *busrange, *ranges; int len, i, mode; + struct pci_bus_region region; struct resource *res; unsigned int flags; u64 size; @@ -270,9 +274,10 @@ void __devinit of_scan_pci_bridge(struct pci_dev *dev) res = bus->resource[i]; ++i; } - res->start = of_read_number(&ranges[1], 2); - res->end = res->start + size - 1; res->flags = flags; + region.start = of_read_number(&ranges[1], 2); + region.end = region.start + size - 1; + pcibios_bus_to_resource(dev, res, ®ion); } sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus), bus->number);