irqchip/irq-bcm7038-l1 updates
Subsystems (4)
v3 cover irqchip/irq-bcm7038-l1 updates
Hi Marc, Jason, Thomas,
This patch series contains some updates from our internal tree to support power management and allow configuring specific instances of the brcm,bcm7038-l1-intc to leave some interrupts untouched and how the firmware might have configured them.
Changes in v3:
- added Rob's Acked-by to dt-bindings patches
- avoid registering syscore_ops() unconditionally, do this the first we register a controller instance
- added locking around the list handling of the controller
- ensure that irq_fwd_mask gets writtent properly to the hardware during initial configuration and suspend/resume
- simplified logic around use of irq_fwd_mask
- added check to refuse mapping of interrupts assigned to firmware
Changes in v2:
- dropped the accidental fixup patch that made it to the list and squash it with patch #1 as it should have
Florian Fainelli (4):
dt-bindings: Document brcm,irq-can-wake for brcm,bcm7038-l1-intc.txt irqchip/irq-bcm7038-l1: Enable parent IRQ if necessary
dt-bindings: Document brcm,int-fwd-mask property for bcm7038-l1-intc irqchip/irq-bcm7038-l1: Support brcm,int-fwd-mask
Justin Chen (1):
irqchip/irq-bcm7038-l1: Add PM support
.../brcm,bcm7038-l1-intc.txt | 11 ++ drivers/irqchip/irq-bcm7038-l1.c | 119 +++++++++++++++++- 2 files changed, 128 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/5 irqchip/irq-bcm7038-l1: Add PM support
From: Justin Chen <[email protected]>
The current L1 controller does not mask any interrupts when dropping into suspend. This mean we can receive unexpected wake up sources. Modified the BCM7038 L1 controller to mask the all non-wake interrupts before dropping into suspend.
--- drivers/irqchip/irq-bcm7038-l1.c | 89 ++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+)
drivers/irqchip/irq-bcm7038-l1.c +89 -0
@@ -27,6 +27,7 @@#include <linux/types.h> #include <linux/irqchip.h> #include <linux/irqchip/chained_irq.h> +#include <linux/syscore_ops.h> #define IRQS_PER_WORD 32#define REG_BYTES_PER_IRQ_WORD (sizeof(u32) * 4)
@@ -39,6 +40,10 @@ struct bcm7038_l1_chip {unsigned int n_words;struct irq_domain *domain;struct bcm7038_l1_cpu *cpus[NR_CPUS ]; +#ifdef CONFIG_PM_SLEEP +struct list_head list; +u32 wake_mask[MAX_WORDS ]; +#endif u8 affinity[MAX_WORDS *IRQS_PER_WORD ]; };
@@ -287,6 +292,77 @@ static int __init bcm7038_l1_init_one(struct device_node *dn,return 0 ; } +#ifdef CONFIG_PM_SLEEP +/* +* We keep a list of bcm7038_l1_chip used for suspend/resume. This hack is +* used because the struct chip_type suspend/resume hooks are not called +* unless chip_type is hooked onto a generic_chip. Since this driver does +* not use generic_chip, we need to manually hook our resume/suspend to +* syscore_ops. +*/ +static LIST_HEAD (bcm7038_l1_intcs_list); +static DEFINE_RAW_SPINLOCK (bcm7038_l1_intcs_lock); + +static int bcm7038_l1_suspend (void ) +{ +struct bcm7038_l1_chip *intc; +int boot_cpu, word; + +/* Wakeup interrupt should only come from the boot cpu */ + boot_cpu =cpu_logical_map (0 ); + +list_for_each_entry (intc, &bcm7038_l1_intcs_list, list) { +for (word =0 ; word < intc->n_words; word++) { +l1_writel (~intc->wake_mask[word], + intc->cpus[boot_cpu]->map_base +reg_mask_set (intc, word)); +l1_writel (intc->wake_mask[word], + intc->cpus[boot_cpu]->map_base +reg_mask_clr (intc, word)); + } + } + +return 0 ; +} + +static void bcm7038_l1_resume (void ) +{ +struct bcm7038_l1_chip *intc; +int boot_cpu, word; + + boot_cpu =cpu_logical_map (0 ); + +list_for_each_entry (intc, &bcm7038_l1_intcs_list, list) { +for (word =0 ; word < intc->n_words; word++) { +l1_writel (intc->cpus[boot_cpu]->mask_cache[word], + intc->cpus[boot_cpu]->map_base +reg_mask_set (intc, word)); +l1_writel (~intc->cpus[boot_cpu]->mask_cache[word], + intc->cpus[boot_cpu]->map_base +reg_mask_clr (intc, word)); + } + } +} + +static struct syscore_ops bcm7038_l1_syscore_ops = { + .suspend = bcm7038_l1_suspend, + .resume = bcm7038_l1_resume, +}; + +static int bcm7038_l1_set_wake (struct irq_data *d,unsigned int on) +{ +struct bcm7038_l1_chip *intc =irq_data_get_irq_chip_data (d); +unsigned long flags; +u32 word = d->hwirq /IRQS_PER_WORD ; +u32 mask =BIT (d->hwirq %IRQS_PER_WORD ); + +raw_spin_lock_irqsave (&intc->lock, flags); +if (on) + intc->wake_mask[word] |= mask; +else + intc->wake_mask[word] &= ~mask; +raw_spin_unlock_irqrestore (&intc->lock, flags); + +return 0 ; +} +#endif +static struct irq_chip bcm7038_l1_irq_chip = { .name ="bcm7038-l1" , .irq_mask = bcm7038_l1_mask,
@@ -295,6 +371,9 @@ static struct irq_chip bcm7038_l1_irq_chip = {#ifdef CONFIG_SMP .irq_cpu_offline = bcm7038_l1_cpu_offline,#endif +#ifdef CONFIG_PM_SLEEP + .irq_set_wake = bcm7038_l1_set_wake, +#endif }; static int bcm7038_l1_map(struct irq_domain *d, unsigned int virq,
@@ -340,6 +419,16 @@ int __init bcm7038_l1_of_init(struct device_node *dn, goto out_unmap; } +#ifdef CONFIG_PM_SLEEP +/* Add bcm7038_l1_chip into a list */ +raw_spin_lock (&bcm7038_l1_intcs_lock); +list_add_tail (&intc->list, &bcm7038_l1_intcs_list); +raw_spin_unlock (&bcm7038_l1_intcs_lock); + +if (list_is_singular (&bcm7038_l1_intcs_list)) +register_syscore_ops (&bcm7038_l1_syscore_ops); +#endif +pr_info ("registered BCM7038 L1 intc (%pOF, IRQs: %d)\n" , dn,IRQS_PER_WORD * intc->n_words);
Signature · 1 line
2.17.1
[tip: irq/core] irqchip/irq-bcm7038-l1: Add PM support
The following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 6468fc18b00685c82408f40e9569c0d3527862b8 Gitweb: https://git.kernel.org/tip/6468fc18b00685c82408f40e9569c0d3527862b8 Author: Justin Chen <[email protected]> AuthorDate: Thu, 24 Oct 2019 13:14:11 -07:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Sun, 10 Nov 2019 18:47:46
irqchip/irq-bcm7038-l1: Add PM support
The current L1 controller does not mask any interrupts when dropping into suspend. This mean we can receive unexpected wake up sources. Modified the BCM7038 L1 controller to mask the all non-wake interrupts before dropping into suspend.
--- drivers/irqchip/irq-bcm7038-l1.c | 89 +++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+)
drivers/irqchip/irq-bcm7038-l1.c +89 -0
@@ -27,6 +27,7 @@#include <linux/types.h> #include <linux/irqchip.h> #include <linux/irqchip/chained_irq.h> +#include <linux/syscore_ops.h> #define IRQS_PER_WORD 32#define REG_BYTES_PER_IRQ_WORD (sizeof(u32) * 4)
@@ -39,6 +40,10 @@ struct bcm7038_l1_chip {unsigned int n_words;struct irq_domain *domain;struct bcm7038_l1_cpu *cpus[NR_CPUS ]; +#ifdef CONFIG_PM_SLEEP +struct list_head list; +u32 wake_mask[MAX_WORDS ]; +#endif u8 affinity[MAX_WORDS *IRQS_PER_WORD ]; };
@@ -287,6 +292,77 @@ static int __init bcm7038_l1_init_one(struct device_node *dn,return 0 ; } +#ifdef CONFIG_PM_SLEEP +/* +* We keep a list of bcm7038_l1_chip used for suspend/resume. This hack is +* used because the struct chip_type suspend/resume hooks are not called +* unless chip_type is hooked onto a generic_chip. Since this driver does +* not use generic_chip, we need to manually hook our resume/suspend to +* syscore_ops. +*/ +static LIST_HEAD (bcm7038_l1_intcs_list); +static DEFINE_RAW_SPINLOCK (bcm7038_l1_intcs_lock); + +static int bcm7038_l1_suspend (void ) +{ +struct bcm7038_l1_chip *intc; +int boot_cpu, word; + +/* Wakeup interrupt should only come from the boot cpu */ + boot_cpu =cpu_logical_map (0 ); + +list_for_each_entry (intc, &bcm7038_l1_intcs_list, list) { +for (word =0 ; word < intc->n_words; word++) { +l1_writel (~intc->wake_mask[word], + intc->cpus[boot_cpu]->map_base +reg_mask_set (intc, word)); +l1_writel (intc->wake_mask[word], + intc->cpus[boot_cpu]->map_base +reg_mask_clr (intc, word)); + } + } + +return 0 ; +} + +static void bcm7038_l1_resume (void ) +{ +struct bcm7038_l1_chip *intc; +int boot_cpu, word; + + boot_cpu =cpu_logical_map (0 ); + +list_for_each_entry (intc, &bcm7038_l1_intcs_list, list) { +for (word =0 ; word < intc->n_words; word++) { +l1_writel (intc->cpus[boot_cpu]->mask_cache[word], + intc->cpus[boot_cpu]->map_base +reg_mask_set (intc, word)); +l1_writel (~intc->cpus[boot_cpu]->mask_cache[word], + intc->cpus[boot_cpu]->map_base +reg_mask_clr (intc, word)); + } + } +} + +static struct syscore_ops bcm7038_l1_syscore_ops = { + .suspend = bcm7038_l1_suspend, + .resume = bcm7038_l1_resume, +}; + +static int bcm7038_l1_set_wake (struct irq_data *d,unsigned int on) +{ +struct bcm7038_l1_chip *intc =irq_data_get_irq_chip_data (d); +unsigned long flags; +u32 word = d->hwirq /IRQS_PER_WORD ; +u32 mask =BIT (d->hwirq %IRQS_PER_WORD ); + +raw_spin_lock_irqsave (&intc->lock, flags); +if (on) + intc->wake_mask[word] |= mask; +else + intc->wake_mask[word] &= ~mask; +raw_spin_unlock_irqrestore (&intc->lock, flags); + +return 0 ; +} +#endif +static struct irq_chip bcm7038_l1_irq_chip = { .name ="bcm7038-l1" , .irq_mask = bcm7038_l1_mask,
@@ -295,6 +371,9 @@ static struct irq_chip bcm7038_l1_irq_chip = {#ifdef CONFIG_SMP .irq_cpu_offline = bcm7038_l1_cpu_offline,#endif +#ifdef CONFIG_PM_SLEEP + .irq_set_wake = bcm7038_l1_set_wake, +#endif }; static int bcm7038_l1_map(struct irq_domain *d, unsigned int virq,
@@ -340,6 +419,16 @@ int __init bcm7038_l1_of_init(struct device_node *dn, goto out_unmap; } +#ifdef CONFIG_PM_SLEEP +/* Add bcm7038_l1_chip into a list */ +raw_spin_lock (&bcm7038_l1_intcs_lock); +list_add_tail (&intc->list, &bcm7038_l1_intcs_list); +raw_spin_unlock (&bcm7038_l1_intcs_lock); + +if (list_is_singular (&bcm7038_l1_intcs_list)) +register_syscore_ops (&bcm7038_l1_syscore_ops); +#endif +pr_info ("registered BCM7038 L1 intc (%pOF, IRQs: %d)\n" , dn,IRQS_PER_WORD * intc->n_words);
PATCH v3 2/5 dt-bindings: Document brcm,irq-can-wake for brcm,bcm7038-l1-intc.txt
In reply to Florian FainelliThe BCM7038 L1 interrupt controller can be used as a wake-up interrupt controller on MIPS and ARM-based systems, document the brcm,irq-can-wake which has been "standardized" across Broadcom interrupt controllers.
--- .../bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt +5 -0
@@ -31,6 +31,11 @@ Required properties: - interrupts: specifies the interrupt line(s) in the interrupt-parent controller node; valid values depend on the type of parent interrupt controller +Optional properties: + +- brcm,irq-can-wake: If present, this means the L1 controller can be used as a + wakeup source for system suspend/resume. + If multiple reg ranges and interrupt-parent entries are present on an SMP system, the driver will allow IRQ SMP affinity to be set up through the /proc/irq/ interface. In the simplest possible configuration, only one
Signature · 1 line
2.17.1
[tip: irq/core] dt-bindings: Document brcm, irq-can-wake for brcm, bcm7038-l1-intc.txt
The following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: b94f9008f2ad551f4d6a9537b10238847cb81e5d Gitweb: https://git.kernel.org/tip/b94f9008f2ad551f4d6a9537b10238847cb81e5d Author: Florian Fainelli <[email protected]> AuthorDate: Thu, 24 Oct 2019 13:14:12 -07:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Sun, 10 Nov 2019 18:47:46
dt-bindings: Document brcm, irq-can-wake for brcm, bcm7038-l1-intc.txt
The BCM7038 L1 interrupt controller can be used as a wake-up interrupt controller on MIPS and ARM-based systems, document the brcm,irq-can-wake which has been "standardized" across Broadcom interrupt controllers.
--- Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt +5 -0
@@ -31,6 +31,11 @@ Required properties: - interrupts: specifies the interrupt line(s) in the interrupt-parent controller node; valid values depend on the type of parent interrupt controller +Optional properties: + +- brcm,irq-can-wake: If present, this means the L1 controller can be used as a + wakeup source for system suspend/resume. + If multiple reg ranges and interrupt-parent entries are present on an SMP system, the driver will allow IRQ SMP affinity to be set up through the /proc/irq/ interface. In the simplest possible configuration, only one
PATCH v3 3/5 irqchip/irq-bcm7038-l1: Enable parent IRQ if necessary
In reply to Florian FainelliIf the 'brcm,irq-can-wake' property is specified, make sure we also enable the corresponding parent interrupt we are attached to.
--- drivers/irqchip/irq-bcm7038-l1.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/irqchip/irq-bcm7038-l1.c +4 -0
@@ -286,6 +286,10 @@ static int __init bcm7038_l1_init_one(struct device_node *dn,pr_err ("failed to map parent interrupt %d\n" , parent_irq);return -EINVAL ; } + +if (of_property_read_bool (dn,"brcm,irq-can-wake" )) +enable_irq_wake (parent_irq); +irq_set_chained_handler_and_data (parent_irq, bcm7038_l1_irq_handle, intc);
Signature · 1 line
2.17.1
[tip: irq/core] irqchip/irq-bcm7038-l1: Enable parent IRQ if necessary
The following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 27eebb60357ed5aa6659442f92907c0f7368d6ae Gitweb: https://git.kernel.org/tip/27eebb60357ed5aa6659442f92907c0f7368d6ae Author: Florian Fainelli <[email protected]> AuthorDate: Thu, 24 Oct 2019 13:14:13 -07:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Sun, 10 Nov 2019 18:47:47
irqchip/irq-bcm7038-l1: Enable parent IRQ if necessary
If the 'brcm,irq-can-wake' property is specified, make sure we also enable the corresponding parent interrupt we are attached to.
--- drivers/irqchip/irq-bcm7038-l1.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/irqchip/irq-bcm7038-l1.c +4 -0
@@ -286,6 +286,10 @@ static int __init bcm7038_l1_init_one(struct device_node *dn,pr_err ("failed to map parent interrupt %d\n" , parent_irq);return -EINVAL ; } + +if (of_property_read_bool (dn,"brcm,irq-can-wake" )) +enable_irq_wake (parent_irq); +irq_set_chained_handler_and_data (parent_irq, bcm7038_l1_irq_handle, intc);
PATCH v3 4/5 dt-bindings: Document brcm,int-fwd-mask property for bcm7038-l1-intc
In reply to Florian FainelliIndicate that the brcm,int-fwd-mask property is optional and can be set on platforms which require to leave specific interrupts unmanaged by Linux and need to retain the firmware configuration.
--- .../bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt +6 -0
@@ -36,6 +36,12 @@ Optional properties: - brcm,irq-can-wake: If present, this means the L1 controller can be used as a wakeup source for system suspend/resume. +Optional properties: + +- brcm,int-fwd-mask: if present, a bit mask to indicate which interrupts + have already been configured by the firmware and should be left unmanaged. + This should have one 32-bit word per status/set/clear/mask group. + If multiple reg ranges and interrupt-parent entries are present on an SMP system, the driver will allow IRQ SMP affinity to be set up through the /proc/irq/ interface. In the simplest possible configuration, only one
Signature · 1 line
2.17.1
[tip: irq/core] dt-bindings: Document brcm, int-fwd-mask property for bcm7038-l1-intc
The following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: e14b5e5ff0841270e6262e3e5fd69ad764a80aee Gitweb: https://git.kernel.org/tip/e14b5e5ff0841270e6262e3e5fd69ad764a80aee Author: Florian Fainelli <[email protected]> AuthorDate: Thu, 24 Oct 2019 13:14:14 -07:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Sun, 10 Nov 2019 18:47:47
dt-bindings: Document brcm, int-fwd-mask property for bcm7038-l1-intc
Indicate that the brcm,int-fwd-mask property is optional and can be set on platforms which require to leave specific interrupts unmanaged by Linux and need to retain the firmware configuration.
--- Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt +6 -0
@@ -36,6 +36,12 @@ Optional properties: - brcm,irq-can-wake: If present, this means the L1 controller can be used as a wakeup source for system suspend/resume. +Optional properties: + +- brcm,int-fwd-mask: if present, a bit mask to indicate which interrupts + have already been configured by the firmware and should be left unmanaged. + This should have one 32-bit word per status/set/clear/mask group. + If multiple reg ranges and interrupt-parent entries are present on an SMP system, the driver will allow IRQ SMP affinity to be set up through the /proc/irq/ interface. In the simplest possible configuration, only one
PATCH v3 5/5 irqchip/irq-bcm7038-l1: Support brcm,int-fwd-mask
In reply to Florian FainelliOn some specific chips like 7211 we need to leave some interrupts untouched/forwarded to the VPU which is another agent in the system making use of that interrupt controller hardware (goes to both ARM GIC and VPU L1 interrupt controller). Make that possible by using the existing brcm,int-fwd-mask property and take necessary actions to avoid masking that interrupt as well as not allowing Linux to map them.
--- drivers/irqchip/irq-bcm7038-l1.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
drivers/irqchip/irq-bcm7038-l1.c +26 -4
@@ -44,6 +44,7 @@ struct bcm7038_l1_chip {struct list_head list;u32 wake_mask[MAX_WORDS ];#endif +u32 irq_fwd_mask[MAX_WORDS ];u8 affinity[MAX_WORDS *IRQS_PER_WORD ]; };
@@ -254,6 +255,7 @@ static int __init bcm7038_l1_init_one(struct device_node *dn,resource_size_t sz;struct bcm7038_l1_cpu *cpu;unsigned int i, n_words, parent_irq; +int ret;if (of_address_to_resource (dn, idx, &res))return -EINVAL ;
@@ -267,6 +269,14 @@ static int __init bcm7038_l1_init_one(struct device_node *dn,else if (intc->n_words != n_words)return -EINVAL ; + ret =of_property_read_u32_array (dn ,"brcm,int-fwd-mask" , + intc->irq_fwd_mask, n_words); +if (ret !=0 && ret != -EINVAL ) { +/* property exists but has the wrong number of words */ +pr_err ("invalid brcm,int-fwd-mask property\n" ); +return -EINVAL ; + } + cpu = intc->cpus[idx] =kzalloc (sizeof (*cpu) + n_words *sizeof (u32),GFP_KERNEL );if (!cpu)
@@ -277,8 +287,11 @@ static int __init bcm7038_l1_init_one(struct device_node *dn,return -ENOMEM ;for (i =0 ; i < n_words; i++) { -l1_writel (0xffffffff , cpu->map_base +reg_mask_set (intc, i)); - cpu->mask_cache[i] =0xffffffff ; +l1_writel (~intc->irq_fwd_mask[i], + cpu->map_base +reg_mask_set (intc, i)); +l1_writel (intc->irq_fwd_mask[i], + cpu->map_base +reg_mask_clr (intc, i)); + cpu->mask_cache[i] = ~intc->irq_fwd_mask[i]; } parent_irq =irq_of_parse_and_map (dn, idx);
@@ -311,15 +324,17 @@ static int bcm7038_l1_suspend(void) {struct bcm7038_l1_chip *intc;int boot_cpu, word; +u32 val;/* Wakeup interrupt should only come from the boot cpu */ boot_cpu =cpu_logical_map (0 );list_for_each_entry (intc, &bcm7038_l1_intcs_list, list) {for (word =0 ; word < intc->n_words; word++) { -l1_writel (~intc->wake_mask[word], + val = intc->wake_mask[word] | intc->irq_fwd_mask[word]; +l1_writel (~val, intc->cpus[boot_cpu]->map_base +reg_mask_set (intc, word)); -l1_writel (intc->wake_mask[word], +l1_writel (val, intc->cpus[boot_cpu]->map_base +reg_mask_clr (intc, word)); } }
@@ -383,6 +398,13 @@ static struct irq_chip bcm7038_l1_irq_chip = {static int bcm7038_l1_map (struct irq_domain *d,unsigned int virq,irq_hw_number_t hw_irq) { +struct bcm7038_l1_chip *intc = d->host_data; +u32 mask =BIT (hw_irq %IRQS_PER_WORD ); +u32 word = hw_irq /IRQS_PER_WORD ; + +if (intc->irq_fwd_mask[word] & mask) +return -EPERM ; +irq_set_chip_and_handler (virq, &bcm7038_l1_irq_chip, handle_level_irq);irq_set_chip_data (virq, d->host_data);irqd_set_single_target (irq_desc_get_irq_data (irq_to_desc (virq)));
Signature · 1 line
2.17.1
[tip: irq/core] irqchip/irq-bcm7038-l1: Support brcm,int-fwd-mask
The following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 96de80c14bc6b43b797299270e31b8924f89fa52 Gitweb: https://git.kernel.org/tip/96de80c14bc6b43b797299270e31b8924f89fa52 Author: Florian Fainelli <[email protected]> AuthorDate: Thu, 24 Oct 2019 13:14:15 -07:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Sun, 10 Nov 2019 18:47:48
irqchip/irq-bcm7038-l1: Support brcm,int-fwd-mask
On some specific chips like 7211 we need to leave some interrupts untouched/forwarded to the VPU which is another agent in the system making use of that interrupt controller hardware (goes to both ARM GIC and VPU L1 interrupt controller). Make that possible by using the existing brcm,int-fwd-mask property and take necessary actions to avoid masking that interrupt as well as not allowing Linux to map them.
--- drivers/irqchip/irq-bcm7038-l1.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
drivers/irqchip/irq-bcm7038-l1.c +26 -4
@@ -44,6 +44,7 @@ struct bcm7038_l1_chip {struct list_head list;u32 wake_mask[MAX_WORDS ];#endif +u32 irq_fwd_mask[MAX_WORDS ];u8 affinity[MAX_WORDS *IRQS_PER_WORD ]; };
@@ -254,6 +255,7 @@ static int __init bcm7038_l1_init_one(struct device_node *dn,resource_size_t sz;struct bcm7038_l1_cpu *cpu;unsigned int i, n_words, parent_irq; +int ret;if (of_address_to_resource (dn, idx, &res))return -EINVAL ;
@@ -267,6 +269,14 @@ static int __init bcm7038_l1_init_one(struct device_node *dn,else if (intc->n_words != n_words)return -EINVAL ; + ret =of_property_read_u32_array (dn ,"brcm,int-fwd-mask" , + intc->irq_fwd_mask, n_words); +if (ret !=0 && ret != -EINVAL ) { +/* property exists but has the wrong number of words */ +pr_err ("invalid brcm,int-fwd-mask property\n" ); +return -EINVAL ; + } + cpu = intc->cpus[idx] =kzalloc (sizeof (*cpu) + n_words *sizeof (u32),GFP_KERNEL );if (!cpu)
@@ -277,8 +287,11 @@ static int __init bcm7038_l1_init_one(struct device_node *dn,return -ENOMEM ;for (i =0 ; i < n_words; i++) { -l1_writel (0xffffffff , cpu->map_base +reg_mask_set (intc, i)); - cpu->mask_cache[i] =0xffffffff ; +l1_writel (~intc->irq_fwd_mask[i], + cpu->map_base +reg_mask_set (intc, i)); +l1_writel (intc->irq_fwd_mask[i], + cpu->map_base +reg_mask_clr (intc, i)); + cpu->mask_cache[i] = ~intc->irq_fwd_mask[i]; } parent_irq =irq_of_parse_and_map (dn, idx);
@@ -311,15 +324,17 @@ static int bcm7038_l1_suspend(void) {struct bcm7038_l1_chip *intc;int boot_cpu, word; +u32 val;/* Wakeup interrupt should only come from the boot cpu */ boot_cpu =cpu_logical_map (0 );list_for_each_entry (intc, &bcm7038_l1_intcs_list, list) {for (word =0 ; word < intc->n_words; word++) { -l1_writel (~intc->wake_mask[word], + val = intc->wake_mask[word] | intc->irq_fwd_mask[word]; +l1_writel (~val, intc->cpus[boot_cpu]->map_base +reg_mask_set (intc, word)); -l1_writel (intc->wake_mask[word], +l1_writel (val, intc->cpus[boot_cpu]->map_base +reg_mask_clr (intc, word)); } }
@@ -383,6 +398,13 @@ static struct irq_chip bcm7038_l1_irq_chip = {static int bcm7038_l1_map (struct irq_domain *d,unsigned int virq,irq_hw_number_t hw_irq) { +struct bcm7038_l1_chip *intc = d->host_data; +u32 mask =BIT (hw_irq %IRQS_PER_WORD ); +u32 word = hw_irq /IRQS_PER_WORD ; + +if (intc->irq_fwd_mask[word] & mask) +return -EPERM ; +irq_set_chip_and_handler (virq, &bcm7038_l1_irq_chip, handle_level_irq);irq_set_chip_data (virq, d->host_data);irqd_set_single_target (irq_desc_get_irq_data (irq_to_desc (virq)));
Marc Zyngier
AppliedQuoted 6 lines · Florian Fainelli
Hi Marc, Jason, Thomas,
This patch series contains some updates from our internal tree to support power management and allow configuring specific instances of the brcm,bcm7038-l1-intc to leave some interrupts untouched and how the firmware might have configured them.
Applied to irqchip-next.
M.
Signature · 1 line
Jazz is not dead. It just smells funny...