Skip to content

Commit

Permalink
x86/irq: Rename VECTOR_UNDEFINED to VECTOR_UNUSED
Browse files Browse the repository at this point in the history 
VECTOR_UNDEFINED is a misnomer. The vector is defined, but unused.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Link: http://lkml.kernel.org/r/20150802203609.477282494@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Thomas Gleixner committed Aug 5, 2015
1 parent 24c70e0 commit 7276c6a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
2 changes: 1 addition & 1 deletion arch/x86/include/asm/hw_irq.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ extern char irq_entries_start[];
#define trace_irq_entries_start irq_entries_start
#endif

#define VECTOR_UNDEFINED (-1)
#define VECTOR_UNUSED (-1)
#define VECTOR_RETRIGGERED (-2)

typedef int vector_irq_t[NR_VECTORS];
Expand Down
15 changes: 7 additions & 8 deletions arch/x86/kernel/apic/vector.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,7 @@ static int __assign_irq_vector(int irq, struct apic_chip_data *d,
goto next;

for_each_cpu_and(new_cpu, vector_cpumask, cpu_online_mask) {
if (per_cpu(vector_irq, new_cpu)[vector] >
VECTOR_UNDEFINED)
if (per_cpu(vector_irq, new_cpu)[vector] > VECTOR_UNUSED)
goto next;
}
/* Found one! */
Expand Down Expand Up @@ -232,7 +231,7 @@ static void clear_irq_vector(int irq, struct apic_chip_data *data)

vector = data->cfg.vector;
for_each_cpu_and(cpu, data->domain, cpu_online_mask)
per_cpu(vector_irq, cpu)[vector] = VECTOR_UNDEFINED;
per_cpu(vector_irq, cpu)[vector] = VECTOR_UNUSED;

data->cfg.vector = 0;
cpumask_clear(data->domain);
Expand All @@ -247,7 +246,7 @@ static void clear_irq_vector(int irq, struct apic_chip_data *data)
vector++) {
if (per_cpu(vector_irq, cpu)[vector] != irq)
continue;
per_cpu(vector_irq, cpu)[vector] = VECTOR_UNDEFINED;
per_cpu(vector_irq, cpu)[vector] = VECTOR_UNUSED;
break;
}
}
Expand Down Expand Up @@ -423,12 +422,12 @@ static void __setup_vector_irq(int cpu)
/* Mark the free vectors */
for (vector = 0; vector < NR_VECTORS; ++vector) {
irq = per_cpu(vector_irq, cpu)[vector];
if (irq <= VECTOR_UNDEFINED)
if (irq <= VECTOR_UNUSED)
continue;

data = apic_chip_data(irq_get_irq_data(irq));
if (!cpumask_test_cpu(cpu, data->domain))
per_cpu(vector_irq, cpu)[vector] = VECTOR_UNDEFINED;
per_cpu(vector_irq, cpu)[vector] = VECTOR_UNUSED;
}
}

Expand Down Expand Up @@ -552,7 +551,7 @@ asmlinkage __visible void smp_irq_move_cleanup_interrupt(void)
retry:
irq = __this_cpu_read(vector_irq[vector]);

if (irq <= VECTOR_UNDEFINED)
if (irq <= VECTOR_UNUSED)
continue;

desc = irq_to_desc(irq);
Expand Down Expand Up @@ -592,7 +591,7 @@ asmlinkage __visible void smp_irq_move_cleanup_interrupt(void)
apic->send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR);
goto unlock;
}
__this_cpu_write(vector_irq[vector], VECTOR_UNDEFINED);
__this_cpu_write(vector_irq[vector], VECTOR_UNUSED);
unlock:
raw_spin_unlock(&desc->lock);
}
Expand Down
8 changes: 4 additions & 4 deletions arch/x86/kernel/irq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ __visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs)
__func__, smp_processor_id(),
vector, irq);
} else {
__this_cpu_write(vector_irq[vector], VECTOR_UNDEFINED);
__this_cpu_write(vector_irq[vector], VECTOR_UNUSED);
}
}

Expand Down Expand Up @@ -401,7 +401,7 @@ int check_irq_vectors_for_cpu_disable(void)
for (vector = FIRST_EXTERNAL_VECTOR;
vector < first_system_vector; vector++) {
if (!test_bit(vector, used_vectors) &&
per_cpu(vector_irq, cpu)[vector] <= VECTOR_UNDEFINED)
per_cpu(vector_irq, cpu)[vector] <= VECTOR_UNUSED)
count++;
}
}
Expand Down Expand Up @@ -506,7 +506,7 @@ void fixup_irqs(void)
for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS; vector++) {
unsigned int irr;

if (__this_cpu_read(vector_irq[vector]) <= VECTOR_UNDEFINED)
if (__this_cpu_read(vector_irq[vector]) <= VECTOR_UNUSED)
continue;

irr = apic_read(APIC_IRR + (vector / 32 * 0x10));
Expand All @@ -524,7 +524,7 @@ void fixup_irqs(void)
raw_spin_unlock(&desc->lock);
}
if (__this_cpu_read(vector_irq[vector]) != VECTOR_RETRIGGERED)
__this_cpu_write(vector_irq[vector], VECTOR_UNDEFINED);
__this_cpu_write(vector_irq[vector], VECTOR_UNUSED);
}
}
#endif
4 changes: 2 additions & 2 deletions arch/x86/kernel/irqinit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ static struct irqaction irq2 = {
};

DEFINE_PER_CPU(vector_irq_t, vector_irq) = {
[0 ... NR_VECTORS - 1] = VECTOR_UNDEFINED,
[0 ... NR_VECTORS - 1] = VECTOR_UNUSED,
};

int vector_used_by_percpu_irq(unsigned int vector)
{
int cpu;

for_each_online_cpu(cpu) {
if (per_cpu(vector_irq, cpu)[vector] > VECTOR_UNDEFINED)
if (per_cpu(vector_irq, cpu)[vector] > VECTOR_UNUSED)
return 1;
}

Expand Down

0 comments on commit 7276c6a

Please sign in to comment.