| Message ID | 1357774909-29938-2-git-send-email-tomasz.figa@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jan 10, 2013 at 12:41:43AM +0100, Tomasz Figa wrote: > +- interrupt-mask : Bit mask of valid interrupt sources (defaults to all valid) > +- wakeup-mask : Bit mask of interrupt sources that can wake up the system > + (defaults to all allowed) Should this really be configured in the VIC itself? It seems like something that might change at runtime (for example, due to the user configuring wakes in sysfs).
On Thursday 10 of January 2013 11:03:14 Mark Brown wrote: > On Thu, Jan 10, 2013 at 12:41:43AM +0100, Tomasz Figa wrote: > > +- interrupt-mask : Bit mask of valid interrupt sources (defaults to > > all valid) +- wakeup-mask : Bit mask of interrupt sources that can > > wake up the system + (defaults to all allowed) > > Should this really be configured in the VIC itself? It seems like > something that might change at runtime (for example, due to the user > configuring wakes in sysfs). This is not the runtime interrupt/wakeup mask, but a global mask of available interrupt/wakeup lines on particular platform, which still have to be configured and enabled appropriately by user. Best regards, Tomasz Figa
On Thu, Jan 10, 2013 at 12:10:38PM +0100, Tomasz Figa wrote: > This is not the runtime interrupt/wakeup mask, but a global mask of > available interrupt/wakeup lines on particular platform, which still have > to be configured and enabled appropriately by user. Ah, OK. Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
diff --git a/Documentation/devicetree/bindings/arm/vic.txt b/Documentation/devicetree/bindings/arm/vic.txt index 266716b..bb7137c 100644 --- a/Documentation/devicetree/bindings/arm/vic.txt +++ b/Documentation/devicetree/bindings/arm/vic.txt @@ -18,6 +18,9 @@ Required properties: Optional properties: - interrupts : Interrupt source for parent controllers if the VIC is nested. +- interrupt-mask : Bit mask of valid interrupt sources (defaults to all valid) +- wakeup-mask : Bit mask of interrupt sources that can wake up the system + (defaults to all allowed) Example: @@ -26,4 +29,7 @@ Example: interrupt-controller; #interrupt-cells = <1>; reg = <0x60000 0x1000>; + + interrupt-mask = <0xffffff7f>; + wakeup-mask = <0x0000ff7f>; }; diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c index e4df17c..c2889da 100644 --- a/arch/arm/common/vic.c +++ b/arch/arm/common/vic.c @@ -407,6 +407,8 @@ void __init vic_init(void __iomem *base, unsigned int irq_start, int __init vic_of_init(struct device_node *node, struct device_node *parent) { void __iomem *regs; + u32 interrupt_mask = ~0; + u32 wakeup_mask = ~0; if (WARN(parent, "non-root VICs are not supported")) return -EINVAL; @@ -415,10 +417,13 @@ int __init vic_of_init(struct device_node *node, struct device_node *parent) if (WARN_ON(!regs)) return -EIO; + of_property_read_u32(node, "interrupt-mask", &interrupt_mask); + of_property_read_u32(node, "wakeup-mask", &wakeup_mask); + /* * Passing -1 as first IRQ makes the simple domain allocate descriptors */ - __vic_init(regs, -1, ~0, ~0, node); + __vic_init(regs, -1, interrupt_mask, wakeup_mask, node); return 0; }
This patch extends vic_of_init to parse valid interrupt sources and resume sources masks from device tree. If mask values are not specified in device tree, all sources are assumed to be valid, as before this patch. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> --- Documentation/devicetree/bindings/arm/vic.txt | 6 ++++++ arch/arm/common/vic.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-)