| Message ID | 20200415071619.6052-2-sibis@codeaurora.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 9666174a4e1a7b1e32c214312678f8452275da6a |
| Headers | show |
| Series | [v2,1/2] remoteproc: qcom_q6v5_mss: map/unmap mpss segments before/after use | expand |
On Wed, Apr 15, 2020 at 12:16 AM Sibi Sankar <sibis@codeaurora.org> wrote: > > Remove unsed q6v5_da_to_va function as the mss driver uses a per segment > dump function. > > Signed-off-by: Sibi Sankar <sibis@codeaurora.org> > --- > drivers/remoteproc/qcom_q6v5_mss.c | 14 -------------- > 1 file changed, 14 deletions(-) > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c > index b781fc8de3597..6a19e0e77236e 100644 > --- a/drivers/remoteproc/qcom_q6v5_mss.c > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > @@ -196,7 +196,6 @@ struct q6v5 { > > phys_addr_t mpss_phys; > phys_addr_t mpss_reloc; > - void *mpss_region; Hm, this doesn't build for me on our Chrome tree: CC [M] drivers/remoteproc/qcom_q6v5_mss.o /mnt/host/source/src/third_party/kernel/v5.4/drivers/remoteproc/qcom_q6v5_mss.c:1118:16: error: no member named 'mpss_region' in 'struct q6v5' ptr = qproc->mpss_region + offset; ~~~~~ ^ /mnt/host/source/src/third_party/kernel/v5.4/drivers/remoteproc/qcom_q6v5_mss.c:1520:9: error: no member named 'mpss_region' in 'struct q6v5' qproc->mpss_region = devm_ioremap_wc(qproc->dev, qproc->mpss_phys, qproc->mpss_size); ~~~~~ ^ /mnt/host/source/src/third_party/kernel/v5.4/drivers/remoteproc/qcom_q6v5_mss.c:1521:14: error: no member named 'mpss_region' in 'struct q6v5' if (!qproc->mpss_region) { ~~~~~ ^
On Mon, Apr 20, 2020 at 11:53 AM Evan Green <evgreen@chromium.org> wrote: > > On Wed, Apr 15, 2020 at 12:16 AM Sibi Sankar <sibis@codeaurora.org> wrote: > > > > Remove unsed q6v5_da_to_va function as the mss driver uses a per segment > > dump function. > > > > Signed-off-by: Sibi Sankar <sibis@codeaurora.org> > > --- > > drivers/remoteproc/qcom_q6v5_mss.c | 14 -------------- > > 1 file changed, 14 deletions(-) > > > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c > > index b781fc8de3597..6a19e0e77236e 100644 > > --- a/drivers/remoteproc/qcom_q6v5_mss.c > > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > > @@ -196,7 +196,6 @@ struct q6v5 { > > > > phys_addr_t mpss_phys; > > phys_addr_t mpss_reloc; > > - void *mpss_region; > > Hm, this doesn't build for me on our Chrome tree: > > CC [M] drivers/remoteproc/qcom_q6v5_mss.o > /mnt/host/source/src/third_party/kernel/v5.4/drivers/remoteproc/qcom_q6v5_mss.c:1118:16: > error: no member named 'mpss_region' in 'struct q6v5' > ptr = qproc->mpss_region + offset; > ~~~~~ ^ > /mnt/host/source/src/third_party/kernel/v5.4/drivers/remoteproc/qcom_q6v5_mss.c:1520:9: > error: no member named 'mpss_region' in 'struct q6v5' > qproc->mpss_region = devm_ioremap_wc(qproc->dev, > qproc->mpss_phys, qproc->mpss_size); > ~~~~~ ^ > /mnt/host/source/src/third_party/kernel/v5.4/drivers/remoteproc/qcom_q6v5_mss.c:1521:14: > error: no member named 'mpss_region' in 'struct q6v5' > if (!qproc->mpss_region) { > ~~~~~ ^ Whoops, ignore me, I missed the other patch in this series. -Evan
On Wed, Apr 15, 2020 at 12:16 AM Sibi Sankar <sibis@codeaurora.org> wrote: > > Remove unsed q6v5_da_to_va function as the mss driver uses a per segment > dump function. > > Signed-off-by: Sibi Sankar <sibis@codeaurora.org> I tested both patches (successfully), but for some reason this is the only one related to this series in my inbox. Tested-by: Evan Green <evgreen@chromium.org>
diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index b781fc8de3597..6a19e0e77236e 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -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; @@ -1342,18 +1341,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) { @@ -1399,7 +1386,6 @@ static int qcom_q6v5_register_dump_segments(struct rproc *rproc, static const struct rproc_ops q6v5_ops = { .start = q6v5_start, .stop = q6v5_stop, - .da_to_va = q6v5_da_to_va, .parse_fw = qcom_q6v5_register_dump_segments, .load = q6v5_load, };
Remove unsed q6v5_da_to_va function as the mss driver uses a per segment dump function. Signed-off-by: Sibi Sankar <sibis@codeaurora.org> --- drivers/remoteproc/qcom_q6v5_mss.c | 14 -------------- 1 file changed, 14 deletions(-)