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

Merge tag 'irq-urgent-2021-09-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Thomas Gleixner:
 "A set of fixes for interrupt chip drivers:

   - Work around a bad GIC integration on a Renesas platform which can't
     handle byte-sized MMIO access

   - Plug a potential memory leak in the GICv4 driver

   - Fix a regression in the Armada 370-XP IPI code which was caused by
     issuing EOI instack of ACK.

   - A couple of small fixes here and there"

* tag 'irq-urgent-2021-09-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/gic: Work around broken Renesas integration
  irqchip/renesas-rza1: Use semicolons instead of commas
  irqchip/gic-v3-its: Fix potential VPE leak on error
  irqchip/goldfish-pic: Select GENERIC_IRQ_CHIP to fix build
  irqchip/mbigen: Repair non-kernel-doc notation
  irqdomain: Change the type of 'size' in __irq_domain_add() to be consistent
  irqchip/armada-370-xp: Fix ack/eoi breakage
  Documentation: Fix irq-domain.rst build warning
parents a3b397b4 f9bfed3a

Documentation/core-api/irq/irq-domain.rst

+3 −2
Original line number Diff line number Diff line
@@ -175,9 +175,10 @@ for IRQ numbers that are passed to struct device registrations. In that 
case the Linux IRQ numbers cannot be dynamically assigned and the legacy

mapping should be used.



As the name implies, the *_legacy() functions are deprecated and only

As the name implies, the \*_legacy() functions are deprecated and only

exist to ease the support of ancient platforms. No new users should be

added.

added. Same goes for the \*_simple() functions when their use results

in the legacy behaviour.



The legacy map assumes a contiguous range of IRQ numbers has already

been allocated for the controller and that the IRQ number can be

drivers/irqchip/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ config MESON_IRQ_GPIO 
config GOLDFISH_PIC

       bool "Goldfish programmable interrupt controller"

       depends on MIPS && (GOLDFISH || COMPILE_TEST)

       select GENERIC_IRQ_CHIP

       select IRQ_DOMAIN

       help

         Say yes here to enable Goldfish interrupt controller driver used

drivers/irqchip/irq-armada-370-xp.c

+2 −2
Original line number Diff line number Diff line
@@ -359,16 +359,16 @@ static void armada_370_xp_ipi_send_mask(struct irq_data *d, 
		ARMADA_370_XP_SW_TRIG_INT_OFFS);

}



static void armada_370_xp_ipi_eoi(struct irq_data *d)

static void armada_370_xp_ipi_ack(struct irq_data *d)

{

	writel(~BIT(d->hwirq), per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS);

}



static struct irq_chip ipi_irqchip = {

	.name		= "IPI",

	.irq_ack	= armada_370_xp_ipi_ack,

	.irq_mask	= armada_370_xp_ipi_mask,

	.irq_unmask	= armada_370_xp_ipi_unmask,

	.irq_eoi	= armada_370_xp_ipi_eoi,

	.ipi_send_mask	= armada_370_xp_ipi_send_mask,

};

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

+1 −1
Original line number Diff line number Diff line
@@ -4501,7 +4501,7 @@ static int its_vpe_irq_domain_alloc(struct irq_domain *domain, unsigned int virq 


	if (err) {

		if (i > 0)

			its_vpe_irq_domain_free(domain, virq, i - 1);

			its_vpe_irq_domain_free(domain, virq, i);



		its_lpi_free(bitmap, base, nr_ids);

		its_free_prop_table(vprop_page);

drivers/irqchip/irq-gic.c

+51 −1
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ static DEFINE_RAW_SPINLOCK(cpu_map_lock); 


#endif



static DEFINE_STATIC_KEY_FALSE(needs_rmw_access);



/*

 * The GIC mapping of CPU interfaces does not necessarily match

 * the logical CPU numbering.  Let's use a mapping as returned
@@ -774,6 +776,25 @@ static int gic_pm_init(struct gic_chip_data *gic) 
#endif



#ifdef CONFIG_SMP

static void rmw_writeb(u8 bval, void __iomem *addr)

{

	static DEFINE_RAW_SPINLOCK(rmw_lock);

	unsigned long offset = (unsigned long)addr & 3UL;

	unsigned long shift = offset * 8;

	unsigned long flags;

	u32 val;



	raw_spin_lock_irqsave(&rmw_lock, flags);



	addr -= offset;

	val = readl_relaxed(addr);

	val &= ~GENMASK(shift + 7, shift);

	val |= bval << shift;

	writel_relaxed(val, addr);



	raw_spin_unlock_irqrestore(&rmw_lock, flags);

}



static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,

			    bool force)

{
@@ -788,6 +809,9 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, 
	if (cpu >= NR_GIC_CPU_IF || cpu >= nr_cpu_ids)

		return -EINVAL;



	if (static_branch_unlikely(&needs_rmw_access))

		rmw_writeb(gic_cpu_map[cpu], reg);

	else

		writeb_relaxed(gic_cpu_map[cpu], reg);

	irq_data_update_effective_affinity(d, cpumask_of(cpu));
@@ -1375,6 +1399,30 @@ static bool gic_check_eoimode(struct device_node *node, void __iomem **base) 
	return true;

}



static bool gic_enable_rmw_access(void *data)

{

	/*

	 * The EMEV2 class of machines has a broken interconnect, and

	 * locks up on accesses that are less than 32bit. So far, only

	 * the affinity setting requires it.

	 */

	if (of_machine_is_compatible("renesas,emev2")) {

		static_branch_enable(&needs_rmw_access);

		return true;

	}



	return false;

}



static const struct gic_quirk gic_quirks[] = {

	{

		.desc		= "broken byte access",

		.compatible	= "arm,pl390",

		.init		= gic_enable_rmw_access,

	},

	{ },

};



static int gic_of_setup(struct gic_chip_data *gic, struct device_node *node)

{

	if (!gic || !node)
@@ -1391,6 +1439,8 @@ static int gic_of_setup(struct gic_chip_data *gic, struct device_node *node) 
	if (of_property_read_u32(node, "cpu-offset", &gic->percpu_offset))

		gic->percpu_offset = 0;



	gic_enable_of_quirks(node, gic_quirks, gic);



	return 0;



error: