Skip to content

Commit f9b8885

Browse files
robherringandersson
authored andcommitted
remoteproc: qcom_wcnss: Fix reserved region mapping failure
Commit c70b9d5 ("remoteproc: qcom: Use of_reserved_mem_region_* functions for "memory-region"") switched from devm_ioremap_wc() to devm_ioremap_resource_wc(). The difference is devm_ioremap_resource_wc() also requests the resource which fails. Testing of both fixed and dynamic reserved regions indicates that requesting the resource should work, so I'm not sure why it doesn't work in this case. Fix the issue by reverting back to devm_ioremap_wc(). Reported-by: Marek Szyprowski <[email protected]> Reported-by: André Apitzsch <[email protected]> Fixes: c70b9d5 ("remoteproc: qcom: Use of_reserved_mem_region_* functions for "memory-region"") Signed-off-by: Rob Herring (Arm) <[email protected]> Tested-by: Marek Szyprowski <[email protected]> Tested-by: André Apitzsch <[email protected]> # on BQ Aquaris M5 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent 6de23f8 commit f9b8885

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/remoteproc/qcom_wcnss.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ static int wcnss_alloc_memory_region(struct qcom_wcnss *wcnss)
537537

538538
wcnss->mem_phys = wcnss->mem_reloc = res.start;
539539
wcnss->mem_size = resource_size(&res);
540-
wcnss->mem_region = devm_ioremap_resource_wc(wcnss->dev, &res);
540+
wcnss->mem_region = devm_ioremap_wc(wcnss->dev, wcnss->mem_phys, wcnss->mem_size);
541541
if (IS_ERR(wcnss->mem_region)) {
542542
dev_err(wcnss->dev, "unable to map memory region: %pR\n", &res);
543543
return PTR_ERR(wcnss->mem_region);

0 commit comments

Comments
 (0)