Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ed8d32e authored by C A Subramaniam's avatar C A Subramaniam Committed by Tony Lindgren
Browse files

omap: mailbox: OMAP4 Mailbox-driver Patch to support tasklet implementation 



This patch uses a tasklet implementation for
sending mailbox messages.

Signed-off-by: default avatarC A Subramaniam <subramaniam.ca@ti.com>
Signed-off-by: default avatarRamesh Gupta G <grgupta@ti.com>
Signed-off-by: default avatarHiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 5e683825

arch/arm/plat-omap/include/plat/mailbox.h

+6 −2
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/wait.h>

#include <linux/wait.h>

#include <linux/workqueue.h>

#include <linux/workqueue.h>

#include <linux/blkdev.h>

#include <linux/blkdev.h>

#include <linux/interrupt.h>





typedef u32 mbox_msg_t;

typedef u32 mbox_msg_t;

struct omap_mbox;

struct omap_mbox;
@@ -28,8 +29,10 @@ struct omap_mbox_ops { 
	int		(*fifo_empty)(struct omap_mbox *mbox);

	int		(*fifo_empty)(struct omap_mbox *mbox);

	int		(*fifo_full)(struct omap_mbox *mbox);

	int		(*fifo_full)(struct omap_mbox *mbox);

	/* irq */

	/* irq */

	void		(*enable_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);

	void		(*enable_irq)(struct omap_mbox *mbox,

	void		(*disable_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);

						omap_mbox_irq_t irq);

	void		(*disable_irq)(struct omap_mbox *mbox,

						omap_mbox_irq_t irq);

	void		(*ack_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);

	void		(*ack_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);

	int		(*is_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);

	int		(*is_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);

	/* ctx */

	/* ctx */
@@ -41,6 +44,7 @@ struct omap_mbox_queue { 
	spinlock_t		lock;

	spinlock_t		lock;

	struct request_queue	*queue;

	struct request_queue	*queue;

	struct work_struct	work;

	struct work_struct	work;

	struct tasklet_struct	tasklet;

	int	(*callback)(void *);

	int	(*callback)(void *);

	struct omap_mbox	*mbox;

	struct omap_mbox	*mbox;

};

};

arch/arm/plat-omap/mailbox.c

+17 −42
Original line number Original line Diff line number Diff line
@@ -80,74 +80,45 @@ static int __mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg) 
	return ret;

	return ret;

}

}





struct omap_msg_tx_data {

	mbox_msg_t	msg;

};



static void omap_msg_tx_end_io(struct request *rq, int error)

{

	kfree(rq->special);

	__blk_put_request(rq->q, rq);

}





int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg)

int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg)

{

{

	struct omap_msg_tx_data *tx_data;



	struct request *rq;

	struct request *rq;

	struct request_queue *q = mbox->txq->queue;

	struct request_queue *q = mbox->txq->queue;





	tx_data = kmalloc(sizeof(*tx_data), GFP_ATOMIC);

	if (unlikely(!tx_data))

		return -ENOMEM;



	rq = blk_get_request(q, WRITE, GFP_ATOMIC);

	rq = blk_get_request(q, WRITE, GFP_ATOMIC);

	if (unlikely(!rq)) {

	if (unlikely(!rq))

		kfree(tx_data);

		return -ENOMEM;

		return -ENOMEM;

	}





	tx_data->msg = msg;

	blk_insert_request(q, rq, 0, (void *) msg);

	rq->end_io = omap_msg_tx_end_io;

	tasklet_schedule(&mbox->txq->tasklet);

	blk_insert_request(q, rq, 0, tx_data);





	schedule_work(&mbox->txq->work);

	return 0;

	return 0;

}

}

EXPORT_SYMBOL(omap_mbox_msg_send);

EXPORT_SYMBOL(omap_mbox_msg_send);





static void mbox_tx_work(struct work_struct *work)

static void mbox_tx_tasklet(unsigned long tx_data)

{

{

	int ret;

	int ret;

	struct request *rq;

	struct request *rq;

	struct omap_mbox_queue *mq = container_of(work,

	struct omap_mbox *mbox = (struct omap_mbox *)tx_data;

				struct omap_mbox_queue, work);

	struct omap_mbox *mbox = mq->queue->queuedata;

	struct request_queue *q = mbox->txq->queue;

	struct request_queue *q = mbox->txq->queue;





	while (1) {

	while (1) {

		struct omap_msg_tx_data *tx_data;





		spin_lock(q->queue_lock);

		rq = blk_fetch_request(q);

		rq = blk_fetch_request(q);

		spin_unlock(q->queue_lock);





		if (!rq)

		if (!rq)

			break;

			break;





		tx_data = rq->special;

		ret = __mbox_msg_send(mbox, (mbox_msg_t)rq->special);



		ret = __mbox_msg_send(mbox, tx_data->msg);

		if (ret) {

		if (ret) {

			omap_mbox_enable_irq(mbox, IRQ_TX);

			omap_mbox_enable_irq(mbox, IRQ_TX);

			spin_lock(q->queue_lock);

			blk_requeue_request(q, rq);

			blk_requeue_request(q, rq);

			spin_unlock(q->queue_lock);

			return;

			return;

		}

		}



		blk_end_request_all(rq, 0);

		spin_lock(q->queue_lock);

		__blk_end_request_all(rq, 0);

		spin_unlock(q->queue_lock);

	}

	}

}

}
@@ -192,7 +163,7 @@ static void __mbox_tx_interrupt(struct omap_mbox *mbox) 
{

{

	omap_mbox_disable_irq(mbox, IRQ_TX);

	omap_mbox_disable_irq(mbox, IRQ_TX);

	ack_mbox_irq(mbox, IRQ_TX);

	ack_mbox_irq(mbox, IRQ_TX);

	schedule_work(&mbox->txq->work);

	tasklet_schedule(&mbox->txq->tasklet);

}

}





static void __mbox_rx_interrupt(struct omap_mbox *mbox)

static void __mbox_rx_interrupt(struct omap_mbox *mbox)
@@ -235,7 +206,8 @@ static irqreturn_t mbox_interrupt(int irq, void *p) 




static struct omap_mbox_queue *mbox_queue_alloc(struct omap_mbox *mbox,

static struct omap_mbox_queue *mbox_queue_alloc(struct omap_mbox *mbox,

					request_fn_proc *proc,

					request_fn_proc *proc,

					void (*work) (struct work_struct *))

					void (*work) (struct work_struct *),

					void (*tasklet)(unsigned long))

{

{

	struct request_queue *q;

	struct request_queue *q;

	struct omap_mbox_queue *mq;

	struct omap_mbox_queue *mq;
@@ -252,8 +224,11 @@ static struct omap_mbox_queue *mbox_queue_alloc(struct omap_mbox *mbox, 
	q->queuedata = mbox;

	q->queuedata = mbox;

	mq->queue = q;

	mq->queue = q;





	if (work)

		INIT_WORK(&mq->work, work);

		INIT_WORK(&mq->work, work);





	if (tasklet)

		tasklet_init(&mq->tasklet, tasklet, (unsigned long)mbox);

	return mq;

	return mq;

error:

error:

	kfree(mq);

	kfree(mq);
@@ -292,14 +267,14 @@ static int omap_mbox_startup(struct omap_mbox *mbox) 
		goto fail_request_irq;

		goto fail_request_irq;

	}

	}





	mq = mbox_queue_alloc(mbox, mbox_txq_fn, mbox_tx_work);

	mq = mbox_queue_alloc(mbox, mbox_txq_fn, NULL, mbox_tx_tasklet);

	if (!mq) {

	if (!mq) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto fail_alloc_txq;

		goto fail_alloc_txq;

	}

	}

	mbox->txq = mq;

	mbox->txq = mq;





	mq = mbox_queue_alloc(mbox, mbox_rxq_fn, mbox_rx_work);

	mq = mbox_queue_alloc(mbox, mbox_rxq_fn, mbox_rx_work, NULL);

	if (!mq) {

	if (!mq) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto fail_alloc_rxq;

		goto fail_alloc_rxq;