Commit 4513fb87 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch irq/misc-5.15 into irq/irqchip-next 



- Fix edge interrupt support on loongson systems
- Advertise lack of wake-up logic on mtk-sysirq

* irq/misc-5.15:
  irqchip/mtk-sysirq: Skip setting irq-wake
  irqchip/loongson-pch-pic: Improve edge triggered interrupt support

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 9b24dab9 c775626f

drivers/irqchip/irq-loongson-pch-pic.c

+18 −1
Original line number Diff line number Diff line
@@ -92,18 +92,22 @@ static int pch_pic_set_type(struct irq_data *d, unsigned int type) 
	case IRQ_TYPE_EDGE_RISING:

		pch_pic_bitset(priv, PCH_PIC_EDGE, d->hwirq);

		pch_pic_bitclr(priv, PCH_PIC_POL, d->hwirq);

		irq_set_handler_locked(d, handle_edge_irq);

		break;

	case IRQ_TYPE_EDGE_FALLING:

		pch_pic_bitset(priv, PCH_PIC_EDGE, d->hwirq);

		pch_pic_bitset(priv, PCH_PIC_POL, d->hwirq);

		irq_set_handler_locked(d, handle_edge_irq);

		break;

	case IRQ_TYPE_LEVEL_HIGH:

		pch_pic_bitclr(priv, PCH_PIC_EDGE, d->hwirq);

		pch_pic_bitclr(priv, PCH_PIC_POL, d->hwirq);

		irq_set_handler_locked(d, handle_level_irq);

		break;

	case IRQ_TYPE_LEVEL_LOW:

		pch_pic_bitclr(priv, PCH_PIC_EDGE, d->hwirq);

		pch_pic_bitset(priv, PCH_PIC_POL, d->hwirq);

		irq_set_handler_locked(d, handle_level_irq);

		break;

	default:

		ret = -EINVAL;
@@ -113,11 +117,24 @@ static int pch_pic_set_type(struct irq_data *d, unsigned int type) 
	return ret;

}



static void pch_pic_ack_irq(struct irq_data *d)

{

	unsigned int reg;

	struct pch_pic *priv = irq_data_get_irq_chip_data(d);



	reg = readl(priv->base + PCH_PIC_EDGE + PIC_REG_IDX(d->hwirq) * 4);

	if (reg & BIT(PIC_REG_BIT(d->hwirq))) {

		writel(BIT(PIC_REG_BIT(d->hwirq)),

			priv->base + PCH_PIC_CLR + PIC_REG_IDX(d->hwirq) * 4);

	}

	irq_chip_ack_parent(d);

}



static struct irq_chip pch_pic_irq_chip = {

	.name			= "PCH PIC",

	.irq_mask		= pch_pic_mask_irq,

	.irq_unmask		= pch_pic_unmask_irq,

	.irq_ack		= irq_chip_ack_parent,

	.irq_ack		= pch_pic_ack_irq,

	.irq_set_affinity	= irq_chip_set_affinity_parent,

	.irq_set_type		= pch_pic_set_type,

};

drivers/irqchip/irq-mtk-sysirq.c

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ static struct irq_chip mtk_sysirq_chip = { 
	.irq_set_type		= mtk_sysirq_set_type,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_set_affinity	= irq_chip_set_affinity_parent,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

};



static int mtk_sysirq_domain_translate(struct irq_domain *d,