Re: [PATCH 0/3] Move the ARCH_DMA_MINALIGN definition to asm/cache.h

Christophe Leroy
2023-06-13T16:42:46Z

Le 13/06/2023 à 17:52, Catalin Marinas a écrit :
> Hi,
>
> The ARCH_KMALLOC_MINALIGN reduction series defines a generic
> ARCH_DMA_MINALIGN in linux/cache.h:
>
> https://lore.kernel.org/r/20230612153201.554742-2-catalin.marinas@arm.com/
>
> Unfortunately, this causes a duplicate definition warning for
> microblaze, powerpc (32-bit only) and sh as these architectures define
> ARCH_DMA_MINALIGN in a different file than asm/cache.h. Move the macro
> to asm/cache.h to avoid this issue and also bring them in line with the
> other architectures.

What about mips ?

arch/mips/include/asm/mach-generic/kmalloc.h:#define ARCH_DMA_MINALIGN 128
arch/mips/include/asm/mach-ip32/kmalloc.h:#define ARCH_DMA_MINALIGN 32
arch/mips/include/asm/mach-ip32/kmalloc.h:#define ARCH_DMA_MINALIGN 128
arch/mips/include/asm/mach-n64/kmalloc.h:#define ARCH_DMA_MINALIGN
L1_CACHE_BYTES
arch/mips/include/asm/mach-tx49xx/kmalloc.h:#define ARCH_DMA_MINALIGN
L1_CACHE_BYTES

>
> Andrew, if the arch maintainers cc'ed are fine with such change, could
> you please take these three patches together with the
> ARCH_KMALLOC_MINALIGN series?
>
> Thank you.
>
> Catalin Marinas (3):
> powerpc: Move the ARCH_DMA_MINALIGN definition to asm/cache.h
> microblaze: Move the ARCH_{DMA,SLAB}_MINALIGN definitions to
> asm/cache.h
> sh: Move the ARCH_DMA_MINALIGN definition to asm/cache.h
>
> arch/microblaze/include/asm/cache.h | 5 +++++
> arch/microblaze/include/asm/page.h | 5 -----
> arch/powerpc/include/asm/cache.h | 4 ++++
> arch/powerpc/include/asm/page_32.h | 4 ----
> arch/sh/include/asm/cache.h | 6 ++++++
> arch/sh/include/asm/page.h | 6 ------
> 6 files changed, 15 insertions(+), 15 deletions(-)
>