ppc/xive: Make XIVE generate the proper interrupt types
PATCH 1/1 ppc/xive: Make XIVE generate the proper interrupt types
From: Benjamin Herrenschmidt <[email protected]>
It should be generic Hypervisor Virtualization interrupts for HV directed rings and traditional External Interrupts for the OS directed ring.
Don't generate anything for the user ring as it isn't actually supported.
Signed-off-by Benjamin Herrenschmidt <[email protected]>
Signed-off-by Cédric Le Goater <[email protected]>
Reviewed-by David Gibson <[email protected]>
---
I forgot to resend this patch, an important one for HV machines !
include/hw/ppc/xive.h | 3 ++- hw/intc/xive.c | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-)
include/hw/ppc/xive.h +2 -1
@@ -317,7 +317,8 @@ typedef struct XiveTCTX {DeviceState parent_obj;CPUState *cs; -qemu_irq output; +qemu_irq hv_output; +qemu_irq os_output;uint8_t regs[XIVE_TM_RING_COUNT *XIVE_TM_RING_SIZE ]; } XiveTCTX;
hw/intc/xive.c +19 -3
@@ -61,13 +61,28 @@ static uint8_t exception_mask(uint8_t ring) } } +static qemu_irq xive_tctx_output (XiveTCTX *tctx,uint8_t ring) +{ +switch (ring) { +case TM_QW0_USER : +return 0 ;/* Not supported */ +case TM_QW1_OS : +return tctx->os_output; +case TM_QW2_HV_POOL : +case TM_QW3_HV_PHYS : +return tctx->hv_output; +default : +return 0 ; + } +} +static uint64_t xive_tctx_accept (XiveTCTX *tctx,uint8_t ring) {uint8_t *regs = &tctx->regs[ring];uint8_t nsr = regs[TM_NSR ];uint8_t mask =exception_mask (ring); -qemu_irq_lower (tctx->output); +qemu_irq_lower (xive_tctx_output (tctx, ring));if (regs[TM_NSR ] & mask) {uint8_t cppr = regs[TM_PIPR ];
@@ -100,7 +115,7 @@ static void xive_tctx_notify(XiveTCTX *tctx, uint8_t ring)default :g_assert_not_reached (); } -qemu_irq_raise (tctx->output); +qemu_irq_raise (xive_tctx_output (tctx, ring)); } }
@@ -556,7 +571,8 @@ static void xive_tctx_realize(DeviceState *dev, Error **errp) env = &cpu->env;switch (PPC_INPUT (env)) {case PPC_FLAGS_INPUT_POWER9 : - tctx->output = env->irq_inputs[POWER9_INPUT_INT ]; + tctx->hv_output = env->irq_inputs[POWER9_INPUT_HINT ]; + tctx->os_output = env->irq_inputs[POWER9_INPUT_INT ];break ;default :
Signature · 1 line
2.21.0
David Gibson
AppliedQuoted 6 lines · Cédric Le Goater
From: Benjamin Herrenschmidt <[email protected]>
It should be generic Hypervisor Virtualization interrupts for HV directed rings and traditional External Interrupts for the OS directed ring.
Quoted 6 lines
Don't generate anything for the user ring as it isn't actually supported.
Signed-off-by Benjamin Herrenschmidt <[email protected]>Signed-off-by Cédric Le Goater <[email protected]>Reviewed-by David Gibson <[email protected]>
Applied, thanks.
Quoted 75 lines
---
I forgot to resend this patch, an important one for HV machines !
include/hw/ppc/xive.h | 3 ++- hw/intc/xive.c | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-)include/hw/ppc/xive.h +2
-1@@ -317,7 +317,8 @@ typedef struct XiveTCTX {DeviceState parent_obj;CPUState *cs; -qemu_irq output; +qemu_irq hv_output; +qemu_irq os_output;uint8_t regs[XIVE_TM_RING_COUNT *XIVE_TM_RING_SIZE ]; } XiveTCTX;hw/intc/xive.c +19
-3@@ -61,13 +61,28 @@ static uint8_t exception_mask(uint8_t ring) } } +static qemu_irq xive_tctx_output (XiveTCTX *tctx,uint8_t ring) +{ +switch (ring) { +case TM_QW0_USER : +return 0 ;/* Not supported */ +case TM_QW1_OS : +return tctx->os_output; +case TM_QW2_HV_POOL : +case TM_QW3_HV_PHYS : +return tctx->hv_output; +default : +return 0 ; + } +} +static uint64_t xive_tctx_accept (XiveTCTX *tctx,uint8_t ring) {uint8_t *regs = &tctx->regs[ring];uint8_t nsr = regs[TM_NSR ];uint8_t mask =exception_mask (ring); -qemu_irq_lower (tctx->output); +qemu_irq_lower (xive_tctx_output (tctx, ring));if (regs[TM_NSR ] & mask) {uint8_t cppr = regs[TM_PIPR ];@@ -100,7 +115,7 @@ static void xive_tctx_notify(XiveTCTX *tctx, uint8_t ring)default :g_assert_not_reached (); } -qemu_irq_raise (tctx->output); +qemu_irq_raise (xive_tctx_output (tctx, ring)); } }@@ -556,7 +571,8 @@ static void xive_tctx_realize(DeviceState *dev, Error **errp) env = &cpu->env;switch (PPC_INPUT (env)) {case PPC_FLAGS_INPUT_POWER9 : - tctx->output = env->irq_inputs[POWER9_INPUT_INT ]; + tctx->hv_output = env->irq_inputs[POWER9_INPUT_HINT ]; + tctx->os_output = env->irq_inputs[POWER9_INPUT_INT ];break ;default :
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson