Skip to content

Commit 6678ae1

Browse files
Jinjie RuanKAGA-KOKO
authored andcommitted
genirq: Reuse irq_is_nmi()
Move irq_is_nmi() to the internal header file and reuse it all over the place. Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20240423024037.3331215-1-ruanjinjie@huawei.com
1 parent 88d724e commit 6678ae1

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

kernel/irq/internals.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,11 @@ static inline int irq_desc_is_chained(struct irq_desc *desc)
280280
return (desc->action && desc->action == &chained_action);
281281
}
282282

283+
static inline bool irq_is_nmi(struct irq_desc *desc)
284+
{
285+
return desc->istate & IRQS_NMI;
286+
}
287+
283288
#ifdef CONFIG_PM_SLEEP
284289
bool irq_pm_check_wakeup(struct irq_desc *desc);
285290
void irq_pm_install_action(struct irq_desc *desc, struct irqaction *action);

kernel/irq/irqdesc.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -965,11 +965,6 @@ unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
965965
return desc && desc->kstat_irqs ? per_cpu(desc->kstat_irqs->cnt, cpu) : 0;
966966
}
967967

968-
static bool irq_is_nmi(struct irq_desc *desc)
969-
{
970-
return desc->istate & IRQS_NMI;
971-
}
972-
973968
unsigned int kstat_irqs_desc(struct irq_desc *desc, const struct cpumask *cpumask)
974969
{
975970
unsigned int sum = 0;

kernel/irq/manage.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
564564
/* The release function is promised process context */
565565
might_sleep();
566566

567-
if (!desc || desc->istate & IRQS_NMI)
567+
if (!desc || irq_is_nmi(desc))
568568
return -EINVAL;
569569

570570
/* Complete initialisation of *notify */
@@ -902,7 +902,7 @@ int irq_set_irq_wake(unsigned int irq, unsigned int on)
902902
return -EINVAL;
903903

904904
/* Don't use NMIs as wake up interrupts please */
905-
if (desc->istate & IRQS_NMI) {
905+
if (irq_is_nmi(desc)) {
906906
ret = -EINVAL;
907907
goto out_unlock;
908908
}
@@ -1628,7 +1628,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
16281628
*/
16291629
unsigned int oldtype;
16301630

1631-
if (desc->istate & IRQS_NMI) {
1631+
if (irq_is_nmi(desc)) {
16321632
pr_err("Invalid attempt to share NMI for %s (irq %d) on irqchip %s.\n",
16331633
new->name, irq, desc->irq_data.chip->name);
16341634
ret = -EINVAL;
@@ -2081,7 +2081,7 @@ const void *free_nmi(unsigned int irq, void *dev_id)
20812081
unsigned long flags;
20822082
const void *devname;
20832083

2084-
if (!desc || WARN_ON(!(desc->istate & IRQS_NMI)))
2084+
if (!desc || WARN_ON(!irq_is_nmi(desc)))
20852085
return NULL;
20862086

20872087
if (WARN_ON(irq_settings_is_per_cpu_devid(desc)))
@@ -2547,7 +2547,7 @@ void free_percpu_nmi(unsigned int irq, void __percpu *dev_id)
25472547
if (!desc || !irq_settings_is_per_cpu_devid(desc))
25482548
return;
25492549

2550-
if (WARN_ON(!(desc->istate & IRQS_NMI)))
2550+
if (WARN_ON(!irq_is_nmi(desc)))
25512551
return;
25522552

25532553
kfree(__free_percpu_irq(irq, dev_id));
@@ -2683,7 +2683,7 @@ int request_percpu_nmi(unsigned int irq, irq_handler_t handler,
26832683
return -EINVAL;
26842684

26852685
/* The line cannot already be NMI */
2686-
if (desc->istate & IRQS_NMI)
2686+
if (irq_is_nmi(desc))
26872687
return -EINVAL;
26882688

26892689
action = kzalloc(sizeof(struct irqaction), GFP_KERNEL);
@@ -2744,7 +2744,7 @@ int prepare_percpu_nmi(unsigned int irq)
27442744
if (!desc)
27452745
return -EINVAL;
27462746

2747-
if (WARN(!(desc->istate & IRQS_NMI),
2747+
if (WARN(!irq_is_nmi(desc),
27482748
KERN_ERR "prepare_percpu_nmi called for a non-NMI interrupt: irq %u\n",
27492749
irq)) {
27502750
ret = -EINVAL;
@@ -2786,7 +2786,7 @@ void teardown_percpu_nmi(unsigned int irq)
27862786
if (!desc)
27872787
return;
27882788

2789-
if (WARN_ON(!(desc->istate & IRQS_NMI)))
2789+
if (WARN_ON(!irq_is_nmi(desc)))
27902790
goto out;
27912791

27922792
irq_nmi_teardown(desc);

kernel/irq/resend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ int irq_inject_interrupt(unsigned int irq)
190190
* - not NMI type
191191
* - activated
192192
*/
193-
if ((desc->istate & IRQS_NMI) || !irqd_is_activated(&desc->irq_data))
193+
if (irq_is_nmi(desc) || !irqd_is_activated(&desc->irq_data))
194194
err = -EINVAL;
195195
else
196196
err = check_irq_resend(desc, true);

0 commit comments

Comments
 (0)