Unverified Commit 0bf4276c authored by YC Hung's avatar YC Hung Committed by Mark Brown
Browse files

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



Modify dram as non-cache memory type to avoid wrong access between
host and dsp side and get the size of shared dma from device tree.

Reviewed-by: default avatarCurtis Malainey <cujomalainey@chromium.org>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarYC Hung <yc.hung@mediatek.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220606210212.146626-5-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fd43dcbb

sound/soc/sof/mediatek/mt8195/mt8195.c

+21 −16
Original line number Diff line number Diff line
@@ -145,6 +145,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");
@@ -273,23 +281,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);

					 adsp->shared_size);

	if (!adsp->shared_dram) {

			dev_err(dev, "ioremap failed for shared DRAM\n");

		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);

		adsp->shared_dram, &adsp->pa_shared_dram, adsp->shared_size);



	return 0;

}
@@ -361,7 +364,9 @@ static int mt8195_dsp_probe(struct snd_sof_dev *sdev) 
		goto err_adsp_sram_power_off;

	}



	sdev->bar[SOF_FW_BLK_TYPE_SRAM] = devm_ioremap_wc(sdev->dev,

	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]) {