summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-10-13 23:50:38 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-13 23:50:38 -0700
commit256c1df36bbec6530c6f9b5a840cc5e87315c19e (patch)
treea5ee78dc315414ce42e9765f44fdc87e3033fe83 /arch
parent771823007fa2acb15a726e7e1f8502d4f350b1fa (diff)
downloadop-kernel-dev-256c1df36bbec6530c6f9b5a840cc5e87315c19e.zip
op-kernel-dev-256c1df36bbec6530c6f9b5a840cc5e87315c19e.tar.gz
[SPARC64]: virt_irq --> bucket mapping no longer necessary
We used to need this to compute virt_irq --> ino, but that is no longer necessary. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc64/kernel/irq.c19
-rw-r--r--arch/sparc64/kernel/pci_msi.c2
2 files changed, 9 insertions, 12 deletions
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 2be6bcb..695b9e4 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -122,19 +122,16 @@ static void bucket_set_virt_irq(unsigned long bucket_pa,
"i" (ASI_PHYS_USE_EC));
}
-#define __irq(bucket) ((unsigned long)(bucket))
-
#define irq_work_pa(__cpu) &(trap_block[(__cpu)].irq_worklist_pa)
static struct {
- unsigned long irq;
unsigned int dev_handle;
unsigned int dev_ino;
+ unsigned int in_use;
} virt_to_real_irq_table[NR_IRQS];
static DEFINE_SPINLOCK(virt_irq_alloc_lock);
-unsigned char virt_irq_alloc(unsigned long real_irq,
- unsigned int dev_handle,
+unsigned char virt_irq_alloc(unsigned int dev_handle,
unsigned int dev_ino)
{
unsigned long flags;
@@ -145,16 +142,16 @@ unsigned char virt_irq_alloc(unsigned long real_irq,
spin_lock_irqsave(&virt_irq_alloc_lock, flags);
for (ent = 1; ent < NR_IRQS; ent++) {
- if (!virt_to_real_irq_table[ent].irq)
+ if (!virt_to_real_irq_table[ent].in_use)
break;
}
if (ent >= NR_IRQS) {
printk(KERN_ERR "IRQ: Out of virtual IRQs.\n");
ent = 0;
} else {
- virt_to_real_irq_table[ent].irq = real_irq;
virt_to_real_irq_table[ent].dev_handle = dev_handle;
virt_to_real_irq_table[ent].dev_ino = dev_ino;
+ virt_to_real_irq_table[ent].in_use = 1;
}
spin_unlock_irqrestore(&virt_irq_alloc_lock, flags);
@@ -172,7 +169,7 @@ void virt_irq_free(unsigned int virt_irq)
spin_lock_irqsave(&virt_irq_alloc_lock, flags);
- virt_to_real_irq_table[virt_irq].irq = 0;
+ virt_to_real_irq_table[virt_irq].in_use = 0;
spin_unlock_irqrestore(&virt_irq_alloc_lock, flags);
}
@@ -583,7 +580,7 @@ unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap)
bucket = &ivector_table[ino];
virt_irq = bucket_get_virt_irq(__pa(bucket));
if (!virt_irq) {
- virt_irq = virt_irq_alloc(__irq(bucket), 0, ino);
+ virt_irq = virt_irq_alloc(0, ino);
bucket_set_virt_irq(__pa(bucket), virt_irq);
set_irq_chip(virt_irq, &sun4u_irq);
}
@@ -618,7 +615,7 @@ static unsigned int sun4v_build_common(unsigned long sysino,
bucket = &ivector_table[sysino];
virt_irq = bucket_get_virt_irq(__pa(bucket));
if (!virt_irq) {
- virt_irq = virt_irq_alloc(__irq(bucket), 0, sysino);
+ virt_irq = virt_irq_alloc(0, sysino);
bucket_set_virt_irq(__pa(bucket), virt_irq);
set_irq_chip(virt_irq, chip);
}
@@ -666,7 +663,7 @@ unsigned int sun4v_build_virq(u32 devhandle, unsigned int devino)
((unsigned long) bucket +
sizeof(struct ino_bucket)));
- virt_irq = virt_irq_alloc(__irq(bucket), devhandle, devino);
+ virt_irq = virt_irq_alloc(devhandle, devino);
bucket_set_virt_irq(__pa(bucket), virt_irq);
set_irq_chip(virt_irq, &sun4v_virq);
diff --git a/arch/sparc64/kernel/pci_msi.c b/arch/sparc64/kernel/pci_msi.c
index e4920cf..31a165f 100644
--- a/arch/sparc64/kernel/pci_msi.c
+++ b/arch/sparc64/kernel/pci_msi.c
@@ -123,7 +123,7 @@ int sparc64_setup_msi_irq(unsigned int *virt_irq_p,
int msi, err;
u32 msiqid;
- *virt_irq_p = virt_irq_alloc(~0, 0, 0);
+ *virt_irq_p = virt_irq_alloc(0, 0);
err = -ENOMEM;
if (!*virt_irq_p)
goto out_err;
OpenPOWER on IntegriCloud