Skip to content

Commit

Permalink
Revert "parisc: fix a possible DMA corruption"
Browse files Browse the repository at this point in the history
This reverts commit dadac97 which is
commit 7ae04ba upstream.

It is reported to cause build failures.

Reported-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/436a575b-4ec0-43a2-b4e9-7eb00d9bbbeb@roeck-us.net
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
gregkh committed Dec 19, 2024
1 parent f585c57 commit 3dfd899
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
1 change: 0 additions & 1 deletion arch/parisc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 1 addition & 10 deletions arch/parisc/include/asm/cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down

0 comments on commit 3dfd899

Please sign in to comment.