From: Dennis-YC Hsieh <dennis-yc.hsieh@mediatek.com>
To: CK Hu <ck.hu@mediatek.com>
Cc: Rob Herring <robh+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Jassi Brar <jassisinghbrar@gmail.com>,
<linux-kernel@vger.kernel.org>,
<linux-mediatek@lists.infradead.org>,
<devicetree@vger.kernel.org>, <wsd_upstream@mediatek.com>,
Bibby Hsieh <bibby.hsieh@mediatek.com>,
Houlong Wei <houlong.wei@mediatek.com>,
<linux-arm-kernel@lists.infradead.org>,
<srv_heupstream@mediatek.com>,
"Ming-Fan Chen" <ming-fan.chen@mediatek.com>
Subject: Re: [PATCH v3 02/13] mailbox: cmdq: variablize address shift in platform
Date: Sat, 29 Feb 2020 21:36:31 +0800 [thread overview]
Message-ID: <1582983391.21073.1.camel@mtkswgap22> (raw)
In-Reply-To: <1582903376.14824.16.camel@mtksdaap41>
Hi CK,
Thanks for your comment.
On Fri, 2020-02-28 at 23:22 +0800, CK Hu wrote:
> Hi, Dennis:
>
> On Fri, 2020-02-28 at 21:44 +0800, Dennis YC Hsieh wrote:
> > Some gce hardware shift pc and end address in register to support
> > large dram addressing.
> > Implement gce address shift when write or read pc and end register.
> > And add shift bit in platform definition.
> >
> > Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
> > ---
> > drivers/mailbox/mtk-cmdq-mailbox.c | 57 ++++++++++++++++++------
> > drivers/soc/mediatek/mtk-cmdq-helper.c | 3 +-
> > include/linux/mailbox/mtk-cmdq-mailbox.h | 2 +
> > 3 files changed, 48 insertions(+), 14 deletions(-)
> >
> > diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
> > index 9a6ce9f5a7db..a98f0357dd7d 100644
> > --- a/drivers/mailbox/mtk-cmdq-mailbox.c
> > +++ b/drivers/mailbox/mtk-cmdq-mailbox.c
> > @@ -76,8 +76,22 @@ struct cmdq {
> > struct cmdq_thread *thread;
> > struct clk *clock;
> > bool suspended;
> > + u8 shift_pa;
> > };
> >
> > +struct gce_plat {
> > + u32 thread_nr;
> > + u8 shift;
> > +};
> > +
> > +u8 cmdq_mbox_shift(struct mbox_chan *chan)
> > +{
> > + struct cmdq *cmdq = container_of(chan->mbox, struct cmdq, mbox);
> > +
> > + return cmdq->shift_pa;
> > +}
> > +EXPORT_SYMBOL(cmdq_mbox_shift);
> > +
> > static int cmdq_thread_suspend(struct cmdq *cmdq, struct cmdq_thread *thread)
> > {
> > u32 status;
> > @@ -183,7 +197,7 @@ static void cmdq_task_remove_wfe(struct cmdq_task *task)
> > for (i = 0; i < CMDQ_NUM_CMD(task->pkt); i++)
> > if (cmdq_command_is_wfe(base[i]))
> > base[i] = (u64)CMDQ_JUMP_BY_OFFSET << 32 |
> > - CMDQ_JUMP_PASS;
> > + CMDQ_JUMP_PASS >> task->cmdq->shift_pa;
> > dma_sync_single_for_device(dev, task->pa_base, task->pkt->cmd_buf_size,
> > DMA_TO_DEVICE);
> > }
> > @@ -221,13 +235,15 @@ static void cmdq_task_handle_error(struct cmdq_task *task)
> > {
> > struct cmdq_thread *thread = task->thread;
> > struct cmdq_task *next_task;
> > + struct cmdq *cmdq = task->cmdq;
> >
> > dev_err(task->cmdq->mbox.dev, "task 0x%p error\n", task);
> > WARN_ON(cmdq_thread_suspend(task->cmdq, thread) < 0);
>
> If you invent local variable 'cmdq', I think you could replace all
> task->cmdq with cmdq in this function.
>
Ok, will do.
> > next_task = list_first_entry_or_null(&thread->task_busy_list,
> > struct cmdq_task, list_entry);
> > if (next_task)
> > - writel(next_task->pa_base, thread->base + CMDQ_THR_CURR_ADDR);
> > + writel(next_task->pa_base >> cmdq->shift_pa,
> > + thread->base + CMDQ_THR_CURR_ADDR);
> > cmdq_thread_resume(thread);
> > }
> >
> > @@ -257,7 +273,7 @@ static void cmdq_thread_irq_handler(struct cmdq *cmdq,
> > else
> > return;
> >
> > - curr_pa = readl(thread->base + CMDQ_THR_CURR_ADDR);
> > + curr_pa = readl(thread->base + CMDQ_THR_CURR_ADDR) << cmdq->shift_pa;
> >
> > list_for_each_entry_safe(task, tmp, &thread->task_busy_list,
> > list_entry) {
> > @@ -373,16 +389,20 @@ static int cmdq_mbox_send_data(struct mbox_chan *chan, void *data)
> > WARN_ON(clk_enable(cmdq->clock) < 0);
> > WARN_ON(cmdq_thread_reset(cmdq, thread) < 0);
> >
> > - writel(task->pa_base, thread->base + CMDQ_THR_CURR_ADDR);
> > - writel(task->pa_base + pkt->cmd_buf_size,
> > + writel(task->pa_base >> cmdq->shift_pa,
> > + thread->base + CMDQ_THR_CURR_ADDR);
> > + writel((task->pa_base + pkt->cmd_buf_size) >> cmdq->shift_pa,
> > thread->base + CMDQ_THR_END_ADDR);
> > +
> > writel(thread->priority, thread->base + CMDQ_THR_PRIORITY);
> > writel(CMDQ_THR_IRQ_EN, thread->base + CMDQ_THR_IRQ_ENABLE);
> > writel(CMDQ_THR_ENABLED, thread->base + CMDQ_THR_ENABLE_TASK);
> > } else {
> > WARN_ON(cmdq_thread_suspend(cmdq, thread) < 0);
> > - curr_pa = readl(thread->base + CMDQ_THR_CURR_ADDR);
> > - end_pa = readl(thread->base + CMDQ_THR_END_ADDR);
> > + curr_pa = readl(thread->base + CMDQ_THR_CURR_ADDR) <<
> > + cmdq->shift_pa;
> > + end_pa = readl(thread->base + CMDQ_THR_END_ADDR) <<
> > + cmdq->shift_pa;
> >
> > /*
> > * Atomic execution should remove the following wfe, i.e. only
> > @@ -395,7 +415,7 @@ static int cmdq_mbox_send_data(struct mbox_chan *chan, void *data)
> > cmdq_thread_wait_end(thread, end_pa);
> > WARN_ON(cmdq_thread_suspend(cmdq, thread) < 0);
> > /* set to this task directly */
> > - writel(task->pa_base,
> > + writel(task->pa_base >> cmdq->shift_pa,
> > thread->base + CMDQ_THR_CURR_ADDR);
> > } else {
> > cmdq_task_insert_into_thread(task);
> > @@ -407,14 +427,14 @@ static int cmdq_mbox_send_data(struct mbox_chan *chan, void *data)
> > if (curr_pa == end_pa - CMDQ_INST_SIZE ||
> > curr_pa == end_pa) {
> > /* set to this task directly */
> > - writel(task->pa_base,
> > + writel(task->pa_base >> cmdq->shift_pa,
> > thread->base + CMDQ_THR_CURR_ADDR);
> > } else {
> > cmdq_task_insert_into_thread(task);
> > smp_mb(); /* modify jump before enable thread */
> > }
> > }
> > - writel(task->pa_base + pkt->cmd_buf_size,
> > + writel((task->pa_base + pkt->cmd_buf_size) >> cmdq->shift_pa,
> > thread->base + CMDQ_THR_END_ADDR);
> > cmdq_thread_resume(thread);
> > }
> > @@ -461,6 +481,7 @@ static int cmdq_probe(struct platform_device *pdev)
> > struct resource *res;
> > struct cmdq *cmdq;
> > int err, i;
> > + struct gce_plat *plat_data;
> >
> > cmdq = devm_kzalloc(dev, sizeof(*cmdq), GFP_KERNEL);
> > if (!cmdq)
> > @@ -479,7 +500,14 @@ static int cmdq_probe(struct platform_device *pdev)
> > return -EINVAL;
> > }
> >
> > - cmdq->thread_nr = (u32)(unsigned long)of_device_get_match_data(dev);
> > + plat_data = (struct gce_plat *)of_device_get_match_data(dev);
> > + if (!plat_data) {
> > + dev_err(dev, "failed to get match data\n");
> > + return -EINVAL;
> > + }
> > +
> > + cmdq->thread_nr = plat_data->thread_nr;
> > + cmdq->shift_pa = plat_data->shift;
> > cmdq->irq_mask = GENMASK(cmdq->thread_nr - 1, 0);
> > err = devm_request_irq(dev, cmdq->irq, cmdq_irq_handler, IRQF_SHARED,
> > "mtk_cmdq", cmdq);
> > @@ -542,9 +570,12 @@ static const struct dev_pm_ops cmdq_pm_ops = {
> > .resume = cmdq_resume,
> > };
> >
> > +static const struct gce_plat gce_plat_v2 = {.thread_nr = 16};
> > +static const struct gce_plat gce_plat_v3 = {.thread_nr = 24};
> > +
> > static const struct of_device_id cmdq_of_ids[] = {
> > - {.compatible = "mediatek,mt8173-gce", .data = (void *)16},
> > - {.compatible = "mediatek,mt8183-gce", .data = (void *)24},
> > + {.compatible = "mediatek,mt8173-gce", .data = (void *)&gce_plat_v2},
> > + {.compatible = "mediatek,mt8183-gce", .data = (void *)&gce_plat_v3},
> > {}
> > };
> >
> > diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > index de20e6cba83b..2e1bc513569b 100644
> > --- a/drivers/soc/mediatek/mtk-cmdq-helper.c
> > +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > @@ -291,7 +291,8 @@ static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
> >
> > /* JUMP to end */
> > inst.op = CMDQ_CODE_JUMP;
> > - inst.value = CMDQ_JUMP_PASS;
> > + inst.value = CMDQ_JUMP_PASS >>
> > + cmdq_mbox_shift(((struct cmdq_client *)pkt->cl)->chan);
>
> Why not just cmdq_mbox_shift(pkt->cl->chan) ?
Ok, will do.
Regards,
Dennis
>
> Regards,
> CK
>
> > err = cmdq_pkt_append_command(pkt, inst);
> >
> > return err;
> > diff --git a/include/linux/mailbox/mtk-cmdq-mailbox.h b/include/linux/mailbox/mtk-cmdq-mailbox.h
> > index a4dc45fbec0a..dfe5b2eb85cc 100644
> > --- a/include/linux/mailbox/mtk-cmdq-mailbox.h
> > +++ b/include/linux/mailbox/mtk-cmdq-mailbox.h
> > @@ -88,4 +88,6 @@ struct cmdq_pkt {
> > void *cl;
> > };
> >
> > +u8 cmdq_mbox_shift(struct mbox_chan *chan);
> > +
> > #endif /* __MTK_CMDQ_MAILBOX_H__ */
>
>
next prev parent reply other threads:[~2020-02-29 13:36 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-28 13:44 [PATCH v3 00/13] support gce on mt6779 platform Dennis YC Hsieh
2020-02-28 13:44 ` Dennis YC Hsieh
2020-02-28 13:44 ` [PATCH v3 01/13] dt-binding: gce: add gce header file for mt6779 Dennis YC Hsieh
2020-02-28 15:26 ` CK Hu
2020-03-02 20:15 ` Rob Herring
2020-02-28 13:44 ` [PATCH v3 02/13] mailbox: cmdq: variablize address shift in platform Dennis YC Hsieh
2020-02-28 15:22 ` CK Hu
2020-02-29 13:36 ` Dennis-YC Hsieh [this message]
2020-02-28 13:44 ` [PATCH v3 03/13] mailbox: cmdq: support mt6779 gce platform definition Dennis YC Hsieh
2020-02-28 13:44 ` [PATCH v3 04/13] mailbox: mediatek: cmdq: clear task in channel before shutdown Dennis YC Hsieh
2020-02-28 15:57 ` CK Hu
2020-02-29 13:40 ` Dennis-YC Hsieh
2020-02-28 13:44 ` [PATCH v3 05/13] soc: mediatek: cmdq: return send msg error code Dennis YC Hsieh
2020-02-28 15:39 ` CK Hu
2020-02-29 13:41 ` Dennis-YC Hsieh
2020-02-28 13:44 ` [PATCH v3 06/13] soc: mediatek: cmdq: add assign function Dennis YC Hsieh
2020-02-28 14:44 ` CK Hu
2020-02-28 13:44 ` [PATCH v3 07/13] soc: mediatek: cmdq: add write_s function Dennis YC Hsieh
2020-02-28 14:49 ` CK Hu
2020-02-28 13:44 ` [PATCH v3 08/13] soc: mediatek: cmdq: add read_s function Dennis YC Hsieh
2020-02-28 14:50 ` CK Hu
2020-02-28 13:44 ` [PATCH v3 09/13] soc: mediatek: cmdq: add write_s value function Dennis YC Hsieh
2020-02-28 14:55 ` CK Hu
2020-02-28 13:44 ` [PATCH v3 10/13] soc: mediatek: cmdq: export finalize function Dennis YC Hsieh
2020-02-28 13:44 ` [PATCH v3 11/13] soc: mediatek: cmdq: add jump function Dennis YC Hsieh
2020-02-28 14:59 ` CK Hu
2020-02-29 13:42 ` Dennis-YC Hsieh
2020-02-28 13:44 ` [PATCH v3 12/13] soc: mediatek: cmdq: add clear option in cmdq_pkt_wfe api Dennis YC Hsieh
2020-02-28 14:32 ` CK Hu
2020-02-29 14:37 ` Dennis-YC Hsieh
2020-02-28 13:44 ` [PATCH v3 13/13] soc: mediatek: cmdq: add set event function Dennis YC Hsieh
2020-02-28 15:05 ` CK Hu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1582983391.21073.1.camel@mtkswgap22 \
--to=dennis-yc.hsieh@mediatek.com \
--cc=bibby.hsieh@mediatek.com \
--cc=ck.hu@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=houlong.wei@mediatek.com \
--cc=jassisinghbrar@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=ming-fan.chen@mediatek.com \
--cc=robh+dt@kernel.org \
--cc=srv_heupstream@mediatek.com \
--cc=wsd_upstream@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).