ASoC: SOF: mediatek: mt8186 modify dram type as non-cache

To prevent incorrect access between the host and DSP sides, we need to
modify DRAM as a non-cache memory type. Additionally, we can retrieve
the size of shared DMA from the device tree.

Signed-off-by: Trevor Wu <trevor.wu@mediatek.com>
Reviewed-by: Yaochun Hung <yc.hung@mediatek.com>
Reviewed-by: Kuan-Hsun Cheng <Allen-KH.Cheng@mediatek.com>
Link: https://lore.kernel.org/r/20230803075028.32170-1-trevor.wu@mediatek.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/mediatek/mt8186/mt8186.c b/sound/soc/sof/mediatek/mt8186/mt8186.c
index 3e0ea0e..f587edf 100644 (file)
--- a/sound/soc/sof/mediatek/mt8186/mt8186.c
+++ b/sound/soc/sof/mediatek/mt8186/mt8186.c
@@ -111,6 +111,14 @@ static int platform_parse_resource(struct platform_device *pdev, void *data)
 
        dev_dbg(dev, "DMA %pR\n", &res);
 
+       adsp->pa_shared_dram = (phys_addr_t)res.start;
+       adsp->shared_size = resource_size(&res);
+       if (adsp->pa_shared_dram & DRAM_REMAP_MASK) {
+               dev_err(dev, "adsp shared dma memory(%#x) is not 4K-aligned\n",
+                       (u32)adsp->pa_shared_dram);
+               return -EINVAL;
+       }
+
        ret = of_reserved_mem_device_init(dev);
        if (ret) {
                dev_err(dev, "of_reserved_mem_device_init failed\n");
@@ -244,23 +252,18 @@ static int adsp_shared_base_ioremap(struct platform_device *pdev, void *data)
 {
        struct device *dev = &pdev->dev;
        struct mtk_adsp_chip_info *adsp = data;
-       u32 shared_size;
 
        /* remap shared-dram base to be non-cachable */
-       shared_size = TOTAL_SIZE_SHARED_DRAM_FROM_TAIL;
-       adsp->pa_shared_dram = adsp->pa_dram + adsp->dramsize - shared_size;
-       if (adsp->va_dram) {
-               adsp->shared_dram = adsp->va_dram + DSP_DRAM_SIZE - shared_size;
-       } else {
-               adsp->shared_dram = devm_ioremap(dev, adsp->pa_shared_dram,
-                                                shared_size);
-               if (!adsp->shared_dram) {
-                       dev_err(dev, "ioremap failed for shared DRAM\n");
-                       return -ENOMEM;
-               }
+       adsp->shared_dram = devm_ioremap(dev, adsp->pa_shared_dram,
+                                        adsp->shared_size);
+       if (!adsp->shared_dram) {
+               dev_err(dev, "failed to ioremap base %pa size %#x\n",
+                       adsp->shared_dram, adsp->shared_size);
+               return -ENOMEM;
        }
-       dev_dbg(dev, "shared-dram vbase=%p, phy addr :%pa, size=%#x\n",
-               adsp->shared_dram, &adsp->pa_shared_dram, shared_size);
+
+       dev_dbg(dev, "shared-dram vbase=%p, phy addr :%pa,  size=%#x\n",
+               adsp->shared_dram, &adsp->pa_shared_dram, adsp->shared_size);
 
        return 0;
 }
@@ -307,9 +310,12 @@ static int mt8186_dsp_probe(struct snd_sof_dev *sdev)
                return -ENOMEM;
        }
 
-       sdev->bar[SOF_FW_BLK_TYPE_SRAM] = devm_ioremap_wc(sdev->dev,
-                                                         priv->adsp->pa_dram,
-                                                         priv->adsp->dramsize);
+       priv->adsp->va_sram = sdev->bar[SOF_FW_BLK_TYPE_IRAM];
+
+       sdev->bar[SOF_FW_BLK_TYPE_SRAM] = devm_ioremap(sdev->dev,
+                                                      priv->adsp->pa_dram,
+                                                      priv->adsp->dramsize);
+
        if (!sdev->bar[SOF_FW_BLK_TYPE_SRAM]) {
                dev_err(sdev->dev, "failed to ioremap base %pa size %#x\n",
                        &priv->adsp->pa_dram, priv->adsp->dramsize);