Commit 88730166 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull misc irqchip fixes from Ingo Molnar:

 - Fix an endianness bug in the gic-v5 irqchip driver

 - Revert a broken commit from the riscv-imsic irqchip driver

* tag 'irq-urgent-2026-01-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Revert "irqchip/riscv-imsic: Embed the vector array in lpriv"
  irqchip/gic-v5: Fix gicv5_its_map_event() ITTE read endianness
parents 2e4b28c4 a33d16dc

drivers/irqchip/irq-gic-v5-its.c

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static int gicv5_its_map_event(struct gicv5_its_dev *its_dev, u16 event_id, u32 


	itte = gicv5_its_device_get_itte_ref(its_dev, event_id);



	if (FIELD_GET(GICV5_ITTL2E_VALID, *itte))

	if (FIELD_GET(GICV5_ITTL2E_VALID, le64_to_cpu(*itte)))

		return -EEXIST;



	itt_entry = FIELD_PREP(GICV5_ITTL2E_LPI_ID, lpi) |

drivers/irqchip/irq-riscv-imsic-state.c

+8 −2
Original line number Diff line number Diff line
@@ -477,6 +477,7 @@ static void __init imsic_local_cleanup(void) 
		lpriv = per_cpu_ptr(imsic->lpriv, cpu);



		bitmap_free(lpriv->dirty_bitmap);

		kfree(lpriv->vectors);

	}



	free_percpu(imsic->lpriv);
@@ -490,8 +491,7 @@ static int __init imsic_local_init(void) 
	int cpu, i;



	/* Allocate per-CPU private state */

	imsic->lpriv = __alloc_percpu(struct_size(imsic->lpriv, vectors, global->nr_ids + 1),

				      __alignof__(*imsic->lpriv));

	imsic->lpriv = alloc_percpu(typeof(*imsic->lpriv));

	if (!imsic->lpriv)

		return -ENOMEM;
@@ -511,6 +511,12 @@ static int __init imsic_local_init(void) 
		timer_setup(&lpriv->timer, imsic_local_timer_callback, TIMER_PINNED);

#endif



		/* Allocate vector array */

		lpriv->vectors = kcalloc(global->nr_ids + 1, sizeof(*lpriv->vectors),

					 GFP_KERNEL);

		if (!lpriv->vectors)

			goto fail_local_cleanup;



		/* Setup vector array */

		for (i = 0; i <= global->nr_ids; i++) {

			vec = &lpriv->vectors[i];

drivers/irqchip/irq-riscv-imsic-state.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct imsic_local_priv { 
#endif



	/* Local vector table */

	struct imsic_vector			vectors[];

	struct imsic_vector			*vectors;

};



struct imsic_priv {