Commit fa943bed authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

ARM: 7394/1: VIC: respect list of valid sources 



The current IRQ domain implementation in the VIC allocates 32
interrupts for each VIC instance no matter whether the
controller actually use all the IRQs or not. Alter this so
we only allocate a domain up until the last IRQ marked valid.

Cc: Will Deacon <will.deacon@arm.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Acked-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 98fab064

arch/arm/common/vic.c

+7 −5
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ late_initcall(vic_pm_init); 
 * vic_register() - Register a VIC.

 * @base: The base address of the VIC.

 * @irq: The base IRQ for the VIC.

 * @valid_sources: bitmask of valid interrupts

 * @resume_sources: bitmask of interrupts allowed for resume sources.

 * @node: The device tree node associated with the VIC.

 *
@@ -178,7 +179,8 @@ late_initcall(vic_pm_init); 
 * This also configures the IRQ domain for the VIC.

 */

static void __init vic_register(void __iomem *base, unsigned int irq,

				u32 resume_sources, struct device_node *node)

				u32 valid_sources, u32 resume_sources,

				struct device_node *node)

{

	struct vic_device *v;
@@ -192,8 +194,8 @@ static void __init vic_register(void __iomem *base, unsigned int irq, 
	v->resume_sources = resume_sources;

	v->irq = irq;

	vic_id++;

	v->domain = irq_domain_add_legacy(node, 32, irq, 0,

					  &irq_domain_simple_ops, v);

	v->domain = irq_domain_add_legacy(node, fls(valid_sources), irq, 0,

					  &vic_irqdomain_ops, v);

}



static void vic_ack_irq(struct irq_data *d)
@@ -339,7 +341,7 @@ static void __init vic_init_st(void __iomem *base, unsigned int irq_start, 
	}



	vic_set_irq_sources(base, irq_start, vic_sources);

	vic_register(base, irq_start, 0, node);

	vic_register(base, irq_start, vic_sources, 0, node);

}



void __init __vic_init(void __iomem *base, unsigned int irq_start,
@@ -381,7 +383,7 @@ void __init __vic_init(void __iomem *base, unsigned int irq_start, 


	vic_set_irq_sources(base, irq_start, vic_sources);



	vic_register(base, irq_start, resume_sources, node);

	vic_register(base, irq_start, vic_sources, resume_sources, node);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE