powerpc/pci: Support per-aperture memory offset

The PCI core supports an offset per aperture nowadays but our arch
code still has a single offset per host bridge representing the
difference betwen CPU memory addresses and PCI MMIO addresses.

This is a problem as new machines and hypervisor versions are
coming out where the 64-bit windows will have a different offset
(basically mapped 1:1) from the 32-bit windows.

This fixes it by using separate offsets. In the long run, we probably
want to get rid of that intermediary struct pci_controller and have
those directly stored into the pci_host_bridge as they are parsed
but this will be a more invasive change.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 2b8af75abc23..cf7009b8c7b6 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -824,6 +824,7 @@ static void __init parse_region_decode(struct pci_controller *hose,
                         hose->mem_resources[cur].name = hose->dn->full_name;
                         hose->mem_resources[cur].start = base;
                         hose->mem_resources[cur].end = end;
+                        hose->mem_offset[cur] = 0;
                         DBG("  %d: 0x%08lx-0x%08lx\n", cur, base, end);
                 } else {
                         DBG("   :           -0x%08lx\n", end);
@@ -866,7 +867,6 @@ static void __init setup_u3_ht(struct pci_controller* hose)
         hose->io_resource.start = 0;
         hose->io_resource.end = 0x003fffff;
         hose->io_resource.flags = IORESOURCE_IO;
-        hose->pci_mem_offset = 0;
         hose->first_busno = 0;
         hose->last_busno = 0xef;