shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: gunyah: Sync with latest "mailbox: Add Gunyah message queue mailbox"

Browse Source 
Align msgq mailbox implementation to version 13 of Gunyah patches:

https://lore.kernel.org/all/20230509204801.2824351-6-quic_eberman@quicinc.com/

Bug: 279506910
Change-Id: I017873310e6c8650afa3e6dae379c7e7048b7197
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
This commit is contained in:
Elliot Berman
2023-05-08 10:33:53 -07:00
committed by Carlos Llamas
parent 016d92266e
commit afaf163329
1 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/mailbox/gunyah-msgq.c
View File

@@ -30,7 +30,8 @@ static irqreturn_t gh_msgq_rx_irq_handler(int irq, void *data)
dev_warn(msgq->mbox.dev, "Failed to receive data: %d\n", gh_error);
break;
}
mbox_chan_received_data(gh_msgq_chan(msgq), &rx_data);
if (likely(gh_msgq_chan(msgq)->cl))
mbox_chan_received_data(gh_msgq_chan(msgq), &rx_data);
}
return IRQ_HANDLED;
@@ -62,6 +63,9 @@ static int gh_msgq_send_data(struct mbox_chan *chan, void *data)
enum gh_error gh_error;
bool ready;
if (!msgq->tx_ghrsc)
return -EOPNOTSUPP;
if (msgq_data->push)
tx_flags |= GH_HYPERCALL_MSGQ_TX_FLAGS_PUSH;
@@ -112,7 +116,7 @@ static struct mbox_chan_ops gh_msgq_ops = {
/**
* gh_msgq_init() - Initialize a Gunyah message queue with an mbox_client
* @parent: optional, device parent used for the mailbox controller
* @parent: device parent used for the mailbox controller
* @msgq: Pointer to the gh_msgq to initialize
* @cl: A mailbox client to bind to the mailbox channel that the message queue creates
* @tx_ghrsc: optional, the transmission side of the message queue
@@ -139,66 +143,68 @@ int gh_msgq_init(struct device *parent, struct gh_msgq *msgq, struct mbox_client
(rx_ghrsc && rx_ghrsc->type != GH_RESOURCE_TYPE_MSGQ_RX))
return -EINVAL;
msgq->tx_ghrsc = tx_ghrsc;
msgq->rx_ghrsc = rx_ghrsc;
msgq->mbox.dev = parent;
msgq->mbox.ops = &gh_msgq_ops;
msgq->mbox.num_chans = 1;
msgq->mbox.txdone_irq = true;
msgq->mbox.chans = &msgq->mbox_chan;
if (msgq->tx_ghrsc) {
ret = mbox_controller_register(&msgq->mbox);
if (ret)
return ret;
ret = mbox_bind_client(gh_msgq_chan(msgq), cl);
if (ret)
goto err_mbox;
if (tx_ghrsc) {
msgq->tx_ghrsc = tx_ghrsc;
ret = request_irq(msgq->tx_ghrsc->irq, gh_msgq_tx_irq_handler, 0, "gh_msgq_tx",
msgq);
if (ret)
goto err_chans;
goto err_tx_ghrsc;
tasklet_setup(&msgq->txdone_tasklet, gh_msgq_txdone_tasklet);
}
if (msgq->rx_ghrsc) {
if (rx_ghrsc) {
msgq->rx_ghrsc = rx_ghrsc;
ret = request_threaded_irq(msgq->rx_ghrsc->irq, NULL, gh_msgq_rx_irq_handler,
IRQF_ONESHOT, "gh_msgq_rx", msgq);
if (ret)
goto err_tx_irq;
}
tasklet_setup(&msgq->txdone_tasklet, gh_msgq_txdone_tasklet);
ret = mbox_controller_register(&msgq->mbox);
if (ret)
goto err_rx_irq;
ret = mbox_bind_client(gh_msgq_chan(msgq), cl);
if (ret)
goto err_mbox;
return 0;
err_mbox:
mbox_controller_unregister(&msgq->mbox);
err_rx_irq:
if (msgq->rx_ghrsc)
free_irq(msgq->rx_ghrsc->irq, msgq);
err_tx_irq:
if (msgq->tx_ghrsc)
free_irq(msgq->tx_ghrsc->irq, msgq);
err_chans:
kfree(msgq->mbox.chans);
msgq->rx_ghrsc = NULL;
err_tx_ghrsc:
msgq->tx_ghrsc = NULL;
err_mbox:
mbox_controller_unregister(&msgq->mbox);
return ret;
}
EXPORT_SYMBOL_GPL(gh_msgq_init);
void gh_msgq_remove(struct gh_msgq *msgq)
{
tasklet_kill(&msgq->txdone_tasklet);
mbox_controller_unregister(&msgq->mbox);
if (msgq->rx_ghrsc)
free_irq(msgq->rx_ghrsc->irq, msgq);
if (msgq->tx_ghrsc)
if (msgq->tx_ghrsc) {
tasklet_kill(&msgq->txdone_tasklet);
free_irq(msgq->tx_ghrsc->irq, msgq);
}
kfree(msgq->mbox.chans);
mbox_controller_unregister(&msgq->mbox);
msgq->rx_ghrsc = NULL;
msgq->tx_ghrsc = NULL;
}
EXPORT_SYMBOL_GPL(gh_msgq_remove);