Commit 0b29d5e7 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc64: Create xics get_irq_server

From: Anton Blanchard <anton@samba.org>

Create xics get_irq_server and use it in enable/disable code.
parent b9027516
...@@ -235,25 +235,47 @@ static unsigned int real_irq_to_virt(unsigned int real_irq) ...@@ -235,25 +235,47 @@ static unsigned int real_irq_to_virt(unsigned int real_irq)
return ptr - virt_irq_to_real_map; return ptr - virt_irq_to_real_map;
} }
static void xics_enable_irq(unsigned int virq) static int get_irq_server(unsigned int irq)
{ {
unsigned int irq; cpumask_t cpumask = irq_affinity[irq];
long call_status; cpumask_t allcpus = CPU_MASK_ALL;
cpumask_t tmp = CPU_MASK_NONE;
unsigned int server; unsigned int server;
irq = virt_irq_to_real(irq_offset_down(virq));
if (irq == XICS_IPI)
return;
#ifdef CONFIG_IRQ_ALL_CPUS #ifdef CONFIG_IRQ_ALL_CPUS
if (smp_threads_ready) /* For the moment only implement delivery to all cpus or one cpu */
if (smp_threads_ready) {
if (cpus_equal(cpumask, allcpus)) {
server = default_distrib_server;
} else {
cpus_and(tmp, cpu_online_map, cpumask);
if (cpus_empty(tmp))
server = default_distrib_server; server = default_distrib_server;
else else
server = get_hard_smp_processor_id(first_cpu(tmp));
}
} else {
server = default_server; server = default_server;
}
#else #else
server = default_server; server = default_server;
#endif #endif
return server;
}
static void xics_enable_irq(unsigned int virq)
{
unsigned int irq;
long call_status;
unsigned int server;
irq = virt_irq_to_real(irq_offset_down(virq));
if (irq == XICS_IPI)
return;
server = get_irq_server(virq);
call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server, call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server,
DEFAULT_PRIORITY); DEFAULT_PRIORITY);
if (call_status != 0) { if (call_status != 0) {
...@@ -274,6 +296,7 @@ static void xics_enable_irq(unsigned int virq) ...@@ -274,6 +296,7 @@ static void xics_enable_irq(unsigned int virq)
static void xics_disable_real_irq(unsigned int irq) static void xics_disable_real_irq(unsigned int irq)
{ {
long call_status; long call_status;
unsigned int server;
if (irq == XICS_IPI) if (irq == XICS_IPI)
return; return;
...@@ -285,9 +308,9 @@ static void xics_disable_real_irq(unsigned int irq) ...@@ -285,9 +308,9 @@ static void xics_disable_real_irq(unsigned int irq)
return; return;
} }
server = get_irq_server(irq);
/* Have to set XIVE to 0xff to be able to remove a slot */ /* Have to set XIVE to 0xff to be able to remove a slot */
call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, default_server, call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server, 0xff);
0xff);
if (call_status != 0) { if (call_status != 0) {
printk(KERN_ERR "xics_disable_irq: irq=%x: ibm_set_xive(0xff)" printk(KERN_ERR "xics_disable_irq: irq=%x: ibm_set_xive(0xff)"
" returned %lx\n", irq, call_status); " returned %lx\n", irq, call_status);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment