diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c index c81e6c33c747..39654206781d 100644 --- a/drivers/remoteproc/qcom_q6v5_adsp.c +++ b/drivers/remoteproc/qcom_q6v5_adsp.c @@ -105,7 +105,7 @@ struct qcom_adsp { phys_addr_t mem_phys; phys_addr_t mem_reloc; - void *mem_region; + void __iomem *mem_region; size_t mem_size; bool has_iommu; @@ -318,7 +318,7 @@ static int adsp_load(struct rproc *rproc, const struct firmware *fw) int ret; ret = qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware, - adsp->mem_region, adsp->mem_phys, + (__force void *)adsp->mem_region, adsp->mem_phys, adsp->mem_size, &adsp->mem_reloc); if (ret) return ret; @@ -492,7 +492,7 @@ static void *adsp_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iom if (offset < 0 || offset + len > adsp->mem_size) return NULL; - return adsp->mem_region + offset; + return (__force void *)adsp->mem_region + offset; } static int adsp_parse_firmware(struct rproc *rproc, const struct firmware *fw) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index c8313c61da94..fb633c2b823d 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -101,8 +101,8 @@ struct qcom_pas { phys_addr_t mem_reloc; phys_addr_t dtb_mem_reloc; phys_addr_t region_assign_phys[MAX_ASSIGN_COUNT]; - void *mem_region; - void *dtb_mem_region; + void __iomem *mem_region; + void __iomem *dtb_mem_region; size_t mem_size; size_t dtb_mem_size; size_t region_assign_size[MAX_ASSIGN_COUNT]; @@ -243,7 +243,7 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw) } ret = qcom_mdt_pas_load(pas->dtb_pas_ctx, pas->dtb_firmware, - pas->dtb_firmware_name, pas->dtb_mem_region, + pas->dtb_firmware_name, (__force void *)pas->dtb_mem_region, &pas->dtb_mem_reloc); if (ret) goto release_dtb_metadata; @@ -321,7 +321,7 @@ static int qcom_pas_start(struct rproc *rproc) } ret = qcom_mdt_pas_load(pas->pas_ctx, pas->firmware, rproc->firmware, - pas->mem_region, &pas->mem_reloc); + (__force void *)pas->mem_region, &pas->mem_reloc); if (ret) goto release_pas_metadata; @@ -447,7 +447,7 @@ static void *qcom_pas_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is if (is_iomem) *is_iomem = true; - return pas->mem_region + offset; + return (__force void *)pas->mem_region + offset; } static int qcom_pas_parse_firmware(struct rproc *rproc, const struct firmware *fw) diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c index e9a00efe97f6..c856a92af43c 100644 --- a/drivers/remoteproc/qcom_wcnss.c +++ b/drivers/remoteproc/qcom_wcnss.c @@ -94,7 +94,7 @@ struct qcom_wcnss { phys_addr_t mem_phys; phys_addr_t mem_reloc; - void *mem_region; + void __iomem *mem_region; size_t mem_size; struct qcom_rproc_subdev smd_subdev; @@ -158,7 +158,7 @@ static int wcnss_load(struct rproc *rproc, const struct firmware *fw) int ret; ret = qcom_mdt_load(wcnss->dev, fw, rproc->firmware, WCNSS_PAS_ID, - wcnss->mem_region, wcnss->mem_phys, + (__force void *)wcnss->mem_region, wcnss->mem_phys, wcnss->mem_size, &wcnss->mem_reloc); if (ret) return ret; @@ -327,7 +327,7 @@ static void *wcnss_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_io if (offset < 0 || offset + len > wcnss->mem_size) return NULL; - return wcnss->mem_region + offset; + return (__force void *)wcnss->mem_region + offset; } static const struct rproc_ops wcnss_ops = {