diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2012-08-07 16:10:32 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-08-15 19:43:16 +0200 |
| commit | a307d59434ba78b97544b42b8cfd24a1b62e39a6 (patch) | |
| tree | 39e626860eed6c311b34770f9fadd9d4e6b5832e /hw/spapr_vio.h | |
| parent | c9f709d2e7d9dcc6e6ecbee8d499b4b14b11320b (diff) | |
| download | qemu-a307d59434ba78b97544b42b8cfd24a1b62e39a6.tar.gz qemu-a307d59434ba78b97544b42b8cfd24a1b62e39a6.tar.bz2 qemu-a307d59434ba78b97544b42b8cfd24a1b62e39a6.zip | |
pseries: Rework irq assignment to avoid carrying qemu_irqs around
Currently, the interfaces in the pseries machine code for assignment
and setup of interrupts pass around qemu_irq objects. That was done
in an attempt not to be too closely linked to the specific XICS
interrupt controller. However interactions with the device tree setup
made that attempt rather futile, and XICS is part of the PAPR spec
anyway, so this really just meant we had to carry both the qemu_irq
pointers and the XICS irq numbers around.
This mess will just get worse when we add upcoming PCI MSI support,
since that will require tracking a bunch more interrupt. Therefore,
this patch reworks the spapr code to just use XICS irq numbers
(roughly equivalent to GSIs on x86) and only retrieve the qemu_irq
pointers from the XICS code when we need them (a trivial lookup).
This is a reworked and generalized version of an earlier spapr_pci
specific patch from Alexey Kardashevskiy.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
[agraf: fix checkpath warning]
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/spapr_vio.h')
| -rw-r--r-- | hw/spapr_vio.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/hw/spapr_vio.h b/hw/spapr_vio.h index 6f9a498ccd..ea6aa43e26 100644 --- a/hw/spapr_vio.h +++ b/hw/spapr_vio.h @@ -61,8 +61,7 @@ struct VIOsPAPRDevice { DeviceState qdev; uint32_t reg; uint32_t flags; - qemu_irq qirq; - uint32_t vio_irq_num; + uint32_t irq; target_ulong signal_state; VIOsPAPR_CRQ crq; DMAContext *dma; @@ -85,6 +84,11 @@ extern int spapr_populate_chosen_stdout(void *fdt, VIOsPAPRBus *bus); extern int spapr_vio_signal(VIOsPAPRDevice *dev, target_ulong mode); +static inline qemu_irq spapr_vio_qirq(VIOsPAPRDevice *dev) +{ + return xics_get_qirq(spapr->icp, dev->irq); +} + static inline bool spapr_vio_dma_valid(VIOsPAPRDevice *dev, uint64_t taddr, uint32_t size, DMADirection dir) { |