ufs: allocate descriptors with size aligned with DMA_MINALIGN

Align the allocation size with DMA_MINALIGN to make sure we do not
flush/invalidate data from following allocations.

Reviewed-by: Neha Malcom Francis <n-francis@ti.com>
Tested-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu@amd.com>
Tested-by: Julius Lehmann <lehmanju@devpi.de>
Link: https://lore.kernel.org/r/20240930-topic-ufs-enhancements-v3-1-58234f84ab89@linaro.org
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index be64bf971f169ee50ae9029e09f8fa071d17b186..e005cc90608e564796f1cb6a09490ee19fbe52fc 100644 (file)
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -633,7 +633,9 @@ static int ufshcd_memory_alloc(struct ufs_hba *hba)
        /* Allocate one Transfer Request Descriptor
         * Should be aligned to 1k boundary.
         */
-       hba->utrdl = memalign(1024, sizeof(struct utp_transfer_req_desc));
+       hba->utrdl = memalign(1024,
+                             ALIGN(sizeof(struct utp_transfer_req_desc),
+                                   ARCH_DMA_MINALIGN));
        if (!hba->utrdl) {
                dev_err(hba->dev, "Transfer Descriptor memory allocation failed\n");
                return -ENOMEM;
@@ -642,7 +644,9 @@ static int ufshcd_memory_alloc(struct ufs_hba *hba)
        /* Allocate one Command Descriptor
         * Should be aligned to 1k boundary.
         */
-       hba->ucdl = memalign(1024, sizeof(struct utp_transfer_cmd_desc));
+       hba->ucdl = memalign(1024,
+                            ALIGN(sizeof(struct utp_transfer_cmd_desc),
+                                  ARCH_DMA_MINALIGN));
        if (!hba->ucdl) {
                dev_err(hba->dev, "Command descriptor memory allocation failed\n");
                return -ENOMEM;