Commit 4fc8d3fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull irq fixes from Ingo Molnar:

 - Fix spurious interrupts during resume in the renesas-rzv2h driver

 - Fix a 32+ bit physical memory truncation bug in the gic-v3-its driver

* tag 'irq-urgent-2026-01-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/gic-v3-its: Avoid truncating memory addresses
  irqchip/renesas-rzv2h: Prevent TINT spurious interrupt during resume
parents 4a51fe91 8d76a7d8

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

+4 −4
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ static struct its_collection *its_build_mapd_cmd(struct its_node *its, 
						 struct its_cmd_block *cmd,

						 struct its_cmd_desc *desc)

{

	unsigned long itt_addr;

	phys_addr_t itt_addr;

	u8 size = ilog2(desc->its_mapd_cmd.dev->nr_ites);



	itt_addr = virt_to_phys(desc->its_mapd_cmd.dev->itt);
@@ -879,7 +879,7 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its, 
					   struct its_cmd_desc *desc)

{

	struct its_vpe *vpe = valid_vpe(its, desc->its_vmapp_cmd.vpe);

	unsigned long vpt_addr, vconf_addr;

	phys_addr_t vpt_addr, vconf_addr;

	u64 target;

	bool alloc;
@@ -2477,10 +2477,10 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, 
	baser->psz = psz;

	tmp = indirect ? GITS_LVL1_ENTRY_SIZE : esz;



	pr_info("ITS@%pa: allocated %d %s @%lx (%s, esz %d, psz %dK, shr %d)\n",

	pr_info("ITS@%pa: allocated %d %s @%llx (%s, esz %d, psz %dK, shr %d)\n",

		&its->phys_base, (int)(PAGE_ORDER_TO_SIZE(order) / (int)tmp),

		its_base_type_string[type],

		(unsigned long)virt_to_phys(base),

		(u64)virt_to_phys(base),

		indirect ? "indirect" : "flat", (int)esz,

		psz / SZ_1K, (int)shr >> GITS_BASER_SHAREABILITY_SHIFT);

drivers/irqchip/irq-renesas-rzv2h.c

+8 −1
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ static int rzv2h_tint_set_type(struct irq_data *d, unsigned int type) 
	u32 titsr, titsr_k, titsel_n, tien;

	struct rzv2h_icu_priv *priv;

	u32 tssr, tssr_k, tssel_n;

	u32 titsr_cur, tssr_cur;

	unsigned int hwirq;

	u32 tint, sense;

	int tint_nr;
@@ -376,12 +377,18 @@ static int rzv2h_tint_set_type(struct irq_data *d, unsigned int type) 
	guard(raw_spinlock)(&priv->lock);



	tssr = readl_relaxed(priv->base + priv->info->t_offs + ICU_TSSR(tssr_k));

	titsr = readl_relaxed(priv->base + priv->info->t_offs + ICU_TITSR(titsr_k));



	tssr_cur = field_get(ICU_TSSR_TSSEL_MASK(tssel_n, priv->info->field_width), tssr);

	titsr_cur = field_get(ICU_TITSR_TITSEL_MASK(titsel_n), titsr);

	if (tssr_cur == tint && titsr_cur == sense)

		return 0;



	tssr &= ~(ICU_TSSR_TSSEL_MASK(tssel_n, priv->info->field_width) | tien);

	tssr |= ICU_TSSR_TSSEL_PREP(tint, tssel_n, priv->info->field_width);



	writel_relaxed(tssr, priv->base + priv->info->t_offs + ICU_TSSR(tssr_k));



	titsr = readl_relaxed(priv->base + priv->info->t_offs + ICU_TITSR(titsr_k));

	titsr &= ~ICU_TITSR_TITSEL_MASK(titsel_n);

	titsr |= ICU_TITSR_TITSEL_PREP(sense, titsel_n);