korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-16 15:34:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/xics: Use hwirq for xics domain irq number

Browse Source 
To try to avoid future confusion, rename irq to hwirq when it refers
to a xics domain number instead of a linux irq number.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Milton Miller 2011-03-21 08:12:13 +00:00 committed by Benjamin Herrenschmidt
parent 4f1fc48a73
commit 943739fd59
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
arch/powerpc/platforms/pseries/xics.c
View File

@ -204,33 +204,33 @@ static int get_irq_server(unsigned int virq, const struct cpumask *cpumask,
static void xics_unmask_irq(struct irq_data *d) static void xics_unmask_irq(struct irq_data *d)
{ {
unsigned int irq; unsigned int hwirq;
int call_status; int call_status;
int server; int server;
pr_devel("xics: unmask virq %d\n", d->irq); pr_devel("xics: unmask virq %d\n", d->irq);
irq = (unsigned int)irq_map[d->irq].hwirq; hwirq = (unsigned int)irq_map[d->irq].hwirq;
pr_devel(" -> map to hwirq 0x%x\n", irq); pr_devel(" -> map to hwirq 0x%x\n", hwirq);
if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS) if (hwirq == XICS_IPI || hwirq == XICS_IRQ_SPURIOUS)
return; return;
server = get_irq_server(d->irq, d->affinity, 0); server = get_irq_server(d->irq, d->affinity, 0);
call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server, call_status = rtas_call(ibm_set_xive, 3, 1, NULL, hwirq, server,
DEFAULT_PRIORITY); DEFAULT_PRIORITY);
if (call_status != 0) { if (call_status != 0) {
printk(KERN_ERR printk(KERN_ERR
"%s: ibm_set_xive irq %u server %x returned %d\n", "%s: ibm_set_xive irq %u server %x returned %d\n",
__func__, irq, server, call_status); __func__, hwirq, server, call_status);
return; return;
} }
/* Now unmask the interrupt (often a no-op) */ /* Now unmask the interrupt (often a no-op) */
call_status = rtas_call(ibm_int_on, 1, 1, NULL, irq); call_status = rtas_call(ibm_int_on, 1, 1, NULL, hwirq);
if (call_status != 0) { if (call_status != 0) {
printk(KERN_ERR "%s: ibm_int_on irq=%u returned %d\n", printk(KERN_ERR "%s: ibm_int_on irq=%u returned %d\n",
__func__, irq, call_status); __func__, hwirq, call_status);
return; return;
} }
} }
@ -276,14 +276,14 @@ static void xics_mask_real_irq(unsigned int hwirq)
static void xics_mask_irq(struct irq_data *d) static void xics_mask_irq(struct irq_data *d)
{ {
unsigned int irq; unsigned int hwirq;
pr_devel("xics: mask virq %d\n", d->irq); pr_devel("xics: mask virq %d\n", d->irq);
irq = (unsigned int)irq_map[d->irq].hwirq; hwirq = (unsigned int)irq_map[d->irq].hwirq;
if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS) if (hwirq == XICS_IPI || hwirq == XICS_IRQ_SPURIOUS)
return; return;
xics_mask_real_irq(irq); xics_mask_real_irq(hwirq);
} }
static void xics_mask_unknown_vec(unsigned int vec) static void xics_mask_unknown_vec(unsigned int vec)
@ -373,37 +373,37 @@ static unsigned char pop_cppr(void)
static void xics_eoi_direct(struct irq_data *d) static void xics_eoi_direct(struct irq_data *d)
{ {
unsigned int irq = (unsigned int)irq_map[d->irq].hwirq; unsigned int hwirq = (unsigned int)irq_map[d->irq].hwirq;
iosync(); iosync();
direct_xirr_info_set((pop_cppr() << 24) | irq); direct_xirr_info_set((pop_cppr() << 24) | hwirq);
} }
static void xics_eoi_lpar(struct irq_data *d) static void xics_eoi_lpar(struct irq_data *d)
{ {
unsigned int irq = (unsigned int)irq_map[d->irq].hwirq; unsigned int hwirq = (unsigned int)irq_map[d->irq].hwirq;
iosync(); iosync();
lpar_xirr_info_set((pop_cppr() << 24) | irq); lpar_xirr_info_set((pop_cppr() << 24) | hwirq);
} }
static int static int
xics_set_affinity(struct irq_data *d, const struct cpumask *cpumask, bool force) xics_set_affinity(struct irq_data *d, const struct cpumask *cpumask, bool force)
{ {
unsigned int irq; unsigned int hwirq;
int status; int status;
int xics_status[2]; int xics_status[2];
int irq_server; int irq_server;
irq = (unsigned int)irq_map[d->irq].hwirq; hwirq = (unsigned int)irq_map[d->irq].hwirq;
if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS) if (hwirq == XICS_IPI || hwirq == XICS_IRQ_SPURIOUS)
return -1; return -1;
status = rtas_call(ibm_get_xive, 1, 3, xics_status, irq); status = rtas_call(ibm_get_xive, 1, 3, xics_status, hwirq);
if (status) { if (status) {
printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n", printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n",
__func__, irq, status); __func__, hwirq, status);
return -1; return -1;
} }
@ -418,11 +418,11 @@ xics_set_affinity(struct irq_data *d, const struct cpumask *cpumask, bool force)
} }
status = rtas_call(ibm_set_xive, 3, 1, NULL, status = rtas_call(ibm_set_xive, 3, 1, NULL,
irq, irq_server, xics_status[1]); hwirq, irq_server, xics_status[1]);
if (status) { if (status) {
printk(KERN_ERR "%s: ibm,set-xive irq=%u returns %d\n", printk(KERN_ERR "%s: ibm,set-xive irq=%u returns %d\n",
__func__, irq, status); __func__, hwirq, status);
return -1; return -1;
} }
@ -874,7 +874,7 @@ void xics_kexec_teardown_cpu(int secondary)
void xics_migrate_irqs_away(void) void xics_migrate_irqs_away(void)
{ {
int cpu = smp_processor_id(), hw_cpu = hard_smp_processor_id(); int cpu = smp_processor_id(), hw_cpu = hard_smp_processor_id();
unsigned int irq, virq; int virq;
/* If we used to be the default server, move to the new "boot_cpuid" */ /* If we used to be the default server, move to the new "boot_cpuid" */
if (hw_cpu == default_server) if (hw_cpu == default_server)
@ -892,6 +892,7 @@ void xics_migrate_irqs_away(void)
for_each_irq(virq) { for_each_irq(virq) {
struct irq_desc *desc; struct irq_desc *desc;
struct irq_chip *chip; struct irq_chip *chip;
unsigned int hwirq;
int xics_status[2]; int xics_status[2];
int status; int status;
unsigned long flags; unsigned long flags;
@ -901,9 +902,9 @@ void xics_migrate_irqs_away(void)
continue; continue;
if (irq_map[virq].host != xics_host) if (irq_map[virq].host != xics_host)
continue; continue;
irq = (unsigned int)irq_map[virq].hwirq; hwirq = (unsigned int)irq_map[virq].hwirq;
/* We need to get IPIs still. */ /* We need to get IPIs still. */
if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS) if (hwirq == XICS_IPI || hwirq == XICS_IRQ_SPURIOUS)
continue; continue;
desc = irq_to_desc(virq); desc = irq_to_desc(virq);
@ -918,10 +919,10 @@ void xics_migrate_irqs_away(void)
raw_spin_lock_irqsave(&desc->lock, flags); raw_spin_lock_irqsave(&desc->lock, flags);
status = rtas_call(ibm_get_xive, 1, 3, xics_status, irq); status = rtas_call(ibm_get_xive, 1, 3, xics_status, hwirq);
if (status) { if (status) {
printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n", printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n",
__func__, irq, status); __func__, hwirq, status);
goto unlock; goto unlock;
} }