| From d217414c12e92fb0efdcd83e05a078772059d8bb Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 8 Nov 2021 15:03:17 +1100 |
| Subject: powerpc/pseries/ddw: Revert "Extend upper limit for huge DMA window |
| for persistent memory" |
| |
| From: Alexey Kardashevskiy <aik@ozlabs.ru> |
| |
| [ Upstream commit 2d33f5504490a9d90924476dbccd4a5349ee1ad0 ] |
| |
| This reverts commit 54fc3c681ded9437e4548e2501dc1136b23cfa9a |
| which does not allow 1:1 mapping even for the system RAM which |
| is usually possible. |
| |
| Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Link: https://lore.kernel.org/r/20211108040320.3857636-2-aik@ozlabs.ru |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/powerpc/platforms/pseries/iommu.c | 9 --------- |
| 1 file changed, 9 deletions(-) |
| |
| diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c |
| index e4198700ed1a3..245f1f8df6563 100644 |
| --- a/arch/powerpc/platforms/pseries/iommu.c |
| +++ b/arch/powerpc/platforms/pseries/iommu.c |
| @@ -1034,15 +1034,6 @@ static phys_addr_t ddw_memory_hotplug_max(void) |
| phys_addr_t max_addr = memory_hotplug_max(); |
| struct device_node *memory; |
| |
| - /* |
| - * The "ibm,pmemory" can appear anywhere in the address space. |
| - * Assuming it is still backed by page structs, set the upper limit |
| - * for the huge DMA window as MAX_PHYSMEM_BITS. |
| - */ |
| - if (of_find_node_by_type(NULL, "ibm,pmemory")) |
| - return (sizeof(phys_addr_t) * 8 <= MAX_PHYSMEM_BITS) ? |
| - (phys_addr_t) -1 : (1ULL << MAX_PHYSMEM_BITS); |
| - |
| for_each_node_by_type(memory, "memory") { |
| unsigned long start, size; |
| int n_mem_addr_cells, n_mem_size_cells, len; |
| -- |
| 2.33.0 |
| |
