Commit 56fe0a6a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq-urgent-2024-08-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Thomas Gleixner:
 "Three small fixes for interrupt core and drivers:

   - The interrupt core fails to honor caller supplied affinity hints
     for non-managed interrupts and uses the system default affinity on
     startup instead. Set the missing flag in the descriptor to tell the
     core to use the provided affinity.

   - Fix a shift out of bounds error in the Xilinx driver

   - Handle switching to level trigger correctly in the RISCV APLIC
     driver. It failed to retrigger the interrupt which causes it to
     become stale"

* tag 'irq-urgent-2024-08-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/riscv-aplic: Retrigger MSI interrupt on source configuration
  irqchip/xilinx: Fix shift out of bounds
  genirq/irqdesc: Honor caller provided affinity in alloc_desc()
parents cb2e5ee8 03f9885c

drivers/irqchip/irq-riscv-aplic-msi.c

+25 −7
Original line number Diff line number Diff line
@@ -32,15 +32,10 @@ static void aplic_msi_irq_unmask(struct irq_data *d) 
	aplic_irq_unmask(d);

}



static void aplic_msi_irq_eoi(struct irq_data *d)

static void aplic_msi_irq_retrigger_level(struct irq_data *d)

{

	struct aplic_priv *priv = irq_data_get_irq_chip_data(d);



	/*

	 * EOI handling is required only for level-triggered interrupts

	 * when APLIC is in MSI mode.

	 */



	switch (irqd_get_trigger_type(d)) {

	case IRQ_TYPE_LEVEL_LOW:

	case IRQ_TYPE_LEVEL_HIGH:
@@ -59,6 +54,29 @@ static void aplic_msi_irq_eoi(struct irq_data *d) 
	}

}



static void aplic_msi_irq_eoi(struct irq_data *d)

{

	/*

	 * EOI handling is required only for level-triggered interrupts

	 * when APLIC is in MSI mode.

	 */

	aplic_msi_irq_retrigger_level(d);

}



static int aplic_msi_irq_set_type(struct irq_data *d, unsigned int type)

{

	int rc = aplic_irq_set_type(d, type);



	if (rc)

		return rc;

	/*

	 * Updating sourcecfg register for level-triggered interrupts

	 * requires interrupt retriggering when APLIC is in MSI mode.

	 */

	aplic_msi_irq_retrigger_level(d);

	return 0;

}



static void aplic_msi_write_msg(struct irq_data *d, struct msi_msg *msg)

{

	unsigned int group_index, hart_index, guest_index, val;
@@ -130,7 +148,7 @@ static const struct msi_domain_template aplic_msi_template = { 
		.name			= "APLIC-MSI",

		.irq_mask		= aplic_msi_irq_mask,

		.irq_unmask		= aplic_msi_irq_unmask,

		.irq_set_type		= aplic_irq_set_type,

		.irq_set_type		= aplic_msi_irq_set_type,

		.irq_eoi		= aplic_msi_irq_eoi,

#ifdef CONFIG_SMP

		.irq_set_affinity	= irq_chip_set_affinity_parent,

drivers/irqchip/irq-xilinx-intc.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static int __init xilinx_intc_of_init(struct device_node *intc, 
		irqc->intr_mask = 0;

	}



	if (irqc->intr_mask >> irqc->nr_irq)

	if ((u64)irqc->intr_mask >> irqc->nr_irq)

		pr_warn("irq-xilinx: mismatch in kind-of-intr param\n");



	pr_info("irq-xilinx: %pOF: num_irq=%d, edge=0x%x\n",

kernel/irq/irqdesc.c

+1 −0
Original line number Diff line number Diff line
@@ -530,6 +530,7 @@ static int alloc_descs(unsigned int start, unsigned int cnt, int node, 
				flags = IRQD_AFFINITY_MANAGED |

					IRQD_MANAGED_SHUTDOWN;

			}

			flags |= IRQD_AFFINITY_SET;

			mask = &affinity->mask;

			node = cpu_to_node(cpumask_first(mask));

			affinity++;