| Message ID | 1608712499-24956-2-git-send-email-yongqiang.niu@mediatek.com |
|---|---|
| State | Accepted |
| Commit | 8b60ed2b1674b78ebc433a11efa7d48821229037 |
| Headers | show |
| Series | [v2] soc: mediatek: cmdq: add address shift in jump | expand |
On Wed, 2020-12-23 at 16:34 +0800, Yongqiang Niu wrote: > Add address shift when compose jump instruction > to compatible with 35bit format. > > Fixes: 0858fde496f8 ("mailbox: cmdq: variablize address shift in platform") > > Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com> > Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> > --- > drivers/mailbox/mtk-cmdq-mailbox.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c > index 5665b6e..75378e3 100644 > --- a/drivers/mailbox/mtk-cmdq-mailbox.c > +++ b/drivers/mailbox/mtk-cmdq-mailbox.c > @@ -168,7 +168,8 @@ static void cmdq_task_insert_into_thread(struct cmdq_task *task) > dma_sync_single_for_cpu(dev, prev_task->pa_base, > prev_task->pkt->cmd_buf_size, DMA_TO_DEVICE); > prev_task_base[CMDQ_NUM_CMD(prev_task->pkt) - 1] = > - (u64)CMDQ_JUMP_BY_PA << 32 | task->pa_base; > + (u64)CMDQ_JUMP_BY_PA << 32 | > + (task->pa_base >> task->cmdq->shift_pa); > dma_sync_single_for_device(dev, prev_task->pa_base, > prev_task->pkt->cmd_buf_size, DMA_TO_DEVICE); > hi jassi please confirm is there any question about this patch. if not, please apply this into next version, tks
On Thu, Jan 7, 2021 at 7:48 PM Yongqiang Niu <yongqiang.niu@mediatek.com> wrote: > > On Wed, 2020-12-23 at 16:34 +0800, Yongqiang Niu wrote: > > Add address shift when compose jump instruction > > to compatible with 35bit format. > > > > Fixes: 0858fde496f8 ("mailbox: cmdq: variablize address shift in platform") > > > > Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com> > > Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> > > --- > > drivers/mailbox/mtk-cmdq-mailbox.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c > > index 5665b6e..75378e3 100644 > > --- a/drivers/mailbox/mtk-cmdq-mailbox.c > > +++ b/drivers/mailbox/mtk-cmdq-mailbox.c > > @@ -168,7 +168,8 @@ static void cmdq_task_insert_into_thread(struct cmdq_task *task) > > dma_sync_single_for_cpu(dev, prev_task->pa_base, > > prev_task->pkt->cmd_buf_size, DMA_TO_DEVICE); > > prev_task_base[CMDQ_NUM_CMD(prev_task->pkt) - 1] = > > - (u64)CMDQ_JUMP_BY_PA << 32 | task->pa_base; > > + (u64)CMDQ_JUMP_BY_PA << 32 | > > + (task->pa_base >> task->cmdq->shift_pa); > > dma_sync_single_for_device(dev, prev_task->pa_base, > > prev_task->pkt->cmd_buf_size, DMA_TO_DEVICE); > > > > hi jassi > > please confirm is there any question about this patch. > if not, please apply this into next version, tks > I can't locate this patch in my inbox. And I can't fwd it from lkml to myself. Please resend. thnks.
diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c index 5665b6e..75378e3 100644 --- a/drivers/mailbox/mtk-cmdq-mailbox.c +++ b/drivers/mailbox/mtk-cmdq-mailbox.c @@ -168,7 +168,8 @@ static void cmdq_task_insert_into_thread(struct cmdq_task *task) dma_sync_single_for_cpu(dev, prev_task->pa_base, prev_task->pkt->cmd_buf_size, DMA_TO_DEVICE); prev_task_base[CMDQ_NUM_CMD(prev_task->pkt) - 1] = - (u64)CMDQ_JUMP_BY_PA << 32 | task->pa_base; + (u64)CMDQ_JUMP_BY_PA << 32 | + (task->pa_base >> task->cmdq->shift_pa); dma_sync_single_for_device(dev, prev_task->pa_base, prev_task->pkt->cmd_buf_size, DMA_TO_DEVICE);
Add address shift when compose jump instruction to compatible with 35bit format. Fixes: 0858fde496f8 ("mailbox: cmdq: variablize address shift in platform") Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com> Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> --- drivers/mailbox/mtk-cmdq-mailbox.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)