ufs: Remap CPU to bus addresses using dev_phys_to_bus()

Use dev_phys_to_bus() to convert CPU addresses of DMA descriptors
into bus addresses of DMA descriptors. This is necessary on hardware
which does not have 1:1 mapping between CPU and memory addressed by
the DMA. This has no impact on other hardware which does not need
this conversion.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>

diff --git a/drivers/ufs/ufs-uclass.c b/drivers/ufs/ufs-uclass.c
index bb997aace8f0511585dfaf43d703c55579b406e3..81fd431f951d62ef1807f3585e5f2f03b61ef9d6 100644 (file)
--- a/drivers/ufs/ufs-uclass.c
+++ b/drivers/ufs/ufs-uclass.c
@@ -19,6 +19,7 @@
 #include <dm/device-internal.h>
 #include <malloc.h>
 #include <hexdump.h>
+#include <phys2bus.h>
 #include <scsi.h>
 #include <ufs.h>
 #include <asm/io.h>
@@ -466,13 +467,13 @@ static int ufshcd_make_hba_operational(struct ufs_hba *hba)
        ufshcd_disable_intr_aggr(hba);
 
        /* Configure UTRL and UTMRL base address registers */
-       ufshcd_writel(hba, lower_32_bits((dma_addr_t)hba->utrdl),
+       ufshcd_writel(hba, lower_32_bits(dev_phys_to_bus(hba->dev, (phys_addr_t)(uintptr_t)(hba->utrdl))),
                      REG_UTP_TRANSFER_REQ_LIST_BASE_L);
-       ufshcd_writel(hba, upper_32_bits((dma_addr_t)hba->utrdl),
+       ufshcd_writel(hba, upper_32_bits(dev_phys_to_bus(hba->dev, (phys_addr_t)(uintptr_t)(hba->utrdl))),
                      REG_UTP_TRANSFER_REQ_LIST_BASE_H);
-       ufshcd_writel(hba, lower_32_bits((dma_addr_t)hba->utmrdl),
+       ufshcd_writel(hba, lower_32_bits(dev_phys_to_bus(hba->dev, (phys_addr_t)(uintptr_t)(hba->utmrdl))),
                      REG_UTP_TASK_REQ_LIST_BASE_L);
-       ufshcd_writel(hba, upper_32_bits((dma_addr_t)hba->utmrdl),
+       ufshcd_writel(hba, upper_32_bits(dev_phys_to_bus(hba->dev, (phys_addr_t)(uintptr_t)(hba->utmrdl))),
                      REG_UTP_TASK_REQ_LIST_BASE_H);
 
        /*
@@ -660,7 +661,7 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba)
        u16 prdt_offset;
 
        utrdlp = hba->utrdl;
-       cmd_desc_dma_addr = (dma_addr_t)hba->ucdl;
+       cmd_desc_dma_addr = dev_phys_to_bus(hba->dev, (phys_addr_t)(uintptr_t)(hba->ucdl));
 
        utrdlp->command_desc_base_addr_lo =
                                cpu_to_le32(lower_32_bits(cmd_desc_dma_addr));
@@ -1612,12 +1613,15 @@ void ufshcd_prepare_utp_scsi_cmd_upiu(struct ufs_hba *hba,
        ufshcd_cache_flush(hba->ucd_rsp_ptr, sizeof(*hba->ucd_rsp_ptr));
 }
 
-static inline void prepare_prdt_desc(struct ufshcd_sg_entry *entry,
+static inline void prepare_prdt_desc(struct ufs_hba *hba,
+                                    struct ufshcd_sg_entry *entry,
                                     unsigned char *buf, ulong len)
 {
+       dma_addr_t da = dev_phys_to_bus(hba->dev, (phys_addr_t)(uintptr_t)buf);
+
        entry->size = cpu_to_le32(len) | GENMASK(1, 0);
-       entry->base_addr = cpu_to_le32(lower_32_bits((unsigned long)buf));
-       entry->upper_addr = cpu_to_le32(upper_32_bits((unsigned long)buf));
+       entry->base_addr = cpu_to_le32(lower_32_bits(da));
+       entry->upper_addr = cpu_to_le32(upper_32_bits(da));
 }
 
 static void prepare_prdt_table(struct ufs_hba *hba, struct scsi_cmd *pccb)
@@ -1639,13 +1643,13 @@ static void prepare_prdt_table(struct ufs_hba *hba, struct scsi_cmd *pccb)
        buf = pccb->pdata;
        i = table_length;
        while (--i) {
-               prepare_prdt_desc(&prd_table[table_length - i - 1], buf,
+               prepare_prdt_desc(hba, &prd_table[table_length - i - 1], buf,
                                  MAX_PRDT_ENTRY - 1);
                buf += MAX_PRDT_ENTRY;
                datalen -= MAX_PRDT_ENTRY;
        }
 
-       prepare_prdt_desc(&prd_table[table_length - i - 1], buf, datalen - 1);
+       prepare_prdt_desc(hba, &prd_table[table_length - i - 1], buf, datalen - 1);
 
        req_desc->prd_table_length = table_length;
        ufshcd_cache_flush(prd_table, sizeof(*prd_table) * table_length);