From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartosz Golaszewski Subject: [PATCH v2 3/9] irq/irq_sim: provide irq_sim_fire_type() Date: Tue, 29 Jan 2019 09:44:05 +0100 Message-ID: <20190129084411.30495-4-brgl@bgdev.pl> References: <20190129084411.30495-1-brgl@bgdev.pl> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20190129084411.30495-1-brgl@bgdev.pl> Sender: linux-kernel-owner@vger.kernel.org To: Linus Walleij , Thomas Gleixner , Marc Zyngier , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski List-Id: linux-gpio@vger.kernel.org From: Bartosz Golaszewski Provide a more specialized variant of irq_sim_fire() that allows to specify the type of the fired interrupt. The type is stored in the dummy irq context struct via the set_type callback. Signed-off-by: Bartosz Golaszewski --- include/linux/irq_sim.h | 9 ++++++++- kernel/irq/irq_sim.c | 26 ++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/include/linux/irq_sim.h b/include/linux/irq_sim.h index b96c2f752320..647a6c8ffb31 100644 --- a/include/linux/irq_sim.h +++ b/include/linux/irq_sim.h @@ -23,6 +23,7 @@ struct irq_sim_work_ctx { struct irq_sim_irq_ctx { bool enabled; + unsigned int type; }; struct irq_sim { @@ -37,7 +38,13 @@ int irq_sim_init(struct irq_sim *sim, unsigned int num_irqs); int devm_irq_sim_init(struct device *dev, struct irq_sim *sim, unsigned int num_irqs); void irq_sim_fini(struct irq_sim *sim); -void irq_sim_fire(struct irq_sim *sim, unsigned int offset); +void irq_sim_fire_type(struct irq_sim *sim, + unsigned int offset, unsigned int type); int irq_sim_irqnum(struct irq_sim *sim, unsigned int offset); +static inline void irq_sim_fire(struct irq_sim *sim, unsigned int offset) +{ + irq_sim_fire_type(sim, offset, IRQ_TYPE_DEFAULT); +} + #endif /* _LINUX_IRQ_SIM_H */ diff --git a/kernel/irq/irq_sim.c b/kernel/irq/irq_sim.c index 2bcdbab1bc5a..e3160b5e59b8 100644 --- a/kernel/irq/irq_sim.c +++ b/kernel/irq/irq_sim.c @@ -25,6 +25,15 @@ static void irq_sim_irqunmask(struct irq_data *data) irq_ctx->enabled = true; } +static int irq_sim_set_type(struct irq_data *data, unsigned int type) +{ + struct irq_sim_irq_ctx *irq_ctx = irq_data_get_irq_chip_data(data); + + irq_ctx->type = type; + + return 0; +} + static void irq_sim_handle_irq(struct irq_work *work) { struct irq_sim_work_ctx *work_ctx; @@ -107,6 +116,7 @@ int irq_sim_init(struct irq_sim *sim, unsigned int num_irqs) sim->chip.name = "irq_sim"; sim->chip.irq_mask = irq_sim_irqmask; sim->chip.irq_unmask = irq_sim_irqunmask; + sim->chip.irq_set_type = irq_sim_set_type; sim->work_ctx.pending = bitmap_zalloc(num_irqs, GFP_KERNEL); if (!sim->work_ctx.pending) { @@ -192,21 +202,29 @@ irq_sim_get_ctx(struct irq_sim *sim, unsigned int offset) } /** - * irq_sim_fire - Enqueue an interrupt. + * irq_sim_fire_type - Enqueue an interrupt. * * @sim: The interrupt simulator object. * @offset: Offset of the simulated interrupt which should be fired. + * @type: Type of the fired interrupt. Must be one of the following: + * IRQ_TYPE_EDGE_RISING, IRQ_TYPE_EDGE_FALLING, + * IRQ_TYPE_EDGE_BOTH, IRQ_TYPE_LEVEL_HIGH, + * IRQ_TYPE_LEVEL_LOW, IRQ_TYPE_DEFAULT */ -void irq_sim_fire(struct irq_sim *sim, unsigned int offset) +void irq_sim_fire_type(struct irq_sim *sim, + unsigned int offset, unsigned int type) { struct irq_sim_irq_ctx *ctx = irq_sim_get_ctx(sim, offset); - if (ctx->enabled) { + /* Only care about relevant flags. */ + type &= IRQ_TYPE_SENSE_MASK; + + if (ctx->enabled && (ctx->type & type)) { set_bit(offset, sim->work_ctx.pending); irq_work_queue(&sim->work_ctx.work); } } -EXPORT_SYMBOL_GPL(irq_sim_fire); +EXPORT_SYMBOL_GPL(irq_sim_fire_type); /** * irq_sim_irqnum - Get the allocated number of a dummy interrupt. -- 2.19.1