On Wed, 2018-09-26 at 23:53 +0800, Matthias Brugger wrote:
>
> On 25/07/2018 03:26, Houlong Wei wrote:
> > Add Mediatek CMDQ helper to create CMDQ packet and assemble GCE op code.
> >
> > Signed-off-by: Houlong Wei <houlong.wei@xxxxxxxxxxxx>
> > Signed-off-by: HS Liao <hs.liao@xxxxxxxxxxxx>
> > ---
> > drivers/soc/mediatek/Kconfig | 12 ++
> > drivers/soc/mediatek/Makefile | 1 +
> > drivers/soc/mediatek/mtk-cmdq-helper.c | 291 ++++++++++++++++++++++++++++++++
> > include/linux/soc/mediatek/mtk-cmdq.h | 135 +++++++++++++++
> > 4 files changed, 439 insertions(+)
> > create mode 100644 drivers/soc/mediatek/mtk-cmdq-helper.c
> > create mode 100644 include/linux/soc/mediatek/mtk-cmdq.h
[...]
> > +
> > +struct cmdq_client *cmdq_mbox_create(struct device *dev, int index, u32 timeout)
> > +{
> > + struct cmdq_client *client;
> > +
> > + client = kzalloc(sizeof(*client), GFP_KERNEL);
> > + if (!client)
> > + return (struct cmdq_client *)-ENOMEM;
> > +
> > + client->timeout_ms = timeout;
> > + if (timeout != CMDQ_NO_TIMEOUT) {
> > + spin_lock_init(&client->lock);
> > + timer_setup(&client->timer, cmdq_client_timeout, 0);
> > + }
> > + client->pkt_cnt = 0;
> > + client->client.dev = dev;
> > + client->client.tx_block = false;
> > + client->chan = mbox_request_channel(&client->client, index);
> > +
> > + if (IS_ERR(client->chan)) {
> > + long err = 0;
> > +
> > + dev_err(dev, "failed to request channel\n");
> > + err = PTR_ERR(client->chan);
> > + kfree(client);
> > +
> > + return (struct cmdq_client *)err;
>
> Can't we use
> return ERR_PTR(err);
> here?
Sure, will fix it.
>
> > + }
> > +
> > + return client;
> > +}
> > +EXPORT_SYMBOL(cmdq_mbox_create);
> > +
> > +void cmdq_mbox_destroy(struct cmdq_client *client)
> > +{
> > + if (client->timeout_ms != CMDQ_NO_TIMEOUT) {
> > + spin_lock(&client->lock);
> > + del_timer_sync(&client->timer);
> > + spin_unlock(&client->lock);
> > + }
> > + mbox_free_channel(client->chan);
> > + kfree(client);
> > +}
> > +EXPORT_SYMBOL(cmdq_mbox_destroy);
> > +
> > +int cmdq_pkt_create(struct cmdq_client *client, struct cmdq_pkt **pkt_ptr,
> > + size_t size)
>
> I suppose you are not returning the allocated cmdq_pkt to avoid checks for
> IS_ERR() logic in the consumer of this API. Am I correct?
> Do we really need a pointer to a pointer here? Can't we just use a struct
> cmdq_pkt *pkt as argument? That would make things easier.
Do you mean we change the argument 'struct cmdq_pkt **pkt_ptr' to
'struct cmdq_pkt *pkt', and the consumer allocate a struct cmdq_pkt
*pkt, then pass pkt as argument of this API?
If yes, the consumer still need to check the return value of this API.
For the current implementation, the consumer doesn't need check
IS_ERR(*pkt_ptr) if the return value equals to 0.
Since the consumer has to check the return value of this API once, to
make it simpler, I shall change the prototype to
'struct cmdq_pkt *cmdq_pkt_create(struct cmdq_client *client, size_t
size)' and change its implementation.
>
> > +{
> > + struct cmdq_pkt *pkt;
> > + struct device *dev;
> > + dma_addr_t dma_addr;
> > +
> > + pkt = kzalloc(sizeof(*pkt), GFP_KERNEL);
> > + if (!pkt)
> > + return -ENOMEM;
> > + pkt->va_base = kzalloc(size, GFP_KERNEL);
> > + if (!pkt->va_base) {
> > + kfree(pkt);
> > + return -ENOMEM;
> > + }
> > + pkt->buf_size = size;
> > + pkt->cl = (void *)client;
> > +
> > + dev = client->chan->mbox->dev;
> > + dma_addr = dma_map_single(dev, pkt->va_base, pkt->buf_size,
> > + DMA_TO_DEVICE);
> > + if (dma_mapping_error(dev, dma_addr)) {
> > + dev_err(dev, "dma map failed, size=%u\n", (u32)(u64)size);
> > + kfree(pkt->va_base);
> > + kfree(pkt);
> > + return -ENOMEM;
> > + }
> > +
> > + pkt->pa_base = dma_addr;
> > + *pkt_ptr = pkt;
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL(cmdq_pkt_create);
> > +
> > +void cmdq_pkt_destroy(struct cmdq_pkt *pkt)
> > +{
> > + struct cmdq_client *client = (struct cmdq_client *)pkt->cl;
> > +
> > + dma_unmap_single(client->chan->mbox->dev, pkt->pa_base, pkt->buf_size,
> > + DMA_TO_DEVICE);
> > + kfree(pkt->va_base);
> > + kfree(pkt);
> > +}
> > +EXPORT_SYMBOL(cmdq_pkt_destroy);
> > +
> > +static int cmdq_pkt_append_command(struct cmdq_pkt *pkt, enum cmdq_code code,
> > + u32 arg_a, u32 arg_b)
> > +{
> > + u64 *cmd_ptr;
> > +
> > + if (unlikely(pkt->cmd_buf_size + CMDQ_INST_SIZE > pkt->buf_size)) {
> > + pkt->cmd_buf_size += CMDQ_INST_SIZE;
>
> Why do we update the cmd_buf_size here?
Because in developing phase of consumer driver, the consumer has to know
the real command buffer size after adding command failure. Then the
consumer will increase the size and run the cmdq flow (cmdq_pkt_create,
cmdq_pkt_write/wfe...) again. Finally, the consumer get the real size
and fix it.
>
> > + return -ENOMEM;
> > + }
> > + cmd_ptr = pkt->va_base + pkt->cmd_buf_size;
> > + (*cmd_ptr) = (u64)((code << CMDQ_OP_CODE_SHIFT) | arg_a) << 32 | arg_b;
> > + pkt->cmd_buf_size += CMDQ_INST_SIZE;
> > +
> > + return 0;
> > +}
[...]
> > diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h
> > new file mode 100644
> > index 0000000..fc84fe4
[...]
> > +/**
> > + * cmdq_pkt_flush() - trigger CMDQ to execute the CMDQ packet
> > + * @pkt: the CMDQ packet
> > + *
> > + * Return: 0 for success; else the error code is returned
> > + *
> > + * Trigger CMDQ to execute the CMDQ packet. Note that this is a
> > + * synchronous flush function. When the function returned, the recorded
> > + * commands have been done.
> > + */
> > +int cmdq_pkt_flush(struct cmdq_pkt *pkt);
> > +
> > +/**
> > + * cmdq_pkt_flush_async() - trigger CMDQ to asynchronously execute the CMDQ
> > + * packet and call back at the end of done packet
> > + * @pkt: the CMDQ packet
> > + * @cb: called at the end of done packet
> > + * @data: this data will pass back to cb
> > + *
> > + * Return: 0 for success; else the error code is returned
> > + *
> > + * Trigger CMDQ to asynchronously execute the CMDQ packet and call back
> > + * at the end of done packet. Note that this is an ASYNC function. When the
> > + * function returned, it may or may not be finished.
> > + */
> > +int cmdq_pkt_flush_async(struct cmdq_pkt *pkt, cmdq_async_flush_cb cb,
> > + void *data);
> > +
>
> bikeshadding alarm:
> can we order the functions in the include file the same way we do in the c file?
Will adjust the functions order in mtk_cmdq.h, thanks.
> Apart from the few comments, the driver looks fine to me.
>
> Regards,
> Matthias
