Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull irq fixes from Thomas Gleixner: "A pile of smallish changes all over the place: - Add a missing ISB in the GIC V1 driver - Remove an ACPI version check in the GIC V3 ITS driver - Add the missing irq_pm_shutdown function for BRCMSTB-L2 to avoid spurious wakeups - Remove the artifical limitation of ITS instances to the number of NUMA nodes which prevents utilizing the ITS hardware correctly - Prevent a infinite parsing loop in the GIC-V3 ITS/MSI code - Honour the force affinity argument in the GIC-V3 driver which is required to make perf work correctly - Correctly report allocation failures in GIC-V2/V3 to avoid using half allocated and initialized interrupts. - Fixup checks against nr_cpu_ids in the generic IPI code" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq/ipi: Fixup checks against nr_cpu_ids genirq: Restore trigger settings in irq_modify_status() MAINTAINERS: Remove Jason Cooper's irqchip git tree irqchip/gic-v3-its-platform-msi: Fix msi-parent parsing loop irqchip/gic-v3-its: Allow GIC ITS number more than MAX_NUMNODES irqchip: brcmstb-l2: Define an irq_pm_shutdown function irqchip/gic: Ensure we have an ISB between ack and ->handle_irq irqchip/gic-v3-its: Remove ACPICA version check for ACPI NUMA irqchip/gic-v3: Honor forced affinity setting irqchip/gic-v3: Report failures in gic_irq_domain_alloc irqchip/gic-v2: Report failures in gic_irq_domain_alloc irqchip/atmel-aic: Remove root argument from ->fixup() prototype irqchip/atmel-aic: Fix unbalanced refcount in aic_common_rtc_irq_fixup() irqchip/atmel-aic: Fix unbalanced of_node_put() in aic_common_irq_fixup()

Linus Torvalds committed 9 years ago

Commit 9dae41a2 parents e18a5eb 8fbbe2d12 files · +84 −38Browse files

Unified · Split

12 files

MAINTAINERS +0 −1
drivers/irqchip/irq-atmel-aic-common.c +6 −7
drivers/irqchip/irq-atmel-aic-common.h +2 −2
drivers/irqchip/irq-atmel-aic.c +7 −7
drivers/irqchip/irq-atmel-aic5.c +2 −2
drivers/irqchip/irq-brcmstb-l2.c +1 −0
drivers/irqchip/irq-gic-v3-its-platform-msi.c +1 −0
drivers/irqchip/irq-gic-v3-its.c +32 −8
drivers/irqchip/irq-gic-v3.c +13 −3
drivers/irqchip/irq-gic.c +10 −4
kernel/irq/chip.c +8 −2
kernel/irq/ipi.c +2 −2

MAINTAINERS+0−1

@@ -7110,7 +7110,6 @@ M: Marc Zyngier <marc.zyngier@arm.com> · 7109 unmodified lines
7110	L: linux-kernel@vger.kernel.org	7110	L: linux-kernel@vger.kernel.org
7111	S: Maintained	7111	S: Maintained
7112	T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core	7112	T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
7113	T: git git://git.infradead.org/users/jcooper/linux.git irqchip/core
7114	F: Documentation/devicetree/bindings/interrupt-controller/	7113	F: Documentation/devicetree/bindings/interrupt-controller/
7115	F: drivers/irqchip/	7114	F: drivers/irqchip/
7116		7115

drivers/irqchip/irq-atmel-aic-common.c+6−7

 #define AT91_RTC_IMR           0x28
 #define AT91_RTC_IRQ_MASK      0x1f
-void __init aic_common_rtc_irq_fixup(struct device_node *root)
+void __init aic_common_rtc_irq_fixup(void)
 {
 	struct device_node *np;
 	void __iomem *regs;
-	np = of_find_compatible_node(root, NULL, "atmel,at91rm9200-rtc");
+	np = of_find_compatible_node(NULL, NULL, "atmel,at91rm9200-rtc");
 	if (!np)
-		np = of_find_compatible_node(root, NULL,
+		np = of_find_compatible_node(NULL, NULL,
 					     "atmel,at91sam9x5-rtc");
 	if (!np)
 #define AT91_RTT_ALMIEN		(1 << 16)		/* Alarm Interrupt Enable */
 #define AT91_RTT_RTTINCIEN	(1 << 17)		/* Real Time Timer Increment Interrupt Enable */
-void __init aic_common_rtt_irq_fixup(struct device_node *root)
+void __init aic_common_rtt_irq_fixup(void)
 {
 	struct device_node *np;
 	void __iomem *regs;
 		return;
 	match = of_match_node(matches, root);
-	of_node_put(root);
 	if (match) {
-		void (*fixup)(struct device_node *) = match->data;
+		void (*fixup)(void) = match->data;
-		fixup(root);
+		fixup();
 	}
 	of_node_put(root);

drivers/irqchip/irq-atmel-aic-common.h+2−2

@@ -33,8 +33,8 @@ struct irq_domain __init aic_common_of_init(struct device_node node, · 32 unmodified lines
33	const char *name, int nirqs,	33	const char *name, int nirqs,
34	const struct of_device_id *matches);	34	const struct of_device_id *matches);
35		35
36	void __init aic_common_rtc_irq_fixup(struct device_node *root);	36	void __init aic_common_rtc_irq_fixup(void);
37		37
38	void __init aic_common_rtt_irq_fixup(struct device_node *root);	38	void __init aic_common_rtt_irq_fixup(void);
39		39
40	#endif /* __IRQ_ATMEL_AIC_COMMON_H */	40	#endif /* __IRQ_ATMEL_AIC_COMMON_H */

drivers/irqchip/irq-atmel-aic.c+7−7

@@ -209,20 +209,20 @@ static const struct irq_domain_ops aic_irq_ops = { · 208 unmodified lines
209	.xlate = aic_irq_domain_xlate,	209	.xlate = aic_irq_domain_xlate,
210	};	210	};
211		211
212	static void __init at91rm9200_aic_irq_fixup(struct device_node *root)	212	static void __init at91rm9200_aic_irq_fixup(void)
213	{	213	{
214	aic_common_rtc_irq_fixup(root);	214	aic_common_rtc_irq_fixup();
215	}	215	}
216		216
217	static void __init at91sam9260_aic_irq_fixup(struct device_node *root)	217	static void __init at91sam9260_aic_irq_fixup(void)
218	{	218	{
219	aic_common_rtt_irq_fixup(root);	219	aic_common_rtt_irq_fixup();
220	}	220	}
221		221
222	static void __init at91sam9g45_aic_irq_fixup(struct device_node *root)	222	static void __init at91sam9g45_aic_irq_fixup(void)
223	{	223	{
224	aic_common_rtc_irq_fixup(root);	224	aic_common_rtc_irq_fixup();
225	aic_common_rtt_irq_fixup(root);	225	aic_common_rtt_irq_fixup();
226	}	226	}
227		227
228	static const struct of_device_id aic_irq_fixups[] __initconst = {	228	static const struct of_device_id aic_irq_fixups[] __initconst = {

drivers/irqchip/irq-atmel-aic5.c+2−2

@@ -305,9 +305,9 @@ static const struct irq_domain_ops aic5_irq_ops = { · 304 unmodified lines
305	.xlate = aic5_irq_domain_xlate,	305	.xlate = aic5_irq_domain_xlate,
306	};	306	};
307		307
308	static void __init sama5d3_aic_irq_fixup(struct device_node *root)	308	static void __init sama5d3_aic_irq_fixup(void)
309	{	309	{
310	aic_common_rtc_irq_fixup(root);	310	aic_common_rtc_irq_fixup();
311	}	311	}
312		312
313	static const struct of_device_id aic5_irq_fixups[] __initconst = {	313	static const struct of_device_id aic5_irq_fixups[] __initconst = {

drivers/irqchip/irq-brcmstb-l2.c+1−0

@@ -189,6 +189,7 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, · 188 unmodified lines
189		189
190	ct->chip.irq_suspend = brcmstb_l2_intc_suspend;	190	ct->chip.irq_suspend = brcmstb_l2_intc_suspend;
191	ct->chip.irq_resume = brcmstb_l2_intc_resume;	191	ct->chip.irq_resume = brcmstb_l2_intc_resume;
		192	ct->chip.irq_pm_shutdown = brcmstb_l2_intc_suspend;
192		193
193	if (data->can_wake) {	194	if (data->can_wake) {
194	/* This IRQ chip can wake the system, set all child interrupts	195	/* This IRQ chip can wake the system, set all child interrupts

drivers/irqchip/irq-gic-v3-its-platform-msi.c+1−0

@@ -43,6 +43,7 @@ static int of_pmsi_get_dev_id(struct irq_domain domain, struct device dev, · 42 unmodified lines
43	*dev_id = args.args[0];	43	*dev_id = args.args[0];
44	break;	44	break;
45	}	45	}
		46	index++;
46	} while (!ret);	47	} while (!ret);
47		48
48	return ret;	49	return ret;

drivers/irqchip/irq-gic-v3-its.c+32−8

 #define ACPI_GICV3_ITS_MEM_SIZE (SZ_128K)
-#if defined(CONFIG_ACPI_NUMA) && (ACPI_CA_VERSION >= 0x20170531)
+#ifdef CONFIG_ACPI_NUMA
 struct its_srat_map {
 	/* numa node id */
 	u32	numa_node;
 	u32	its_id;
 };
-static struct its_srat_map its_srat_maps[MAX_NUMNODES] __initdata;
+static struct its_srat_map *its_srat_maps __initdata;
 static int its_in_srat __initdata;
 static int __init acpi_get_its_numa_node(u32 its_id)
 	return NUMA_NO_NODE;
 }
+static int __init gic_acpi_match_srat_its(struct acpi_subtable_header *header,
+					  const unsigned long end)
+{
+	return 0;
+}
 static int __init gic_acpi_parse_srat_its(struct acpi_subtable_header *header,
 			 const unsigned long end)
 {
 		return -EINVAL;
 	}
-	if (its_in_srat >= MAX_NUMNODES) {
-		pr_err("SRAT: ITS affinity exceeding max count[%d]\n",
-				MAX_NUMNODES);
-		return -EINVAL;
-	}
 	node = acpi_map_pxm_to_node(its_affinity->proximity_domain);
 	if (node == NUMA_NO_NODE || node >= MAX_NUMNODES) {
 static void __init acpi_table_parse_srat_its(void)
 {
+	int count;
+	count = acpi_table_parse_entries(ACPI_SIG_SRAT,
+			sizeof(struct acpi_table_srat),
+			ACPI_SRAT_TYPE_GIC_ITS_AFFINITY,
+			gic_acpi_match_srat_its, 0);
+	if (count <= 0)
+		return;
+	its_srat_maps = kmalloc(count * sizeof(struct its_srat_map),
+				GFP_KERNEL);
+	if (!its_srat_maps) {
+		pr_warn("SRAT: Failed to allocate memory for its_srat_maps!\n");
+		return;
+	}
 	acpi_table_parse_entries(ACPI_SIG_SRAT,
 			sizeof(struct acpi_table_srat),
 			ACPI_SRAT_TYPE_GIC_ITS_AFFINITY,
 			gic_acpi_parse_srat_its, 0);
 }
+/* free the its_srat_maps after ITS probing */
+static void __init acpi_its_srat_maps_free(void)
+{
+	kfree(its_srat_maps);
+}
 #else
 static void __init acpi_table_parse_srat_its(void)	{ }
 static int __init acpi_get_its_numa_node(u32 its_id) { return NUMA_NO_NODE; }
+static void __init acpi_its_srat_maps_free(void) { }
 #endif
 static int __init gic_acpi_parse_madt_its(struct acpi_subtable_header *header,
 	acpi_table_parse_srat_its();
 	acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_TRANSLATOR,
 			      gic_acpi_parse_madt_its, 0);
+	acpi_its_srat_maps_free();
 }
 #else
 static void __init its_acpi_probe(void) { }

drivers/irqchip/irq-gic-v3.c+13−3

 			if (static_key_true(&supports_deactivate))
 				gic_write_eoir(irqnr);
+			else
+				isb();
 			err = handle_domain_irq(gic_data.domain, irqnr, regs);
 			if (err) {
 static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
 			    bool force)
 {
-	unsigned int cpu = cpumask_any_and(mask_val, cpu_online_mask);
+	unsigned int cpu;
 	void __iomem *reg;
 	int enabled;
 	u64 val;
+	if (force)
+		cpu = cpumask_first(mask_val);
+	else
+		cpu = cpumask_any_and(mask_val, cpu_online_mask);
 	if (cpu >= nr_cpu_ids)
 		return -EINVAL;
 	if (ret)
 		return ret;
-	for (i = 0; i < nr_irqs; i++)
+	for (i = 0; i < nr_irqs; i++) {
-		gic_irq_domain_map(domain, virq + i, hwirq + i);
+		ret = gic_irq_domain_map(domain, virq + i, hwirq + i);
+		if (ret)
+			return ret;
+	}
 	return 0;
 }

drivers/irqchip/irq-gic.c+10−4

 		if (likely(irqnr > 15 && irqnr < 1020)) {
 			if (static_key_true(&supports_deactivate))
 				writel_relaxed(irqstat, cpu_base + GIC_CPU_EOI);
+			isb();
 			handle_domain_irq(gic->domain, irqnr, regs);
 			continue;
 		}
 		goto out;
 	cascade_irq = irq_find_mapping(chip_data->domain, gic_irq);
-	if (unlikely(gic_irq < 32 || gic_irq > 1020))
+	if (unlikely(gic_irq < 32 || gic_irq > 1020)) {
 		handle_bad_irq(desc);
-	else
+	} else {
+		isb();
 		generic_handle_irq(cascade_irq);
+	}
  out:
 	chained_irq_exit(chip, desc);
 	if (ret)
 		return ret;
-	for (i = 0; i < nr_irqs; i++)
+	for (i = 0; i < nr_irqs; i++) {
-		gic_irq_domain_map(domain, virq + i, hwirq + i);
+		ret = gic_irq_domain_map(domain, virq + i, hwirq + i);
+		if (ret)
+			return ret;
+	}
 	return 0;
 }

kernel/irq/chip.c+8−2

 void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set)
 {
-	unsigned long flags;
+	unsigned long flags, trigger, tmp;
 	struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);
 	if (!desc)
 	irq_settings_clr_and_set(desc, clr, set);
+	trigger = irqd_get_trigger_type(&desc->irq_data);
 	irqd_clear(&desc->irq_data, IRQD_NO_BALANCING | IRQD_PER_CPU |
 		   IRQD_TRIGGER_MASK | IRQD_LEVEL | IRQD_MOVE_PCNTXT);
 	if (irq_settings_has_no_balance_set(desc))
 	if (irq_settings_is_level(desc))
 		irqd_set(&desc->irq_data, IRQD_LEVEL);
-	irqd_set(&desc->irq_data, irq_settings_get_trigger_mask(desc));
+	tmp = irq_settings_get_trigger_mask(desc);
+	if (tmp != IRQ_TYPE_NONE)
+		trigger = tmp;
+	irqd_set(&desc->irq_data, trigger);
 	irq_put_desc_unlock(desc, flags);
 }

kernel/irq/ipi.c+2−2

@@ -165,7 +165,7 @@ irq_hw_number_t ipi_get_hwirq(unsigned int irq, unsigned int cpu) · 164 unmodified lines
165	struct irq_data *data = irq_get_irq_data(irq);	165	struct irq_data *data = irq_get_irq_data(irq);
166	struct cpumask *ipimask = data ? irq_data_get_affinity_mask(data) : NULL;	166	struct cpumask *ipimask = data ? irq_data_get_affinity_mask(data) : NULL;
167		167
168	if (!data \|\| !ipimask \|\| cpu > nr_cpu_ids)	168	if (!data \|\| !ipimask \|\| cpu >= nr_cpu_ids)
169	return INVALID_HWIRQ;	169	return INVALID_HWIRQ;
170		170
171	if (!cpumask_test_cpu(cpu, ipimask))	171	if (!cpumask_test_cpu(cpu, ipimask))
@@ -195,7 +195,7 @@ static int ipi_send_verify(struct irq_chip chip, struct irq_data data, · 23 unmodified lines
195	if (!chip->ipi_send_single && !chip->ipi_send_mask)	195	if (!chip->ipi_send_single && !chip->ipi_send_mask)
196	return -EINVAL;	196	return -EINVAL;
197		197
198	if (cpu > nr_cpu_ids)	198	if (cpu >= nr_cpu_ids)
199	return -EINVAL;	199	return -EINVAL;
200		200
201	if (dest) {	201	if (dest) {

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code