remoteproc: qcom_q6v5_mss: map/unmap mpss region before/after use
Subsystems (2)
PATCH 1/1 remoteproc: qcom_q6v5_mss: map/unmap mpss region before/after use
The application processor accessing the mpss region when the Q6 modem is running will lead to an XPU violation. Fix this by un-mapping the mpss region post copy during processor out of reset sequence and coredumps.
--- drivers/remoteproc/qcom_q6v5_mss.c | 53 ++++++++++++++++-------------- 1 file changed, 29 insertions(+), 24 deletions(-)
drivers/remoteproc/qcom_q6v5_mss.c +29 -24
@@ -196,7 +196,6 @@ struct q6v5 {phys_addr_t mpss_phys;phys_addr_t mpss_reloc; -void *mpss_region;size_t mpss_size;struct qcom_rproc_glink glink_subdev;
@@ -1061,6 +1060,18 @@ static int q6v5_reload_mba(struct rproc *rproc)return ret; } +static void *q6v5_da_to_va (struct rproc *rproc,u64 da,size_t len) +{ +struct q6v5 *qproc = rproc->priv; +int offset; + + offset = da - qproc->mpss_reloc; +if (offset <0 || offset + len > qproc->mpss_size) +return NULL ; + +return devm_ioremap_wc (qproc->dev, qproc->mpss_phys + offset, len); +} +static int q6v5_mpss_load (struct q6v5 *qproc) {const struct elf32_phdr *phdrs;
@@ -1156,7 +1167,11 @@ static int q6v5_mpss_load(struct q6v5 *qproc) goto release_firmware; } - ptr = qproc->mpss_region + offset; + ptr =q6v5_da_to_va (qproc->rproc, phdr->p_paddr, phdr->p_memsz); +if (!ptr) { +dev_err (qproc->dev,"failed to map memory\n" ); + goto release_firmware; + }if (phdr->p_filesz && phdr->p_offset < fw->size) {/* Firmware is large enough to be non-split */
@@ -1165,6 +1180,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)"failed to load segment %d from truncated file %s\n" , i, fw_name); ret = -EINVAL ; +devm_iounmap (qproc->dev, ptr); goto release_firmware; }
@@ -1175,6 +1191,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc) ret =request_firmware (&seg_fw, fw_name, qproc->dev);if (ret) {dev_err (qproc->dev,"failed to load %s\n" , fw_name); +devm_iounmap (qproc->dev, ptr); goto release_firmware; }
@@ -1187,6 +1204,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)memset (ptr + phdr->p_filesz,0 , phdr->p_memsz - phdr->p_filesz); } +devm_iounmap (qproc->dev, ptr); size += phdr->p_memsz; code_length =readl (qproc->rmb_base +RMB_PMI_CODE_LENGTH_REG );
@@ -1236,7 +1254,7 @@ static void qcom_q6v5_dump_segment(struct rproc *rproc,int ret =0 ;struct q6v5 *qproc = rproc->priv;unsigned long mask =BIT ((unsigned long )segment->priv); -void *ptr =rproc_da_to_va (rproc, segment->da, segment->size); +void *ptr =NULL ;/* Unlock mba before copying segments */ if (!qproc->dump_mba_loaded) {
@@ -1250,10 +1268,15 @@ static void qcom_q6v5_dump_segment(struct rproc *rproc, } } -if (!ptr || ret) -memset (dest,0xff , segment->size); -else +if (!ret) + ptr =rproc_da_to_va (rproc, segment->da, segment->size); + +if (ptr) {memcpy (dest, ptr, segment->size); +devm_iounmap (qproc->dev, ptr); + }else { +memset (dest,0xff , segment->size); + } qproc->dump_segment_mask |= mask;
@@ -1327,18 +1350,6 @@ static int q6v5_stop(struct rproc *rproc)return 0 ; } -static void *q6v5_da_to_va (struct rproc *rproc,u64 da,size_t len) -{ -struct q6v5 *qproc = rproc->priv; -int offset; - - offset = da - qproc->mpss_reloc; -if (offset <0 || offset + len > qproc->mpss_size) -return NULL ; - -return qproc->mpss_region + offset; -} -static int qcom_q6v5_register_dump_segments (struct rproc *rproc,const struct firmware *mba_fw) {
@@ -1595,12 +1606,6 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc) qproc->mpss_phys = qproc->mpss_reloc = r.start; qproc->mpss_size =resource_size (&r); - qproc->mpss_region =devm_ioremap_wc (qproc->dev, qproc->mpss_phys, qproc->mpss_size); -if (!qproc->mpss_region) { -dev_err (qproc->dev,"unable to map memory region: %pa+%zx\n" , - &r.start, qproc->mpss_size); -return -EBUSY ; - }return 0 ; }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoted 5 lines · Sibi Sankar
The application processor accessing the mpss region when the Q6 modem is running will lead to an XPU violation. Fix this by un-mapping the mpss region post copy during processor out of reset sequence and coredumps.
Does this problem not apply to the "mba" region?
Quoted 21 lines
Signed-off-by Sibi Sankar <[email protected]>--- drivers/remoteproc/qcom_q6v5_mss.c | 53 ++++++++++++++++-------------- 1 file changed, 29 insertions(+), 24 deletions(-)drivers/remoteproc/qcom_q6v5_mss.c +0
-1@@ -196,7 +196,6 @@ struct q6v5 {phys_addr_t mpss_phys;phys_addr_t mpss_reloc; -void *mpss_region;size_t mpss_size;struct qcom_rproc_glink glink_subdev;@@ -1061,6 +1060,18 @@ static int q6v5_reload_mba(struct rproc *rproc)return ret; }
drivers/remoteproc/qcom_q6v5_mss.c static int q6v5_reload_mba(struct rproc *rproc) · line 1072
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_mss.c +10
-0+static void *q6v5_da_to_va (struct rproc *rproc,u64 da,size_t len) +{ +struct q6v5 *qproc = rproc->priv; +int offset; + + offset = da - qproc->mpss_reloc; +if (offset <0 || offset + len > qproc->mpss_size) +return NULL ; + +return devm_ioremap_wc (qproc->dev, qproc->mpss_phys + offset, len);
This function isn't expected to have side effects.
So I think you should add the ioremap/iounmap to the beginning/end of mpss_load and the dump_segment directly instead.
drivers/remoteproc/qcom_q6v5_mss.c static int q6v5_mpss_load(struct q6v5 *qproc) · line 1170
Quoted 11 lines
drivers/remoteproc/qcom_q6v5_mss.c +3
-1+} +static int q6v5_mpss_load (struct q6v5 *qproc) {const struct elf32_phdr *phdrs;@@ -1156,7 +1167,11 @@ static int q6v5_mpss_load(struct q6v5 *qproc) goto release_firmware; } - ptr = qproc->mpss_region + offset; + ptr =q6v5_da_to_va (qproc->rproc, phdr->p_paddr, phdr->p_memsz);
rproc_da_to_va() here.
drivers/remoteproc/qcom_q6v5_mss.c static int q6v5_mpss_load(struct q6v5 *qproc) · line 1172
Quoted 2 lines
drivers/remoteproc/qcom_q6v5_mss.c +2
-0+if (!ptr) { +dev_err (qproc->dev,"failed to map memory\n" );
Now this will be able to fail, so you should add this error handling snippet, just with a slightly different message.
Quoted 22 lines
drivers/remoteproc/qcom_q6v5_mss.c +4
-0+ goto release_firmware; + }if (phdr->p_filesz && phdr->p_offset < fw->size) {/* Firmware is large enough to be non-split */ @@ -1165,6 +1180,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)"failed to load segment %d from truncated file %s\n" , i, fw_name); ret = -EINVAL ; +devm_iounmap (qproc->dev, ptr); goto release_firmware; }@@ -1175,6 +1191,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc) ret =request_firmware (&seg_fw, fw_name, qproc->dev);if (ret) {dev_err (qproc->dev,"failed to load %s\n" , fw_name); +devm_iounmap (qproc->dev, ptr); goto release_firmware; }
drivers/remoteproc/qcom_q6v5_mss.c static int q6v5_mpss_load(struct q6v5 *qproc) · line 1207
Quoted 4 lines
drivers/remoteproc/qcom_q6v5_mss.c +1
-0@@ -1187,6 +1204,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)memset (ptr + phdr->p_filesz,0 , phdr->p_memsz - phdr->p_filesz); } +devm_iounmap (qproc->dev, ptr);
Move this to the end an unmap the entire thing.
And generally, please avoid devm for things where you manually unmap.
Regards,
Bjorn
Quoted 66 lines
drivers/remoteproc/qcom_q6v5_mss.c +9
-22size += phdr->p_memsz; code_length =readl (qproc->rmb_base +RMB_PMI_CODE_LENGTH_REG );@@ -1236,7 +1254,7 @@ static void qcom_q6v5_dump_segment(struct rproc *rproc,int ret =0 ;struct q6v5 *qproc = rproc->priv;unsigned long mask =BIT ((unsigned long )segment->priv); -void *ptr =rproc_da_to_va (rproc, segment->da, segment->size); +void *ptr =NULL ;/* Unlock mba before copying segments */ if (!qproc->dump_mba_loaded) {@@ -1250,10 +1268,15 @@ static void qcom_q6v5_dump_segment(struct rproc *rproc, } } -if (!ptr || ret) -memset (dest,0xff , segment->size); -else +if (!ret) + ptr =rproc_da_to_va (rproc, segment->da, segment->size); + +if (ptr) {memcpy (dest, ptr, segment->size); +devm_iounmap (qproc->dev, ptr); + }else { +memset (dest,0xff , segment->size); + } qproc->dump_segment_mask |= mask;@@ -1327,18 +1350,6 @@ static int q6v5_stop(struct rproc *rproc)return 0 ; } -static void *q6v5_da_to_va (struct rproc *rproc,u64 da,size_t len) -{ -struct q6v5 *qproc = rproc->priv; -int offset; - - offset = da - qproc->mpss_reloc; -if (offset <0 || offset + len > qproc->mpss_size) -return NULL ; - -return qproc->mpss_region + offset; -} -static int qcom_q6v5_register_dump_segments (struct rproc *rproc,const struct firmware *mba_fw) {@@ -1595,12 +1606,6 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc) qproc->mpss_phys = qproc->mpss_reloc = r.start; qproc->mpss_size =resource_size (&r); - qproc->mpss_region =devm_ioremap_wc (qproc->dev, qproc->mpss_phys, qproc->mpss_size); -if (!qproc->mpss_region) { -dev_err (qproc->dev,"unable to map memory region: %pa+%zx\n" , - &r.start, qproc->mpss_size); -return -EBUSY ; - }return 0 ; }Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Hey Bjorn,
Thanks for review!
Quoted 9 lines · Bjorn Andersson
Quoted 5 lines · Sibi Sankar
The application processor accessing the mpss region when the Q6 modem is running will lead to an XPU violation. Fix this by un-mapping the mpss region post copy during processor out of reset sequence and coredumps.
Does this problem not apply to the "mba" region?
For mba region, memcpy is expected
to be completed before bringing
the Q6 out of reset. Downstream they seem to use a wmb() to accomplish this. Since we havn't observed any issues until now, we can defer adding any fixes related to mba region.
Quoted 23 lines
Quoted 23 lines
Signed-off-by Sibi Sankar <[email protected]>--- drivers/remoteproc/qcom_q6v5_mss.c | 53 ++++++++++++++++-------------- 1 file changed, 29 insertions(+), 24 deletions(-)drivers/remoteproc/qcom_q6v5_mss.c +0
-1@@ -196,7 +196,6 @@ struct q6v5 {phys_addr_t mpss_phys;phys_addr_t mpss_reloc; -void *mpss_region;size_t mpss_size;struct qcom_rproc_glink glink_subdev;@@ -1061,6 +1060,18 @@ static int q6v5_reload_mba(struct rproc *rproc)return ret; }
Quoted 12 lines
drivers/remoteproc/qcom_q6v5_mss.c static int q6v5_reload_mba(struct rproc *rproc) · line 1072
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_mss.c +10
-0+static void *q6v5_da_to_va (struct rproc *rproc,u64 da,size_t len) +{ +struct q6v5 *qproc = rproc->priv; +int offset; + + offset = da - qproc->mpss_reloc; +if (offset <0 || offset + len > qproc->mpss_size) +return NULL ; + +return devm_ioremap_wc (qproc->dev, qproc->mpss_phys + offset, len);This function isn't expected to have side effects.
unfortunately doing ioremap/iounmap for the entire region isn't sufficient, while testing I found per region remap /unmap was required i.e after we moved to away from the validating the entire blog in a single pass.
Now with the mpss_region out of the picture da_to_va really made no sense without having ioremap function in it. Let me know what you think.
Quoted 13 lines
So I think you should add the ioremap/iounmap to the beginning/end of
mpss_loadand thedump_segmentdirectly instead.Quoted 9 lines
drivers/remoteproc/qcom_q6v5_mss.c +2
-0+} +static int q6v5_mpss_load (struct q6v5 *qproc) {const struct elf32_phdr *phdrs;@@ -1156,7 +1167,11 @@ static int q6v5_mpss_load(struct q6v5 *qproc) goto release_firmware; }
Quoted 4 lines
drivers/remoteproc/qcom_q6v5_mss.c static int q6v5_mpss_load(struct q6v5 *qproc) · line 1170
Quoted 2 lines
drivers/remoteproc/qcom_q6v5_mss.c +1
-1- ptr = qproc->mpss_region + offset; + ptr =q6v5_da_to_va (qproc->rproc, phdr->p_paddr, phdr->p_memsz);
rproc_da_to_va()here.
sure
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_mss.c static int q6v5_mpss_load(struct q6v5 *qproc) · line 1172
Quoted 3 lines
drivers/remoteproc/qcom_q6v5_mss.c +2
-0+if (!ptr) { +dev_err (qproc->dev,"failed to map memory\n" );Now this will be able to fail, so you should add this error handling snippet, just with a slightly different message.
sure
Quoted 30 lines
Quoted 23 lines
drivers/remoteproc/qcom_q6v5_mss.c +4
-0+ goto release_firmware; + }if (phdr->p_filesz && phdr->p_offset < fw->size) {/* Firmware is large enough to be non-split */ @@ -1165,6 +1180,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)"failed to load segment %d from truncated file %s\n" , i, fw_name); ret = -EINVAL ; +devm_iounmap (qproc->dev, ptr); goto release_firmware; }@@ -1175,6 +1191,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc) ret =request_firmware (&seg_fw, fw_name, qproc->dev);if (ret) {dev_err (qproc->dev,"failed to load %s\n" , fw_name); +devm_iounmap (qproc->dev, ptr); goto release_firmware; }drivers/remoteproc/qcom_q6v5_mss.c static int q6v5_mpss_load(struct q6v5 *qproc) · line 1207
Quoted 4 lines
drivers/remoteproc/qcom_q6v5_mss.c +1
-0@@ -1187,6 +1204,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)memset (ptr + phdr->p_filesz,0 , phdr->p_memsz - phdr->p_filesz); } +devm_iounmap (qproc->dev, ptr);Move this to the end an unmap the entire thing.
Quoted 1 line
And generally, please avoid devm for things where you manually unmap.
will take care of ^^ in the next re-spin.
Quoted 74 lines
Regards,
BjornQuoted 70 lines
drivers/remoteproc/qcom_q6v5_mss.c +1
-1size += phdr->p_memsz; code_length =readl (qproc->rmb_base +RMB_PMI_CODE_LENGTH_REG );@@ -1236,7 +1254,7 @@ static void qcom_q6v5_dump_segment(struct rproc *rproc, int ret = 0;struct q6v5 *qproc = rproc->priv;unsigned long mask =BIT ((unsigned long )segment->priv); -void *ptr =rproc_da_to_va (rproc, segment->da, segment->size); +void *ptr =NULL ;/* Unlock mba before copying segments */ drivers/remoteproc/qcom_q6v5_mss.c +8
-21if (!qproc->dump_mba_loaded) {@@ -1250,10 +1268,15 @@ static void qcom_q6v5_dump_segment(struct rproc *rproc, } } -if (!ptr || ret) -memset (dest,0xff , segment->size); -else +if (!ret) + ptr =rproc_da_to_va (rproc, segment->da, segment->size); + +if (ptr) {memcpy (dest, ptr, segment->size); +devm_iounmap (qproc->dev, ptr); + }else { +memset (dest,0xff , segment->size); + } qproc->dump_segment_mask |= mask;@@ -1327,18 +1350,6 @@ static int q6v5_stop(struct rproc *rproc)return 0 ; } -static void *q6v5_da_to_va (struct rproc *rproc,u64 da,size_t len) -{ -struct q6v5 *qproc = rproc->priv; -int offset; - - offset = da - qproc->mpss_reloc; -if (offset <0 || offset + len > qproc->mpss_size) -return NULL ; - -return qproc->mpss_region + offset; -} -static int qcom_q6v5_register_dump_segments (struct rproc *rproc,const struct firmware *mba_fw) {@@ -1595,12 +1606,6 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc) qproc->mpss_phys = qproc->mpss_reloc = r.start; qproc->mpss_size =resource_size (&r); - qproc->mpss_region =devm_ioremap_wc (qproc->dev, qproc->mpss_phys, qproc->mpss_size); -if (!qproc->mpss_region) { -dev_err (qproc->dev,"unable to map memory region: %pa+%zx\n" , - &r.start, qproc->mpss_size); -return -EBUSY ; - }return 0;
}
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.