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

Commit fa54b326 authored by Aaron Sierra's avatar Aaron Sierra Committed by Greg Kroah-Hartman
Browse files

vme: change LM callback argument to void pointer 



Make the location monitor callback function prototype more useful by
changing the argument from an integer to a void pointer.

All VME bridge drivers were simply passing the location monitor index
(e.g. 0-3) as the argument to these callbacks. It is much more useful
to pass back a pointer to data that the callback-registering driver
cares about.

There appear to be no in-kernel callers of vme_lm_attach (or
vme_lme_request for that matter), so this change only affects the VME
subsystem and bridge drivers.

This has been tested with Tsi148 hardware, but the CA91Cx42 changes
have only been compiled.

Signed-off-by: default avatarAaron Sierra <asierra@xes-inc.com>
Acked-by: default avatarMartyn Welch <martyn@welchs.me.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 655745b0

Documentation/vme_api.txt

+2 −2
Original line number Diff line number Diff line
@@ -385,13 +385,13 @@ location monitor location. Each location monitor can monitor a number of 
adjacent locations:



	int vme_lm_attach(struct vme_resource *res, int num,

		void (*callback)(int));

		void (*callback)(void *));



	int vme_lm_detach(struct vme_resource *res, int num);



The callback function is declared as follows.



	void callback(int num);

	void callback(void *data);





Slot Detection

drivers/vme/bridges/vme_ca91cx42.c

+4 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static u32 ca91cx42_LM_irqhandler(struct ca91cx42_driver *bridge, u32 stat) 
	for (i = 0; i < 4; i++) {

		if (stat & CA91CX42_LINT_LM[i]) {

			/* We only enable interrupts if the callback is set */

			bridge->lm_callback[i](i);

			bridge->lm_callback[i](bridge->lm_data[i]);

			serviced |= CA91CX42_LINT_LM[i];

		}

	}
@@ -1410,7 +1410,7 @@ static int ca91cx42_lm_get(struct vme_lm_resource *lm, 
 * Callback will be passed the monitor triggered.

 */

static int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor,

	void (*callback)(int))

	void (*callback)(void *), void *data)

{

	u32 lm_ctl, tmp;

	struct ca91cx42_driver *bridge;
@@ -1438,6 +1438,7 @@ static int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor, 


	/* Attach callback */

	bridge->lm_callback[monitor] = callback;

	bridge->lm_data[monitor] = data;



	/* Enable Location Monitor interrupt */

	tmp = ioread32(bridge->base + LINT_EN);
@@ -1477,6 +1478,7 @@ static int ca91cx42_lm_detach(struct vme_lm_resource *lm, int monitor) 


	/* Detach callback */

	bridge->lm_callback[monitor] = NULL;

	bridge->lm_data[monitor] = NULL;



	/* If all location monitors disabled, disable global Location Monitor */

	if ((tmp & (CA91CX42_LINT_LM0 | CA91CX42_LINT_LM1 | CA91CX42_LINT_LM2 |

drivers/vme/bridges/vme_ca91cx42.h

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ struct ca91cx42_driver { 
	wait_queue_head_t dma_queue;

	wait_queue_head_t iack_queue;

	wait_queue_head_t mbox_queue;

	void (*lm_callback[4])(int);	/* Called in interrupt handler */

	void (*lm_callback[4])(void *);	/* Called in interrupt handler */

	void *lm_data[4];

	void *crcsr_kernel;

	dma_addr_t crcsr_bus;

	struct mutex vme_rmw;		/* Only one RMW cycle at a time */

drivers/vme/bridges/vme_tsi148.c

+4 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static u32 tsi148_LM_irqhandler(struct tsi148_driver *bridge, u32 stat) 
	for (i = 0; i < 4; i++) {

		if (stat & TSI148_LCSR_INTS_LMS[i]) {

			/* We only enable interrupts if the callback is set */

			bridge->lm_callback[i](i);

			bridge->lm_callback[i](bridge->lm_data[i]);

			serviced |= TSI148_LCSR_INTC_LMC[i];

		}

	}
@@ -2047,7 +2047,7 @@ static int tsi148_lm_get(struct vme_lm_resource *lm, 
 * Callback will be passed the monitor triggered.

 */

static int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor,

	void (*callback)(int))

	void (*callback)(void *), void *data)

{

	u32 lm_ctl, tmp;

	struct vme_bridge *tsi148_bridge;
@@ -2077,6 +2077,7 @@ static int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor, 


	/* Attach callback */

	bridge->lm_callback[monitor] = callback;

	bridge->lm_data[monitor] = data;



	/* Enable Location Monitor interrupt */

	tmp = ioread32be(bridge->base + TSI148_LCSR_INTEN);
@@ -2124,6 +2125,7 @@ static int tsi148_lm_detach(struct vme_lm_resource *lm, int monitor) 


	/* Detach callback */

	bridge->lm_callback[monitor] = NULL;

	bridge->lm_data[monitor] = NULL;



	/* If all location monitors disabled, disable global Location Monitor */

	if ((lm_en & (TSI148_LCSR_INTS_LM0S | TSI148_LCSR_INTS_LM1S |

drivers/vme/bridges/vme_tsi148.h

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ struct tsi148_driver { 
	void __iomem *base;	/* Base Address of device registers */

	wait_queue_head_t dma_queue[2];

	wait_queue_head_t iack_queue;

	void (*lm_callback[4])(int);	/* Called in interrupt handler */

	void (*lm_callback[4])(void *);	/* Called in interrupt handler */

	void *lm_data[4];

	void *crcsr_kernel;

	dma_addr_t crcsr_bus;

	struct vme_master_resource *flush_image;