diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2015-03-31 13:11:17 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2015-03-31 13:11:17 +1100 |
| commit | d4ed11aa4881246e1e36e0189f30f053f140370c (patch) | |
| tree | 233ca0735d061155a2f94fddebbec683f793eeae /arch/powerpc/platforms | |
| parent | 330524404298b2142d2e3a2f64251ca855d55d72 (diff) | |
| parent | 027fa02f84e851e21daffdf8900d6117071890f8 (diff) | |
| download | op-kernel-dev-d4ed11aa4881246e1e36e0189f30f053f140370c.zip op-kernel-dev-d4ed11aa4881246e1e36e0189f30f053f140370c.tar.gz | |
Merge branch 'next-eeh' into next-sriov
Merge in Gavin EEH fixes
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/powernv/pci-ioda.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index b1387ea..5ac7c60 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -2462,7 +2462,8 @@ static void pnv_ioda_setup_pe_seg(struct pci_controller *hose, region.start += phb->ioda.io_segsize; index++; } - } else if (res->flags & IORESOURCE_MEM) { + } else if ((res->flags & IORESOURCE_MEM) && + !pnv_pci_is_mem_pref_64(res->flags)) { region.start = res->start - hose->mem_offset[0] - phb->ioda.m32_pci_base; |
