diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-08-30 22:27:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-08-30 23:06:51 -0700 |
| commit | 5f92c329364c0bf2d3a356da5e8759fbe349f9d1 (patch) | |
| tree | 2bf27d77009229a26c371102655c5f81c7e68d1e /include | |
| parent | 6e69d6068cc2aa545544189a1ee4d2e1a32ad591 (diff) | |
| download | linux-5f92c329364c0bf2d3a356da5e8759fbe349f9d1.tar.gz linux-5f92c329364c0bf2d3a356da5e8759fbe349f9d1.tar.bz2 linux-5f92c329364c0bf2d3a356da5e8759fbe349f9d1.zip | |
[SPARC64]: Fix several bugs in MSI handling.
1) sun4{u,v}_build_msi() have improper return value handling.
We should always return negative error codes, instead of
using the magic value "0" which could in fact be a valid
MSI number.
2) sun4{u,v}_build_msi() should return -ENOMEM instead of
calling prom_prom() halt with kzalloc() of the interrupt
data fails.
3) We 'remembered' the MSI number using a singleton in the
struct device archdata area, this doesn't work for MSI-X
which can cause multiple MSIs assosciated with one device.
Delete that archdata member, and instead store the MSI
number in the IRQ chip data area.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/device.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/irq.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-sparc64/device.h b/include/asm-sparc64/device.h index d5a4559b9555..5111e8717be3 100644 --- a/include/asm-sparc64/device.h +++ b/include/asm-sparc64/device.h @@ -16,8 +16,6 @@ struct dev_archdata { struct device_node *prom_node; struct of_device *op; - - unsigned int msi_num; }; #endif /* _ASM_SPARC64_DEVICE_H */ diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h index c041e10ae7df..c00ad152771b 100644 --- a/include/asm-sparc64/irq.h +++ b/include/asm-sparc64/irq.h @@ -53,6 +53,9 @@ extern unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p, extern void sun4v_destroy_msi(unsigned int virt_irq); extern unsigned int sbus_build_irq(void *sbus, unsigned int ino); +extern void sparc64_set_msi(unsigned int virt_irq, u32 msi); +extern u32 sparc64_get_msi(unsigned int virt_irq); + extern void fixup_irqs(void); static __inline__ void set_softint(unsigned long bits) |