Skip to content

Commit a82f311

Browse files
author
Marc Zyngier
committed
Merge branch irq/misc-6.5 into irq/irqchip-next
* irq/misc-6.5: : . : Misc cleanups: : : - Add a number of missing prototypes : - Mark global symbol as static where needed : - Drop some now useless non-DT code paths : - Add a missing interrupt mapping to the STM32 irqchip : - Silence another STM32 warning when building with W=1 : - Fix the jcore-aic driver that actually never worked... : . Revert "irqchip/mxs: Include linux/irqchip/mxs.h" irqchip/jcore-aic: Fix missing allocation of IRQ descriptors irqchip/stm32-exti: Fix warning on initialized field overwritten irqchip/stm32-exti: Add STM32MP15xx IWDG2 EXTI to GIC map irqchip/gicv3: Add a iort_pmsi_get_dev_id() prototype irqchip/mxs: Include linux/irqchip/mxs.h irqchip/clps711x: Remove unused clps711x_intc_init() function irqchip/mmp: Remove non-DT codepath irqchip/ftintc010: Mark all function static irqdomain: Include internals.h for function prototypes Signed-off-by: Marc Zyngier <maz@kernel.org>
2 parents e0b78e9 + d93c221 commit a82f311

File tree

8 files changed

+26
-147
lines changed

8 files changed

+26
-147
lines changed

‎drivers/irqchip/irq-clps711x.c‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,6 @@ static int __init _clps711x_intc_init(struct device_node *np,
212212
return err;
213213
}
214214

215-
void __init clps711x_intc_init(phys_addr_t base, resource_size_t size)
216-
{
217-
BUG_ON(_clps711x_intc_init(NULL, base, size));
218-
}
219-
220-
#ifdef CONFIG_IRQCHIP
221215
static int __init clps711x_intc_init_dt(struct device_node *np,
222216
struct device_node *parent)
223217
{
@@ -231,4 +225,3 @@ static int __init clps711x_intc_init_dt(struct device_node *np,
231225
return _clps711x_intc_init(np, res.start, resource_size(&res));
232226
}
233227
IRQCHIP_DECLARE(clps711x, "cirrus,ep7209-intc", clps711x_intc_init_dt);
234-
#endif

‎drivers/irqchip/irq-ftintc010.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ static struct irq_chip ft010_irq_chip = {
125125
/* Local static for the IRQ entry call */
126126
static struct ft010_irq_data firq;
127127

128-
asmlinkage void __exception_irq_entry ft010_irqchip_handle_irq(struct pt_regs *regs)
128+
static asmlinkage void __exception_irq_entry ft010_irqchip_handle_irq(struct pt_regs *regs)
129129
{
130130
struct ft010_irq_data *f = &firq;
131131
int irq;
@@ -162,7 +162,7 @@ static const struct irq_domain_ops ft010_irqdomain_ops = {
162162
.xlate = irq_domain_xlate_onetwocell,
163163
};
164164

165-
int __init ft010_of_init_irq(struct device_node *node,
165+
static int __init ft010_of_init_irq(struct device_node *node,
166166
struct device_node *parent)
167167
{
168168
struct ft010_irq_data *f = &firq;

‎drivers/irqchip/irq-jcore-aic.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ static int __init aic_irq_of_init(struct device_node *node,
6868
unsigned min_irq = JCORE_AIC2_MIN_HWIRQ;
6969
unsigned dom_sz = JCORE_AIC_MAX_HWIRQ+1;
7070
struct irq_domain *domain;
71+
int ret;
7172

7273
pr_info("Initializing J-Core AIC\n");
7374

@@ -100,6 +101,12 @@ static int __init aic_irq_of_init(struct device_node *node,
100101
jcore_aic.irq_unmask = noop;
101102
jcore_aic.name = "AIC";
102103

104+
ret = irq_alloc_descs(-1, min_irq, dom_sz - min_irq,
105+
of_node_to_nid(node));
106+
107+
if (ret < 0)
108+
return ret;
109+
103110
domain = irq_domain_add_legacy(node, dom_sz - min_irq, min_irq, min_irq,
104111
&jcore_aic_irqdomain_ops,
105112
&jcore_aic);

‎drivers/irqchip/irq-mmp.c‎

Lines changed: 0 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -244,132 +244,6 @@ static void __exception_irq_entry mmp2_handle_irq(struct pt_regs *regs)
244244
generic_handle_domain_irq(icu_data[0].domain, hwirq);
245245
}
246246

247-
/* MMP (ARMv5) */
248-
void __init icu_init_irq(void)
249-
{
250-
int irq;
251-
252-
max_icu_nr = 1;
253-
mmp_icu_base = ioremap(0xd4282000, 0x1000);
254-
icu_data[0].conf_enable = mmp_conf.conf_enable;
255-
icu_data[0].conf_disable = mmp_conf.conf_disable;
256-
icu_data[0].conf_mask = mmp_conf.conf_mask;
257-
icu_data[0].nr_irqs = 64;
258-
icu_data[0].virq_base = 0;
259-
icu_data[0].domain = irq_domain_add_legacy(NULL, 64, 0, 0,
260-
&irq_domain_simple_ops,
261-
&icu_data[0]);
262-
for (irq = 0; irq < 64; irq++) {
263-
icu_mask_irq(irq_get_irq_data(irq));
264-
irq_set_chip_and_handler(irq, &icu_irq_chip, handle_level_irq);
265-
}
266-
irq_set_default_host(icu_data[0].domain);
267-
set_handle_irq(mmp_handle_irq);
268-
}
269-
270-
/* MMP2 (ARMv7) */
271-
void __init mmp2_init_icu(void)
272-
{
273-
int irq, end;
274-
275-
max_icu_nr = 8;
276-
mmp_icu_base = ioremap(0xd4282000, 0x1000);
277-
icu_data[0].conf_enable = mmp2_conf.conf_enable;
278-
icu_data[0].conf_disable = mmp2_conf.conf_disable;
279-
icu_data[0].conf_mask = mmp2_conf.conf_mask;
280-
icu_data[0].nr_irqs = 64;
281-
icu_data[0].virq_base = 0;
282-
icu_data[0].domain = irq_domain_add_legacy(NULL, 64, 0, 0,
283-
&irq_domain_simple_ops,
284-
&icu_data[0]);
285-
icu_data[1].reg_status = mmp_icu_base + 0x150;
286-
icu_data[1].reg_mask = mmp_icu_base + 0x168;
287-
icu_data[1].clr_mfp_irq_base = icu_data[0].virq_base +
288-
icu_data[0].nr_irqs;
289-
icu_data[1].clr_mfp_hwirq = 1; /* offset to IRQ_MMP2_PMIC_BASE */
290-
icu_data[1].nr_irqs = 2;
291-
icu_data[1].cascade_irq = 4;
292-
icu_data[1].virq_base = icu_data[0].virq_base + icu_data[0].nr_irqs;
293-
icu_data[1].domain = irq_domain_add_legacy(NULL, icu_data[1].nr_irqs,
294-
icu_data[1].virq_base, 0,
295-
&irq_domain_simple_ops,
296-
&icu_data[1]);
297-
icu_data[2].reg_status = mmp_icu_base + 0x154;
298-
icu_data[2].reg_mask = mmp_icu_base + 0x16c;
299-
icu_data[2].nr_irqs = 2;
300-
icu_data[2].cascade_irq = 5;
301-
icu_data[2].virq_base = icu_data[1].virq_base + icu_data[1].nr_irqs;
302-
icu_data[2].domain = irq_domain_add_legacy(NULL, icu_data[2].nr_irqs,
303-
icu_data[2].virq_base, 0,
304-
&irq_domain_simple_ops,
305-
&icu_data[2]);
306-
icu_data[3].reg_status = mmp_icu_base + 0x180;
307-
icu_data[3].reg_mask = mmp_icu_base + 0x17c;
308-
icu_data[3].nr_irqs = 3;
309-
icu_data[3].cascade_irq = 9;
310-
icu_data[3].virq_base = icu_data[2].virq_base + icu_data[2].nr_irqs;
311-
icu_data[3].domain = irq_domain_add_legacy(NULL, icu_data[3].nr_irqs,
312-
icu_data[3].virq_base, 0,
313-
&irq_domain_simple_ops,
314-
&icu_data[3]);
315-
icu_data[4].reg_status = mmp_icu_base + 0x158;
316-
icu_data[4].reg_mask = mmp_icu_base + 0x170;
317-
icu_data[4].nr_irqs = 5;
318-
icu_data[4].cascade_irq = 17;
319-
icu_data[4].virq_base = icu_data[3].virq_base + icu_data[3].nr_irqs;
320-
icu_data[4].domain = irq_domain_add_legacy(NULL, icu_data[4].nr_irqs,
321-
icu_data[4].virq_base, 0,
322-
&irq_domain_simple_ops,
323-
&icu_data[4]);
324-
icu_data[5].reg_status = mmp_icu_base + 0x15c;
325-
icu_data[5].reg_mask = mmp_icu_base + 0x174;
326-
icu_data[5].nr_irqs = 15;
327-
icu_data[5].cascade_irq = 35;
328-
icu_data[5].virq_base = icu_data[4].virq_base + icu_data[4].nr_irqs;
329-
icu_data[5].domain = irq_domain_add_legacy(NULL, icu_data[5].nr_irqs,
330-
icu_data[5].virq_base, 0,
331-
&irq_domain_simple_ops,
332-
&icu_data[5]);
333-
icu_data[6].reg_status = mmp_icu_base + 0x160;
334-
icu_data[6].reg_mask = mmp_icu_base + 0x178;
335-
icu_data[6].nr_irqs = 2;
336-
icu_data[6].cascade_irq = 51;
337-
icu_data[6].virq_base = icu_data[5].virq_base + icu_data[5].nr_irqs;
338-
icu_data[6].domain = irq_domain_add_legacy(NULL, icu_data[6].nr_irqs,
339-
icu_data[6].virq_base, 0,
340-
&irq_domain_simple_ops,
341-
&icu_data[6]);
342-
icu_data[7].reg_status = mmp_icu_base + 0x188;
343-
icu_data[7].reg_mask = mmp_icu_base + 0x184;
344-
icu_data[7].nr_irqs = 2;
345-
icu_data[7].cascade_irq = 55;
346-
icu_data[7].virq_base = icu_data[6].virq_base + icu_data[6].nr_irqs;
347-
icu_data[7].domain = irq_domain_add_legacy(NULL, icu_data[7].nr_irqs,
348-
icu_data[7].virq_base, 0,
349-
&irq_domain_simple_ops,
350-
&icu_data[7]);
351-
end = icu_data[7].virq_base + icu_data[7].nr_irqs;
352-
for (irq = 0; irq < end; irq++) {
353-
icu_mask_irq(irq_get_irq_data(irq));
354-
if (irq == icu_data[1].cascade_irq ||
355-
irq == icu_data[2].cascade_irq ||
356-
irq == icu_data[3].cascade_irq ||
357-
irq == icu_data[4].cascade_irq ||
358-
irq == icu_data[5].cascade_irq ||
359-
irq == icu_data[6].cascade_irq ||
360-
irq == icu_data[7].cascade_irq) {
361-
irq_set_chip(irq, &icu_irq_chip);
362-
irq_set_chained_handler(irq, icu_mux_irq_demux);
363-
} else {
364-
irq_set_chip_and_handler(irq, &icu_irq_chip,
365-
handle_level_irq);
366-
}
367-
}
368-
irq_set_default_host(icu_data[0].domain);
369-
set_handle_irq(mmp2_handle_irq);
370-
}
371-
372-
#ifdef CONFIG_OF
373247
static int __init mmp_init_bases(struct device_node *node)
374248
{
375249
int ret, nr_irqs, irq, i = 0;
@@ -548,4 +422,3 @@ static int __init mmp2_mux_of_init(struct device_node *node,
548422
return -EINVAL;
549423
}
550424
IRQCHIP_DECLARE(mmp2_mux_intc, "mrvl,mmp2-mux-intc", mmp2_mux_of_init);
551-
#endif

‎drivers/irqchip/irq-stm32-exti.c‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,16 @@ static struct irq_chip stm32_exti_h_chip_direct;
173173
#define EXTI_INVALID_IRQ U8_MAX
174174
#define STM32MP1_DESC_IRQ_SIZE (ARRAY_SIZE(stm32mp1_exti_banks) * IRQS_PER_BANK)
175175

176+
/*
177+
* Use some intentionally tricky logic here to initialize the whole array to
178+
* EXTI_INVALID_IRQ, but then override certain fields, requiring us to indicate
179+
* that we "know" that there are overrides in this structure, and we'll need to
180+
* disable that warning from W=1 builds.
181+
*/
182+
__diag_push();
183+
__diag_ignore_all("-Woverride-init",
184+
"logic to initialize all and then override some is OK");
185+
176186
static const u8 stm32mp1_desc_irq[] = {
177187
/* default value */
178188
[0 ... (STM32MP1_DESC_IRQ_SIZE - 1)] = EXTI_INVALID_IRQ,
@@ -208,6 +218,7 @@ static const u8 stm32mp1_desc_irq[] = {
208218
[31] = 53,
209219
[32] = 82,
210220
[33] = 83,
221+
[46] = 151,
211222
[47] = 93,
212223
[48] = 138,
213224
[50] = 139,
@@ -266,6 +277,8 @@ static const u8 stm32mp13_desc_irq[] = {
266277
[70] = 98,
267278
};
268279

280+
__diag_pop();
281+
269282
static const struct stm32_exti_drv_data stm32mp1_drv_data = {
270283
.exti_banks = stm32mp1_exti_banks,
271284
.bank_nr = ARRAY_SIZE(stm32mp1_exti_banks),

‎include/linux/acpi_iort.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ int iort_register_domain_token(int trans_id, phys_addr_t base,
2626
struct fwnode_handle *fw_node);
2727
void iort_deregister_domain_token(int trans_id);
2828
struct fwnode_handle *iort_find_domain_token(int trans_id);
29+
int iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id);
30+
2931
#ifdef CONFIG_ACPI_IORT
3032
void acpi_iort_init(void);
3133
u32 iort_msi_map_id(struct device *dev, u32 id);
3234
struct irq_domain *iort_get_device_domain(struct device *dev, u32 id,
3335
enum irq_domain_bus_token bus_token);
3436
void acpi_configure_pmsi_domain(struct device *dev);
35-
int iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id);
3637
void iort_get_rmr_sids(struct fwnode_handle *iommu_fwnode,
3738
struct list_head *head);
3839
void iort_put_rmr_sids(struct fwnode_handle *iommu_fwnode,

‎include/linux/irqchip/mmp.h‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎kernel/irq/irqdomain.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1915,6 +1915,8 @@ static void irq_domain_check_hierarchy(struct irq_domain *domain)
19151915
#endif /* CONFIG_IRQ_DOMAIN_HIERARCHY */
19161916

19171917
#ifdef CONFIG_GENERIC_IRQ_DEBUGFS
1918+
#include "internals.h"
1919+
19181920
static struct dentry *domain_dir;
19191921

19201922
static void

0 commit comments

Comments
 (0)