Pull irq fixes from Thomas Gleixner: "A set of irqchip updates: - Make the GENERIC_IRQ_MULTI_HANDLER configuration correct - Add a missing DT compatible string for the Ingenic driver - Remove the pointless debugfs_file pointer from struct irqdomain" * tag 'irq-urgent-2021-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/ingenic: Add support for the JZ4760 dt-bindings/irq: Add compatible string for the JZ4760B irqchip: Do not blindly select CONFIG_GENERIC_IRQ_MULTI_HANDLER ARM: ep93xx: Select GENERIC_IRQ_MULTI_HANDLER directly irqdomain: Remove debugfs_file from struct irq_domain
Unified · Split
| @@ -23,6 +23,7 @@ properties: · 22 unmodified lines | |||
| 23 | - enum: | 23 | - enum: |
| 24 | - ingenic,jz4775-intc | 24 | - ingenic,jz4775-intc |
| 25 | - ingenic,jz4770-intc | 25 | - ingenic,jz4770-intc |
| 26 | - ingenic,jz4760b-intc | ||
| 26 | - const: ingenic,jz4760-intc | 27 | - const: ingenic,jz4760-intc |
| 27 | - items: | 28 | - items: |
| 28 | - const: ingenic,x1000-intc | 29 | - const: ingenic,x1000-intc |
| @@ -348,6 +348,7 @@ config ARCH_EP93XX · 347 unmodified lines | |||
| 348 | select ARM_AMBA | 348 | select ARM_AMBA |
| 349 | imply ARM_PATCH_PHYS_VIRT | 349 | imply ARM_PATCH_PHYS_VIRT |
| 350 | select ARM_VIC | 350 | select ARM_VIC |
| 351 | select GENERIC_IRQ_MULTI_HANDLER | ||
| 351 | select AUTO_ZRELADDR | 352 | select AUTO_ZRELADDR |
| 352 | select CLKDEV_LOOKUP | 353 | select CLKDEV_LOOKUP |
| 353 | select CLKSRC_MMIO | 354 | select CLKSRC_MMIO |
| @@ -8,7 +8,6 @@ config IRQCHIP · 7 unmodified lines | |||
| 8 | config ARM_GIC | 8 | config ARM_GIC |
| 9 | bool | 9 | bool |
| 10 | select IRQ_DOMAIN_HIERARCHY | 10 | select IRQ_DOMAIN_HIERARCHY |
| 11 | select GENERIC_IRQ_MULTI_HANDLER | ||
| 12 | select GENERIC_IRQ_EFFECTIVE_AFF_MASK | 11 | select GENERIC_IRQ_EFFECTIVE_AFF_MASK |
| 13 | 12 | ||
| 14 | config ARM_GIC_PM | 13 | config ARM_GIC_PM |
| @@ -33,7 +32,6 @@ config GIC_NON_BANKED · 18 unmodified lines | |||
| 33 | 32 | ||
| 34 | config ARM_GIC_V3 | 33 | config ARM_GIC_V3 |
| 35 | bool | 34 | bool |
| 36 | select GENERIC_IRQ_MULTI_HANDLER | ||
| 37 | select IRQ_DOMAIN_HIERARCHY | 35 | select IRQ_DOMAIN_HIERARCHY |
| 38 | select PARTITION_PERCPU | 36 | select PARTITION_PERCPU |
| 39 | select GENERIC_IRQ_EFFECTIVE_AFF_MASK | 37 | select GENERIC_IRQ_EFFECTIVE_AFF_MASK |
| @@ -64,7 +62,6 @@ config ARM_NVIC · 24 unmodified lines | |||
| 64 | config ARM_VIC | 62 | config ARM_VIC |
| 65 | bool | 63 | bool |
| 66 | select IRQ_DOMAIN | 64 | select IRQ_DOMAIN |
| 67 | select GENERIC_IRQ_MULTI_HANDLER | ||
| 68 | 65 | ||
| 69 | config ARM_VIC_NR | 66 | config ARM_VIC_NR |
| 70 | int | 67 | int |
| @@ -99,14 +96,12 @@ config ATMEL_AIC_IRQ · 28 unmodified lines | |||
| 99 | bool | 96 | bool |
| 100 | select GENERIC_IRQ_CHIP | 97 | select GENERIC_IRQ_CHIP |
| 101 | select IRQ_DOMAIN | 98 | select IRQ_DOMAIN |
| 102 | select GENERIC_IRQ_MULTI_HANDLER | ||
| 103 | select SPARSE_IRQ | 99 | select SPARSE_IRQ |
| 104 | 100 | ||
| 105 | config ATMEL_AIC5_IRQ | 101 | config ATMEL_AIC5_IRQ |
| 106 | bool | 102 | bool |
| 107 | select GENERIC_IRQ_CHIP | 103 | select GENERIC_IRQ_CHIP |
| 108 | select IRQ_DOMAIN | 104 | select IRQ_DOMAIN |
| 109 | select GENERIC_IRQ_MULTI_HANDLER | ||
| 110 | select SPARSE_IRQ | 105 | select SPARSE_IRQ |
| 111 | 106 | ||
| 112 | config I8259 | 107 | config I8259 |
| @@ -153,7 +148,6 @@ config DW_APB_ICTL · 40 unmodified lines | |||
| 153 | config FARADAY_FTINTC010 | 148 | config FARADAY_FTINTC010 |
| 154 | bool | 149 | bool |
| 155 | select IRQ_DOMAIN | 150 | select IRQ_DOMAIN |
| 156 | select GENERIC_IRQ_MULTI_HANDLER | ||
| 157 | select SPARSE_IRQ | 151 | select SPARSE_IRQ |
| 158 | 152 | ||
| 159 | config HISILICON_IRQ_MBIGEN | 153 | config HISILICON_IRQ_MBIGEN |
| @@ -169,7 +163,6 @@ config IMGPDC_IRQ · 9 unmodified lines | |||
| 169 | config IXP4XX_IRQ | 163 | config IXP4XX_IRQ |
| 170 | bool | 164 | bool |
| 171 | select IRQ_DOMAIN | 165 | select IRQ_DOMAIN |
| 172 | select GENERIC_IRQ_MULTI_HANDLER | ||
| 173 | select SPARSE_IRQ | 166 | select SPARSE_IRQ |
| 174 | 167 | ||
| 175 | config MADERA_IRQ | 168 | config MADERA_IRQ |
| @@ -186,7 +179,6 @@ config CLPS711X_IRQCHIP · 10 unmodified lines | |||
| 186 | bool | 179 | bool |
| 187 | depends on ARCH_CLPS711X | 180 | depends on ARCH_CLPS711X |
| 188 | select IRQ_DOMAIN | 181 | select IRQ_DOMAIN |
| 189 | select GENERIC_IRQ_MULTI_HANDLER | ||
| 190 | select SPARSE_IRQ | 182 | select SPARSE_IRQ |
| 191 | default y | 183 | default y |
| 192 | 184 | ||
| @@ -205,7 +197,6 @@ config OMAP_IRQCHIP · 12 unmodified lines | |||
| 205 | config ORION_IRQCHIP | 197 | config ORION_IRQCHIP |
| 206 | bool | 198 | bool |
| 207 | select IRQ_DOMAIN | 199 | select IRQ_DOMAIN |
| 208 | select GENERIC_IRQ_MULTI_HANDLER | ||
| 209 | 200 | ||
| 210 | config PIC32_EVIC | 201 | config PIC32_EVIC |
| 211 | bool | 202 | bool |
| @@ -179,5 +179,6 @@ err_free_tcu: · 178 unmodified lines | |||
| 179 | } | 179 | } |
| 180 | IRQCHIP_DECLARE(jz4740_tcu_irq, "ingenic,jz4740-tcu", ingenic_tcu_irq_init); | 180 | IRQCHIP_DECLARE(jz4740_tcu_irq, "ingenic,jz4740-tcu", ingenic_tcu_irq_init); |
| 181 | IRQCHIP_DECLARE(jz4725b_tcu_irq, "ingenic,jz4725b-tcu", ingenic_tcu_irq_init); | 181 | IRQCHIP_DECLARE(jz4725b_tcu_irq, "ingenic,jz4725b-tcu", ingenic_tcu_irq_init); |
| 182 | IRQCHIP_DECLARE(jz4760_tcu_irq, "ingenic,jz4760-tcu", ingenic_tcu_irq_init); | ||
| 182 | IRQCHIP_DECLARE(jz4770_tcu_irq, "ingenic,jz4770-tcu", ingenic_tcu_irq_init); | 183 | IRQCHIP_DECLARE(jz4770_tcu_irq, "ingenic,jz4770-tcu", ingenic_tcu_irq_init); |
| 183 | IRQCHIP_DECLARE(x1000_tcu_irq, "ingenic,x1000-tcu", ingenic_tcu_irq_init); | 184 | IRQCHIP_DECLARE(x1000_tcu_irq, "ingenic,x1000-tcu", ingenic_tcu_irq_init); |
| @@ -155,6 +155,7 @@ static int __init intc_2chip_of_init(struct device_node *node, · 154 unmodified lines | |||
| 155 | { | 155 | { |
| 156 | return ingenic_intc_of_init(node, 2); | 156 | return ingenic_intc_of_init(node, 2); |
| 157 | } | 157 | } |
| 158 | IRQCHIP_DECLARE(jz4760_intc, "ingenic,jz4760-intc", intc_2chip_of_init); | ||
| 158 | IRQCHIP_DECLARE(jz4770_intc, "ingenic,jz4770-intc", intc_2chip_of_init); | 159 | IRQCHIP_DECLARE(jz4770_intc, "ingenic,jz4770-intc", intc_2chip_of_init); |
| 159 | IRQCHIP_DECLARE(jz4775_intc, "ingenic,jz4775-intc", intc_2chip_of_init); | 160 | IRQCHIP_DECLARE(jz4775_intc, "ingenic,jz4775-intc", intc_2chip_of_init); |
| 160 | IRQCHIP_DECLARE(jz4780_intc, "ingenic,jz4780-intc", intc_2chip_of_init); | 161 | IRQCHIP_DECLARE(jz4780_intc, "ingenic,jz4780-intc", intc_2chip_of_init); |
| @@ -150,7 +150,6 @@ struct irq_domain_chip_generic; · 149 unmodified lines | |||
| 150 | * setting up one or more generic chips for interrupt controllers | 150 | * setting up one or more generic chips for interrupt controllers |
| 151 | * drivers using the generic chip library which uses this pointer. | 151 | * drivers using the generic chip library which uses this pointer. |
| 152 | * @parent: Pointer to parent irq_domain to support hierarchy irq_domains | 152 | * @parent: Pointer to parent irq_domain to support hierarchy irq_domains |
| 153 | * @debugfs_file: dentry for the domain debugfs file | ||
| 154 | * | 153 | * |
| 155 | * Revmap data, used internally by irq_domain | 154 | * Revmap data, used internally by irq_domain |
| 156 | * @revmap_direct_max_irq: The largest hwirq that can be set for controllers that | 155 | * @revmap_direct_max_irq: The largest hwirq that can be set for controllers that |
| @@ -174,9 +173,6 @@ struct irq_domain { · 17 unmodified lines | |||
| 174 | #ifdef CONFIG_IRQ_DOMAIN_HIERARCHY | 173 | #ifdef CONFIG_IRQ_DOMAIN_HIERARCHY |
| 175 | struct irq_domain *parent; | 174 | struct irq_domain *parent; |
| 176 | #endif | 175 | #endif |
| 177 | #ifdef CONFIG_GENERIC_IRQ_DEBUGFS | ||
| 178 | struct dentry *debugfs_file; | ||
| 179 | #endif | ||
| 180 | 176 | ||
| 181 | /* reverse map data. The linear map gets appended to the irq_domain */ | 177 | /* reverse map data. The linear map gets appended to the irq_domain */ |
| 182 | irq_hw_number_t hwirq_max; | 178 | irq_hw_number_t hwirq_max; |
| @@ -1898,16 +1898,15 @@ DEFINE_SHOW_ATTRIBUTE(irq_domain_debug); · 1897 unmodified lines | |||
| 1898 | 1898 | ||
| 1899 | static void debugfs_add_domain_dir(struct irq_domain *d) | 1899 | static void debugfs_add_domain_dir(struct irq_domain *d) |
| 1900 | { | 1900 | { |
| 1901 | if (!d->name || !domain_dir || d->debugfs_file) | 1901 | if (!d->name || !domain_dir) |
| 1902 | return; | 1902 | return; |
| 1903 | d->debugfs_file = debugfs_create_file(d->name, 0444, domain_dir, d, | 1903 | debugfs_create_file(d->name, 0444, domain_dir, d, |
| 1904 | &irq_domain_debug_fops); | 1904 | &irq_domain_debug_fops); |
| 1905 | } | 1905 | } |
| 1906 | 1906 | ||
| 1907 | static void debugfs_remove_domain_dir(struct irq_domain *d) | 1907 | static void debugfs_remove_domain_dir(struct irq_domain *d) |
| 1908 | { | 1908 | { |
| 1909 | debugfs_remove(d->debugfs_file); | 1909 | debugfs_remove(debugfs_lookup(d->name, domain_dir)); |
| 1910 | d->debugfs_file = NULL; | ||
| 1911 | } | 1910 | } |
| 1912 | 1911 | ||
| 1913 | void __init irq_domain_debugfs_init(struct dentry *root) | 1912 | void __init irq_domain_debugfs_init(struct dentry *root) |