From: Greg Kroah-Hartman Date: Tue, 17 Dec 2024 09:06:00 +0000 (+0100) Subject: Revert "parisc: fix a possible DMA corruption" X-Git-Tag: v5.15.175~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dfd8991ad33b10c2fb027a4cfcf57579fa786c1;p=thirdparty%2Fkernel%2Fstable.git Revert "parisc: fix a possible DMA corruption" This reverts commit dadac97f066a67334268132c1e2d0fd599fbcbec which is commit 7ae04ba36b381bffe2471eff3a93edced843240f upstream. It is reported to cause build failures. Reported-by: Guenter Roeck Link: https://lore.kernel.org/r/436a575b-4ec0-43a2-b4e9-7eb00d9bbbeb@roeck-us.net Cc: Mikulas Patocka Cc: Helge Deller Cc: Mingli Yu Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 9888e0b3f6751..6ac0c4b98e281 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -15,7 +15,6 @@ config PARISC select ARCH_SPLIT_ARG64 if !64BIT select ARCH_SUPPORTS_HUGETLBFS if PA20 select ARCH_SUPPORTS_MEMORY_FAILURE - select ARCH_HAS_CACHE_LINE_SIZE select DMA_OPS select RTC_CLASS select RTC_DRV_GENERIC diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h index 99e26c686f7ff..d53e9e27dba00 100644 --- a/arch/parisc/include/asm/cache.h +++ b/arch/parisc/include/asm/cache.h @@ -20,16 +20,7 @@ #define SMP_CACHE_BYTES L1_CACHE_BYTES -#ifdef CONFIG_PA20 -#define ARCH_DMA_MINALIGN 128 -#else -#define ARCH_DMA_MINALIGN 32 -#endif -#define ARCH_KMALLOC_MINALIGN 16 /* ldcw requires 16-byte alignment */ - -#define arch_slab_minalign() ((unsigned)dcache_stride) -#define cache_line_size() dcache_stride -#define dma_get_cache_alignment cache_line_size +#define ARCH_DMA_MINALIGN L1_CACHE_BYTES #define __read_mostly __section(".data..read_mostly")