Skip to content

Commit

Permalink
powerpc/xics: Initialization code cleanups
Browse files Browse the repository at this point in the history
We only need to check the ibm,interrupt-server#-size property once, not
once per global server and thread.

We can use !CONFIG_SMP cpu masks and hard_smp_processor_id() to avoid an ifdef.
Put the node when breaking out of the loop on lpar systems.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Milton Miller authored and Benjamin Herrenschmidt committed Oct 13, 2008
1 parent 188bddd commit a244a95
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions arch/powerpc/platforms/pseries/xics.c
Original file line number Diff line number Diff line change
Expand Up @@ -606,21 +606,20 @@ static void xics_update_irq_servers(void)
if (ireg[j] == hcpuid) {
default_server = hcpuid;
default_distrib_server = ireg[j+1];

isize = of_get_property(np,
"ibm,interrupt-server#-size", NULL);
if (isize)
interrupt_server_size = *isize;
}
}

/* get the bit size of server numbers */
isize = of_get_property(np, "ibm,interrupt-server#-size", NULL);
if (isize)
interrupt_server_size = *isize;

of_node_put(np);
}

static void __init xics_map_one_cpu(int hw_id, unsigned long addr,
unsigned long size)
{
#ifdef CONFIG_SMP
int i;

/* This may look gross but it's good enough for now, we don't quite
Expand All @@ -634,11 +633,6 @@ static void __init xics_map_one_cpu(int hw_id, unsigned long addr,
return;
}
}
#else
if (hw_id != 0)
return;
xics_per_cpu[0] = ioremap(addr, size);
#endif /* CONFIG_SMP */
}

static void __init xics_init_one_node(struct device_node *np,
Expand Down Expand Up @@ -700,8 +694,10 @@ void __init xics_init_IRQ(void)

for_each_node_by_type(np, "PowerPC-External-Interrupt-Presentation") {
found = 1;
if (firmware_has_feature(FW_FEATURE_LPAR))
if (firmware_has_feature(FW_FEATURE_LPAR)) {
of_node_put(np);
break;
}
xics_init_one_node(np, &indx);
}
if (found == 0)
Expand Down

0 comments on commit a244a95

Please sign in to comment.