Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16aba533 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'irqchip-core-4.6-2' of git://git.infradead.org/users/jcooper/linux into irq/core 

Pull the second round of irqchip core changes for v4.6 from Jason Cooper:

- mvebu:
   - Add odmi driver for Marvell 7K/8K SoCs
   - Replace driver-specific set_affinity with generic version

- mips:
   - Move ath79 MISC and CPU drivers from arch/ code to irqchip/

- tango:
   - Add support for Sigma Designs SMP8[67]xx ctrl
parents fa00cb26 1ad9a576

Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt

0 → 100644
+41 −0
Original line number Diff line number Diff line 


* Marvell ODMI for MSI support



Some Marvell SoCs have an On-Die Message Interrupt (ODMI) controller

which can be used by on-board peripheral for MSI interrupts.



Required properties:



- compatible           : The value here should contain "marvell,odmi-controller".



- interrupt,controller : Identifies the node as an interrupt controller.



- msi-controller       : Identifies the node as an MSI controller.



- marvell,odmi-frames  : Number of ODMI frames available. Each frame

                         provides a number of events.



- reg                  : List of register definitions, one for each

                         ODMI frame.



- marvell,spi-base     : List of GIC base SPI interrupts, one for each

                         ODMI frame. Those SPI interrupts are 0-based,

                         i.e marvell,spi-base = <128> will use SPI #96.

                         See Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt

                         for details about the GIC Device Tree binding.



- interrupt-parent     : Reference to the parent interrupt controller.



Example:



	odmi: odmi@300000 {

		compatible = "marvell,odmi-controller";

		interrupt-controller;

		msi-controller;

		marvell,odmi-frames = <4>;

		reg = <0x300000 0x4000>,

		      <0x304000 0x4000>,

		      <0x308000 0x4000>,

		      <0x30C000 0x4000>;

		marvell,spi-base = <128>, <136>, <144>, <152>;

	};

Documentation/devicetree/bindings/interrupt-controller/sigma,smp8642-intc.txt

0 → 100644
+49 −0
Original line number Diff line number Diff line 
Sigma Designs SMP86xx/SMP87xx secondary interrupt controller



Required properties:

- compatible: should be "sigma,smp8642-intc"

- reg: physical address of MMIO region

- ranges: address space mapping of child nodes

- interrupt-parent: phandle of parent interrupt controller

- interrupt-controller: boolean

- #address-cells: should be <1>

- #size-cells: should be <1>



One child node per control block with properties:

- reg: address of registers for this control block

- interrupt-controller: boolean

- #interrupt-cells: should be <2>, interrupt index and flags per interrupts.txt

- interrupts: interrupt spec of primary interrupt controller



Example:



interrupt-controller@6e000 {

	compatible = "sigma,smp8642-intc";

	reg = <0x6e000 0x400>;

	ranges = <0x0 0x6e000 0x400>;

	interrupt-parent = <&gic>;

	interrupt-controller;

	#address-cells = <1>;

	#size-cells = <1>;



	irq0: interrupt-controller@0 {

		reg = <0x000 0x100>;

		interrupt-controller;

		#interrupt-cells = <2>;

		interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

	};



	irq1: interrupt-controller@100 {

		reg = <0x100 0x100>;

		interrupt-controller;

		#interrupt-cells = <2>;

		interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;

	};



	irq2: interrupt-controller@300 {

		reg = <0x300 0x100>;

		interrupt-controller;

		#interrupt-cells = <2>;

		interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;

	};

};

arch/mips/ath79/irq.c

+21 −223
Original line number Diff line number Diff line
@@ -26,90 +26,6 @@ 
#include "common.h"

#include "machtypes.h"



static void __init ath79_misc_intc_domain_init(

	struct device_node *node, int irq);



static void ath79_misc_irq_handler(struct irq_desc *desc)

{

	struct irq_domain *domain = irq_desc_get_handler_data(desc);

	void __iomem *base = domain->host_data;

	u32 pending;



	pending = __raw_readl(base + AR71XX_RESET_REG_MISC_INT_STATUS) &

		  __raw_readl(base + AR71XX_RESET_REG_MISC_INT_ENABLE);



	if (!pending) {

		spurious_interrupt();

		return;

	}



	while (pending) {

		int bit = __ffs(pending);



		generic_handle_irq(irq_linear_revmap(domain, bit));

		pending &= ~BIT(bit);

	}

}



static void ar71xx_misc_irq_unmask(struct irq_data *d)

{

	void __iomem *base = irq_data_get_irq_chip_data(d);

	unsigned int irq = d->hwirq;

	u32 t;



	t = __raw_readl(base + AR71XX_RESET_REG_MISC_INT_ENABLE);

	__raw_writel(t | (1 << irq), base + AR71XX_RESET_REG_MISC_INT_ENABLE);



	/* flush write */

	__raw_readl(base + AR71XX_RESET_REG_MISC_INT_ENABLE);

}



static void ar71xx_misc_irq_mask(struct irq_data *d)

{

	void __iomem *base = irq_data_get_irq_chip_data(d);

	unsigned int irq = d->hwirq;

	u32 t;



	t = __raw_readl(base + AR71XX_RESET_REG_MISC_INT_ENABLE);

	__raw_writel(t & ~(1 << irq), base + AR71XX_RESET_REG_MISC_INT_ENABLE);



	/* flush write */

	__raw_readl(base + AR71XX_RESET_REG_MISC_INT_ENABLE);

}



static void ar724x_misc_irq_ack(struct irq_data *d)

{

	void __iomem *base = irq_data_get_irq_chip_data(d);

	unsigned int irq = d->hwirq;

	u32 t;



	t = __raw_readl(base + AR71XX_RESET_REG_MISC_INT_STATUS);

	__raw_writel(t & ~(1 << irq), base + AR71XX_RESET_REG_MISC_INT_STATUS);



	/* flush write */

	__raw_readl(base + AR71XX_RESET_REG_MISC_INT_STATUS);

}



static struct irq_chip ath79_misc_irq_chip = {

	.name		= "MISC",

	.irq_unmask	= ar71xx_misc_irq_unmask,

	.irq_mask	= ar71xx_misc_irq_mask,

};



static void __init ath79_misc_irq_init(void)

{

	if (soc_is_ar71xx() || soc_is_ar913x())

		ath79_misc_irq_chip.irq_mask_ack = ar71xx_misc_irq_mask;

	else if (soc_is_ar724x() ||

		 soc_is_ar933x() ||

		 soc_is_ar934x() ||

		 soc_is_qca955x())

		ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack;

	else

		BUG();



	ath79_misc_intc_domain_init(NULL, ATH79_CPU_IRQ(6));

}



static void ar934x_ip2_irq_dispatch(struct irq_desc *desc)

{
@@ -212,142 +128,12 @@ static void qca955x_irq_init(void) 
	irq_set_chained_handler(ATH79_CPU_IRQ(3), qca955x_ip3_irq_dispatch);

}



/*

 * The IP2/IP3 lines are tied to a PCI/WMAC/USB device. Drivers for

 * these devices typically allocate coherent DMA memory, however the

 * DMA controller may still have some unsynchronized data in the FIFO.

 * Issue a flush in the handlers to ensure that the driver sees

 * the update.

 *

 * This array map the interrupt lines to the DDR write buffer channels.

 */



static unsigned irq_wb_chan[8] = {

	-1, -1, -1, -1, -1, -1, -1, -1,

};



asmlinkage void plat_irq_dispatch(void)

{

	unsigned long pending;

	int irq;



	pending = read_c0_status() & read_c0_cause() & ST0_IM;



	if (!pending) {

		spurious_interrupt();

		return;

	}



	pending >>= CAUSEB_IP;

	while (pending) {

		irq = fls(pending) - 1;

		if (irq < ARRAY_SIZE(irq_wb_chan) && irq_wb_chan[irq] != -1)

			ath79_ddr_wb_flush(irq_wb_chan[irq]);

		do_IRQ(MIPS_CPU_IRQ_BASE + irq);

		pending &= ~BIT(irq);

	}

}



static int misc_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)

{

	irq_set_chip_and_handler(irq, &ath79_misc_irq_chip, handle_level_irq);

	irq_set_chip_data(irq, d->host_data);

	return 0;

}



static const struct irq_domain_ops misc_irq_domain_ops = {

	.xlate = irq_domain_xlate_onecell,

	.map = misc_map,

};



static void __init ath79_misc_intc_domain_init(

	struct device_node *node, int irq)

{

	void __iomem *base = ath79_reset_base;

	struct irq_domain *domain;



	domain = irq_domain_add_legacy(node, ATH79_MISC_IRQ_COUNT,

			ATH79_MISC_IRQ_BASE, 0, &misc_irq_domain_ops, base);

	if (!domain)

		panic("Failed to add MISC irqdomain");



	/* Disable and clear all interrupts */

	__raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_ENABLE);

	__raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_STATUS);



	irq_set_chained_handler_and_data(irq, ath79_misc_irq_handler, domain);

}



static int __init ath79_misc_intc_of_init(

	struct device_node *node, struct device_node *parent)

{

	int irq;



	irq = irq_of_parse_and_map(node, 0);

	if (!irq)

		panic("Failed to get MISC IRQ");



	ath79_misc_intc_domain_init(node, irq);

	return 0;

}



static int __init ar7100_misc_intc_of_init(

	struct device_node *node, struct device_node *parent)

{

	ath79_misc_irq_chip.irq_mask_ack = ar71xx_misc_irq_mask;

	return ath79_misc_intc_of_init(node, parent);

}



IRQCHIP_DECLARE(ar7100_misc_intc, "qca,ar7100-misc-intc",

		ar7100_misc_intc_of_init);



static int __init ar7240_misc_intc_of_init(

	struct device_node *node, struct device_node *parent)

{

	ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack;

	return ath79_misc_intc_of_init(node, parent);

}



IRQCHIP_DECLARE(ar7240_misc_intc, "qca,ar7240-misc-intc",

		ar7240_misc_intc_of_init);



static int __init ar79_cpu_intc_of_init(

	struct device_node *node, struct device_node *parent)

{

	int err, i, count;



	/* Fill the irq_wb_chan table */

	count = of_count_phandle_with_args(

		node, "qca,ddr-wb-channels", "#qca,ddr-wb-channel-cells");



	for (i = 0; i < count; i++) {

		struct of_phandle_args args;

		u32 irq = i;



		of_property_read_u32_index(

			node, "qca,ddr-wb-channel-interrupts", i, &irq);

		if (irq >= ARRAY_SIZE(irq_wb_chan))

			continue;



		err = of_parse_phandle_with_args(

			node, "qca,ddr-wb-channels",

			"#qca,ddr-wb-channel-cells",

			i, &args);

		if (err)

			return err;



		irq_wb_chan[irq] = args.args[0];

		pr_info("IRQ: Set flush channel of IRQ%d to %d\n",

			irq, args.args[0]);

	}



	return mips_cpu_irq_of_init(node, parent);

}

IRQCHIP_DECLARE(ar79_cpu_intc, "qca,ar7100-cpu-intc",

		ar79_cpu_intc_of_init);



void __init arch_init_irq(void)

{

	unsigned irq_wb_chan2 = -1;

	unsigned irq_wb_chan3 = -1;

	bool misc_is_ar71xx;



	if (mips_machtype == ATH79_MACH_GENERIC_OF) {

		irqchip_init();

		return;
@@ -355,14 +141,26 @@ void __init arch_init_irq(void) 


	if (soc_is_ar71xx() || soc_is_ar724x() ||

	    soc_is_ar913x() || soc_is_ar933x()) {

		irq_wb_chan[2] = 3;

		irq_wb_chan[3] = 2;

		irq_wb_chan2 = 3;

		irq_wb_chan3 = 2;

	} else if (soc_is_ar934x()) {

		irq_wb_chan[3] = 2;

		irq_wb_chan3 = 2;

	}



	mips_cpu_irq_init();

	ath79_misc_irq_init();

	ath79_cpu_irq_init(irq_wb_chan2, irq_wb_chan3);



	if (soc_is_ar71xx() || soc_is_ar913x())

		misc_is_ar71xx = true;

	else if (soc_is_ar724x() ||

		 soc_is_ar933x() ||

		 soc_is_ar934x() ||

		 soc_is_qca955x())

		misc_is_ar71xx = false;

	else

		BUG();

	ath79_misc_irq_init(

		ath79_reset_base + AR71XX_RESET_REG_MISC_INT_STATUS,

		ATH79_CPU_IRQ(6), ATH79_MISC_IRQ_BASE, misc_is_ar71xx);



	if (soc_is_ar934x())

		ar934x_ip2_irq_init();

arch/mips/include/asm/mach-ath79/ath79.h

+4 −0
Original line number Diff line number Diff line
@@ -144,4 +144,8 @@ static inline u32 ath79_reset_rr(unsigned reg) 
void ath79_device_reset_set(u32 mask);

void ath79_device_reset_clear(u32 mask);



void ath79_cpu_irq_init(unsigned irq_wb_chan2, unsigned irq_wb_chan3);

void ath79_misc_irq_init(void __iomem *regs, int irq,

			int irq_base, bool is_ar71xx);



#endif /* __ASM_MACH_ATH79_H */

drivers/irqchip/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -161,6 +161,11 @@ config ST_IRQCHIP 
	help

	  Enables SysCfg Controlled IRQs on STi based platforms.



config TANGO_IRQ

	bool

	select IRQ_DOMAIN

	select GENERIC_IRQ_CHIP



config TB10X_IRQC

	bool

	select IRQ_DOMAIN
@@ -229,3 +234,7 @@ config IRQ_MXS 
	def_bool y if MACH_ASM9260 || ARCH_MXS

	select IRQ_DOMAIN

	select STMP_DEVICE



config MVEBU_ODMI

	bool

	select GENERIC_MSI_IRQ_DOMAIN