powerpc: Move DMA64_PROPNAME define to a header
PATCH 1/1 powerpc: Move DMA64_PROPNAME define to a header
Avoid redefining the same value in multiple source.
Signed-off-by Michal Suchanek <[email protected]>
--- arch/powerpc/include/asm/iommu.h | 3 +++ arch/powerpc/kexec/file_load_64.c | 5 +---- arch/powerpc/platforms/pseries/iommu.c | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-)
arch/powerpc/include/asm/iommu.h +3 -0
@@ -28,6 +28,9 @@#define IOMMU_PAGE_MASK (tblptr) (~((1 << (tblptr)->it_page_shift) - 1))#define IOMMU_PAGE_ALIGN (addr, tblptr) ALIGN(addr, IOMMU_PAGE_SIZE(tblptr)) +#define DIRECT64_PROPNAME "linux,direct64-ddr-window-info" +#define DMA64_PROPNAME "linux,dma64-ddr-window-info" +/* Boot time flags */ extern int iommu_is_off;extern int iommu_force_on;
arch/powerpc/kexec/file_load_64.c +1 -4
@@ -27,6 +27,7 @@#include <asm/kexec_ranges.h> #include <asm/crashdump-ppc64.h> #include <asm/mmzone.h> +#include <asm/iommu.h> #include <asm/prom.h> #include <asm/plpks.h>
@@ -1208,8 +1209,6 @@ int setup_new_fdt_ppc64(const struct kimage *image, void *fdt,if (ret <0 ) goto out; -#define DIRECT64_PROPNAME "linux,direct64-ddr-window-info" -#define DMA64_PROPNAME "linux,dma64-ddr-window-info" ret =update_pci_dma_nodes (fdt,DIRECT64_PROPNAME );if (ret <0 ) goto out;
@@ -1217,8 +1216,6 @@ int setup_new_fdt_ppc64(const struct kimage *image, void *fdt, ret =update_pci_dma_nodes (fdt,DMA64_PROPNAME );if (ret <0 ) goto out; -#undef DMA64_PROPNAME -#undef DIRECT64_PROPNAME/* Update memory reserve map */ ret =get_reserved_memory_ranges (&rmem);
arch/powerpc/platforms/pseries/iommu.c +0 -2
@@ -395,8 +395,6 @@ static LIST_HEAD(dma_win_list);static DEFINE_SPINLOCK (dma_win_list_lock);/* protects initializing window twice for same device */ static DEFINE_MUTEX (dma_win_init_mutex); -#define DIRECT64_PROPNAME "linux,direct64-ddr-window-info" -#define DMA64_PROPNAME "linux,dma64-ddr-window-info"static int tce_clearrange_multi_pSeriesLP (unsigned long start_pfn,unsigned long num_pfn,const void *arg)
Signature · 1 line
2.41.0
Michael Ellerman
AppliedQuoted 3 lines · Michal Suchanek
Avoid redefining the same value in multiple source.
Applied to powerpc/next.
[1/1] powerpc: Move DMA64_PROPNAME define to a header
https://git.kernel.org/powerpc/c/89c9ce1c99df553029fc4503506ff5a1793f3eaf
cheers