| Message ID | 1437166592-25378-2-git-send-email-d-gerlach@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Dave Gerlach <d-gerlach@ti.com> [150717 13:59]: > --- a/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt > +++ b/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt > @@ -75,6 +75,14 @@ data that represent the following: > Cell #3 (usr_id) - mailbox user id for identifying the interrupt line > associated with generating a tx/rx fifo interrupt. > > +Optional Properties: > +-------------------- > +- ti,mbox-send-noirq: Quirk flag to allow the client user of this sub-mailbox > + to send messages without triggering a Tx ready interrupt, > + and to control the Tx ticker. Should be used only on > + sub-mailboxes used to communicate with WkupM3 remote > + processor on AM33xx/AM43xx SoCs. > + Hmm can't you do this just by setting a flag in the device driver based on the compatible string? Regards, Tony
Hi Tony, On 08/05/2015 05:28 AM, Tony Lindgren wrote: > * Dave Gerlach <d-gerlach@ti.com> [150717 13:59]: >> --- a/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt >> +++ b/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt >> @@ -75,6 +75,14 @@ data that represent the following: >> Cell #3 (usr_id) - mailbox user id for identifying the interrupt line >> associated with generating a tx/rx fifo interrupt. >> >> +Optional Properties: >> +-------------------- >> +- ti,mbox-send-noirq: Quirk flag to allow the client user of this sub-mailbox >> + to send messages without triggering a Tx ready interrupt, >> + and to control the Tx ticker. Should be used only on >> + sub-mailboxes used to communicate with WkupM3 remote >> + processor on AM33xx/AM43xx SoCs. >> + > > Hmm can't you do this just by setting a flag in the device driver > based on the compatible string? We can't because there can be other users like PRUSS which will use a sub-mailbox in a regular fashion. The compatible serves the IP and there can be multiple sub-mailboxes underneath it, and this quirk is needed only on the one that's used by the WkupM3. Jassi, Do you have any comments on this? regards Suman
* Suman Anna <s-anna@ti.com> [150805 08:35]: > Hi Tony, > > On 08/05/2015 05:28 AM, Tony Lindgren wrote: > > * Dave Gerlach <d-gerlach@ti.com> [150717 13:59]: > >> --- a/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt > >> +++ b/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt > >> @@ -75,6 +75,14 @@ data that represent the following: > >> Cell #3 (usr_id) - mailbox user id for identifying the interrupt line > >> associated with generating a tx/rx fifo interrupt. > >> > >> +Optional Properties: > >> +-------------------- > >> +- ti,mbox-send-noirq: Quirk flag to allow the client user of this sub-mailbox > >> + to send messages without triggering a Tx ready interrupt, > >> + and to control the Tx ticker. Should be used only on > >> + sub-mailboxes used to communicate with WkupM3 remote > >> + processor on AM33xx/AM43xx SoCs. > >> + > > > > Hmm can't you do this just by setting a flag in the device driver > > based on the compatible string? > > We can't because there can be other users like PRUSS which will use a > sub-mailbox in a regular fashion. The compatible serves the IP and there > can be multiple sub-mailboxes underneath it, and this quirk is needed > only on the one that's used by the WkupM3. OK > Do you have any comments on this? Up to you guys then to figure out what property is used for it then. Regards, Tony
diff --git a/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt b/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt index d1a0433..9b40c49 100644 --- a/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt +++ b/Documentation/devicetree/bindings/mailbox/omap-mailbox.txt @@ -75,6 +75,14 @@ data that represent the following: Cell #3 (usr_id) - mailbox user id for identifying the interrupt line associated with generating a tx/rx fifo interrupt. +Optional Properties: +-------------------- +- ti,mbox-send-noirq: Quirk flag to allow the client user of this sub-mailbox + to send messages without triggering a Tx ready interrupt, + and to control the Tx ticker. Should be used only on + sub-mailboxes used to communicate with WkupM3 remote + processor on AM33xx/AM43xx SoCs. + Mailbox Users: ============== A device needing to communicate with a target processor device should specify diff --git a/drivers/mailbox/omap-mailbox.c b/drivers/mailbox/omap-mailbox.c index a3dbfd9..b7f636f 100644 --- a/drivers/mailbox/omap-mailbox.c +++ b/drivers/mailbox/omap-mailbox.c @@ -38,6 +38,8 @@ #include <linux/mailbox_controller.h> #include <linux/mailbox_client.h> +#include "mailbox.h" + #define MAILBOX_REVISION 0x000 #define MAILBOX_MESSAGE(m) (0x040 + 4 * (m)) #define MAILBOX_FIFOSTATUS(m) (0x080 + 4 * (m)) @@ -106,6 +108,7 @@ struct omap_mbox_fifo_info { int rx_irq; const char *name; + bool send_no_irq; }; struct omap_mbox { @@ -119,6 +122,7 @@ struct omap_mbox { u32 ctx[OMAP4_MBOX_NR_REGS]; u32 intr_type; struct mbox_chan *chan; + bool send_no_irq; }; /* global variables for the mailbox devices */ @@ -418,6 +422,9 @@ static int omap_mbox_startup(struct omap_mbox *mbox) goto fail_request_irq; } + if (mbox->send_no_irq) + mbox->chan->txdone_method = TXDONE_BY_ACK; + _omap_mbox_enable_irq(mbox, IRQ_RX); return 0; @@ -586,13 +593,27 @@ static void omap_mbox_chan_shutdown(struct mbox_chan *chan) mutex_unlock(&mdev->cfg_lock); } -static int omap_mbox_chan_send_data(struct mbox_chan *chan, void *data) +static int omap_mbox_chan_send_noirq(struct omap_mbox *mbox, void *data) { - struct omap_mbox *mbox = mbox_chan_to_omap_mbox(chan); int ret = -EBUSY; - if (!mbox) - return -EINVAL; + if (!mbox_fifo_full(mbox)) { + _omap_mbox_enable_irq(mbox, IRQ_RX); + mbox_fifo_write(mbox, (mbox_msg_t)data); + ret = 0; + _omap_mbox_disable_irq(mbox, IRQ_RX); + + /* we must read and ack the interrupt directly from here */ + mbox_fifo_read(mbox); + ack_mbox_irq(mbox, IRQ_RX); + } + + return ret; +} + +static int omap_mbox_chan_send(struct omap_mbox *mbox, void *data) +{ + int ret = -EBUSY; if (!mbox_fifo_full(mbox)) { mbox_fifo_write(mbox, (mbox_msg_t)data); @@ -604,6 +625,22 @@ static int omap_mbox_chan_send_data(struct mbox_chan *chan, void *data) return ret; } +static int omap_mbox_chan_send_data(struct mbox_chan *chan, void *data) +{ + struct omap_mbox *mbox = mbox_chan_to_omap_mbox(chan); + int ret; + + if (!mbox) + return -EINVAL; + + if (mbox->send_no_irq) + ret = omap_mbox_chan_send_noirq(mbox, data); + else + ret = omap_mbox_chan_send(mbox, data); + + return ret; +} + static const struct mbox_chan_ops omap_mbox_chan_ops = { .startup = omap_mbox_chan_startup, .send_data = omap_mbox_chan_send_data, @@ -732,6 +769,9 @@ static int omap_mbox_probe(struct platform_device *pdev) finfo->rx_usr = tmp[2]; finfo->name = child->name; + + if (of_find_property(child, "ti,mbox-send-noirq", NULL)) + finfo->send_no_irq = true; } else { finfo->tx_id = info->tx_id; finfo->rx_id = info->rx_id; @@ -791,6 +831,7 @@ static int omap_mbox_probe(struct platform_device *pdev) fifo->irqstatus = MAILBOX_IRQSTATUS(intr_type, finfo->rx_usr); fifo->irqdisable = MAILBOX_IRQDISABLE(intr_type, finfo->rx_usr); + mbox->send_no_irq = finfo->send_no_irq; mbox->intr_type = intr_type; mbox->parent = mdev;