| From 027fa02f84e851e21daffdf8900d6117071890f8 Mon Sep 17 00:00:00 2001 |
| From: Gavin Shan <gwshan@linux.vnet.ibm.com> |
| Date: Fri, 27 Mar 2015 11:29:00 +1100 |
| Subject: powerpc/powernv: Don't map M64 segments using M32DT |
| |
| From: Gavin Shan <gwshan@linux.vnet.ibm.com> |
| |
| commit 027fa02f84e851e21daffdf8900d6117071890f8 upstream. |
| |
| If M64 has been supported, the prefetchable 64-bits memory resources |
| shouldn't be mapped to the corresponding PE# via M32DT. Unfortunately, |
| we're doing that in pnv_ioda_setup_pe_seg() wrongly. The issue was |
| introduced by commit 262af55 ("powerpc/powernv: Enable M64 aperatus |
| for PHB3"). The patch fixes the issue by simply skipping M64 resources |
| when updating to M32DT. |
| |
| Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> |
| Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/powerpc/platforms/powernv/pci-ioda.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/arch/powerpc/platforms/powernv/pci-ioda.c |
| +++ b/arch/powerpc/platforms/powernv/pci-ioda.c |
| @@ -1777,7 +1777,8 @@ static void pnv_ioda_setup_pe_seg(struct |
| 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; |
