Skip to content

Commit 011f583

Browse files
author
Bartosz Golaszewski
committed
genirq/irq_sim: add an extended irq_sim initializer
Currently users of the interrupt simulator don't have any way of being notified about interrupts from the simulated domain being requested or released. This causes a problem for one of the users - the GPIO simulator - which is unable to lock the pins as interrupts. Define a structure containing callbacks to be executed on various irq_sim-related events (for now: irq request and release) and provide an extended function for creating simulated interrupt domains that takes it and a pointer to custom user data (to be passed to said callbacks) as arguments. Reviewed-by: Linus Walleij <[email protected]> Acked-by: Linus Walleij <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bartosz Golaszewski <[email protected]>
1 parent f2e3956 commit 011f583

File tree

2 files changed

+74
-3
lines changed

2 files changed

+74
-3
lines changed

include/linux/irq_sim.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,28 @@
1616
* requested like normal irqs and enqueued from process context.
1717
*/
1818

19+
struct irq_sim_ops {
20+
int (*irq_sim_irq_requested)(struct irq_domain *domain,
21+
irq_hw_number_t hwirq, void *data);
22+
void (*irq_sim_irq_released)(struct irq_domain *domain,
23+
irq_hw_number_t hwirq, void *data);
24+
};
25+
1926
struct irq_domain *irq_domain_create_sim(struct fwnode_handle *fwnode,
2027
unsigned int num_irqs);
2128
struct irq_domain *devm_irq_domain_create_sim(struct device *dev,
2229
struct fwnode_handle *fwnode,
2330
unsigned int num_irqs);
31+
struct irq_domain *irq_domain_create_sim_full(struct fwnode_handle *fwnode,
32+
unsigned int num_irqs,
33+
const struct irq_sim_ops *ops,
34+
void *data);
35+
struct irq_domain *
36+
devm_irq_domain_create_sim_full(struct device *dev,
37+
struct fwnode_handle *fwnode,
38+
unsigned int num_irqs,
39+
const struct irq_sim_ops *ops,
40+
void *data);
2441
void irq_domain_remove_sim(struct irq_domain *domain);
2542

2643
#endif /* _LINUX_IRQ_SIM_H */

kernel/irq/irq_sim.c

Lines changed: 57 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ struct irq_sim_work_ctx {
1717
unsigned int irq_count;
1818
unsigned long *pending;
1919
struct irq_domain *domain;
20+
struct irq_sim_ops ops;
21+
void *user_data;
2022
};
2123

2224
struct irq_sim_irq_ctx {
@@ -88,13 +90,40 @@ static int irq_sim_set_irqchip_state(struct irq_data *data,
8890
return 0;
8991
}
9092

93+
static int irq_sim_request_resources(struct irq_data *data)
94+
{
95+
struct irq_sim_irq_ctx *irq_ctx = irq_data_get_irq_chip_data(data);
96+
struct irq_sim_work_ctx *work_ctx = irq_ctx->work_ctx;
97+
irq_hw_number_t hwirq = irqd_to_hwirq(data);
98+
99+
if (work_ctx->ops.irq_sim_irq_requested)
100+
return work_ctx->ops.irq_sim_irq_requested(work_ctx->domain,
101+
hwirq,
102+
work_ctx->user_data);
103+
104+
return 0;
105+
}
106+
107+
static void irq_sim_release_resources(struct irq_data *data)
108+
{
109+
struct irq_sim_irq_ctx *irq_ctx = irq_data_get_irq_chip_data(data);
110+
struct irq_sim_work_ctx *work_ctx = irq_ctx->work_ctx;
111+
irq_hw_number_t hwirq = irqd_to_hwirq(data);
112+
113+
if (work_ctx->ops.irq_sim_irq_released)
114+
work_ctx->ops.irq_sim_irq_released(work_ctx->domain, hwirq,
115+
work_ctx->user_data);
116+
}
117+
91118
static struct irq_chip irq_sim_irqchip = {
92119
.name = "irq_sim",
93120
.irq_mask = irq_sim_irqmask,
94121
.irq_unmask = irq_sim_irqunmask,
95122
.irq_set_type = irq_sim_set_type,
96123
.irq_get_irqchip_state = irq_sim_get_irqchip_state,
97124
.irq_set_irqchip_state = irq_sim_set_irqchip_state,
125+
.irq_request_resources = irq_sim_request_resources,
126+
.irq_release_resources = irq_sim_release_resources,
98127
};
99128

100129
static void irq_sim_handle_irq(struct irq_work *work)
@@ -163,6 +192,15 @@ static const struct irq_domain_ops irq_sim_domain_ops = {
163192
*/
164193
struct irq_domain *irq_domain_create_sim(struct fwnode_handle *fwnode,
165194
unsigned int num_irqs)
195+
{
196+
return irq_domain_create_sim_full(fwnode, num_irqs, NULL, NULL);
197+
}
198+
EXPORT_SYMBOL_GPL(irq_domain_create_sim);
199+
200+
struct irq_domain *irq_domain_create_sim_full(struct fwnode_handle *fwnode,
201+
unsigned int num_irqs,
202+
const struct irq_sim_ops *ops,
203+
void *data)
166204
{
167205
struct irq_sim_work_ctx *work_ctx __free(kfree) =
168206
kmalloc(sizeof(*work_ctx), GFP_KERNEL);
@@ -183,10 +221,14 @@ struct irq_domain *irq_domain_create_sim(struct fwnode_handle *fwnode,
183221
work_ctx->irq_count = num_irqs;
184222
work_ctx->work = IRQ_WORK_INIT_HARD(irq_sim_handle_irq);
185223
work_ctx->pending = no_free_ptr(pending);
224+
work_ctx->user_data = data;
225+
226+
if (ops)
227+
memcpy(&work_ctx->ops, ops, sizeof(*ops));
186228

187229
return no_free_ptr(work_ctx)->domain;
188230
}
189-
EXPORT_SYMBOL_GPL(irq_domain_create_sim);
231+
EXPORT_SYMBOL_GPL(irq_domain_create_sim_full);
190232

191233
/**
192234
* irq_domain_remove_sim - Deinitialize the interrupt simulator domain: free
@@ -227,11 +269,23 @@ static void devm_irq_domain_remove_sim(void *data)
227269
struct irq_domain *devm_irq_domain_create_sim(struct device *dev,
228270
struct fwnode_handle *fwnode,
229271
unsigned int num_irqs)
272+
{
273+
return devm_irq_domain_create_sim_full(dev, fwnode, num_irqs,
274+
NULL, NULL);
275+
}
276+
EXPORT_SYMBOL_GPL(devm_irq_domain_create_sim);
277+
278+
struct irq_domain *
279+
devm_irq_domain_create_sim_full(struct device *dev,
280+
struct fwnode_handle *fwnode,
281+
unsigned int num_irqs,
282+
const struct irq_sim_ops *ops,
283+
void *data)
230284
{
231285
struct irq_domain *domain;
232286
int ret;
233287

234-
domain = irq_domain_create_sim(fwnode, num_irqs);
288+
domain = irq_domain_create_sim_full(fwnode, num_irqs, ops, data);
235289
if (IS_ERR(domain))
236290
return domain;
237291

@@ -241,4 +295,4 @@ struct irq_domain *devm_irq_domain_create_sim(struct device *dev,
241295

242296
return domain;
243297
}
244-
EXPORT_SYMBOL_GPL(devm_irq_domain_create_sim);
298+
EXPORT_SYMBOL_GPL(devm_irq_domain_create_sim_full);

0 commit comments

Comments
 (0)