lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, ioapic: replace loop with nr_irqs with for_each_irq_icfg

Browse Source 
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu
2008-08-19 20:50:13 -07:00
committed by Ingo Molnar
parent c7fb03a475
commit 46b8214d12
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arch/x86/kernel/io_apic_64.c
View File

@@ -129,6 +129,9 @@ static void __init init_work(void *data)
cfg[i-1].next = &cfg[i]; cfg[i-1].next = &cfg[i];
} }
#define for_each_irq_cfg(cfg) \
for (cfg = irq_cfgx; cfg && cfg->irq != -1U; cfg = cfg->next)
static struct irq_cfg *irq_cfgx; static struct irq_cfg *irq_cfgx;
DEFINE_DYN_ARRAY(irq_cfgx, sizeof(struct irq_cfg), nr_irq_cfg, PAGE_SIZE, init_work); DEFINE_DYN_ARRAY(irq_cfgx, sizeof(struct irq_cfg), nr_irq_cfg, PAGE_SIZE, init_work);
@@ -1097,20 +1100,18 @@ void __setup_vector_irq(int cpu)
/* Initialize vector_irq on a new cpu */ /* Initialize vector_irq on a new cpu */
/* This function must be called with vector_lock held */ /* This function must be called with vector_lock held */
int irq, vector; int irq, vector;
struct irq_cfg *cfg;
/* Mark the inuse vectors */ /* Mark the inuse vectors */
for (irq = 0; irq < nr_irqs; ++irq) { for_each_irq_cfg(cfg) {
struct irq_cfg *cfg = irq_cfg(irq);
if (!cpu_isset(cpu, cfg->domain)) if (!cpu_isset(cpu, cfg->domain))
continue; continue;
vector = cfg->vector; vector = cfg->vector;
irq = cfg->irq;
per_cpu(vector_irq, cpu)[vector] = irq; per_cpu(vector_irq, cpu)[vector] = irq;
} }
/* Mark the free vectors */ /* Mark the free vectors */
for (vector = 0; vector < NR_VECTORS; ++vector) { for (vector = 0; vector < NR_VECTORS; ++vector) {
struct irq_cfg *cfg;
irq = per_cpu(vector_irq, cpu)[vector]; irq = per_cpu(vector_irq, cpu)[vector];
if (irq < 0) if (irq < 0)
continue; continue;
@@ -1340,6 +1341,7 @@ __apicdebuginit(void) print_IO_APIC(void)
union IO_APIC_reg_01 reg_01; union IO_APIC_reg_01 reg_01;
union IO_APIC_reg_02 reg_02; union IO_APIC_reg_02 reg_02;
unsigned long flags; unsigned long flags;
struct irq_cfg *cfg;
if (apic_verbosity == APIC_QUIET) if (apic_verbosity == APIC_QUIET)
return; return;
@@ -1408,12 +1410,11 @@ __apicdebuginit(void) print_IO_APIC(void)
} }
} }
printk(KERN_DEBUG "IRQ to pin mappings:\n"); printk(KERN_DEBUG "IRQ to pin mappings:\n");
for (i = 0; i < nr_irqs; i++) { for_each_irq_cfg(cfg) {
struct irq_cfg *cfg = irq_cfg(i);
struct irq_pin_list *entry = cfg->irq_2_pin; struct irq_pin_list *entry = cfg->irq_2_pin;
if (!entry) if (!entry)
continue; continue;
printk(KERN_DEBUG "IRQ%d ", i); printk(KERN_DEBUG "IRQ%d ", cfg->irq);
for (;;) { for (;;) {
printk("-> %d:%d", entry->apic, entry->pin); printk("-> %d:%d", entry->apic, entry->pin);
if (!entry->next) if (!entry->next)
@@ -2070,6 +2071,7 @@ static inline void init_IO_APIC_traps(void)
{ {
int irq; int irq;
struct irq_desc *desc; struct irq_desc *desc;
struct irq_cfg *cfg;
/* /*
* NOTE! The local APIC isn't very good at handling * NOTE! The local APIC isn't very good at handling
@@ -2082,10 +2084,8 @@ static inline void init_IO_APIC_traps(void)
* Also, we've got to be careful not to trash gate * Also, we've got to be careful not to trash gate
* 0x80, because int 0x80 is hm, kind of importantish. ;) * 0x80, because int 0x80 is hm, kind of importantish. ;)
*/ */
for (irq = 0; irq < nr_irqs ; irq++) { for_each_irq_cfg(cfg) {
struct irq_cfg *cfg; irq = cfg->irq;
cfg = irq_cfg(irq);
if (IO_APIC_IRQ(irq) && !cfg->vector) { if (IO_APIC_IRQ(irq) && !cfg->vector) {
/* /*
* Hmm.. We don't have an entry for this, * Hmm.. We don't have an entry for this,