Commit 63f4993b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq_urgent_for_v6.13_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Borislav Petkov:

 - Move the ->select callback to the correct ops structure in
   irq-mvebu-sei to fix some Marvell Armada platforms

 - Add a workaround for Hisilicon ITS erratum 162100801 which can cause
   some virtual interrupts to get lost

 - More platform_driver::remove() conversion

* tag 'irq_urgent_for_v6.13_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip: Switch back to struct platform_driver::remove()
  irqchip/gicv3-its: Add workaround for hip09 ITS erratum 162100801
  irqchip/irq-mvebu-sei: Move misplaced select() callback to SEI CP domain
parents 58ac609b cc47268c

Documentation/arch/arm64/silicon-errata.rst

+2 −0
Original line number Diff line number Diff line
@@ -258,6 +258,8 @@ stable kernels. 
| Hisilicon      | Hip{08,09,10,10C| #162001900      | N/A                         |

|                | ,11} SMMU PMCG  |                 |                             |

+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip09           | #162100801      | HISILICON_ERRATUM_162100801 |

+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

| Qualcomm Tech. | Kryo/Falkor v1  | E1003           | QCOM_FALKOR_ERRATUM_1003    |

+----------------+-----------------+-----------------+-----------------------------+

arch/arm64/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -1235,6 +1235,17 @@ config HISILICON_ERRATUM_161600802 


	  If unsure, say Y.



config HISILICON_ERRATUM_162100801

	bool "Hip09 162100801 erratum support"

	default y

	help

	  When enabling GICv4.1 in hip09, VMAPP will fail to clear some caches

	  during unmapping operation, which will cause some vSGIs lost.

	  To fix the issue, invalidate related vPE cache through GICR_INVALLR

	  after VMOVP.



	  If unsure, say Y.



config QCOM_FALKOR_ERRATUM_1003

	bool "Falkor E1003: Incorrect translation due to ASID change"

	default y

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

+39 −11
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#define ITS_FLAGS_WORKAROUND_CAVIUM_22375	(1ULL << 1)

#define ITS_FLAGS_WORKAROUND_CAVIUM_23144	(1ULL << 2)

#define ITS_FLAGS_FORCE_NON_SHAREABLE		(1ULL << 3)

#define ITS_FLAGS_WORKAROUND_HISILICON_162100801	(1ULL << 4)



#define RD_LOCAL_LPI_ENABLED                    BIT(0)

#define RD_LOCAL_PENDTABLE_PREALLOCATED         BIT(1)
@@ -64,6 +65,7 @@ static u32 lpi_id_bits; 
#define LPI_PENDBASE_SZ		ALIGN(BIT(LPI_NRBITS) / 8, SZ_64K)



static u8 __ro_after_init lpi_prop_prio;

static struct its_node *find_4_1_its(void);



/*

 * Collection structure - just an ID, and a redistributor address to
@@ -3883,6 +3885,20 @@ static void its_vpe_db_proxy_move(struct its_vpe *vpe, int from, int to) 
	raw_spin_unlock_irqrestore(&vpe_proxy.lock, flags);

}



static void its_vpe_4_1_invall_locked(int cpu, struct its_vpe *vpe)

{

	void __iomem *rdbase;

	u64 val;



	val  = GICR_INVALLR_V;

	val |= FIELD_PREP(GICR_INVALLR_VPEID, vpe->vpe_id);



	guard(raw_spinlock)(&gic_data_rdist_cpu(cpu)->rd_lock);

	rdbase = per_cpu_ptr(gic_rdists->rdist, cpu)->rd_base;

	gic_write_lpir(val, rdbase + GICR_INVALLR);

	wait_for_syncr(rdbase);

}



static int its_vpe_set_affinity(struct irq_data *d,

				const struct cpumask *mask_val,

				bool force)
@@ -3890,6 +3906,7 @@ static int its_vpe_set_affinity(struct irq_data *d, 
	struct its_vpe *vpe = irq_data_get_irq_chip_data(d);

	unsigned int from, cpu = nr_cpu_ids;

	struct cpumask *table_mask;

	struct its_node *its;

	unsigned long flags;



	/*
@@ -3952,6 +3969,11 @@ static int its_vpe_set_affinity(struct irq_data *d, 
	vpe->col_idx = cpu;



	its_send_vmovp(vpe);



	its = find_4_1_its();

	if (its && its->flags & ITS_FLAGS_WORKAROUND_HISILICON_162100801)

		its_vpe_4_1_invall_locked(cpu, vpe);



	its_vpe_db_proxy_move(vpe, from, cpu);



out:
@@ -4259,22 +4281,12 @@ static void its_vpe_4_1_deschedule(struct its_vpe *vpe, 


static void its_vpe_4_1_invall(struct its_vpe *vpe)

{

	void __iomem *rdbase;

	unsigned long flags;

	u64 val;

	int cpu;



	val  = GICR_INVALLR_V;

	val |= FIELD_PREP(GICR_INVALLR_VPEID, vpe->vpe_id);



	/* Target the redistributor this vPE is currently known on */

	cpu = vpe_to_cpuid_lock(vpe, &flags);

	raw_spin_lock(&gic_data_rdist_cpu(cpu)->rd_lock);

	rdbase = per_cpu_ptr(gic_rdists->rdist, cpu)->rd_base;

	gic_write_lpir(val, rdbase + GICR_INVALLR);



	wait_for_syncr(rdbase);

	raw_spin_unlock(&gic_data_rdist_cpu(cpu)->rd_lock);

	its_vpe_4_1_invall_locked(cpu, vpe);

	vpe_to_cpuid_unlock(vpe, flags);

}
@@ -4867,6 +4879,14 @@ static bool its_set_non_coherent(void *data) 
	return true;

}



static bool __maybe_unused its_enable_quirk_hip09_162100801(void *data)

{

	struct its_node *its = data;



	its->flags |= ITS_FLAGS_WORKAROUND_HISILICON_162100801;

	return true;

}



static const struct gic_quirk its_quirks[] = {

#ifdef CONFIG_CAVIUM_ERRATUM_22375

	{
@@ -4913,6 +4933,14 @@ static const struct gic_quirk its_quirks[] = { 
		.init	= its_enable_quirk_hip07_161600802,

	},

#endif

#ifdef CONFIG_HISILICON_ERRATUM_162100801

	{

		.desc	= "ITS: Hip09 erratum 162100801",

		.iidr	= 0x00051736,

		.mask	= 0xffffffff,

		.init	= its_enable_quirk_hip09_162100801,

	},

#endif

#ifdef CONFIG_ROCKCHIP_ERRATUM_3588001

	{

		.desc   = "ITS: Rockchip erratum RK3588001",

drivers/irqchip/irq-imgpdc.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static struct platform_driver pdc_intc_driver = { 
		.of_match_table	= pdc_intc_match,

	},

	.probe		= pdc_intc_probe,

	.remove_new	= pdc_intc_remove,

	.remove		= pdc_intc_remove,

};



static int __init pdc_intc_init(void)

drivers/irqchip/irq-imx-intmux.c

+1 −1
Original line number Diff line number Diff line
@@ -361,6 +361,6 @@ static struct platform_driver imx_intmux_driver = { 
		.pm		= &imx_intmux_pm_ops,

	},

	.probe		= imx_intmux_probe,

	.remove_new	= imx_intmux_remove,

	.remove		= imx_intmux_remove,

};

builtin_platform_driver(imx_intmux_driver);