when percpu devices set its IRQ trigger type using irq_of_parse and_map API,it will be failed because irq_set_irq_type is only for 1-N mode interrupt source,not for per-cpu interrupt source. so handle per-cpu IRQs for this failure.
problem: per cpu device call irq_of_parse_and_map to set its timer trigger type IRQ_TYPE_EDGE_RISING, irq_of_parse_and_map will call irq_create_of_mapping to set trigger_type through irq_set_irq_type. But irq_set_irq_type uses IRQ_GET_DESC_CHECK_GLOBAL and not IRQ_GET_DESC_CHECK_PERCPU. per-cpu IRQ is per-cpu and not global. solution: storing the type into irqdata, then get this IRQ type fromirq_get_trigger_type, and enable_percpu_irq sets the type Signed-off-by: Dongjiu Geng <[email protected]> Signed-off-by: Haibin Zhang <[email protected]> --- kernel/irq/irqdomain.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 9fd618d..8116cf2 100755 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -542,8 +542,16 @@ unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data) /* Set type if specified and different than the current one */ if (type != IRQ_TYPE_NONE && - type != irq_get_trigger_type(virq)) - irq_set_irq_type(virq, type); + type != irq_get_trigger_type(virq)) { + int ret = 0; + struct irq_data *irq_data = irq_get_irq_data(virq); + + ret = irq_set_irq_type(virq, type); + + /* Handle per-cpu IRQ: just save type in irq_data */ + if (-EINVAL == ret && irq_data) + irqd_set_trigger_type(irq_data, type); + } return virq; } EXPORT_SYMBOL_GPL(irq_create_of_mapping); -- 1.7.7
