From f26b2703466a26ecc6dbe0766485f16ff3836c58 Mon Sep 17 00:00:00 2001 From: Keyon Jie Date: Fri, 12 Nov 2021 09:58:18 +0800 Subject: [PATCH] Revert "dw-dma: set LLI alignment to platform specific" This reverts commit aeda0158b0df86cc66e1e41da1e343d45c349d12. Signed-off-by: Keyon Jie --- src/include/sof/drivers/dw-dma.h | 11 +++-------- .../tigerlake/include/platform/drivers/dw-dma.h | 3 --- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/include/sof/drivers/dw-dma.h b/src/include/sof/drivers/dw-dma.h index c259161a6..b96e7adcd 100644 --- a/src/include/sof/drivers/dw-dma.h +++ b/src/include/sof/drivers/dw-dma.h @@ -130,11 +130,6 @@ #define DW_DMA_BUFFER_ALIGNMENT 0x4 #define DW_DMA_COPY_ALIGNMENT 0x4 -/* LLI address alignment, in Bytes */ -#ifndef DW_DMA_LLI_ALIGN -#define DW_DMA_LLI_ALIGN 32 -#endif - /* TODO: add FIFO sizes */ struct dw_chan_data { uint16_t class; @@ -155,10 +150,10 @@ struct dw_lli { uint32_t sstat; uint32_t dstat; - /* align to required bytes to make sure every item - * is aligned in case of more than two items + /* align to 32 bytes to not cross cache line + * in case of more than two items */ - uint8_t reserved[DW_DMA_LLI_ALIGN - sizeof(uint32_t) * 7]; + uint32_t reserved; } __packed; extern const struct dma_ops dw_dma_ops; diff --git a/src/platform/tigerlake/include/platform/drivers/dw-dma.h b/src/platform/tigerlake/include/platform/drivers/dw-dma.h index 18d002bf3..2fe0b2645 100644 --- a/src/platform/tigerlake/include/platform/drivers/dw-dma.h +++ b/src/platform/tigerlake/include/platform/drivers/dw-dma.h @@ -12,9 +12,6 @@ #include -/* LLI address alignment, in Bytes */ -#define DW_DMA_LLI_ALIGN 128 - #endif /* __PLATFORM_DRIVERS_DW_DMA_H__ */ #else