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

Commit cb70e4c1 authored by Sebastian Reichel's avatar Sebastian Reichel
Browse files

HSI: omap_ssi: convert cawake irq handler to thread 



Convert cawake interrupt handler from tasklet to
threaded interrupt handler in preparation of
blocking runtime_pm calls.

Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
Tested-by: default avatarPavel Machek <pavel@ucw.cz>
parent df26d639

drivers/hsi/controllers/omap_ssi.h

+0 −2
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ struct omap_ssm_ctx { 
 * @wake_irq: IRQ number for incoming wake line (-1 if none)

 * @wake_gpio: GPIO number for incoming wake line (-1 if none)

 * @pio_tasklet: Bottom half for PIO transfers and events

 * @wake_tasklet: Bottom half for incoming wake events

 * @wkin_cken: Keep track of clock references due to the incoming wake line

 * @wk_refcount: Reference count for output wake line

 * @sys_mpu_enable: Context for the interrupt enable register for irq 0
@@ -99,7 +98,6 @@ struct omap_ssi_port { 
	int			wake_irq;

	struct gpio_desc	*wake_gpio;

	struct tasklet_struct	pio_tasklet;

	struct tasklet_struct	wake_tasklet;

	bool			wktest:1; /* FIXME: HACK to be removed */

	bool			wkin_cken:1; /* Workaround */

	unsigned int		wk_refcount;

drivers/hsi/controllers/omap_ssi_core.c

+2 −2
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static int ssi_clk_event(struct notifier_block *nb, unsigned long event, 
				continue;



			/* Workaround for SWBREAK + CAwake down race in CMT */

			tasklet_disable(&omap_port->wake_tasklet);

			disable_irq(omap_port->wake_irq);



			/* stop all ssi communication */

			pinctrl_pm_select_idle_state(omap_port->pdev);
@@ -338,7 +338,7 @@ static int ssi_clk_event(struct notifier_block *nb, unsigned long event, 


			/* resume ssi communication */

			pinctrl_pm_select_default_state(omap_port->pdev);

			tasklet_enable(&omap_port->wake_tasklet);

			enable_irq(omap_port->wake_irq);

		}



		break;

drivers/hsi/controllers/omap_ssi_port.c

+6 −15
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ static irqreturn_t ssi_pio_isr(int irq, void *port) 
	return IRQ_HANDLED;

}



static void ssi_wake_tasklet(unsigned long ssi_port)

static irqreturn_t ssi_wake_thread(int irq __maybe_unused, void *ssi_port)

{

	struct hsi_port *port = (struct hsi_port *)ssi_port;

	struct hsi_controller *ssi = to_hsi_controller(port->device.parent);
@@ -1007,13 +1007,6 @@ static void ssi_wake_tasklet(unsigned long ssi_port) 
		}

		spin_unlock(&omap_port->lock);

	}

}



static irqreturn_t ssi_wake_isr(int irq __maybe_unused, void *ssi_port)

{

	struct omap_ssi_port *omap_port = hsi_port_drvdata(ssi_port);



	tasklet_hi_schedule(&omap_port->wake_tasklet);



	return IRQ_HANDLED;

}
@@ -1051,13 +1044,12 @@ static int ssi_wake_irq(struct hsi_port *port, struct platform_device *pd) 
	}



	cawake_irq = gpiod_to_irq(omap_port->wake_gpio);



	omap_port->wake_irq = cawake_irq;

	tasklet_init(&omap_port->wake_tasklet, ssi_wake_tasklet,

							(unsigned long)port);

	err = devm_request_irq(&port->device, cawake_irq, ssi_wake_isr,

		IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

							"cawake", port);



	err = devm_request_threaded_irq(&port->device, cawake_irq, NULL,

		ssi_wake_thread,

		IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

		"SSI cawake", port);

	if (err < 0)

		dev_err(&port->device, "Request Wake in IRQ %d failed %d\n",

						cawake_irq, err);
@@ -1234,7 +1226,6 @@ static int ssi_port_remove(struct platform_device *pd) 


	hsi_port_unregister_clients(port);



	tasklet_kill(&omap_port->wake_tasklet);

	tasklet_kill(&omap_port->pio_tasklet);



	port->async	= hsi_dummy_msg;