From: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
On some architectures (e.g. arm64), ____cachline_aligned only aligns
to the cacheline size of the L1 cache size. L1_CACHE_BYTES in
arch64/include/asm/cache.h Unfortunately DMA safety on these
architectures requires the buffer no share a last level cache cacheline
given by ARCH_DMA_MINALIGN which has a greater granularity.
ARCH_DMA_MINALIGN is not defined for all architectures, but when it is
defined it is used to set the size of ARCH_KMALLOC_MINALIGN
to allow DMA safe buffer allocations.
As such the correct alignment requirement is
__aligned(ARCH_KMALLOC_MINALIGN).
This has recently been fixed in other subsystems such as IIO.
Fixes: 8be193c7b1f4 ("Input: add support for PlayStation 1/2 joypads connected via SPI")
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
Cc: Tomohiro Yoshidomi <sylph23k@xxxxxxxxx>
---
drivers/input/joystick/psxpad-spi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/joystick/psxpad-spi.c b/drivers/input/joystick/psxpad-spi.c
index a32656064f39..8098d205b58d 100644
--- a/drivers/input/joystick/psxpad-spi.c
+++ b/drivers/input/joystick/psxpad-spi.c
@@ -65,8 +65,8 @@ struct psxpad {
bool motor2enable;
u8 motor1level;
u8 motor2level;
- u8 sendbuf[0x20] ____cacheline_aligned;
- u8 response[sizeof(PSX_CMD_POLL)] ____cacheline_aligned;
+ u8 sendbuf[0x20] __aligned(ARCH_KMALLOC_MINALIGN);
+ u8 response[sizeof(PSX_CMD_POLL)] __aligned(ARCH_KMALLOC_MINALIGN);
};
static int psxpad_command(struct psxpad *pad, const u8 sendcmdlen)
--
2.38.1
