Commit 9cd847ee authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'irqchip-fixes-6.6-1' of... 

Merge tag 'irqchip-fixes-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Pull irqchip fixes from Marc Zygnier:

  - Fix QC PDC v3.2 support by working around broken firmware tables

  - Fix rzg2l-irqc missing #interrupt-cells description in the DT binding

  - Fix rzg2l-irqc interrupt masking

Link: https://lore.kernel.org/lkml/20230924094105.2361754-1-maz@kernel.org
parents 0bb80ecc 9b8df572

Documentation/devicetree/bindings/interrupt-controller/renesas,rzg2l-irqc.yaml

+3 −2
Original line number Diff line number Diff line
@@ -31,8 +31,9 @@ properties: 
      - const: renesas,rzg2l-irqc



  '#interrupt-cells':

    description: The first cell should contain external interrupt number (IRQ0-7) and the

                 second cell is used to specify the flag.

    description: The first cell should contain a macro RZG2L_{NMI,IRQX} included in the

                 include/dt-bindings/interrupt-controller/irqc-rzg2l.h and the second

                 cell is used to specify the flag.

    const: 2



  '#address-cells':

arch/arm64/boot/dts/qcom/sm8150.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -3958,7 +3958,7 @@ 


		pdc: interrupt-controller@b220000 {

			compatible = "qcom,sm8150-pdc", "qcom,pdc";

			reg = <0 0x0b220000 0 0x400>;

			reg = <0 0x0b220000 0 0x30000>;

			qcom,pdc-ranges = <0 480 94>, <94 609 31>,

					  <125 63 1>;

			#interrupt-cells = <2>;

drivers/irqchip/irq-renesas-rzg2l.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void rzg2l_irqc_irq_disable(struct irq_data *d) 


		raw_spin_lock(&priv->lock);

		reg = readl_relaxed(priv->base + TSSR(tssr_index));

		reg &= ~(TSSEL_MASK << tssr_offset);

		reg &= ~(TSSEL_MASK << TSSEL_SHIFT(tssr_offset));

		writel_relaxed(reg, priv->base + TSSR(tssr_index));

		raw_spin_unlock(&priv->lock);

	}

drivers/irqchip/qcom-pdc.c

+51 −18
Original line number Diff line number Diff line
@@ -22,9 +22,20 @@ 


#define PDC_MAX_GPIO_IRQS	256



/* Valid only on HW version < 3.2 */

#define IRQ_ENABLE_BANK		0x10

#define IRQ_i_CFG		0x110



/* Valid only on HW version >= 3.2 */

#define IRQ_i_CFG_IRQ_ENABLE	3



#define IRQ_i_CFG_TYPE_MASK	GENMASK(2, 0)



#define PDC_VERSION_REG		0x1000



/* Notable PDC versions */

#define PDC_VERSION_3_2		0x30200



struct pdc_pin_region {

	u32 pin_base;

	u32 parent_base;
@@ -37,6 +48,7 @@ static DEFINE_RAW_SPINLOCK(pdc_lock); 
static void __iomem *pdc_base;

static struct pdc_pin_region *pdc_region;

static int pdc_region_cnt;

static unsigned int pdc_version;



static void pdc_reg_write(int reg, u32 i, u32 val)

{
@@ -48,20 +60,32 @@ static u32 pdc_reg_read(int reg, u32 i) 
	return readl_relaxed(pdc_base + reg + i * sizeof(u32));

}



static void pdc_enable_intr(struct irq_data *d, bool on)

static void __pdc_enable_intr(int pin_out, bool on)

{

	int pin_out = d->hwirq;

	unsigned long enable;

	unsigned long flags;



	if (pdc_version < PDC_VERSION_3_2) {

		u32 index, mask;



		index = pin_out / 32;

		mask = pin_out % 32;



	raw_spin_lock_irqsave(&pdc_lock, flags);

		enable = pdc_reg_read(IRQ_ENABLE_BANK, index);

		__assign_bit(mask, &enable, on);

		pdc_reg_write(IRQ_ENABLE_BANK, index, enable);

	} else {

		enable = pdc_reg_read(IRQ_i_CFG, pin_out);

		__assign_bit(IRQ_i_CFG_IRQ_ENABLE, &enable, on);

		pdc_reg_write(IRQ_i_CFG, pin_out, enable);

	}

}



static void pdc_enable_intr(struct irq_data *d, bool on)

{

	unsigned long flags;



	raw_spin_lock_irqsave(&pdc_lock, flags);

	__pdc_enable_intr(d->hwirq, on);

	raw_spin_unlock_irqrestore(&pdc_lock, flags);

}
@@ -142,6 +166,7 @@ static int qcom_pdc_gic_set_type(struct irq_data *d, unsigned int type) 
	}



	old_pdc_type = pdc_reg_read(IRQ_i_CFG, d->hwirq);

	pdc_type |= (old_pdc_type & ~IRQ_i_CFG_TYPE_MASK);

	pdc_reg_write(IRQ_i_CFG, d->hwirq, pdc_type);



	ret = irq_chip_set_type_parent(d, type);
@@ -246,7 +271,6 @@ static const struct irq_domain_ops qcom_pdc_ops = { 
static int pdc_setup_pin_mapping(struct device_node *np)

{

	int ret, n, i;

	u32 irq_index, reg_index, val;



	n = of_property_count_elems_of_size(np, "qcom,pdc-ranges", sizeof(u32));

	if (n <= 0 || n % 3)
@@ -276,29 +300,38 @@ static int pdc_setup_pin_mapping(struct device_node *np) 
		if (ret)

			return ret;



		for (i = 0; i < pdc_region[n].cnt; i++) {

			reg_index = (i + pdc_region[n].pin_base) >> 5;

			irq_index = (i + pdc_region[n].pin_base) & 0x1f;

			val = pdc_reg_read(IRQ_ENABLE_BANK, reg_index);

			val &= ~BIT(irq_index);

			pdc_reg_write(IRQ_ENABLE_BANK, reg_index, val);

		}

		for (i = 0; i < pdc_region[n].cnt; i++)

			__pdc_enable_intr(i + pdc_region[n].pin_base, 0);

	}



	return 0;

}



#define QCOM_PDC_SIZE 0x30000



static int qcom_pdc_init(struct device_node *node, struct device_node *parent)

{

	struct irq_domain *parent_domain, *pdc_domain;

	resource_size_t res_size;

	struct resource res;

	int ret;



	pdc_base = of_iomap(node, 0);

	/* compat with old sm8150 DT which had very small region for PDC */

	if (of_address_to_resource(node, 0, &res))

		return -EINVAL;



	res_size = max_t(resource_size_t, resource_size(&res), QCOM_PDC_SIZE);

	if (res_size > resource_size(&res))

		pr_warn("%pOF: invalid reg size, please fix DT\n", node);



	pdc_base = ioremap(res.start, res_size);

	if (!pdc_base) {

		pr_err("%pOF: unable to map PDC registers\n", node);

		return -ENXIO;

	}



	pdc_version = pdc_reg_read(PDC_VERSION_REG, 0);



	parent_domain = irq_find_host(parent);

	if (!parent_domain) {

		pr_err("%pOF: unable to find PDC's parent domain\n", node);