History

Merge tag 'irq_urgent_for_v5.11_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull irq fixes from Borislav Petkov: - Fix a kernel panic in mips-cpu due to invalid irq domain hierarchy. - Fix to not lose IPIs on bcm2836. - Fix for a bogus marking of ITS devices as shared due to unitialized stack variable. - Clear a phantom interrupt on qcom-pdc to unblock suspend. - Small cleanups, warning and build fixes. * tag 'irq_urgent_for_v5.11_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Export irq_check_status_bit() irqchip/mips-cpu: Set IPI domain parent chip irqchip/pruss: Simplify the TI_PRUSS_INTC Kconfig irqchip/loongson-liointc: Fix build warnings driver core: platform: Add extra error check in devm_platform_get_irqs_affinity() irqchip/bcm2836: Fix IPI acknowledgement after conversion to handle_percpu_devid_irq irqchip/irq-sl28cpld: Convert comma to semicolon genirq/msi: Initialize msi_alloc_info before calling msi_domain_prepare_irqs()

Linus Torvalds committed 5 years ago

Commit e6806132 parents 32d4327 ce09ccc8 files · +19 −8Browse files

Unified · Split

8 files
  1. drivers/base/platform.c +2 −0
  2. drivers/irqchip/Kconfig +3 −2
  3. drivers/irqchip/irq-bcm2836.c +2 −2
  4. drivers/irqchip/irq-loongson-liointc.c +2 −2
  5. drivers/irqchip/irq-mips-cpu.c +7 −0
  6. drivers/irqchip/irq-sl28cpld.c +1 −1
  7. kernel/irq/manage.c +1 −0
  8. kernel/irq/msi.c +1 −1
drivers/base/platform.c+2−0
@@ -366,6 +366,8 @@ int devm_platform_get_irqs_affinity(struct platform_device *dev, · 365 unmodified lines
366 return -ERANGE;366 return -ERANGE;
367 367
368 nvec = platform_irq_count(dev);368 nvec = platform_irq_count(dev);
369 if (nvec < 0)
370 return nvec;
369 371
370 if (nvec < minvec)372 if (nvec < minvec)
371 return -ENOSPC;373 return -ENOSPC;
drivers/irqchip/Kconfig+3−2
@@ -493,8 +493,9 @@ config TI_SCI_INTA_IRQCHIP · 492 unmodified lines
493 TI System Controller, say Y here. Otherwise, say N.493 TI System Controller, say Y here. Otherwise, say N.
494 494
495config TI_PRUSS_INTC495config TI_PRUSS_INTC
496 tristate "TI PRU-ICSS Interrupt Controller"496 tristate
497 depends on ARCH_DAVINCI || SOC_AM33XX || SOC_AM43XX || SOC_DRA7XX || ARCH_KEYSTONE || ARCH_K3497 depends on TI_PRUSS
498 default TI_PRUSS
498 select IRQ_DOMAIN499 select IRQ_DOMAIN
499 help500 help
500 This enables support for the PRU-ICSS Local Interrupt Controller501 This enables support for the PRU-ICSS Local Interrupt Controller
drivers/irqchip/irq-bcm2836.c+2−2
@@ -167,7 +167,7 @@ static void bcm2836_arm_irqchip_handle_ipi(struct irq_desc *desc) · 166 unmodified lines
167 chained_irq_exit(chip, desc);167 chained_irq_exit(chip, desc);
168}168}
169 169
170static void bcm2836_arm_irqchip_ipi_eoi(struct irq_data *d)170static void bcm2836_arm_irqchip_ipi_ack(struct irq_data *d)
171{171{
172 int cpu = smp_processor_id();172 int cpu = smp_processor_id();
173 173
@@ -195,7 +195,7 @@ static struct irq_chip bcm2836_arm_irqchip_ipi = { · 21 unmodified lines
195 .name = "IPI",195 .name = "IPI",
196 .irq_mask = bcm2836_arm_irqchip_dummy_op,196 .irq_mask = bcm2836_arm_irqchip_dummy_op,
197 .irq_unmask = bcm2836_arm_irqchip_dummy_op,197 .irq_unmask = bcm2836_arm_irqchip_dummy_op,
198 .irq_eoi = bcm2836_arm_irqchip_ipi_eoi,198 .irq_ack = bcm2836_arm_irqchip_ipi_ack,
199 .ipi_send_mask = bcm2836_arm_irqchip_ipi_send_mask,199 .ipi_send_mask = bcm2836_arm_irqchip_ipi_send_mask,
200};200};
201 201
drivers/irqchip/irq-loongson-liointc.c+2−2
@@ -142,8 +142,8 @@ static void liointc_resume(struct irq_chip_generic *gc) · 141 unmodified lines
142 142
143static const char * const parent_names[] = {"int0", "int1", "int2", "int3"};143static const char * const parent_names[] = {"int0", "int1", "int2", "int3"};
144 144
145int __init liointc_of_init(struct device_node *node,145static int __init liointc_of_init(struct device_node *node,
146 struct device_node *parent)146 struct device_node *parent)
147{147{
148 struct irq_chip_generic *gc;148 struct irq_chip_generic *gc;
149 struct irq_domain *domain;149 struct irq_domain *domain;
drivers/irqchip/irq-mips-cpu.c+7−0
@@ -197,6 +197,13 @@ static int mips_cpu_ipi_alloc(struct irq_domain *domain, unsigned int virq, · 196 unmodified lines
197 if (ret)197 if (ret)
198 return ret;198 return ret;
199 199
200 ret = irq_domain_set_hwirq_and_chip(domain->parent, virq + i, hwirq,
201 &mips_mt_cpu_irq_controller,
202 NULL);
203
204 if (ret)
205 return ret;
206
200 ret = irq_set_irq_type(virq + i, IRQ_TYPE_LEVEL_HIGH);207 ret = irq_set_irq_type(virq + i, IRQ_TYPE_LEVEL_HIGH);
201 if (ret)208 if (ret)
202 return ret;209 return ret;
drivers/irqchip/irq-sl28cpld.c+1−1
@@ -66,7 +66,7 @@ static int sl28cpld_intc_probe(struct platform_device *pdev) · 65 unmodified lines
66 irqchip->chip.num_regs = 1;66 irqchip->chip.num_regs = 1;
67 irqchip->chip.status_base = base + INTC_IP;67 irqchip->chip.status_base = base + INTC_IP;
68 irqchip->chip.mask_base = base + INTC_IE;68 irqchip->chip.mask_base = base + INTC_IE;
69 irqchip->chip.mask_invert = true,69 irqchip->chip.mask_invert = true;
70 irqchip->chip.ack_base = base + INTC_IP;70 irqchip->chip.ack_base = base + INTC_IP;
71 71
72 return devm_regmap_add_irq_chip_fwnode(dev, dev_fwnode(dev),72 return devm_regmap_add_irq_chip_fwnode(dev, dev_fwnode(dev),
kernel/irq/manage.c+1−0
@@ -2859,3 +2859,4 @@ bool irq_check_status_bit(unsigned int irq, unsigned int bitmask) · 2858 unmodified lines
2859 rcu_read_unlock();2859 rcu_read_unlock();
2860 return res;2860 return res;
2861}2861}
2862EXPORT_SYMBOL_GPL(irq_check_status_bit);
kernel/irq/msi.c+1−1
@@ -402,7 +402,7 @@ int __msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, · 401 unmodified lines
402 struct msi_domain_ops *ops = info->ops;402 struct msi_domain_ops *ops = info->ops;
403 struct irq_data *irq_data;403 struct irq_data *irq_data;
404 struct msi_desc *desc;404 struct msi_desc *desc;
405 msi_alloc_info_t arg;405 msi_alloc_info_t arg = { };
406 int i, ret, virq;406 int i, ret, virq;
407 bool can_reserve;407 bool can_reserve;
408 408

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t