irqchip/irq-brcmstb-l2: Replace brcmstb_l2_mask_and_ack by generic
Subsystems (4)
PATCH 1/1 irqchip/irq-brcmstb-l2: Replace brcmstb_l2_mask_and_ack by generic
From: "Dr. David Alan Gilbert" <[email protected]>
Replace brcmstb_l2_mask_and_ack() by the genericirq_gc_mask_disable_and_ack_set().
brcmstb_l2_mask_and_ack() was added by
commit 49aa6ef0b439 ("irqchip/brcmstb-l2: Remove some processing from the handler") in September 2017 with a comment saying it was actually generic and someone should add it to the generic code.
commit 20608924cc2e ("genirq: generic chip: Add irq_gc_mask_disable_and_ack_set()") did that a few weeks later, however no one went back and took the original out.
Build tested only.
--- drivers/irqchip/irq-brcmstb-l2.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-)
drivers/irqchip/irq-brcmstb-l2.c +1 -27
@@ -61,32 +61,6 @@ struct brcmstb_l2_intc_data {u32 saved_mask;/* for suspend/resume */ }; -/** -* brcmstb_l2_mask_and_ack - Mask and ack pending interrupt -* @d: irq_data -* -* Chip has separate enable/disable registers instead of a single mask -* register and pending interrupt is acknowledged by setting a bit. -* -* Note: This function is generic and could easily be added to the -* generic irqchip implementation if there ever becomes a will to do so. -* Perhaps with a name like irq_gc_mask_disable_and_ack_set(). -* -* e.g.: https://patchwork.kernel.org/patch/9831047/ -*/ -static void brcmstb_l2_mask_and_ack (struct irq_data *d) -{ -struct irq_chip_generic *gc =irq_data_get_irq_chip_data (d); -struct irq_chip_type *ct =irq_data_get_chip_type (d); -u32 mask = d->mask; - -irq_gc_lock (gc); -irq_reg_writel (gc, mask, ct->regs.disable); - *ct->mask_cache &= ~mask; -irq_reg_writel (gc, mask, ct->regs.ack); -irq_gc_unlock (gc); -} -static void brcmstb_l2_intc_irq_handle (struct irq_desc *desc) {struct brcmstb_l2_intc_data *b =irq_desc_get_handler_data (desc);
@@ -248,7 +222,7 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np,if (init_params->cpu_clear >=0 ) { ct->regs.ack = init_params->cpu_clear; ct->chip.irq_ack = irq_gc_ack_set_bit; - ct->chip.irq_mask_ack = brcmstb_l2_mask_and_ack; + ct->chip.irq_mask_ack = irq_gc_mask_disable_and_ack_set; }else {/* No Ack - but still slightly more efficient to define this */ ct->chip.irq_mask_ack = irq_gc_mask_disable_reg;
Signature · 1 line
2.47.1
Quoted 10 lines · On 12/23/2024 4:17 PM, [email protected] wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
Replace
brcmstb_l2_mask_and_ack()by the genericirq_gc_mask_disable_and_ack_set().
brcmstb_l2_mask_and_ack()was added by
commit49aa6ef0b439("irqchip/brcmstb-l2: Remove some processing from the handler") in September 2017 with a comment saying it was actually generic and someone should add it to the generic code.
Quoted 7 lines
commit
20608924cc2e("genirq: generic chip: Addirq_gc_mask_disable_and_ack_set()") did that a few weeks later, however no one went back and took the original out.Build tested only.
Signed-off-by Dr. David Alan Gilbert <[email protected]>
Signature · 1 line
Florian
[tip: irq/core] irqchip/irq-brcmstb-l2: Replace brcmstb_l2_mask_and_ack() by generic function
In reply to [email protected]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: dd1f17a9faf5359d76644236cde4cc1720f1184d Gitweb: https://git.kernel.org/tip/dd1f17a9faf5359d76644236cde4cc1720f1184d Author: Dr. David Alan Gilbert <[email protected]> AuthorDate: Tue, 24 Dec 2024 00:17:27 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 15 Jan 2025 09:47:46 +01:00
irqchip/irq-brcmstb-l2: Replace brcmstb_l2_mask_and_ack() by generic function
Replace brcmstb_l2_mask_and_ack() by the genericirq_gc_mask_disable_and_ack_set().
brcmstb_l2_mask_and_ack() was added in commit 49aa6ef0b439 ("irqchip/brcmstb-l2: Remove some processing from the handler") in September 2017 with a comment saying it was actually generic and someone should add it to the generic code.
commit 20608924cc2e ("genirq: generic chip: Add irq_gc_mask_disable_and_ack_set()") did that a few weeks later, however no one went back and took the brcmstb variant out.
--- drivers/irqchip/irq-brcmstb-l2.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-)
drivers/irqchip/irq-brcmstb-l2.c +1 -27
@@ -61,32 +61,6 @@ struct brcmstb_l2_intc_data {u32 saved_mask;/* for suspend/resume */ }; -/** -* brcmstb_l2_mask_and_ack - Mask and ack pending interrupt -* @d: irq_data -* -* Chip has separate enable/disable registers instead of a single mask -* register and pending interrupt is acknowledged by setting a bit. -* -* Note: This function is generic and could easily be added to the -* generic irqchip implementation if there ever becomes a will to do so. -* Perhaps with a name like irq_gc_mask_disable_and_ack_set(). -* -* e.g.: https://patchwork.kernel.org/patch/9831047/ -*/ -static void brcmstb_l2_mask_and_ack (struct irq_data *d) -{ -struct irq_chip_generic *gc =irq_data_get_irq_chip_data (d); -struct irq_chip_type *ct =irq_data_get_chip_type (d); -u32 mask = d->mask; - -irq_gc_lock (gc); -irq_reg_writel (gc, mask, ct->regs.disable); - *ct->mask_cache &= ~mask; -irq_reg_writel (gc, mask, ct->regs.ack); -irq_gc_unlock (gc); -} -static void brcmstb_l2_intc_irq_handle (struct irq_desc *desc) {struct brcmstb_l2_intc_data *b =irq_desc_get_handler_data (desc);
@@ -248,7 +222,7 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np,if (init_params->cpu_clear >=0 ) { ct->regs.ack = init_params->cpu_clear; ct->chip.irq_ack = irq_gc_ack_set_bit; - ct->chip.irq_mask_ack = brcmstb_l2_mask_and_ack; + ct->chip.irq_mask_ack = irq_gc_mask_disable_and_ack_set; }else {/* No Ack - but still slightly more efficient to define this */ ct->chip.irq_mask_ack = irq_gc_mask_disable_reg;