kevin/linux
1
Fork 0
Code

remoteproc: mediatek: Don't attempt to remap l1tcm memory if missing

Browse Source 
The current code doesn't check whether platform_get_resource_byname()
succeeded to get the l1tcm memory, which is optional, before attempting
to map it. This results in the following error message when it is
missing:

  mtk-scp 10500000.scp: error -EINVAL: invalid resource (null)

Add a check so that the remapping is only attempted if the memory region
exists. This also allows to simplify the logic handling failure to
remap, since a failure then is always a failure.

Fixes: ca23ecfdbd ("remoteproc/mediatek: support L1TCM")
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20240627-scp-invalid-resource-l1tcm-v1-1-7d221e6c495a@collabora.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
This commit is contained in:
Nícolas F. R. A. Prado 2024-06-27 17:20:55 -04:00 committed by Mathieu Poirier
parent 5b9f51b200
commit 67ca3f9807
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/remoteproc/mtk_scp.c
View File

@ -1344,14 +1344,12 @@ static int scp_probe(struct platform_device *pdev)
/* l1tcm is an optional memory region */ /* l1tcm is an optional memory region */
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "l1tcm"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "l1tcm");
if (res) {
scp_cluster->l1tcm_base = devm_ioremap_resource(dev, res); scp_cluster->l1tcm_base = devm_ioremap_resource(dev, res);
if (IS_ERR(scp_cluster->l1tcm_base)) { if (IS_ERR(scp_cluster->l1tcm_base))
ret = PTR_ERR(scp_cluster->l1tcm_base); return dev_err_probe(dev, PTR_ERR(scp_cluster->l1tcm_base),
if (ret != -EINVAL) "Failed to map l1tcm memory\n");
return dev_err_probe(dev, ret, "Failed to map l1tcm memory\n");
scp_cluster->l1tcm_base = NULL;
} else {
scp_cluster->l1tcm_size = resource_size(res); scp_cluster->l1tcm_size = resource_size(res);
scp_cluster->l1tcm_phys = res->start; scp_cluster->l1tcm_phys = res->start;
} }