Message ID | 20120227173747.853e7fbe3ce3afab8939720b@canb.auug.org.au (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
On Mon, 2012-02-27 at 17:37 +1100, Stephen Rothwell wrote: > pci_add_resource_offset(resources, res, > - (resource_size_t) hose->io_base_virt - _IO_BASE); > + (resource_size_t)(unsigned long)hose->io_base_virt - _IO_BASE); We have to be careful here as we do want sign extension to happen (yeah it's odd, but it's the way we do IOs on ppc32 :-) Maybe I should change it one day). So we probably want to do: (resource_size_t)(long long)(hose->io_base_virt - _IO_BASE) Basically, IO resources are relative to _IO_BASE which on ppc32 is basically the virtual address where we map the first PHB IO space. Subsequent PHB mappings can end up below _IO_BASE, leading to negative resource values for IO BARs on those busses. It all works fine because even an unsigned addition will do the right thing as long as the value is fully sign extended. Cheers, Ben.
On Mon, 2012-02-27 at 20:19 +1100, Benjamin Herrenschmidt wrote: > On Mon, 2012-02-27 at 17:37 +1100, Stephen Rothwell wrote: > > pci_add_resource_offset(resources, res, > > - (resource_size_t) hose->io_base_virt - _IO_BASE); > > + (resource_size_t)(unsigned long)hose->io_base_virt - _IO_BASE); > > We have to be careful here as we do want sign extension to happen (yeah > it's odd, but it's the way we do IOs on ppc32 :-) Maybe I should change > it one day). > > So we probably want to do: > > (resource_size_t)(long long)(hose->io_base_virt - _IO_BASE) Oops ... that was meant to read (long) not (long long)... Any ways, I more or less convinced myself that even without the sign extension it would still work, since the IO port number is eventually cast to an unsigned int by the accessors, so as long as the low 32-bits are correct (and they'll be with or without the sign extension), we should be fine. It's just that something trying to print the resource might end up displaying garbage in the top bits. Cheers, Ben. > Basically, IO resources are relative to _IO_BASE which on ppc32 is > basically the virtual address where we map the first PHB IO space. > > Subsequent PHB mappings can end up below _IO_BASE, leading to negative > resource values for IO BARs on those busses. It all works fine because > even an unsigned addition will do the right thing as long as the value > is fully sign extended. > > Cheers, > Ben.
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 910b9de..808ecbb 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1517,7 +1517,7 @@ static void __devinit pcibios_setup_phb_resources(struct pci_controller *hose, s (unsigned long long)res->end, (unsigned long)res->flags); pci_add_resource_offset(resources, res, - (resource_size_t) hose->io_base_virt - _IO_BASE); + (resource_size_t)(unsigned long)hose->io_base_virt - _IO_BASE); /* Hookup PHB Memory resources */ for (i = 0; i < 3; ++i) {