* [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9)
@ 2019-01-28 9:46 Cédric Le Goater
2019-01-28 9:46 ` [Qemu-devel] [PATCH 01/19] ppc/xive: hardwire the Physical CAM line of the thread context Cédric Le Goater
` (18 more replies)
0 siblings, 19 replies; 50+ messages in thread
From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw)
To: David Gibson; +Cc: qemu-ppc, qemu-devel, Cédric Le Goater
Hello,
Here is a series adding support for the XIVE interrupt controller as
found on POWER9 PowerNV mchines. It includes models for the baremetal
IC itself and a set of fixes and extensions of the POWER9 core
provided by Ben.
Thanks,
C.
Changes in v1 (since PnvXive was last sent) :
- made more use of the register values instead of caching them under
PnvXive
- generalized the VST accessors.
- reworked indirect accesses to the TIMA with a custom get_tctx()
method
- fixed the translation table definitions
- XiveSource and XiveENDSource objects are now sized to the maximum
allowed by HW and the memory regions exposing the ESB pages are
resized at runtime when the firmware configures the controller.
- included changes from Ben on the POWER9 core model to fix power
management instructions, add support for sreset and the HV
interrupt line
Benjamin Herrenschmidt (14):
target/ppc: Remove some #if 0'ed code
target/ppc: Make special ORs match x86 pause and don't generate on
mttcg
target/ppc: Fix nip on power management instructions
target/ppc: Don't clobber MSR:EE on PM instructions
target/ppc: Fix support for "STOP light" states on POWER9
target/ppc: Move "wakeup reset" code to a separate function
target/ppc: Disable ISA 2.06 PM instructions on POWER9
target/ppc: Rename "in_pm_state" to "resume_as_sreset"
target/ppc: Add POWER9 exception model
target/ppc: Detect erroneous condition in interrupt delivery
target/ppc: Add Hypervisor Virtualization Interrupt on POWER9
target/ppc: Add POWER9 external interrupt model
ppc/xive: Make XIVE generate the proper interrupt types
target/ppc: Add support for LPCR:HEIC on POWER9
Cédric Le Goater (5):
ppc/xive: hardwire the Physical CAM line of the thread context
ppc: externalize ppc_get_vcpu_by_pir()
xive: extend the XiveRouter get_tctx() method with the page offset
ppc/pnv: xive: export the TIMA memory accessors
ppc/pnv: add XIVE support
hw/intc/pnv_xive_regs.h | 315 ++++++
include/hw/ppc/pnv.h | 21 +
include/hw/ppc/pnv_core.h | 1 +
include/hw/ppc/pnv_xive.h | 95 ++
include/hw/ppc/pnv_xscom.h | 3 +
include/hw/ppc/ppc.h | 3 +
include/hw/ppc/xive.h | 12 +-
target/ppc/cpu-qom.h | 5 +
target/ppc/cpu.h | 26 +-
hw/intc/pnv_xive.c | 1698 +++++++++++++++++++++++++++++++
hw/intc/spapr_xive.c | 3 +-
hw/intc/xics.c | 1 +
hw/intc/xive.c | 167 ++-
hw/ppc/pnv.c | 84 +-
hw/ppc/pnv_core.c | 16 +-
hw/ppc/ppc.c | 32 +-
target/ppc/excp_helper.c | 176 ++--
target/ppc/mmu_helper.c | 12 -
target/ppc/translate.c | 34 +-
target/ppc/translate_init.inc.c | 36 +-
hw/intc/Makefile.objs | 2 +-
21 files changed, 2593 insertions(+), 149 deletions(-)
create mode 100644 hw/intc/pnv_xive_regs.h
create mode 100644 include/hw/ppc/pnv_xive.h
create mode 100644 hw/intc/pnv_xive.c
--
2.20.1
^ permalink raw reply [flat|nested] 50+ messages in thread* [Qemu-devel] [PATCH 01/19] ppc/xive: hardwire the Physical CAM line of the thread context 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-08 5:44 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 02/19] ppc: externalize ppc_get_vcpu_by_pir() Cédric Le Goater ` (17 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson; +Cc: qemu-ppc, qemu-devel, Cédric Le Goater By default on P9, the HW CAM line (23bits) is hardwired to : 0x000||0b1||4Bit chip number||7Bit Thread number. When the block group mode is enabled at the controller level (PowerNV), the CAM line is changed for CAM compares to : 4Bit chip number||0x001||7Bit Thread number This will require changes in xive_presenter_tctx_match() possibly. This is a lowlevel functionality of the HW controller and it is not strictly needed. Leave it for later. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- include/hw/ppc/xive.h | 1 + hw/intc/xive.c | 53 ++++++++++++++++++++++++++++++++++++++++--- hw/ppc/pnv_core.c | 16 ++++++++----- 3 files changed, 61 insertions(+), 9 deletions(-) diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index ec3bb2aae45a..04d54e8315f7 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -319,6 +319,7 @@ typedef struct XiveTCTX { qemu_irq output; uint8_t regs[XIVE_TM_RING_COUNT * XIVE_TM_RING_SIZE]; + uint32_t hw_cam; } XiveTCTX; /* diff --git a/hw/intc/xive.c b/hw/intc/xive.c index 2e9b8efd4342..f5642f2338de 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -469,6 +469,12 @@ static void xive_tctx_realize(DeviceState *dev, Error **errp) Object *obj; Error *local_err = NULL; + if (!tctx->hw_cam) { + error_setg(errp, "XIVE: HW CAM is not set for CPU %d", + tctx->cs->cpu_index); + return; + } + obj = object_property_get_link(OBJECT(dev), "cpu", &local_err); if (!obj) { error_propagate(errp, local_err); @@ -509,11 +515,17 @@ static const VMStateDescription vmstate_xive_tctx = { }, }; +static Property xive_tctx_properties[] = { + DEFINE_PROP_UINT32("hw-cam", XiveTCTX, hw_cam, 0), + DEFINE_PROP_END_OF_LIST(), +}; + static void xive_tctx_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); dc->desc = "XIVE Interrupt Thread Context"; + dc->props = xive_tctx_properties; dc->realize = xive_tctx_realize; dc->unrealize = xive_tctx_unrealize; dc->vmsd = &vmstate_xive_tctx; @@ -526,8 +538,21 @@ static const TypeInfo xive_tctx_info = { .class_init = xive_tctx_class_init, }; +/* + * The HW CAM line (23bits) is hardwired to : + * + * 0x000||0b1||4Bit chip number||7Bit Thread number. + */ +static uint32_t hw_cam_line(uint8_t chip_id, uint8_t tid) +{ + return 1 << 11 | (chip_id & 0xf) << 7 | (tid & 0x7f); +} + Object *xive_tctx_create(Object *cpu, XiveRouter *xrtr, Error **errp) { + CPUPPCState *env = &POWERPC_CPU(cpu)->env; + uint32_t pir = env->spr_cb[SPR_PIR].default_value; + uint32_t hw_cam = hw_cam_line((pir >> 8) & 0xf, pir & 0x7f); Error *local_err = NULL; Object *obj; @@ -535,6 +560,10 @@ Object *xive_tctx_create(Object *cpu, XiveRouter *xrtr, Error **errp) object_property_add_child(cpu, TYPE_XIVE_TCTX, obj, &error_abort); object_unref(obj); object_property_add_const_link(obj, "cpu", cpu, &error_abort); + object_property_set_int(obj, hw_cam, "hw-cam", &local_err); + if (local_err) { + goto error; + } object_property_set_bool(obj, true, "realized", &local_err); if (local_err) { goto error; @@ -1112,14 +1141,28 @@ XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs) return xrc->get_tctx(xrtr, cs); } +/* + * When the block grouping is enabled, the CAM line is changed to : + * + * 4Bit chip number||0x001||7Bit Thread number. + */ +static bool xive_presenter_tctx_match_hw(XiveRouter *xrtr, XiveTCTX *tctx, + uint8_t nvt_blk, uint32_t nvt_idx) +{ + /* TODO: block group support */ + return tctx->hw_cam == hw_cam_line(nvt_blk, nvt_idx); +} + /* * The thread context register words are in big-endian format. */ -static int xive_presenter_tctx_match(XiveTCTX *tctx, uint8_t format, +static int xive_presenter_tctx_match(XiveRouter *xrtr, + XiveTCTX *tctx, uint8_t format, uint8_t nvt_blk, uint32_t nvt_idx, bool cam_ignore, uint32_t logic_serv) { uint32_t cam = xive_nvt_cam_line(nvt_blk, nvt_idx); + uint32_t qw3w2 = xive_tctx_word2(&tctx->regs[TM_QW3_HV_PHYS]); uint32_t qw2w2 = xive_tctx_word2(&tctx->regs[TM_QW2_HV_POOL]); uint32_t qw1w2 = xive_tctx_word2(&tctx->regs[TM_QW1_OS]); uint32_t qw0w2 = xive_tctx_word2(&tctx->regs[TM_QW0_USER]); @@ -1142,7 +1185,11 @@ static int xive_presenter_tctx_match(XiveTCTX *tctx, uint8_t format, /* F=0 & i=0: Specific NVT notification */ - /* TODO (PowerNV) : PHYS ring */ + /* PHYS ring */ + if ((be32_to_cpu(qw3w2) & TM_QW3W2_VT) && + xive_presenter_tctx_match_hw(xrtr, tctx, nvt_blk, nvt_idx)) { + return TM_QW3_HV_PHYS; + } /* HV POOL ring */ if ((be32_to_cpu(qw2w2) & TM_QW2W2_VP) && @@ -1199,7 +1246,7 @@ static bool xive_presenter_match(XiveRouter *xrtr, uint8_t format, * Check the thread context CAM lines and record matches. We * will handle CPU exception delivery later */ - ring = xive_presenter_tctx_match(tctx, format, nvt_blk, nvt_idx, + ring = xive_presenter_tctx_match(xrtr, tctx, format, nvt_blk, nvt_idx, cam_ignore, logic_serv); /* * Save the context and follow on to catch duplicates, that we diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index 7c806da720c6..f035522b4ec9 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -114,12 +114,6 @@ static void pnv_realize_vcpu(PowerPCCPU *cpu, PnvChip *chip, Error **errp) return; } - pcc->intc_create(chip, cpu, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - core_pir = object_property_get_uint(OBJECT(cpu), "core-pir", &error_abort); /* @@ -129,6 +123,16 @@ static void pnv_realize_vcpu(PowerPCCPU *cpu, PnvChip *chip, Error **errp) */ pir->default_value = core_pir + thread_index; + /* + * On P9, the interrupt presenter needs to hardwire the PIR value + * in the thread interrupt context of the CPU. + */ + pcc->intc_create(chip, cpu, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + /* Set time-base frequency to 512 MHz */ cpu_ppc_tb_init(env, PNV_TIMEBASE_FREQ); -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 01/19] ppc/xive: hardwire the Physical CAM line of the thread context 2019-01-28 9:46 ` [Qemu-devel] [PATCH 01/19] ppc/xive: hardwire the Physical CAM line of the thread context Cédric Le Goater @ 2019-02-08 5:44 ` David Gibson 2019-02-08 7:28 ` Cédric Le Goater 0 siblings, 1 reply; 50+ messages in thread From: David Gibson @ 2019-02-08 5:44 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel [-- Attachment #1: Type: text/plain, Size: 7609 bytes --] On Mon, Jan 28, 2019 at 10:46:07AM +0100, Cédric Le Goater wrote: > By default on P9, the HW CAM line (23bits) is hardwired to : > > 0x000||0b1||4Bit chip number||7Bit Thread number. > > When the block group mode is enabled at the controller level (PowerNV), > the CAM line is changed for CAM compares to : > > 4Bit chip number||0x001||7Bit Thread number > > This will require changes in xive_presenter_tctx_match() possibly. > This is a lowlevel functionality of the HW controller and it is not > strictly needed. Leave it for later. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > include/hw/ppc/xive.h | 1 + > hw/intc/xive.c | 53 ++++++++++++++++++++++++++++++++++++++++--- > hw/ppc/pnv_core.c | 16 ++++++++----- > 3 files changed, 61 insertions(+), 9 deletions(-) > > diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h > index ec3bb2aae45a..04d54e8315f7 100644 > --- a/include/hw/ppc/xive.h > +++ b/include/hw/ppc/xive.h > @@ -319,6 +319,7 @@ typedef struct XiveTCTX { > qemu_irq output; > > uint8_t regs[XIVE_TM_RING_COUNT * XIVE_TM_RING_SIZE]; > + uint32_t hw_cam; I don't love the fact that the hw_cam field is mirroring something that's in the regs structure. Any way you can have the property poke the right value directly into regs? Or else split up regs so you can set the pieces individually. > } XiveTCTX; > > /* > diff --git a/hw/intc/xive.c b/hw/intc/xive.c > index 2e9b8efd4342..f5642f2338de 100644 > --- a/hw/intc/xive.c > +++ b/hw/intc/xive.c > @@ -469,6 +469,12 @@ static void xive_tctx_realize(DeviceState *dev, Error **errp) > Object *obj; > Error *local_err = NULL; > > + if (!tctx->hw_cam) { > + error_setg(errp, "XIVE: HW CAM is not set for CPU %d", > + tctx->cs->cpu_index); > + return; > + } > + > obj = object_property_get_link(OBJECT(dev), "cpu", &local_err); > if (!obj) { > error_propagate(errp, local_err); > @@ -509,11 +515,17 @@ static const VMStateDescription vmstate_xive_tctx = { > }, > }; > > +static Property xive_tctx_properties[] = { > + DEFINE_PROP_UINT32("hw-cam", XiveTCTX, hw_cam, 0), > + DEFINE_PROP_END_OF_LIST(), > +}; > + > static void xive_tctx_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > > dc->desc = "XIVE Interrupt Thread Context"; > + dc->props = xive_tctx_properties; > dc->realize = xive_tctx_realize; > dc->unrealize = xive_tctx_unrealize; > dc->vmsd = &vmstate_xive_tctx; > @@ -526,8 +538,21 @@ static const TypeInfo xive_tctx_info = { > .class_init = xive_tctx_class_init, > }; > > +/* > + * The HW CAM line (23bits) is hardwired to : > + * > + * 0x000||0b1||4Bit chip number||7Bit Thread number. > + */ > +static uint32_t hw_cam_line(uint8_t chip_id, uint8_t tid) > +{ > + return 1 << 11 | (chip_id & 0xf) << 7 | (tid & 0x7f); > +} > + > Object *xive_tctx_create(Object *cpu, XiveRouter *xrtr, Error **errp) > { > + CPUPPCState *env = &POWERPC_CPU(cpu)->env; > + uint32_t pir = env->spr_cb[SPR_PIR].default_value; > + uint32_t hw_cam = hw_cam_line((pir >> 8) & 0xf, pir & 0x7f); > Error *local_err = NULL; > Object *obj; > > @@ -535,6 +560,10 @@ Object *xive_tctx_create(Object *cpu, XiveRouter *xrtr, Error **errp) > object_property_add_child(cpu, TYPE_XIVE_TCTX, obj, &error_abort); > object_unref(obj); > object_property_add_const_link(obj, "cpu", cpu, &error_abort); > + object_property_set_int(obj, hw_cam, "hw-cam", &local_err); > + if (local_err) { > + goto error; > + } > object_property_set_bool(obj, true, "realized", &local_err); > if (local_err) { > goto error; > @@ -1112,14 +1141,28 @@ XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs) > return xrc->get_tctx(xrtr, cs); > } > > +/* > + * When the block grouping is enabled, the CAM line is changed to : > + * > + * 4Bit chip number||0x001||7Bit Thread number. > + */ > +static bool xive_presenter_tctx_match_hw(XiveRouter *xrtr, XiveTCTX *tctx, > + uint8_t nvt_blk, uint32_t nvt_idx) > +{ > + /* TODO: block group support */ > + return tctx->hw_cam == hw_cam_line(nvt_blk, nvt_idx); > +} > + > /* > * The thread context register words are in big-endian format. > */ > -static int xive_presenter_tctx_match(XiveTCTX *tctx, uint8_t format, > +static int xive_presenter_tctx_match(XiveRouter *xrtr, > + XiveTCTX *tctx, uint8_t format, > uint8_t nvt_blk, uint32_t nvt_idx, > bool cam_ignore, uint32_t logic_serv) > { > uint32_t cam = xive_nvt_cam_line(nvt_blk, nvt_idx); > + uint32_t qw3w2 = xive_tctx_word2(&tctx->regs[TM_QW3_HV_PHYS]); > uint32_t qw2w2 = xive_tctx_word2(&tctx->regs[TM_QW2_HV_POOL]); > uint32_t qw1w2 = xive_tctx_word2(&tctx->regs[TM_QW1_OS]); > uint32_t qw0w2 = xive_tctx_word2(&tctx->regs[TM_QW0_USER]); > @@ -1142,7 +1185,11 @@ static int xive_presenter_tctx_match(XiveTCTX *tctx, uint8_t format, > > /* F=0 & i=0: Specific NVT notification */ > > - /* TODO (PowerNV) : PHYS ring */ > + /* PHYS ring */ > + if ((be32_to_cpu(qw3w2) & TM_QW3W2_VT) && > + xive_presenter_tctx_match_hw(xrtr, tctx, nvt_blk, nvt_idx)) { > + return TM_QW3_HV_PHYS; > + } > > /* HV POOL ring */ > if ((be32_to_cpu(qw2w2) & TM_QW2W2_VP) && > @@ -1199,7 +1246,7 @@ static bool xive_presenter_match(XiveRouter *xrtr, uint8_t format, > * Check the thread context CAM lines and record matches. We > * will handle CPU exception delivery later > */ > - ring = xive_presenter_tctx_match(tctx, format, nvt_blk, nvt_idx, > + ring = xive_presenter_tctx_match(xrtr, tctx, format, nvt_blk, nvt_idx, > cam_ignore, logic_serv); > /* > * Save the context and follow on to catch duplicates, that we > diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c > index 7c806da720c6..f035522b4ec9 100644 > --- a/hw/ppc/pnv_core.c > +++ b/hw/ppc/pnv_core.c > @@ -114,12 +114,6 @@ static void pnv_realize_vcpu(PowerPCCPU *cpu, PnvChip *chip, Error **errp) > return; > } > > - pcc->intc_create(chip, cpu, &local_err); > - if (local_err) { > - error_propagate(errp, local_err); > - return; > - } > - > core_pir = object_property_get_uint(OBJECT(cpu), "core-pir", &error_abort); > > /* > @@ -129,6 +123,16 @@ static void pnv_realize_vcpu(PowerPCCPU *cpu, PnvChip *chip, Error **errp) > */ > pir->default_value = core_pir + thread_index; > > + /* > + * On P9, the interrupt presenter needs to hardwire the PIR value > + * in the thread interrupt context of the CPU. > + */ > + pcc->intc_create(chip, cpu, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > + > /* Set time-base frequency to 512 MHz */ > cpu_ppc_tb_init(env, PNV_TIMEBASE_FREQ); > -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 01/19] ppc/xive: hardwire the Physical CAM line of the thread context 2019-02-08 5:44 ` David Gibson @ 2019-02-08 7:28 ` Cédric Le Goater 0 siblings, 0 replies; 50+ messages in thread From: Cédric Le Goater @ 2019-02-08 7:28 UTC (permalink / raw) To: David Gibson; +Cc: qemu-ppc, qemu-devel On 2/8/19 6:44 AM, David Gibson wrote: > On Mon, Jan 28, 2019 at 10:46:07AM +0100, Cédric Le Goater wrote: >> By default on P9, the HW CAM line (23bits) is hardwired to : >> >> 0x000||0b1||4Bit chip number||7Bit Thread number. >> >> When the block group mode is enabled at the controller level (PowerNV), >> the CAM line is changed for CAM compares to : >> >> 4Bit chip number||0x001||7Bit Thread number >> >> This will require changes in xive_presenter_tctx_match() possibly. >> This is a lowlevel functionality of the HW controller and it is not >> strictly needed. Leave it for later. >> >> Signed-off-by: Cédric Le Goater <clg@kaod.org> >> --- >> include/hw/ppc/xive.h | 1 + >> hw/intc/xive.c | 53 ++++++++++++++++++++++++++++++++++++++++--- >> hw/ppc/pnv_core.c | 16 ++++++++----- >> 3 files changed, 61 insertions(+), 9 deletions(-) >> >> diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h >> index ec3bb2aae45a..04d54e8315f7 100644 >> --- a/include/hw/ppc/xive.h >> +++ b/include/hw/ppc/xive.h >> @@ -319,6 +319,7 @@ typedef struct XiveTCTX { >> qemu_irq output; >> >> uint8_t regs[XIVE_TM_RING_COUNT * XIVE_TM_RING_SIZE]; >> + uint32_t hw_cam; > > I don't love the fact that the hw_cam field is mirroring something > that's in the regs structure. Any way you can have the property poke > the right value directly into regs? Or else split up regs so you can > set the pieces individually. We only need the PIR value to compute the HW CAM line. That's was the initial proposal : +static uint32_t xive_tctx_hw_cam_line(XiveTCTX *tctx, bool block_group) +{ + PowerPCCPU *cpu = POWERPC_CPU(tctx->cs); + CPUPPCState *env = &cpu->env; + uint32_t pir = env->spr_cb[SPR_PIR].default_value; + + return tctx_hw_cam_line(block_group, (pir >> 8) & 0xf, pir & 0x7f); +} but you didn't like either because it peeked into the CPUPPCState. But I prefer the initial method. Less fuss. C. > >> } XiveTCTX; >> >> /* >> diff --git a/hw/intc/xive.c b/hw/intc/xive.c >> index 2e9b8efd4342..f5642f2338de 100644 >> --- a/hw/intc/xive.c >> +++ b/hw/intc/xive.c >> @@ -469,6 +469,12 @@ static void xive_tctx_realize(DeviceState *dev, Error **errp) >> Object *obj; >> Error *local_err = NULL; >> >> + if (!tctx->hw_cam) { >> + error_setg(errp, "XIVE: HW CAM is not set for CPU %d", >> + tctx->cs->cpu_index); >> + return; >> + } >> + >> obj = object_property_get_link(OBJECT(dev), "cpu", &local_err); >> if (!obj) { >> error_propagate(errp, local_err); >> @@ -509,11 +515,17 @@ static const VMStateDescription vmstate_xive_tctx = { >> }, >> }; >> >> +static Property xive_tctx_properties[] = { >> + DEFINE_PROP_UINT32("hw-cam", XiveTCTX, hw_cam, 0), >> + DEFINE_PROP_END_OF_LIST(), >> +}; >> + >> static void xive_tctx_class_init(ObjectClass *klass, void *data) >> { >> DeviceClass *dc = DEVICE_CLASS(klass); >> >> dc->desc = "XIVE Interrupt Thread Context"; >> + dc->props = xive_tctx_properties; >> dc->realize = xive_tctx_realize; >> dc->unrealize = xive_tctx_unrealize; >> dc->vmsd = &vmstate_xive_tctx; >> @@ -526,8 +538,21 @@ static const TypeInfo xive_tctx_info = { >> .class_init = xive_tctx_class_init, >> }; >> >> +/* >> + * The HW CAM line (23bits) is hardwired to : >> + * >> + * 0x000||0b1||4Bit chip number||7Bit Thread number. >> + */ >> +static uint32_t hw_cam_line(uint8_t chip_id, uint8_t tid) >> +{ >> + return 1 << 11 | (chip_id & 0xf) << 7 | (tid & 0x7f); >> +} >> + >> Object *xive_tctx_create(Object *cpu, XiveRouter *xrtr, Error **errp) >> { >> + CPUPPCState *env = &POWERPC_CPU(cpu)->env; >> + uint32_t pir = env->spr_cb[SPR_PIR].default_value; >> + uint32_t hw_cam = hw_cam_line((pir >> 8) & 0xf, pir & 0x7f); >> Error *local_err = NULL; >> Object *obj; >> >> @@ -535,6 +560,10 @@ Object *xive_tctx_create(Object *cpu, XiveRouter *xrtr, Error **errp) >> object_property_add_child(cpu, TYPE_XIVE_TCTX, obj, &error_abort); >> object_unref(obj); >> object_property_add_const_link(obj, "cpu", cpu, &error_abort); >> + object_property_set_int(obj, hw_cam, "hw-cam", &local_err); >> + if (local_err) { >> + goto error; >> + } >> object_property_set_bool(obj, true, "realized", &local_err); >> if (local_err) { >> goto error; >> @@ -1112,14 +1141,28 @@ XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs) >> return xrc->get_tctx(xrtr, cs); >> } >> >> +/* >> + * When the block grouping is enabled, the CAM line is changed to : >> + * >> + * 4Bit chip number||0x001||7Bit Thread number. >> + */ >> +static bool xive_presenter_tctx_match_hw(XiveRouter *xrtr, XiveTCTX *tctx, >> + uint8_t nvt_blk, uint32_t nvt_idx) >> +{ >> + /* TODO: block group support */ >> + return tctx->hw_cam == hw_cam_line(nvt_blk, nvt_idx); >> +} >> + >> /* >> * The thread context register words are in big-endian format. >> */ >> -static int xive_presenter_tctx_match(XiveTCTX *tctx, uint8_t format, >> +static int xive_presenter_tctx_match(XiveRouter *xrtr, >> + XiveTCTX *tctx, uint8_t format, >> uint8_t nvt_blk, uint32_t nvt_idx, >> bool cam_ignore, uint32_t logic_serv) >> { >> uint32_t cam = xive_nvt_cam_line(nvt_blk, nvt_idx); >> + uint32_t qw3w2 = xive_tctx_word2(&tctx->regs[TM_QW3_HV_PHYS]); >> uint32_t qw2w2 = xive_tctx_word2(&tctx->regs[TM_QW2_HV_POOL]); >> uint32_t qw1w2 = xive_tctx_word2(&tctx->regs[TM_QW1_OS]); >> uint32_t qw0w2 = xive_tctx_word2(&tctx->regs[TM_QW0_USER]); >> @@ -1142,7 +1185,11 @@ static int xive_presenter_tctx_match(XiveTCTX *tctx, uint8_t format, >> >> /* F=0 & i=0: Specific NVT notification */ >> >> - /* TODO (PowerNV) : PHYS ring */ >> + /* PHYS ring */ >> + if ((be32_to_cpu(qw3w2) & TM_QW3W2_VT) && >> + xive_presenter_tctx_match_hw(xrtr, tctx, nvt_blk, nvt_idx)) { >> + return TM_QW3_HV_PHYS; >> + } >> >> /* HV POOL ring */ >> if ((be32_to_cpu(qw2w2) & TM_QW2W2_VP) && >> @@ -1199,7 +1246,7 @@ static bool xive_presenter_match(XiveRouter *xrtr, uint8_t format, >> * Check the thread context CAM lines and record matches. We >> * will handle CPU exception delivery later >> */ >> - ring = xive_presenter_tctx_match(tctx, format, nvt_blk, nvt_idx, >> + ring = xive_presenter_tctx_match(xrtr, tctx, format, nvt_blk, nvt_idx, >> cam_ignore, logic_serv); >> /* >> * Save the context and follow on to catch duplicates, that we >> diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c >> index 7c806da720c6..f035522b4ec9 100644 >> --- a/hw/ppc/pnv_core.c >> +++ b/hw/ppc/pnv_core.c >> @@ -114,12 +114,6 @@ static void pnv_realize_vcpu(PowerPCCPU *cpu, PnvChip *chip, Error **errp) >> return; >> } >> >> - pcc->intc_create(chip, cpu, &local_err); >> - if (local_err) { >> - error_propagate(errp, local_err); >> - return; >> - } >> - >> core_pir = object_property_get_uint(OBJECT(cpu), "core-pir", &error_abort); >> >> /* >> @@ -129,6 +123,16 @@ static void pnv_realize_vcpu(PowerPCCPU *cpu, PnvChip *chip, Error **errp) >> */ >> pir->default_value = core_pir + thread_index; >> >> + /* >> + * On P9, the interrupt presenter needs to hardwire the PIR value >> + * in the thread interrupt context of the CPU. >> + */ >> + pcc->intc_create(chip, cpu, &local_err); >> + if (local_err) { >> + error_propagate(errp, local_err); >> + return; >> + } >> + >> /* Set time-base frequency to 512 MHz */ >> cpu_ppc_tb_init(env, PNV_TIMEBASE_FREQ); >> > ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 02/19] ppc: externalize ppc_get_vcpu_by_pir() 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 01/19] ppc/xive: hardwire the Physical CAM line of the thread context Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 03/19] xive: extend the XiveRouter get_tctx() method with the page offset Cédric Le Goater ` (16 subsequent siblings) 18 siblings, 0 replies; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson; +Cc: qemu-ppc, qemu-devel, Cédric Le Goater We will use it to get the CPU interrupt presenter in XIVE. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- include/hw/ppc/ppc.h | 1 + hw/ppc/pnv.c | 16 ---------------- hw/ppc/ppc.c | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h index 298ec354a8a8..daaa04a22dbf 100644 --- a/include/hw/ppc/ppc.h +++ b/include/hw/ppc/ppc.h @@ -4,6 +4,7 @@ #include "target/ppc/cpu-qom.h" void ppc_set_irq(PowerPCCPU *cpu, int n_IRQ, int level); +PowerPCCPU *ppc_get_vcpu_by_pir(int pir); /* PowerPC hardware exceptions management helpers */ typedef void (*clk_setup_cb)(void *opaque, uint32_t freq); diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index da540860a2b0..0c9de76b71ff 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -1080,22 +1080,6 @@ static void pnv_ics_resend(XICSFabric *xi) } } -static PowerPCCPU *ppc_get_vcpu_by_pir(int pir) -{ - CPUState *cs; - - CPU_FOREACH(cs) { - PowerPCCPU *cpu = POWERPC_CPU(cs); - CPUPPCState *env = &cpu->env; - - if (env->spr_cb[SPR_PIR].default_value == pir) { - return cpu; - } - } - - return NULL; -} - static ICPState *pnv_icp_get(XICSFabric *xi, int pir) { PowerPCCPU *cpu = ppc_get_vcpu_by_pir(pir); diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index ec4be25f4994..9292f986eba7 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -1358,3 +1358,19 @@ void PPC_debug_write (void *opaque, uint32_t addr, uint32_t val) break; } } + +PowerPCCPU *ppc_get_vcpu_by_pir(int pir) +{ + CPUState *cs; + + CPU_FOREACH(cs) { + PowerPCCPU *cpu = POWERPC_CPU(cs); + CPUPPCState *env = &cpu->env; + + if (env->spr_cb[SPR_PIR].default_value == pir) { + return cpu; + } + } + + return NULL; +} -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 03/19] xive: extend the XiveRouter get_tctx() method with the page offset 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 01/19] ppc/xive: hardwire the Physical CAM line of the thread context Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 02/19] ppc: externalize ppc_get_vcpu_by_pir() Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-12 4:34 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 04/19] ppc/pnv: xive: export the TIMA memory accessors Cédric Le Goater ` (15 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson; +Cc: qemu-ppc, qemu-devel, Cédric Le Goater The PowerNV machine can perform indirect loads and stores on the TIMA on behalf of another CPU. The PIR of the CPU is controlled by a set of 4 registers, one per TIMA page. To know which page is being accessed, we need to inform the controller model of the operation offset. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- include/hw/ppc/xive.h | 4 ++-- hw/intc/spapr_xive.c | 3 ++- hw/intc/xive.c | 12 +++++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index 04d54e8315f7..a1f5ea2d9143 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -352,7 +352,7 @@ typedef struct XiveRouterClass { XiveNVT *nvt); int (*write_nvt)(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, XiveNVT *nvt, uint8_t word_number); - XiveTCTX *(*get_tctx)(XiveRouter *xrtr, CPUState *cs); + XiveTCTX *(*get_tctx)(XiveRouter *xrtr, CPUState *cs, hwaddr offset); } XiveRouterClass; void xive_eas_pic_print_info(XiveEAS *eas, uint32_t lisn, Monitor *mon); @@ -367,7 +367,7 @@ int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, XiveNVT *nvt); int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, XiveNVT *nvt, uint8_t word_number); -XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs); +XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs, hwaddr offset); /* * XIVE END ESBs diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index a0f5ff929447..c41ee96c4c84 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -391,7 +391,8 @@ static int spapr_xive_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, g_assert_not_reached(); } -static XiveTCTX *spapr_xive_get_tctx(XiveRouter *xrtr, CPUState *cs) +static XiveTCTX *spapr_xive_get_tctx(XiveRouter *xrtr, CPUState *cs, + hwaddr offset) { PowerPCCPU *cpu = POWERPC_CPU(cs); diff --git a/hw/intc/xive.c b/hw/intc/xive.c index f5642f2338de..39dff557fadc 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -320,7 +320,8 @@ static const XiveTmOp *xive_tm_find_op(hwaddr offset, unsigned size, bool write) static void xive_tm_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { - XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu); + XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu, + offset); const XiveTmOp *xto; /* @@ -358,7 +359,8 @@ static void xive_tm_write(void *opaque, hwaddr offset, static uint64_t xive_tm_read(void *opaque, hwaddr offset, unsigned size) { - XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu); + XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu, + offset); const XiveTmOp *xto; /* @@ -1134,11 +1136,11 @@ int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, return xrc->write_nvt(xrtr, nvt_blk, nvt_idx, nvt, word_number); } -XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs) +XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs, hwaddr offset) { XiveRouterClass *xrc = XIVE_ROUTER_GET_CLASS(xrtr); - return xrc->get_tctx(xrtr, cs); + return xrc->get_tctx(xrtr, cs, offset); } /* @@ -1234,7 +1236,7 @@ static bool xive_presenter_match(XiveRouter *xrtr, uint8_t format, */ CPU_FOREACH(cs) { - XiveTCTX *tctx = xive_router_get_tctx(xrtr, cs); + XiveTCTX *tctx = xive_router_get_tctx(xrtr, cs, 0); int ring; /* -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 03/19] xive: extend the XiveRouter get_tctx() method with the page offset 2019-01-28 9:46 ` [Qemu-devel] [PATCH 03/19] xive: extend the XiveRouter get_tctx() method with the page offset Cédric Le Goater @ 2019-02-12 4:34 ` David Gibson 2019-02-12 8:25 ` Cédric Le Goater 0 siblings, 1 reply; 50+ messages in thread From: David Gibson @ 2019-02-12 4:34 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel [-- Attachment #1: Type: text/plain, Size: 4481 bytes --] On Mon, Jan 28, 2019 at 10:46:09AM +0100, Cédric Le Goater wrote: > The PowerNV machine can perform indirect loads and stores on the TIMA > on behalf of another CPU. The PIR of the CPU is controlled by a set of > 4 registers, one per TIMA page. To know which page is being accessed, > we need to inform the controller model of the operation offset. This doesn't seem like the right place to handle this. Shouldn't you instead be passing a different CPUState in for "foreign" TCTX accesses? > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > include/hw/ppc/xive.h | 4 ++-- > hw/intc/spapr_xive.c | 3 ++- > hw/intc/xive.c | 12 +++++++----- > 3 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h > index 04d54e8315f7..a1f5ea2d9143 100644 > --- a/include/hw/ppc/xive.h > +++ b/include/hw/ppc/xive.h > @@ -352,7 +352,7 @@ typedef struct XiveRouterClass { > XiveNVT *nvt); > int (*write_nvt)(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > XiveNVT *nvt, uint8_t word_number); > - XiveTCTX *(*get_tctx)(XiveRouter *xrtr, CPUState *cs); > + XiveTCTX *(*get_tctx)(XiveRouter *xrtr, CPUState *cs, hwaddr offset); > } XiveRouterClass; > > void xive_eas_pic_print_info(XiveEAS *eas, uint32_t lisn, Monitor *mon); > @@ -367,7 +367,7 @@ int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > XiveNVT *nvt); > int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > XiveNVT *nvt, uint8_t word_number); > -XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs); > +XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs, hwaddr offset); > > /* > * XIVE END ESBs > diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c > index a0f5ff929447..c41ee96c4c84 100644 > --- a/hw/intc/spapr_xive.c > +++ b/hw/intc/spapr_xive.c > @@ -391,7 +391,8 @@ static int spapr_xive_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, > g_assert_not_reached(); > } > > -static XiveTCTX *spapr_xive_get_tctx(XiveRouter *xrtr, CPUState *cs) > +static XiveTCTX *spapr_xive_get_tctx(XiveRouter *xrtr, CPUState *cs, > + hwaddr offset) > { > PowerPCCPU *cpu = POWERPC_CPU(cs); > > diff --git a/hw/intc/xive.c b/hw/intc/xive.c > index f5642f2338de..39dff557fadc 100644 > --- a/hw/intc/xive.c > +++ b/hw/intc/xive.c > @@ -320,7 +320,8 @@ static const XiveTmOp *xive_tm_find_op(hwaddr offset, unsigned size, bool write) > static void xive_tm_write(void *opaque, hwaddr offset, > uint64_t value, unsigned size) > { > - XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu); > + XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu, > + offset); > const XiveTmOp *xto; > > /* > @@ -358,7 +359,8 @@ static void xive_tm_write(void *opaque, hwaddr offset, > > static uint64_t xive_tm_read(void *opaque, hwaddr offset, unsigned size) > { > - XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu); > + XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu, > + offset); > const XiveTmOp *xto; > > /* > @@ -1134,11 +1136,11 @@ int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > return xrc->write_nvt(xrtr, nvt_blk, nvt_idx, nvt, word_number); > } > > -XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs) > +XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs, hwaddr offset) > { > XiveRouterClass *xrc = XIVE_ROUTER_GET_CLASS(xrtr); > > - return xrc->get_tctx(xrtr, cs); > + return xrc->get_tctx(xrtr, cs, offset); > } > > /* > @@ -1234,7 +1236,7 @@ static bool xive_presenter_match(XiveRouter *xrtr, uint8_t format, > */ > > CPU_FOREACH(cs) { > - XiveTCTX *tctx = xive_router_get_tctx(xrtr, cs); > + XiveTCTX *tctx = xive_router_get_tctx(xrtr, cs, 0); > int ring; > > /* -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 03/19] xive: extend the XiveRouter get_tctx() method with the page offset 2019-02-12 4:34 ` David Gibson @ 2019-02-12 8:25 ` Cédric Le Goater 2019-02-12 20:31 ` Cédric Le Goater 0 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-02-12 8:25 UTC (permalink / raw) To: David Gibson; +Cc: qemu-ppc, qemu-devel On 2/12/19 5:34 AM, David Gibson wrote: > On Mon, Jan 28, 2019 at 10:46:09AM +0100, Cédric Le Goater wrote: >> The PowerNV machine can perform indirect loads and stores on the TIMA >> on behalf of another CPU. The PIR of the CPU is controlled by a set of >> 4 registers, one per TIMA page. To know which page is being accessed, >> we need to inform the controller model of the operation offset. > > This doesn't seem like the right place to handle this. Shouldn't you > instead be passing a different CPUState in for "foreign" TCTX > accesses? This patch only adds the page offset required to pick the correct register from the XIVE IC. May be I should have introduced this page offset extension in the baremetal patch. I might reorganize the patchset in the next round. Anyhow, we pass a different XiveTCTX instead. See the routines in PnvXive, xive_tm_indirect_read() and xive_tm_indirect_write(). We don't pass a CPUState because we depend on the machine data to retrieve the XiveTCTX and that would be problematic to do in the common XIVE routines. C. > >> >> Signed-off-by: Cédric Le Goater <clg@kaod.org> >> --- >> include/hw/ppc/xive.h | 4 ++-- >> hw/intc/spapr_xive.c | 3 ++- >> hw/intc/xive.c | 12 +++++++----- >> 3 files changed, 11 insertions(+), 8 deletions(-) >> >> diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h >> index 04d54e8315f7..a1f5ea2d9143 100644 >> --- a/include/hw/ppc/xive.h >> +++ b/include/hw/ppc/xive.h >> @@ -352,7 +352,7 @@ typedef struct XiveRouterClass { >> XiveNVT *nvt); >> int (*write_nvt)(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >> XiveNVT *nvt, uint8_t word_number); >> - XiveTCTX *(*get_tctx)(XiveRouter *xrtr, CPUState *cs); >> + XiveTCTX *(*get_tctx)(XiveRouter *xrtr, CPUState *cs, hwaddr offset); >> } XiveRouterClass; >> >> void xive_eas_pic_print_info(XiveEAS *eas, uint32_t lisn, Monitor *mon); >> @@ -367,7 +367,7 @@ int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >> XiveNVT *nvt); >> int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >> XiveNVT *nvt, uint8_t word_number); >> -XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs); >> +XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs, hwaddr offset); >> >> /* >> * XIVE END ESBs >> diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c >> index a0f5ff929447..c41ee96c4c84 100644 >> --- a/hw/intc/spapr_xive.c >> +++ b/hw/intc/spapr_xive.c >> @@ -391,7 +391,8 @@ static int spapr_xive_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, >> g_assert_not_reached(); >> } >> >> -static XiveTCTX *spapr_xive_get_tctx(XiveRouter *xrtr, CPUState *cs) >> +static XiveTCTX *spapr_xive_get_tctx(XiveRouter *xrtr, CPUState *cs, >> + hwaddr offset) >> { >> PowerPCCPU *cpu = POWERPC_CPU(cs); >> >> diff --git a/hw/intc/xive.c b/hw/intc/xive.c >> index f5642f2338de..39dff557fadc 100644 >> --- a/hw/intc/xive.c >> +++ b/hw/intc/xive.c >> @@ -320,7 +320,8 @@ static const XiveTmOp *xive_tm_find_op(hwaddr offset, unsigned size, bool write) >> static void xive_tm_write(void *opaque, hwaddr offset, >> uint64_t value, unsigned size) >> { >> - XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu); >> + XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu, >> + offset); >> const XiveTmOp *xto; >> >> /* >> @@ -358,7 +359,8 @@ static void xive_tm_write(void *opaque, hwaddr offset, >> >> static uint64_t xive_tm_read(void *opaque, hwaddr offset, unsigned size) >> { >> - XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu); >> + XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu, >> + offset); >> const XiveTmOp *xto; >> >> /* >> @@ -1134,11 +1136,11 @@ int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >> return xrc->write_nvt(xrtr, nvt_blk, nvt_idx, nvt, word_number); >> } >> >> -XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs) >> +XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs, hwaddr offset) >> { >> XiveRouterClass *xrc = XIVE_ROUTER_GET_CLASS(xrtr); >> >> - return xrc->get_tctx(xrtr, cs); >> + return xrc->get_tctx(xrtr, cs, offset); >> } >> >> /* >> @@ -1234,7 +1236,7 @@ static bool xive_presenter_match(XiveRouter *xrtr, uint8_t format, >> */ >> >> CPU_FOREACH(cs) { >> - XiveTCTX *tctx = xive_router_get_tctx(xrtr, cs); >> + XiveTCTX *tctx = xive_router_get_tctx(xrtr, cs, 0); >> int ring; >> >> /* > ^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 03/19] xive: extend the XiveRouter get_tctx() method with the page offset 2019-02-12 8:25 ` Cédric Le Goater @ 2019-02-12 20:31 ` Cédric Le Goater 0 siblings, 0 replies; 50+ messages in thread From: Cédric Le Goater @ 2019-02-12 20:31 UTC (permalink / raw) To: David Gibson; +Cc: qemu-ppc, qemu-devel On 2/12/19 9:25 AM, Cédric Le Goater wrote: > On 2/12/19 5:34 AM, David Gibson wrote: >> On Mon, Jan 28, 2019 at 10:46:09AM +0100, Cédric Le Goater wrote: >>> The PowerNV machine can perform indirect loads and stores on the TIMA >>> on behalf of another CPU. The PIR of the CPU is controlled by a set of >>> 4 registers, one per TIMA page. To know which page is being accessed, >>> we need to inform the controller model of the operation offset. >> >> This doesn't seem like the right place to handle this. Shouldn't you >> instead be passing a different CPUState in for "foreign" TCTX >> accesses? > > This patch only adds the page offset required to pick the correct > register from the XIVE IC. May be I should have introduced this > page offset extension in the baremetal patch. I might reorganize > the patchset in the next round. I had a chat with our hardware designer and the four indirect access registers of the XIVE IC have no relation with the four pages exposing the TIMA. It's just four different engines. We can drop this change. next patch "ppc/pnv: xive: export the TIMA memory accessors" is still needed though. C. > Anyhow, we pass a different XiveTCTX instead. See the routines in > PnvXive, xive_tm_indirect_read() and xive_tm_indirect_write(). > > We don't pass a CPUState because we depend on the machine data to > retrieve the XiveTCTX and that would be problematic to do in the > common XIVE routines. > > C. > > >> >>> >>> Signed-off-by: Cédric Le Goater <clg@kaod.org> >>> --- >>> include/hw/ppc/xive.h | 4 ++-- >>> hw/intc/spapr_xive.c | 3 ++- >>> hw/intc/xive.c | 12 +++++++----- >>> 3 files changed, 11 insertions(+), 8 deletions(-) >>> >>> diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h >>> index 04d54e8315f7..a1f5ea2d9143 100644 >>> --- a/include/hw/ppc/xive.h >>> +++ b/include/hw/ppc/xive.h >>> @@ -352,7 +352,7 @@ typedef struct XiveRouterClass { >>> XiveNVT *nvt); >>> int (*write_nvt)(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >>> XiveNVT *nvt, uint8_t word_number); >>> - XiveTCTX *(*get_tctx)(XiveRouter *xrtr, CPUState *cs); >>> + XiveTCTX *(*get_tctx)(XiveRouter *xrtr, CPUState *cs, hwaddr offset); >>> } XiveRouterClass; >>> >>> void xive_eas_pic_print_info(XiveEAS *eas, uint32_t lisn, Monitor *mon); >>> @@ -367,7 +367,7 @@ int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >>> XiveNVT *nvt); >>> int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >>> XiveNVT *nvt, uint8_t word_number); >>> -XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs); >>> +XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs, hwaddr offset); >>> >>> /* >>> * XIVE END ESBs >>> diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c >>> index a0f5ff929447..c41ee96c4c84 100644 >>> --- a/hw/intc/spapr_xive.c >>> +++ b/hw/intc/spapr_xive.c >>> @@ -391,7 +391,8 @@ static int spapr_xive_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, >>> g_assert_not_reached(); >>> } >>> >>> -static XiveTCTX *spapr_xive_get_tctx(XiveRouter *xrtr, CPUState *cs) >>> +static XiveTCTX *spapr_xive_get_tctx(XiveRouter *xrtr, CPUState *cs, >>> + hwaddr offset) >>> { >>> PowerPCCPU *cpu = POWERPC_CPU(cs); >>> >>> diff --git a/hw/intc/xive.c b/hw/intc/xive.c >>> index f5642f2338de..39dff557fadc 100644 >>> --- a/hw/intc/xive.c >>> +++ b/hw/intc/xive.c >>> @@ -320,7 +320,8 @@ static const XiveTmOp *xive_tm_find_op(hwaddr offset, unsigned size, bool write) >>> static void xive_tm_write(void *opaque, hwaddr offset, >>> uint64_t value, unsigned size) >>> { >>> - XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu); >>> + XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu, >>> + offset); >>> const XiveTmOp *xto; >>> >>> /* >>> @@ -358,7 +359,8 @@ static void xive_tm_write(void *opaque, hwaddr offset, >>> >>> static uint64_t xive_tm_read(void *opaque, hwaddr offset, unsigned size) >>> { >>> - XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu); >>> + XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu, >>> + offset); >>> const XiveTmOp *xto; >>> >>> /* >>> @@ -1134,11 +1136,11 @@ int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >>> return xrc->write_nvt(xrtr, nvt_blk, nvt_idx, nvt, word_number); >>> } >>> >>> -XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs) >>> +XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs, hwaddr offset) >>> { >>> XiveRouterClass *xrc = XIVE_ROUTER_GET_CLASS(xrtr); >>> >>> - return xrc->get_tctx(xrtr, cs); >>> + return xrc->get_tctx(xrtr, cs, offset); >>> } >>> >>> /* >>> @@ -1234,7 +1236,7 @@ static bool xive_presenter_match(XiveRouter *xrtr, uint8_t format, >>> */ >>> >>> CPU_FOREACH(cs) { >>> - XiveTCTX *tctx = xive_router_get_tctx(xrtr, cs); >>> + XiveTCTX *tctx = xive_router_get_tctx(xrtr, cs, 0); >>> int ring; >>> >>> /* >> > ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 04/19] ppc/pnv: xive: export the TIMA memory accessors 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (2 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 03/19] xive: extend the XiveRouter get_tctx() method with the page offset Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 05/19] ppc/pnv: add XIVE support Cédric Le Goater ` (14 subsequent siblings) 18 siblings, 0 replies; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson; +Cc: qemu-ppc, qemu-devel, Cédric Le Goater The PowerNV machine can perform indirect loads and stores on the TIMA on behalf of another CPU. Give the controller the possibility to call the TIMA memory accessors with a XiveTCTX of its choice. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- include/hw/ppc/xive.h | 3 +++ hw/intc/xive.c | 27 ++++++++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index a1f5ea2d9143..763691e9bae9 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -414,6 +414,9 @@ void xive_end_queue_pic_print_info(XiveEND *end, uint32_t width, Monitor *mon); #define XIVE_TM_USER_PAGE 0x3 extern const MemoryRegionOps xive_tm_ops; +void xive_tctx_tm_write(XiveTCTX *tctx, hwaddr offset, uint64_t value, + unsigned size); +uint64_t xive_tctx_tm_read(XiveTCTX *tctx, hwaddr offset, unsigned size); void xive_tctx_pic_print_info(XiveTCTX *tctx, Monitor *mon); Object *xive_tctx_create(Object *cpu, XiveRouter *xrtr, Error **errp); diff --git a/hw/intc/xive.c b/hw/intc/xive.c index 39dff557fadc..ee6e81425784 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -317,11 +317,9 @@ static const XiveTmOp *xive_tm_find_op(hwaddr offset, unsigned size, bool write) /* * TIMA MMIO handlers */ -static void xive_tm_write(void *opaque, hwaddr offset, - uint64_t value, unsigned size) +void xive_tctx_tm_write(XiveTCTX *tctx, hwaddr offset, uint64_t value, + unsigned size) { - XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu, - offset); const XiveTmOp *xto; /* @@ -357,10 +355,8 @@ static void xive_tm_write(void *opaque, hwaddr offset, xive_tm_raw_write(tctx, offset, value, size); } -static uint64_t xive_tm_read(void *opaque, hwaddr offset, unsigned size) +uint64_t xive_tctx_tm_read(XiveTCTX *tctx, hwaddr offset, unsigned size) { - XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu, - offset); const XiveTmOp *xto; /* @@ -394,6 +390,23 @@ static uint64_t xive_tm_read(void *opaque, hwaddr offset, unsigned size) return xive_tm_raw_read(tctx, offset, size); } +static void xive_tm_write(void *opaque, hwaddr offset, + uint64_t value, unsigned size) +{ + XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu, + offset); + + xive_tctx_tm_write(tctx, offset, value, size); +} + +static uint64_t xive_tm_read(void *opaque, hwaddr offset, unsigned size) +{ + XiveTCTX *tctx = xive_router_get_tctx(XIVE_ROUTER(opaque), current_cpu, + offset); + + return xive_tctx_tm_read(tctx, offset, size); +} + const MemoryRegionOps xive_tm_ops = { .read = xive_tm_read, .write = xive_tm_write, -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 05/19] ppc/pnv: add XIVE support 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (3 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 04/19] ppc/pnv: xive: export the TIMA memory accessors Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-12 5:40 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 06/19] target/ppc: Remove some #if 0'ed code Cédric Le Goater ` (13 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson; +Cc: qemu-ppc, qemu-devel, Cédric Le Goater This is simple model of the POWER9 XIVE interrupt controller for the PowerNV machine. XIVE for baremetal is a complex controller and the model only addresses the needs of the skiboot firmware. The PowerNV model reuses the common XIVE framework developed for sPAPR and the fundamentals aspects are quite the same. The difference are outlined below. The controller initial BAR configuration is performed using the XSCOM bus from there, MMIO are used for further configuration. The MMIO regions exposed are : - Interrupt controller registers - ESB pages for IPIs and ENDs - Presenter MMIO (Not used) - Thread Interrupt Management Area MMIO, direct and indirect The virtualization controller MMIO region containing the IPI ESB pages and END ESB pages is sub-divided into "sets" which map portions of the VC region to the different ESB pages. These are modeled with custom address spaces and the XiveSource and XiveENDSource objects are sized to the maximum allowed by HW. The memory regions are resized at run-time using the configuration of EDT set translation table provided by the firmware. The XIVE virtualization structure tables (EAT, ENDT, NVTT) are now in the machine RAM and not in the hypervisor anymore. The firmware (skiboot) configures these tables using Virtual Structure Descriptor defining the characteristics of each table : SBE, EAS, END and NVT. These are later used to access the virtual interrupt entries. The internal cache of these tables in the interrupt controller is updated and invalidated using a set of registers. Still to address to complete the model but not fully required is the support for block grouping. Escalation support will be necessary for KVM guests. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- hw/intc/pnv_xive_regs.h | 315 +++++++ include/hw/ppc/pnv.h | 21 + include/hw/ppc/pnv_core.h | 1 + include/hw/ppc/pnv_xive.h | 95 ++ include/hw/ppc/pnv_xscom.h | 3 + include/hw/ppc/xive.h | 1 + hw/intc/pnv_xive.c | 1698 ++++++++++++++++++++++++++++++++++++ hw/intc/xive.c | 59 +- hw/ppc/pnv.c | 68 +- hw/intc/Makefile.objs | 2 +- 10 files changed, 2253 insertions(+), 10 deletions(-) create mode 100644 hw/intc/pnv_xive_regs.h create mode 100644 include/hw/ppc/pnv_xive.h create mode 100644 hw/intc/pnv_xive.c diff --git a/hw/intc/pnv_xive_regs.h b/hw/intc/pnv_xive_regs.h new file mode 100644 index 000000000000..96ac27701cee --- /dev/null +++ b/hw/intc/pnv_xive_regs.h @@ -0,0 +1,315 @@ +/* + * QEMU PowerPC XIVE interrupt controller model + * + * Copyright (c) 2017-2018, IBM Corporation. + * + * This code is licensed under the GPL version 2 or later. See the + * COPYING file in the top-level directory. + */ + +#ifndef PPC_PNV_XIVE_REGS_H +#define PPC_PNV_XIVE_REGS_H + +/* IC register offsets 0x0 - 0x400 */ +#define CQ_SWI_CMD_HIST 0x020 +#define CQ_SWI_CMD_POLL 0x028 +#define CQ_SWI_CMD_BCAST 0x030 +#define CQ_SWI_CMD_ASSIGN 0x038 +#define CQ_SWI_CMD_BLK_UPD 0x040 +#define CQ_SWI_RSP 0x048 +#define X_CQ_CFG_PB_GEN 0x0a +#define CQ_CFG_PB_GEN 0x050 +#define CQ_INT_ADDR_OPT PPC_BITMASK(14, 15) +#define X_CQ_IC_BAR 0x10 +#define X_CQ_MSGSND 0x0b +#define CQ_MSGSND 0x058 +#define CQ_CNPM_SEL 0x078 +#define CQ_IC_BAR 0x080 +#define CQ_IC_BAR_VALID PPC_BIT(0) +#define CQ_IC_BAR_64K PPC_BIT(1) +#define X_CQ_TM1_BAR 0x12 +#define CQ_TM1_BAR 0x90 +#define X_CQ_TM2_BAR 0x014 +#define CQ_TM2_BAR 0x0a0 +#define CQ_TM_BAR_VALID PPC_BIT(0) +#define CQ_TM_BAR_64K PPC_BIT(1) +#define X_CQ_PC_BAR 0x16 +#define CQ_PC_BAR 0x0b0 +#define CQ_PC_BAR_VALID PPC_BIT(0) +#define X_CQ_PC_BARM 0x17 +#define CQ_PC_BARM 0x0b8 +#define CQ_PC_BARM_MASK PPC_BITMASK(26, 38) +#define X_CQ_VC_BAR 0x18 +#define CQ_VC_BAR 0x0c0 +#define CQ_VC_BAR_VALID PPC_BIT(0) +#define X_CQ_VC_BARM 0x19 +#define CQ_VC_BARM 0x0c8 +#define CQ_VC_BARM_MASK PPC_BITMASK(21, 37) +#define X_CQ_TAR 0x1e +#define CQ_TAR 0x0f0 +#define CQ_TAR_TBL_AUTOINC PPC_BIT(0) +#define CQ_TAR_TSEL PPC_BITMASK(12, 15) +#define CQ_TAR_TSEL_BLK PPC_BIT(12) +#define CQ_TAR_TSEL_MIG PPC_BIT(13) +#define CQ_TAR_TSEL_VDT PPC_BIT(14) +#define CQ_TAR_TSEL_EDT PPC_BIT(15) +#define CQ_TAR_TSEL_INDEX PPC_BITMASK(26, 31) +#define X_CQ_TDR 0x1f +#define CQ_TDR 0x0f8 +#define CQ_TDR_VDT_VALID PPC_BIT(0) +#define CQ_TDR_VDT_BLK PPC_BITMASK(11, 15) +#define CQ_TDR_VDT_INDEX PPC_BITMASK(28, 31) +#define CQ_TDR_EDT_TYPE PPC_BITMASK(0, 1) +#define CQ_TDR_EDT_INVALID 0 +#define CQ_TDR_EDT_IPI 1 +#define CQ_TDR_EDT_EQ 2 +#define CQ_TDR_EDT_BLK PPC_BITMASK(12, 15) +#define CQ_TDR_EDT_INDEX PPC_BITMASK(26, 31) +#define X_CQ_PBI_CTL 0x20 +#define CQ_PBI_CTL 0x100 +#define CQ_PBI_PC_64K PPC_BIT(5) +#define CQ_PBI_VC_64K PPC_BIT(6) +#define CQ_PBI_LNX_TRIG PPC_BIT(7) +#define CQ_PBI_FORCE_TM_LOCAL PPC_BIT(22) +#define CQ_PBO_CTL 0x108 +#define CQ_AIB_CTL 0x110 +#define X_CQ_RST_CTL 0x23 +#define CQ_RST_CTL 0x118 +#define X_CQ_FIRMASK 0x33 +#define CQ_FIRMASK 0x198 +#define X_CQ_FIRMASK_AND 0x34 +#define CQ_FIRMASK_AND 0x1a0 +#define X_CQ_FIRMASK_OR 0x35 +#define CQ_FIRMASK_OR 0x1a8 + +/* PC LBS1 register offsets 0x400 - 0x800 */ +#define X_PC_TCTXT_CFG 0x100 +#define PC_TCTXT_CFG 0x400 +#define PC_TCTXT_CFG_BLKGRP_EN PPC_BIT(0) +#define PC_TCTXT_CFG_TARGET_EN PPC_BIT(1) +#define PC_TCTXT_CFG_LGS_EN PPC_BIT(2) +#define PC_TCTXT_CFG_STORE_ACK PPC_BIT(3) +#define PC_TCTXT_CFG_HARD_CHIPID_BLK PPC_BIT(8) +#define PC_TCTXT_CHIPID_OVERRIDE PPC_BIT(9) +#define PC_TCTXT_CHIPID PPC_BITMASK(12, 15) +#define PC_TCTXT_INIT_AGE PPC_BITMASK(30, 31) +#define X_PC_TCTXT_TRACK 0x101 +#define PC_TCTXT_TRACK 0x408 +#define PC_TCTXT_TRACK_EN PPC_BIT(0) +#define X_PC_TCTXT_INDIR0 0x104 +#define PC_TCTXT_INDIR0 0x420 +#define PC_TCTXT_INDIR_VALID PPC_BIT(0) +#define PC_TCTXT_INDIR_THRDID PPC_BITMASK(9, 15) +#define X_PC_TCTXT_INDIR1 0x105 +#define PC_TCTXT_INDIR1 0x428 +#define X_PC_TCTXT_INDIR2 0x106 +#define PC_TCTXT_INDIR2 0x430 +#define X_PC_TCTXT_INDIR3 0x107 +#define PC_TCTXT_INDIR3 0x438 +#define X_PC_THREAD_EN_REG0 0x108 +#define PC_THREAD_EN_REG0 0x440 +#define X_PC_THREAD_EN_REG0_SET 0x109 +#define PC_THREAD_EN_REG0_SET 0x448 +#define X_PC_THREAD_EN_REG0_CLR 0x10a +#define PC_THREAD_EN_REG0_CLR 0x450 +#define X_PC_THREAD_EN_REG1 0x10c +#define PC_THREAD_EN_REG1 0x460 +#define X_PC_THREAD_EN_REG1_SET 0x10d +#define PC_THREAD_EN_REG1_SET 0x468 +#define X_PC_THREAD_EN_REG1_CLR 0x10e +#define PC_THREAD_EN_REG1_CLR 0x470 +#define X_PC_GLOBAL_CONFIG 0x110 +#define PC_GLOBAL_CONFIG 0x480 +#define PC_GCONF_INDIRECT PPC_BIT(32) +#define PC_GCONF_CHIPID_OVR PPC_BIT(40) +#define PC_GCONF_CHIPID PPC_BITMASK(44, 47) +#define X_PC_VSD_TABLE_ADDR 0x111 +#define PC_VSD_TABLE_ADDR 0x488 +#define X_PC_VSD_TABLE_DATA 0x112 +#define PC_VSD_TABLE_DATA 0x490 +#define X_PC_AT_KILL 0x116 +#define PC_AT_KILL 0x4b0 +#define PC_AT_KILL_VALID PPC_BIT(0) +#define PC_AT_KILL_BLOCK_ID PPC_BITMASK(27, 31) +#define PC_AT_KILL_OFFSET PPC_BITMASK(48, 60) +#define X_PC_AT_KILL_MASK 0x117 +#define PC_AT_KILL_MASK 0x4b8 + +/* PC LBS2 register offsets */ +#define X_PC_VPC_CACHE_ENABLE 0x161 +#define PC_VPC_CACHE_ENABLE 0x708 +#define PC_VPC_CACHE_EN_MASK PPC_BITMASK(0, 31) +#define X_PC_VPC_SCRUB_TRIG 0x162 +#define PC_VPC_SCRUB_TRIG 0x710 +#define X_PC_VPC_SCRUB_MASK 0x163 +#define PC_VPC_SCRUB_MASK 0x718 +#define PC_SCRUB_VALID PPC_BIT(0) +#define PC_SCRUB_WANT_DISABLE PPC_BIT(1) +#define PC_SCRUB_WANT_INVAL PPC_BIT(2) +#define PC_SCRUB_BLOCK_ID PPC_BITMASK(27, 31) +#define PC_SCRUB_OFFSET PPC_BITMASK(45, 63) +#define X_PC_VPC_CWATCH_SPEC 0x167 +#define PC_VPC_CWATCH_SPEC 0x738 +#define PC_VPC_CWATCH_CONFLICT PPC_BIT(0) +#define PC_VPC_CWATCH_FULL PPC_BIT(8) +#define PC_VPC_CWATCH_BLOCKID PPC_BITMASK(27, 31) +#define PC_VPC_CWATCH_OFFSET PPC_BITMASK(45, 63) +#define X_PC_VPC_CWATCH_DAT0 0x168 +#define PC_VPC_CWATCH_DAT0 0x740 +#define X_PC_VPC_CWATCH_DAT1 0x169 +#define PC_VPC_CWATCH_DAT1 0x748 +#define X_PC_VPC_CWATCH_DAT2 0x16a +#define PC_VPC_CWATCH_DAT2 0x750 +#define X_PC_VPC_CWATCH_DAT3 0x16b +#define PC_VPC_CWATCH_DAT3 0x758 +#define X_PC_VPC_CWATCH_DAT4 0x16c +#define PC_VPC_CWATCH_DAT4 0x760 +#define X_PC_VPC_CWATCH_DAT5 0x16d +#define PC_VPC_CWATCH_DAT5 0x768 +#define X_PC_VPC_CWATCH_DAT6 0x16e +#define PC_VPC_CWATCH_DAT6 0x770 +#define X_PC_VPC_CWATCH_DAT7 0x16f +#define PC_VPC_CWATCH_DAT7 0x778 + +/* VC0 register offsets 0x800 - 0xFFF */ +#define X_VC_GLOBAL_CONFIG 0x200 +#define VC_GLOBAL_CONFIG 0x800 +#define VC_GCONF_INDIRECT PPC_BIT(32) +#define X_VC_VSD_TABLE_ADDR 0x201 +#define VC_VSD_TABLE_ADDR 0x808 +#define X_VC_VSD_TABLE_DATA 0x202 +#define VC_VSD_TABLE_DATA 0x810 +#define VC_IVE_ISB_BLOCK_MODE 0x818 +#define VC_EQD_BLOCK_MODE 0x820 +#define VC_VPS_BLOCK_MODE 0x828 +#define X_VC_IRQ_CONFIG_IPI 0x208 +#define VC_IRQ_CONFIG_IPI 0x840 +#define VC_IRQ_CONFIG_MEMB_EN PPC_BIT(45) +#define VC_IRQ_CONFIG_MEMB_SZ PPC_BITMASK(46, 51) +#define VC_IRQ_CONFIG_HW 0x848 +#define VC_IRQ_CONFIG_CASCADE1 0x850 +#define VC_IRQ_CONFIG_CASCADE2 0x858 +#define VC_IRQ_CONFIG_REDIST 0x860 +#define VC_IRQ_CONFIG_IPI_CASC 0x868 +#define X_VC_AIB_TX_ORDER_TAG2 0x22d +#define VC_AIB_TX_ORDER_TAG2_REL_TF PPC_BIT(20) +#define VC_AIB_TX_ORDER_TAG2 0x890 +#define X_VC_AT_MACRO_KILL 0x23e +#define VC_AT_MACRO_KILL 0x8b0 +#define X_VC_AT_MACRO_KILL_MASK 0x23f +#define VC_AT_MACRO_KILL_MASK 0x8b8 +#define VC_KILL_VALID PPC_BIT(0) +#define VC_KILL_TYPE PPC_BITMASK(14, 15) +#define VC_KILL_IRQ 0 +#define VC_KILL_IVC 1 +#define VC_KILL_SBC 2 +#define VC_KILL_EQD 3 +#define VC_KILL_BLOCK_ID PPC_BITMASK(27, 31) +#define VC_KILL_OFFSET PPC_BITMASK(48, 60) +#define X_VC_EQC_CACHE_ENABLE 0x211 +#define VC_EQC_CACHE_ENABLE 0x908 +#define VC_EQC_CACHE_EN_MASK PPC_BITMASK(0, 15) +#define X_VC_EQC_SCRUB_TRIG 0x212 +#define VC_EQC_SCRUB_TRIG 0x910 +#define X_VC_EQC_SCRUB_MASK 0x213 +#define VC_EQC_SCRUB_MASK 0x918 +#define X_VC_EQC_CWATCH_SPEC 0x215 +#define VC_EQC_CONFIG 0x920 +#define X_VC_EQC_CONFIG 0x214 +#define VC_EQC_CONF_SYNC_IPI PPC_BIT(32) +#define VC_EQC_CONF_SYNC_HW PPC_BIT(33) +#define VC_EQC_CONF_SYNC_ESC1 PPC_BIT(34) +#define VC_EQC_CONF_SYNC_ESC2 PPC_BIT(35) +#define VC_EQC_CONF_SYNC_REDI PPC_BIT(36) +#define VC_EQC_CONF_EQP_INTERLEAVE PPC_BIT(38) +#define VC_EQC_CONF_ENABLE_END_s_BIT PPC_BIT(39) +#define VC_EQC_CONF_ENABLE_END_u_BIT PPC_BIT(40) +#define VC_EQC_CONF_ENABLE_END_c_BIT PPC_BIT(41) +#define VC_EQC_CONF_ENABLE_MORE_QSZ PPC_BIT(42) +#define VC_EQC_CONF_SKIP_ESCALATE PPC_BIT(43) +#define VC_EQC_CWATCH_SPEC 0x928 +#define VC_EQC_CWATCH_CONFLICT PPC_BIT(0) +#define VC_EQC_CWATCH_FULL PPC_BIT(8) +#define VC_EQC_CWATCH_BLOCKID PPC_BITMASK(28, 31) +#define VC_EQC_CWATCH_OFFSET PPC_BITMASK(40, 63) +#define X_VC_EQC_CWATCH_DAT0 0x216 +#define VC_EQC_CWATCH_DAT0 0x930 +#define X_VC_EQC_CWATCH_DAT1 0x217 +#define VC_EQC_CWATCH_DAT1 0x938 +#define X_VC_EQC_CWATCH_DAT2 0x218 +#define VC_EQC_CWATCH_DAT2 0x940 +#define X_VC_EQC_CWATCH_DAT3 0x219 +#define VC_EQC_CWATCH_DAT3 0x948 +#define X_VC_IVC_SCRUB_TRIG 0x222 +#define VC_IVC_SCRUB_TRIG 0x990 +#define X_VC_IVC_SCRUB_MASK 0x223 +#define VC_IVC_SCRUB_MASK 0x998 +#define X_VC_SBC_SCRUB_TRIG 0x232 +#define VC_SBC_SCRUB_TRIG 0xa10 +#define X_VC_SBC_SCRUB_MASK 0x233 +#define VC_SBC_SCRUB_MASK 0xa18 +#define VC_SCRUB_VALID PPC_BIT(0) +#define VC_SCRUB_WANT_DISABLE PPC_BIT(1) +#define VC_SCRUB_WANT_INVAL PPC_BIT(2) /* EQC and SBC only */ +#define VC_SCRUB_BLOCK_ID PPC_BITMASK(28, 31) +#define VC_SCRUB_OFFSET PPC_BITMASK(40, 63) +#define X_VC_IVC_CACHE_ENABLE 0x221 +#define VC_IVC_CACHE_ENABLE 0x988 +#define VC_IVC_CACHE_EN_MASK PPC_BITMASK(0, 15) +#define X_VC_SBC_CACHE_ENABLE 0x231 +#define VC_SBC_CACHE_ENABLE 0xa08 +#define VC_SBC_CACHE_EN_MASK PPC_BITMASK(0, 15) +#define VC_IVC_CACHE_SCRUB_TRIG 0x990 +#define VC_IVC_CACHE_SCRUB_MASK 0x998 +#define VC_SBC_CACHE_ENABLE 0xa08 +#define VC_SBC_CACHE_SCRUB_TRIG 0xa10 +#define VC_SBC_CACHE_SCRUB_MASK 0xa18 +#define VC_SBC_CONFIG 0xa20 +#define X_VC_SBC_CONFIG 0x234 +#define VC_SBC_CONF_CPLX_CIST PPC_BIT(44) +#define VC_SBC_CONF_CIST_BOTH PPC_BIT(45) +#define VC_SBC_CONF_NO_UPD_PRF PPC_BIT(59) + +/* VC1 register offsets */ + +/* VSD Table address register definitions (shared) */ +#define VST_ADDR_AUTOINC PPC_BIT(0) +#define VST_TABLE_SELECT PPC_BITMASK(13, 15) +#define VST_TSEL_IVT 0 +#define VST_TSEL_SBE 1 +#define VST_TSEL_EQDT 2 +#define VST_TSEL_VPDT 3 +#define VST_TSEL_IRQ 4 /* VC only */ +#define VST_TABLE_BLOCK PPC_BITMASK(27, 31) + +/* Number of queue overflow pages */ +#define VC_QUEUE_OVF_COUNT 6 + +/* + * Bits in a VSD entry. + * + * Note: the address is naturally aligned, we don't use a PPC_BITMASK, + * but just a mask to apply to the address before OR'ing it in. + * + * Note: VSD_FIRMWARE is a SW bit ! It hijacks an unused bit in the + * VSD and is only meant to be used in indirect mode ! + */ +#define VSD_MODE PPC_BITMASK(0, 1) +#define VSD_MODE_SHARED 1 +#define VSD_MODE_EXCLUSIVE 2 +#define VSD_MODE_FORWARD 3 +#define VSD_ADDRESS_MASK 0x0ffffffffffff000ull +#define VSD_MIGRATION_REG PPC_BITMASK(52, 55) +#define VSD_INDIRECT PPC_BIT(56) +#define VSD_TSIZE PPC_BITMASK(59, 63) +#define VSD_FIRMWARE PPC_BIT(2) /* Read warning above */ + +#define VC_EQC_SYNC_MASK \ + (VC_EQC_CONF_SYNC_IPI | \ + VC_EQC_CONF_SYNC_HW | \ + VC_EQC_CONF_SYNC_ESC1 | \ + VC_EQC_CONF_SYNC_ESC2 | \ + VC_EQC_CONF_SYNC_REDI) + + +#endif /* PPC_PNV_XIVE_REGS_H */ diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h index 6b65397b7ebf..ebbb3d0e9aa7 100644 --- a/include/hw/ppc/pnv.h +++ b/include/hw/ppc/pnv.h @@ -25,6 +25,7 @@ #include "hw/ppc/pnv_lpc.h" #include "hw/ppc/pnv_psi.h" #include "hw/ppc/pnv_occ.h" +#include "hw/ppc/pnv_xive.h" #define TYPE_PNV_CHIP "pnv-chip" #define PNV_CHIP(obj) OBJECT_CHECK(PnvChip, (obj), TYPE_PNV_CHIP) @@ -82,6 +83,7 @@ typedef struct Pnv9Chip { PnvChip parent_obj; /*< public >*/ + PnvXive xive; } Pnv9Chip; typedef struct PnvChipClass { @@ -215,4 +217,23 @@ void pnv_bmc_powerdown(IPMIBmc *bmc); (0x0003ffe000000000ull + (uint64_t)PNV_CHIP_INDEX(chip) * \ PNV_PSIHB_FSP_SIZE) +/* + * POWER9 MMIO base addresses + */ +#define PNV9_CHIP_BASE(chip, base) \ + ((base) + ((uint64_t) (chip)->chip_id << 42)) + +#define PNV9_XIVE_VC_SIZE 0x0000008000000000ull +#define PNV9_XIVE_VC_BASE(chip) PNV9_CHIP_BASE(chip, 0x0006010000000000ull) + +#define PNV9_XIVE_PC_SIZE 0x0000001000000000ull +#define PNV9_XIVE_PC_BASE(chip) PNV9_CHIP_BASE(chip, 0x0006018000000000ull) + +#define PNV9_XIVE_IC_SIZE 0x0000000000080000ull +#define PNV9_XIVE_IC_BASE(chip) PNV9_CHIP_BASE(chip, 0x0006030203100000ull) + +#define PNV9_XIVE_TM_SIZE 0x0000000000040000ull +#define PNV9_XIVE_TM_BASE(chip) PNV9_CHIP_BASE(chip, 0x0006030203180000ull) + + #endif /* _PPC_PNV_H */ diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h index 9961ea3a92cd..8e57c064e661 100644 --- a/include/hw/ppc/pnv_core.h +++ b/include/hw/ppc/pnv_core.h @@ -49,6 +49,7 @@ typedef struct PnvCoreClass { typedef struct PnvCPUState { struct ICPState *icp; + struct XiveTCTX *tctx; } PnvCPUState; static inline PnvCPUState *pnv_cpu_state(PowerPCCPU *cpu) diff --git a/include/hw/ppc/pnv_xive.h b/include/hw/ppc/pnv_xive.h new file mode 100644 index 000000000000..4fc917d1dcf9 --- /dev/null +++ b/include/hw/ppc/pnv_xive.h @@ -0,0 +1,95 @@ +/* + * QEMU PowerPC XIVE interrupt controller model + * + * Copyright (c) 2017-2019, IBM Corporation. + * + * This code is licensed under the GPL version 2 or later. See the + * COPYING file in the top-level directory. + */ + +#ifndef PPC_PNV_XIVE_H +#define PPC_PNV_XIVE_H + +#include "hw/ppc/xive.h" + +#define TYPE_PNV_XIVE "pnv-xive" +#define PNV_XIVE(obj) OBJECT_CHECK(PnvXive, (obj), TYPE_PNV_XIVE) + +#define XIVE_BLOCK_MAX 16 + +#define XIVE_TABLE_BLK_MAX 16 /* Block Scope Table (0-15) */ +#define XIVE_TABLE_MIG_MAX 16 /* Migration Register Table (1-15) */ +#define XIVE_TABLE_VDT_MAX 16 /* VDT Domain Table (0-15) */ +#define XIVE_TABLE_EDT_MAX 64 /* EDT Domain Table (0-63) */ + +typedef struct PnvXive { + XiveRouter parent_obj; + + /* Owning chip */ + PnvChip *chip; + + /* XSCOM addresses giving access to the controller registers */ + MemoryRegion xscom_regs; + + /* Main MMIO regions that can be configured by FW */ + MemoryRegion ic_mmio; + MemoryRegion ic_reg_mmio; + MemoryRegion ic_notify_mmio; + MemoryRegion ic_lsi_mmio; + MemoryRegion tm_indirect_mmio; + MemoryRegion vc_mmio; + MemoryRegion pc_mmio; + MemoryRegion tm_mmio; + + /* + * IPI and END address spaces modeling the EDT segmentation in the + * VC region + */ + AddressSpace ipi_as; + MemoryRegion ipi_mmio; + MemoryRegion ipi_edt_mmio; + + AddressSpace end_as; + MemoryRegion end_mmio; + MemoryRegion end_edt_mmio; + + /* Shortcut values for the Main MMIO regions */ + hwaddr ic_base; + uint32_t ic_shift; + hwaddr vc_base; + uint32_t vc_shift; + hwaddr pc_base; + uint32_t pc_shift; + hwaddr tm_base; + uint32_t tm_shift; + + /* Our XIVE source objects for IPIs and ENDs */ + uint32_t nr_irqs; + XiveSource source; + + uint32_t nr_ends; + XiveENDSource end_source; + + /* Interrupt controller registers */ + uint64_t regs[0x300]; + + /* Can be configured by FW */ + uint32_t tctx_chipid; + uint32_t chip_id; + + /* + * Virtual Structure Descriptor tables : EAT, SBE, ENDT, NVTT, IRQ + * These are in a SRAM protected by ECC. + */ + uint64_t vsds[5][XIVE_BLOCK_MAX]; + + /* Translation tables */ + uint64_t blk[XIVE_TABLE_BLK_MAX]; + uint64_t mig[XIVE_TABLE_MIG_MAX]; + uint64_t vdt[XIVE_TABLE_VDT_MAX]; + uint64_t edt[XIVE_TABLE_EDT_MAX]; +} PnvXive; + +void pnv_xive_pic_print_info(PnvXive *xive, Monitor *mon); + +#endif /* PPC_PNV_XIVE_H */ diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h index 255b26a5aaf6..6623ec54a7a8 100644 --- a/include/hw/ppc/pnv_xscom.h +++ b/include/hw/ppc/pnv_xscom.h @@ -73,6 +73,9 @@ typedef struct PnvXScomInterfaceClass { #define PNV_XSCOM_OCC_BASE 0x0066000 #define PNV_XSCOM_OCC_SIZE 0x6000 +#define PNV9_XSCOM_XIVE_BASE 0x5013000 +#define PNV9_XSCOM_XIVE_SIZE 0x300 + extern void pnv_xscom_realize(PnvChip *chip, Error **errp); extern int pnv_dt_xscom(PnvChip *chip, void *fdt, int offset); diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index 763691e9bae9..2bad8526221b 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -368,6 +368,7 @@ int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, XiveNVT *nvt, uint8_t word_number); XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs, hwaddr offset); +void xive_router_notify(XiveNotifier *xn, uint32_t lisn); /* * XIVE END ESBs diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c new file mode 100644 index 000000000000..4be9b69b76a3 --- /dev/null +++ b/hw/intc/pnv_xive.c @@ -0,0 +1,1698 @@ +/* + * QEMU PowerPC XIVE interrupt controller model + * + * Copyright (c) 2017-2019, IBM Corporation. + * + * This code is licensed under the GPL version 2 or later. See the + * COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qapi/error.h" +#include "target/ppc/cpu.h" +#include "sysemu/cpus.h" +#include "sysemu/dma.h" +#include "monitor/monitor.h" +#include "hw/ppc/fdt.h" +#include "hw/ppc/pnv.h" +#include "hw/ppc/pnv_core.h" +#include "hw/ppc/pnv_xscom.h" +#include "hw/ppc/pnv_xive.h" +#include "hw/ppc/xive_regs.h" +#include "hw/ppc/ppc.h" + +#include <libfdt.h> + +#include "pnv_xive_regs.h" + +/* + * Virtual structures table (VST) + */ +typedef struct XiveVstInfo { + uint32_t type; + const char *name; + uint32_t size; + uint32_t max_blocks; +} XiveVstInfo; + +static const XiveVstInfo vst_infos[] = { + [VST_TSEL_IVT] = { VST_TSEL_IVT, "EAT", sizeof(XiveEAS), 16 }, + [VST_TSEL_SBE] = { VST_TSEL_SBE, "SBE", 0, 16 }, + [VST_TSEL_EQDT] = { VST_TSEL_EQDT, "ENDT", sizeof(XiveEND), 16 }, + [VST_TSEL_VPDT] = { VST_TSEL_VPDT, "VPDT", sizeof(XiveNVT), 32 }, + + /* + * Interrupt fifo backing store table (not modeled) : + * + * 0 - IPI, + * 1 - HWD, + * 2 - First escalate, + * 3 - Second escalate, + * 4 - Redistribution, + * 5 - IPI cascaded queue ? + */ + [VST_TSEL_IRQ] = { VST_TSEL_IRQ, "IRQ", 0, 6 }, +}; + +#define xive_error(xive, fmt, ...) \ + qemu_log_mask(LOG_GUEST_ERROR, "XIVE[%x] - " fmt "\n", (xive)->chip_id, \ + ## __VA_ARGS__); + +/* + * QEMU version of the GETFIELD/SETFIELD macros + */ +static inline uint64_t GETFIELD(uint64_t mask, uint64_t word) +{ + return (word & mask) >> ctz64(mask); +} + +static inline uint64_t SETFIELD(uint64_t mask, uint64_t word, + uint64_t value) +{ + return (word & ~mask) | ((value << ctz64(mask)) & mask); +} + +/* + * Remote access to controllers. HW uses MMIOs. For now, a simple scan + * of the chips is good enough. + */ +static PnvXive *pnv_xive_get_ic(PnvXive *xive, uint8_t blk) +{ + PnvMachineState *pnv = PNV_MACHINE(qdev_get_machine()); + int i; + + for (i = 0; i < pnv->num_chips; i++) { + Pnv9Chip *chip9 = PNV9_CHIP(pnv->chips[i]); + PnvXive *ic_xive = &chip9->xive; + bool chip_override = + ic_xive->regs[PC_GLOBAL_CONFIG >> 3] & PC_GCONF_CHIPID_OVR; + + if (chip_override) { + if (ic_xive->chip_id == blk) { + return ic_xive; + } + } else { + ; /* TODO: Block scope support */ + } + } + xive_error(xive, "VST: unknown chip/block %d !?", blk); + return NULL; +} + +/* + * VST accessors for SBE, EAT, ENDT, NVT + */ +static uint64_t pnv_xive_vst_addr_direct(PnvXive *xive, + const XiveVstInfo *info, uint64_t vsd, + uint8_t blk, uint32_t idx) +{ + uint64_t vst_addr = vsd & VSD_ADDRESS_MASK; + uint64_t vst_tsize = 1ull << (GETFIELD(VSD_TSIZE, vsd) + 12); + uint32_t idx_max = (vst_tsize / info->size) - 1; + + if (idx > idx_max) { +#ifdef XIVE_DEBUG + xive_error(xive, "VST: %s entry %x/%x out of range !?", info->name, + blk, idx); +#endif + return 0; + } + + return vst_addr + idx * info->size; +} + +#define XIVE_VSD_SIZE 8 + +static uint64_t pnv_xive_vst_addr_indirect(PnvXive *xive, + const XiveVstInfo *info, + uint64_t vsd, uint8_t blk, + uint32_t idx) +{ + uint64_t vsd_addr; + uint64_t vst_addr; + uint32_t page_shift; + uint32_t page_mask; + uint64_t vst_tsize = 1ull << (GETFIELD(VSD_TSIZE, vsd) + 12); + uint32_t idx_max = (vst_tsize / XIVE_VSD_SIZE) - 1; + + if (idx > idx_max) { +#ifdef XIVE_DEBUG + xive_error(xive, "VST: %s entry %x/%x out of range !?", info->name, + blk, idx); +#endif + return 0; + } + + vsd_addr = vsd & VSD_ADDRESS_MASK; + + /* + * Read the first descriptor to get the page size of each indirect + * table. + */ + vsd = ldq_be_dma(&address_space_memory, vsd_addr); + page_shift = GETFIELD(VSD_TSIZE, vsd) + 12; + page_mask = (1ull << page_shift) - 1; + + /* Indirect page size can be 4K, 64K, 2M, 16M. */ + if (page_shift != 12 && page_shift != 16 && page_shift != 21 + && page_shift != 24) { + xive_error(xive, "VST: invalid %s table shift %d", info->name, + page_shift); + } + + if (!(vsd & VSD_ADDRESS_MASK)) { + xive_error(xive, "VST: invalid %s entry %x/%x !?", info->name, + blk, 0); + return 0; + } + + /* Load the descriptor we are looking for, if not already done */ + if (idx) { + vsd_addr = vsd_addr + (idx >> page_shift); + vsd = ldq_be_dma(&address_space_memory, vsd_addr); + + if (page_shift != GETFIELD(VSD_TSIZE, vsd) + 12) { + xive_error(xive, "VST: %s entry %x/%x indirect page size differ !?", + info->name, blk, idx); + return 0; + } + } + + vst_addr = vsd & VSD_ADDRESS_MASK; + + return vst_addr + (idx & page_mask) * info->size; +} + +static uint64_t pnv_xive_vst_addr(PnvXive *xive, const XiveVstInfo *info, + uint8_t blk, uint32_t idx) +{ + uint64_t vsd; + + if (blk >= info->max_blocks) { + xive_error(xive, "VST: invalid block id %d for VST %s %d !?", + blk, info->name, idx); + return 0; + } + + vsd = xive->vsds[info->type][blk]; + + /* Remote VST access */ + if (GETFIELD(VSD_MODE, vsd) == VSD_MODE_FORWARD) { + xive = pnv_xive_get_ic(xive, blk); + + return xive ? pnv_xive_vst_addr(xive, info, blk, idx) : 0; + } + + if (VSD_INDIRECT & vsd) { + return pnv_xive_vst_addr_indirect(xive, info, vsd, blk, idx); + } + + return pnv_xive_vst_addr_direct(xive, info, vsd, blk, idx); +} + +static int pnv_xive_vst_read(PnvXive *xive, uint32_t type, uint8_t blk, + uint32_t idx, void *data) +{ + const XiveVstInfo *info = &vst_infos[type]; + uint64_t addr = pnv_xive_vst_addr(xive, info, blk, idx); + + if (!addr) { + return -1; + } + + cpu_physical_memory_read(addr, data, info->size); + return 0; +} + +/* TODO: take into account word_number */ +static int pnv_xive_vst_write(PnvXive *xive, uint32_t type, uint8_t blk, + uint32_t idx, void *data) +{ + const XiveVstInfo *info = &vst_infos[type]; + uint64_t addr = pnv_xive_vst_addr(xive, info, blk, idx); + + if (!addr) { + return -1; + } + + cpu_physical_memory_write(addr, data, info->size); + return 0; +} + +static int pnv_xive_get_end(XiveRouter *xrtr, uint8_t blk, uint32_t idx, + XiveEND *end) +{ + return pnv_xive_vst_read(PNV_XIVE(xrtr), VST_TSEL_EQDT, blk, idx, end); +} + +static int pnv_xive_write_end(XiveRouter *xrtr, uint8_t blk, + uint32_t idx, XiveEND *end, + uint8_t word_number) +{ + return pnv_xive_vst_write(PNV_XIVE(xrtr), VST_TSEL_EQDT, blk, idx, end); +} + +static int pnv_xive_end_update(PnvXive *xive, uint8_t blk, uint32_t idx) +{ + int i; + uint64_t eqc_watch[4]; + + for (i = 0; i < ARRAY_SIZE(eqc_watch); i++) { + eqc_watch[i] = cpu_to_be64(xive->regs[(VC_EQC_CWATCH_DAT0 >> 3) + i]); + } + + return pnv_xive_vst_write(xive, VST_TSEL_EQDT, blk, idx, eqc_watch); +} + +static int pnv_xive_get_nvt(XiveRouter *xrtr, uint8_t blk, uint32_t idx, + XiveNVT *nvt) +{ + return pnv_xive_vst_read(PNV_XIVE(xrtr), VST_TSEL_VPDT, blk, idx, nvt); +} + +static int pnv_xive_write_nvt(XiveRouter *xrtr, uint8_t blk, uint32_t idx, + XiveNVT *nvt, uint8_t word_number) +{ + return pnv_xive_vst_write(PNV_XIVE(xrtr), VST_TSEL_VPDT, blk, idx, nvt); +} + +static int pnv_xive_nvt_update(PnvXive *xive, uint8_t blk, uint32_t idx) +{ + int i; + uint64_t vpc_watch[8]; + + for (i = 0; i < ARRAY_SIZE(vpc_watch); i++) { + vpc_watch[i] = cpu_to_be64(xive->regs[(PC_VPC_CWATCH_DAT0 >> 3) + i]); + } + + return pnv_xive_vst_write(xive, VST_TSEL_VPDT, blk, idx, vpc_watch); +} + +static int pnv_xive_get_eas(XiveRouter *xrtr, uint8_t blk, + uint32_t idx, XiveEAS *eas) +{ + PnvXive *xive = PNV_XIVE(xrtr); + + /* TODO: check when remote EAS lookups are possible */ + if (pnv_xive_get_ic(xive, blk) != xive) { + xive_error(xive, "VST: EAS %x is remote !?", XIVE_SRCNO(blk, idx)); + return -1; + } + + return pnv_xive_vst_read(xive, VST_TSEL_IVT, blk, idx, eas); +} + +static int pnv_xive_eas_update(PnvXive *xive, uint8_t blk, uint32_t idx) +{ + /* All done. */ + return 0; +} + +static XiveTCTX *pnv_xive_get_tctx(XiveRouter *xrtr, CPUState *cs, + hwaddr offset) +{ + PowerPCCPU *cpu = POWERPC_CPU(cs); + XiveTCTX *tctx = pnv_cpu_state(cpu)->tctx; + PnvXive *xive = NULL; + uint8_t chip_id; + CPUPPCState *env = &cpu->env; + int pir = env->spr_cb[SPR_PIR].default_value; + + /* + * Perform an extra check on the CPU enablement. + * + * The TIMA is shared among the chips and to identify the chip + * from which the access is being done, we extract the chip id + * from the HW CAM line of XiveTCTX. + */ + chip_id = (tctx->hw_cam >> 7) & 0xf; + + xive = pnv_xive_get_ic(PNV_XIVE(xrtr), chip_id); + if (!xive) { + return NULL; + } + + if (!(xive->regs[PC_THREAD_EN_REG0 >> 3] & PPC_BIT(pir & 0x3f))) { + xive_error(PNV_XIVE(xrtr), "IC: CPU %x is not enabled", pir); + } + + return tctx; +} + +/* + * The internal sources (IPIs) of the interrupt controller have no + * knowledge of the XIVE chip on which they reside. Encode the block + * id in the source interrupt number before forwarding the source + * event notification to the Router. This is required on a multichip + * system. + */ +static void pnv_xive_notify(XiveNotifier *xn, uint32_t srcno) +{ + PnvXive *xive = PNV_XIVE(xn); + + xive_router_notify(xn, XIVE_SRCNO(xive->chip_id, srcno)); +} + +/* + * XIVE helpers + */ + +static uint64_t pnv_xive_vc_size(PnvXive *xive) +{ + return (~xive->regs[CQ_VC_BARM >> 3] + 1) & CQ_VC_BARM_MASK; +} + +static uint64_t pnv_xive_edt_shift(PnvXive *xive) +{ + return ctz64(pnv_xive_vc_size(xive) / XIVE_TABLE_EDT_MAX); +} + +static uint64_t pnv_xive_pc_size(PnvXive *xive) +{ + return (~xive->regs[CQ_PC_BARM >> 3] + 1) & CQ_PC_BARM_MASK; +} + +/* + * XIVE Table configuration + * + * The Virtualization Controller MMIO region containing the IPI ESB + * pages and END ESB pages is sub-divided into "sets" which map + * portions of the VC region to the different ESB pages. It is + * configured at runtime through the EDT "Domain Table" to let the + * firmware decide how to split the VC address space between IPI ESB + * pages and END ESB pages. + */ +static int pnv_xive_table_set_data(PnvXive *xive, uint64_t val) +{ + uint64_t tsel = xive->regs[CQ_TAR >> 3] & CQ_TAR_TSEL; + uint8_t tsel_index = GETFIELD(CQ_TAR_TSEL_INDEX, xive->regs[CQ_TAR >> 3]); + uint64_t *xive_table; + uint8_t max_index; + + switch (tsel) { + case CQ_TAR_TSEL_BLK: + max_index = ARRAY_SIZE(xive->blk); + xive_table = xive->blk; + break; + case CQ_TAR_TSEL_MIG: + max_index = ARRAY_SIZE(xive->mig); + xive_table = xive->mig; + break; + case CQ_TAR_TSEL_EDT: + max_index = ARRAY_SIZE(xive->edt); + xive_table = xive->edt; + break; + case CQ_TAR_TSEL_VDT: + max_index = ARRAY_SIZE(xive->vdt); + xive_table = xive->vdt; + break; + default: + xive_error(xive, "IC: invalid table %d", (int) tsel); + return -1; + } + + if (tsel_index >= max_index) { + xive_error(xive, "IC: invalid index %d", (int) tsel_index); + return -1; + } + + xive_table[tsel_index] = val; + + if (xive->regs[CQ_TAR >> 3] & CQ_TAR_TBL_AUTOINC) { + xive->regs[CQ_TAR >> 3] = + SETFIELD(CQ_TAR_TSEL_INDEX, xive->regs[CQ_TAR >> 3], ++tsel_index); + } + + return 0; +} + +/* + * Computes the overall size of the IPI or the END ESB pages + */ +static uint64_t pnv_xive_edt_size(PnvXive *xive, uint64_t type) +{ + uint64_t edt_size = 1ull << pnv_xive_edt_shift(xive); + uint64_t size = 0; + int i; + + for (i = 0; i < XIVE_TABLE_EDT_MAX; i++) { + uint64_t edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[i]); + + if (edt_type == type) { + size += edt_size; + } + } + + return size; +} + +/* + * Maps an offset of the VC region in the IPI or END region using the + * layout defined by the EDT "Domaine Table" + */ +static uint64_t pnv_xive_edt_offset(PnvXive *xive, uint64_t vc_offset, + uint64_t type) +{ + int i; + uint64_t edt_size = 1ull << pnv_xive_edt_shift(xive); + uint64_t edt_offset = vc_offset; + + for (i = 0; i < XIVE_TABLE_EDT_MAX && (i * edt_size) < vc_offset; i++) { + uint64_t edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[i]); + + if (edt_type != type) { + edt_offset -= edt_size; + } + } + + return edt_offset; +} + +/* + * The EDT "Domain Table" is used to size the MMIO window exposing the + * IPI and the END ESBs in the VC region. + */ +static void pnv_xive_ipi_edt_resize(PnvXive *xive) +{ + uint64_t ipi_edt_size = pnv_xive_edt_size(xive, CQ_TDR_EDT_IPI); + + /* Resize the EDT window of the IPI ESBs in the VC region */ + memory_region_set_size(&xive->ipi_edt_mmio, ipi_edt_size); + memory_region_add_subregion(&xive->ipi_mmio, 0, &xive->ipi_edt_mmio); + + /* + * The IPI ESBs region will be resized when the SBE backing store + * is configured. + */ +} + +static void pnv_xive_end_edt_resize(PnvXive *xive) +{ + XiveENDSource *end_xsrc = &xive->end_source; + uint64_t end_edt_size = pnv_xive_edt_size(xive, CQ_TDR_EDT_EQ); + + /* + * Compute the number of provisioned ENDs from the END ESB MMIO + * window size + */ + xive->nr_ends = end_edt_size / (1ull << (xive->vc_shift + 1)); + + /* Resize the EDT window of the END ESBs in the VC region */ + memory_region_set_size(&xive->end_edt_mmio, end_edt_size); + memory_region_add_subregion(&xive->end_mmio, 0, &xive->end_edt_mmio); + + /* Also resize the END ESBs region (This is a bit redundant) */ + memory_region_set_size(&end_xsrc->esb_mmio, + xive->nr_ends * (1ull << (end_xsrc->esb_shift + 1))); + memory_region_add_subregion(&xive->end_edt_mmio, 0, &end_xsrc->esb_mmio); +} + +/* + * Virtual Structure Tables (VST) configuration + */ +static void pnv_xive_vst_set_exclusive(PnvXive *xive, uint8_t type, + uint8_t blk, uint64_t vsd) +{ + XiveSource *xsrc = &xive->source; + bool gconf_indirect = + xive->regs[VC_GLOBAL_CONFIG >> 3] & VC_GCONF_INDIRECT; + uint32_t vst_shift = GETFIELD(VSD_TSIZE, vsd) + 12; + uint64_t vst_addr = vsd & VSD_ADDRESS_MASK; + + if (VSD_INDIRECT & vsd) { + if (!gconf_indirect) { + xive_error(xive, "VST: %s indirect tables not enabled", + vst_infos[type].name); + return; + } + } + + switch (type) { + case VST_TSEL_IVT: + pnv_xive_ipi_edt_resize(xive); + break; + + case VST_TSEL_EQDT: + pnv_xive_end_edt_resize(xive); + break; + + case VST_TSEL_VPDT: + /* FIXME (skiboot) : remove DD1 workaround on the NVT table size */ + vst_shift = 16; + break; + + case VST_TSEL_SBE: /* Not modeled */ + /* + * Contains the backing store pages for the source PQ bits. + * + * The XiveSource object has its own. We would need a custom + * source object to use the PQ bits backed in RAM. We can + * nevertheless compute the number of IRQs provisioned by FW + * and resize the IPI ESB window accordingly. + */ + xive->nr_irqs = (1ull << vst_shift) * 4; + memory_region_set_size(&xsrc->esb_mmio, + xive->nr_irqs * (1ull << xsrc->esb_shift)); + memory_region_add_subregion(&xive->ipi_edt_mmio, 0, &xsrc->esb_mmio); + break; + + case VST_TSEL_IRQ: /* VC only. Not modeled */ + /* + * These tables contains the backing store pages for the + * interrupt fifos of the VC sub-engine in case of overflow. + */ + break; + default: + g_assert_not_reached(); + } + + if (!QEMU_IS_ALIGNED(vst_addr, 1ull << vst_shift)) { + xive_error(xive, "VST: %s table address 0x%"PRIx64" is not aligned with" + " page shift %d", vst_infos[type].name, vst_addr, vst_shift); + } + + /* Keep the VSD for later use */ + xive->vsds[type][blk] = vsd; +} + +/* + * Both PC and VC sub-engines are configured as each use the Virtual + * Structure Tables : SBE, EAS, END and NVT. + */ +static void pnv_xive_vst_set_data(PnvXive *xive, uint64_t vsd, bool pc_engine) +{ + uint8_t mode = GETFIELD(VSD_MODE, vsd); + uint8_t type = GETFIELD(VST_TABLE_SELECT, + xive->regs[VC_VSD_TABLE_ADDR >> 3]); + uint8_t blk = GETFIELD(VST_TABLE_BLOCK, + xive->regs[VC_VSD_TABLE_ADDR >> 3]); + uint64_t vst_addr = vsd & VSD_ADDRESS_MASK; + + if (type > VST_TSEL_IRQ) { + xive_error(xive, "VST: invalid table type %d", type); + return; + } + + if (blk >= vst_infos[type].max_blocks) { + xive_error(xive, "VST: invalid block id %d for" + " %s table", blk, vst_infos[type].name); + return; + } + + /* + * Only take the VC sub-engine configuration into account because + * the XiveRouter model combines both VC and PC sub-engines + */ + if (pc_engine) { + return; + } + + if (!vst_addr) { + xive_error(xive, "VST: invalid %s table address", vst_infos[type].name); + return; + } + + switch (mode) { + case VSD_MODE_FORWARD: + xive->vsds[type][blk] = vsd; + break; + + case VSD_MODE_EXCLUSIVE: + pnv_xive_vst_set_exclusive(xive, type, blk, vsd); + break; + + default: + xive_error(xive, "VST: unsupported table mode %d", mode); + return; + } +} + +/* + * Interrupt controller MMIO region. The layout is compatible between + * 4K and 64K pages : + * + * Page 0 sub-engine BARs + * 0x000 - 0x3FF IC registers + * 0x400 - 0x7FF PC registers + * 0x800 - 0xFFF VC registers + * + * Page 1 Notify page (writes only) + * 0x000 - 0x7FF HW interrupt triggers (PSI, PHB) + * 0x800 - 0xFFF forwards and syncs + * + * Page 2 LSI Trigger page (writes only) (not modeled) + * Page 3 LSI SB EOI page (reads only) (not modeled) + * + * Page 4-7 indirect TIMA + */ + +/* + * IC - registers MMIO + */ +static void pnv_xive_ic_reg_write(void *opaque, hwaddr offset, + uint64_t val, unsigned size) +{ + PnvXive *xive = PNV_XIVE(opaque); + MemoryRegion *sysmem = get_system_memory(); + uint32_t reg = offset >> 3; + + switch (offset) { + + /* + * XIVE CQ (PowerBus bridge) settings + */ + case CQ_MSGSND: /* msgsnd for doorbells */ + case CQ_FIRMASK_OR: /* FIR error reporting */ + break; + case CQ_PBI_CTL: + if (val & CQ_PBI_PC_64K) { + xive->pc_shift = 16; + } + if (val & CQ_PBI_VC_64K) { + xive->vc_shift = 16; + } + break; + case CQ_CFG_PB_GEN: /* PowerBus General Configuration */ + /* + * TODO: CQ_INT_ADDR_OPT for 1-block-per-chip mode + */ + break; + + /* + * XIVE Virtualization Controller settings + */ + case VC_GLOBAL_CONFIG: + break; + + /* + * XIVE Presenter Controller settings + */ + case PC_GLOBAL_CONFIG: + /* Overrides Int command Chip ID with the Chip ID field */ + if (val & PC_GCONF_CHIPID_OVR) { + xive->chip_id = GETFIELD(PC_GCONF_CHIPID, val); + } + break; + case PC_TCTXT_CFG: + /* + * TODO: block group support + * + * PC_TCTXT_CFG_BLKGRP_EN + * PC_TCTXT_CFG_HARD_CHIPID_BLK : + * Moves the chipid into block field for hardwired CAM compares. + * Block offset value is adjusted to 0b0..01 & ThrdId + * + * Will require changes in xive_presenter_tctx_match(). I am + * not sure how to handle that yet. + */ + + /* Overrides hardwired chip ID with the chip ID field */ + if (val & PC_TCTXT_CHIPID_OVERRIDE) { + xive->tctx_chipid = GETFIELD(PC_TCTXT_CHIPID, val); + } + break; + case PC_TCTXT_TRACK: + /* + * PC_TCTXT_TRACK_EN: + * enable block tracking and exchange of block ownership + * information between Interrupt controllers + */ + break; + + /* + * Misc settings + */ + case VC_SBC_CONFIG: /* Store EOI configuration */ + /* + * Configure store EOI if required by firwmare (skiboot has removed + * support recently though) + */ + if (val & (VC_SBC_CONF_CPLX_CIST | VC_SBC_CONF_CIST_BOTH)) { + object_property_set_int(OBJECT(&xive->source), XIVE_SRC_STORE_EOI, + "flags", &error_fatal); + } + break; + + case VC_EQC_CONFIG: /* TODO: silent escalation */ + case VC_AIB_TX_ORDER_TAG2: /* relax ordering */ + break; + + /* + * XIVE BAR settings (XSCOM only) + */ + case CQ_RST_CTL: + /* bit4: resets all BAR registers */ + break; + + case CQ_IC_BAR: /* IC BAR. 8 pages */ + xive->ic_shift = val & CQ_IC_BAR_64K ? 16 : 12; + if (!(val & CQ_IC_BAR_VALID)) { + xive->ic_base = 0; + if (xive->regs[reg] & CQ_IC_BAR_VALID) { + memory_region_del_subregion(&xive->ic_mmio, + &xive->ic_reg_mmio); + memory_region_del_subregion(&xive->ic_mmio, + &xive->ic_notify_mmio); + memory_region_del_subregion(&xive->ic_mmio, + &xive->ic_lsi_mmio); + memory_region_del_subregion(&xive->ic_mmio, + &xive->tm_indirect_mmio); + + memory_region_del_subregion(sysmem, &xive->ic_mmio); + } + } else { + xive->ic_base = val & ~(CQ_IC_BAR_VALID | CQ_IC_BAR_64K); + if (!(xive->regs[reg] & CQ_IC_BAR_VALID)) { + memory_region_add_subregion(sysmem, xive->ic_base, + &xive->ic_mmio); + + memory_region_add_subregion(&xive->ic_mmio, 0, + &xive->ic_reg_mmio); + memory_region_add_subregion(&xive->ic_mmio, + 1ul << xive->ic_shift, + &xive->ic_notify_mmio); + memory_region_add_subregion(&xive->ic_mmio, + 2ul << xive->ic_shift, + &xive->ic_lsi_mmio); + memory_region_add_subregion(&xive->ic_mmio, + 4ull << xive->ic_shift, + &xive->tm_indirect_mmio); + } + } + break; + + case CQ_TM1_BAR: /* TM BAR. 4 pages. Map only once */ + case CQ_TM2_BAR: /* second TM BAR. for hotplug. Not modeled */ + xive->tm_shift = val & CQ_TM_BAR_64K ? 16 : 12; + if (!(val & CQ_TM_BAR_VALID)) { + xive->tm_base = 0; + if (xive->regs[reg] & CQ_TM_BAR_VALID && xive->chip_id == 0) { + memory_region_del_subregion(sysmem, &xive->tm_mmio); + } + } else { + xive->tm_base = val & ~(CQ_TM_BAR_VALID | CQ_TM_BAR_64K); + if (!(xive->regs[reg] & CQ_TM_BAR_VALID) && xive->chip_id == 0) { + memory_region_add_subregion(sysmem, xive->tm_base, + &xive->tm_mmio); + } + } + break; + + case CQ_PC_BARM: + xive->regs[reg] = val; + memory_region_set_size(&xive->pc_mmio, pnv_xive_pc_size(xive)); + break; + case CQ_PC_BAR: /* From 32M to 512G */ + if (!(val & CQ_PC_BAR_VALID)) { + xive->pc_base = 0; + if (xive->regs[reg] & CQ_PC_BAR_VALID) { + memory_region_del_subregion(sysmem, &xive->pc_mmio); + } + } else { + xive->pc_base = val & ~(CQ_PC_BAR_VALID); + if (!(xive->regs[reg] & CQ_PC_BAR_VALID)) { + memory_region_add_subregion(sysmem, xive->pc_base, + &xive->pc_mmio); + } + } + break; + + case CQ_VC_BARM: + xive->regs[reg] = val; + memory_region_set_size(&xive->vc_mmio, pnv_xive_vc_size(xive)); + break; + case CQ_VC_BAR: /* From 64M to 4TB */ + if (!(val & CQ_VC_BAR_VALID)) { + xive->vc_base = 0; + if (xive->regs[reg] & CQ_VC_BAR_VALID) { + memory_region_del_subregion(sysmem, &xive->vc_mmio); + } + } else { + xive->vc_base = val & ~(CQ_VC_BAR_VALID); + if (!(xive->regs[reg] & CQ_VC_BAR_VALID)) { + memory_region_add_subregion(sysmem, xive->vc_base, + &xive->vc_mmio); + } + } + break; + + /* + * XIVE Table settings. + */ + case CQ_TAR: /* Table Address */ + break; + case CQ_TDR: /* Table Data */ + pnv_xive_table_set_data(xive, val); + break; + + /* + * XIVE VC & PC Virtual Structure Table settings + */ + case VC_VSD_TABLE_ADDR: + case PC_VSD_TABLE_ADDR: /* Virtual table selector */ + break; + case VC_VSD_TABLE_DATA: /* Virtual table setting */ + case PC_VSD_TABLE_DATA: + pnv_xive_vst_set_data(xive, val, offset == PC_VSD_TABLE_DATA); + break; + + /* + * Interrupt fifo overflow in memory backing store (Not modeled) + */ + case VC_IRQ_CONFIG_IPI: + case VC_IRQ_CONFIG_HW: + case VC_IRQ_CONFIG_CASCADE1: + case VC_IRQ_CONFIG_CASCADE2: + case VC_IRQ_CONFIG_REDIST: + case VC_IRQ_CONFIG_IPI_CASC: + break; + + /* + * XIVE hardware thread enablement + */ + case PC_THREAD_EN_REG0: /* Physical Thread Enable */ + case PC_THREAD_EN_REG1: /* Physical Thread Enable (fused core) */ + break; + + case PC_THREAD_EN_REG0_SET: + xive->regs[PC_THREAD_EN_REG0 >> 3] |= val; + break; + case PC_THREAD_EN_REG1_SET: + xive->regs[PC_THREAD_EN_REG1 >> 3] |= val; + break; + case PC_THREAD_EN_REG0_CLR: + xive->regs[PC_THREAD_EN_REG0 >> 3] &= ~val; + break; + case PC_THREAD_EN_REG1_CLR: + xive->regs[PC_THREAD_EN_REG1 >> 3] &= ~val; + break; + + /* + * Indirect TIMA access set up. Defines the PIR of the HW thread + * to use. + */ + case PC_TCTXT_INDIR0 ... PC_TCTXT_INDIR3: + break; + + /* + * XIVE PC & VC cache updates for EAS, NVT and END + */ + case VC_IVC_SCRUB_MASK: + break; + case VC_IVC_SCRUB_TRIG: + pnv_xive_eas_update(xive, GETFIELD(PC_SCRUB_BLOCK_ID, val), + GETFIELD(VC_SCRUB_OFFSET, val)); + break; + + case VC_EQC_SCRUB_MASK: + case VC_EQC_CWATCH_SPEC: + case VC_EQC_CWATCH_DAT0 ... VC_EQC_CWATCH_DAT3: + break; + case VC_EQC_SCRUB_TRIG: + pnv_xive_end_update(xive, GETFIELD(VC_SCRUB_BLOCK_ID, val), + GETFIELD(VC_SCRUB_OFFSET, val)); + break; + + case PC_VPC_SCRUB_MASK: + case PC_VPC_CWATCH_SPEC: + case PC_VPC_CWATCH_DAT0 ... PC_VPC_CWATCH_DAT7: + break; + case PC_VPC_SCRUB_TRIG: + pnv_xive_nvt_update(xive, GETFIELD(PC_SCRUB_BLOCK_ID, val), + GETFIELD(PC_SCRUB_OFFSET, val)); + break; + + + /* + * XIVE PC & VC cache invalidation + */ + case PC_AT_KILL: + break; + case VC_AT_MACRO_KILL: + break; + case PC_AT_KILL_MASK: + case VC_AT_MACRO_KILL_MASK: + break; + + default: + xive_error(xive, "IC: invalid write to reg=0x%"HWADDR_PRIx, offset); + return; + } + + xive->regs[reg] = val; +} + +static uint64_t pnv_xive_ic_reg_read(void *opaque, hwaddr offset, unsigned size) +{ + PnvXive *xive = PNV_XIVE(opaque); + uint64_t val = 0; + uint32_t reg = offset >> 3; + + switch (offset) { + case CQ_CFG_PB_GEN: + case CQ_IC_BAR: + case CQ_TM1_BAR: + case CQ_TM2_BAR: + case CQ_PC_BAR: + case CQ_PC_BARM: + case CQ_VC_BAR: + case CQ_VC_BARM: + case CQ_TAR: + case CQ_TDR: + case CQ_PBI_CTL: + + case PC_TCTXT_CFG: + case PC_TCTXT_TRACK: + case PC_TCTXT_INDIR0: + case PC_TCTXT_INDIR1: + case PC_TCTXT_INDIR2: + case PC_TCTXT_INDIR3: + case PC_GLOBAL_CONFIG: + + case PC_VPC_SCRUB_MASK: + case PC_VPC_CWATCH_SPEC: + case PC_VPC_CWATCH_DAT0: + case PC_VPC_CWATCH_DAT1: + case PC_VPC_CWATCH_DAT2: + case PC_VPC_CWATCH_DAT3: + case PC_VPC_CWATCH_DAT4: + case PC_VPC_CWATCH_DAT5: + case PC_VPC_CWATCH_DAT6: + case PC_VPC_CWATCH_DAT7: + + case VC_GLOBAL_CONFIG: + case VC_AIB_TX_ORDER_TAG2: + + case VC_IRQ_CONFIG_IPI: + case VC_IRQ_CONFIG_HW: + case VC_IRQ_CONFIG_CASCADE1: + case VC_IRQ_CONFIG_CASCADE2: + case VC_IRQ_CONFIG_REDIST: + case VC_IRQ_CONFIG_IPI_CASC: + + case VC_EQC_SCRUB_MASK: + case VC_EQC_CWATCH_DAT0: + case VC_EQC_CWATCH_DAT1: + case VC_EQC_CWATCH_DAT2: + case VC_EQC_CWATCH_DAT3: + + case VC_EQC_CWATCH_SPEC: + case VC_IVC_SCRUB_MASK: + case VC_SBC_CONFIG: + case VC_AT_MACRO_KILL_MASK: + case VC_VSD_TABLE_ADDR: + case PC_VSD_TABLE_ADDR: + case VC_VSD_TABLE_DATA: + case PC_VSD_TABLE_DATA: + case PC_THREAD_EN_REG0: + case PC_THREAD_EN_REG1: + val = xive->regs[reg]; + break; + + /* + * XIVE hardware thread enablement + */ + case PC_THREAD_EN_REG0_SET: + case PC_THREAD_EN_REG0_CLR: + val = xive->regs[PC_THREAD_EN_REG0 >> 3]; + break; + case PC_THREAD_EN_REG1_SET: + case PC_THREAD_EN_REG1_CLR: + val = xive->regs[PC_THREAD_EN_REG1 >> 3]; + break; + + case CQ_MSGSND: /* Identifies which cores have msgsnd enabled. */ + val = 0xffffff0000000000; + break; + + /* + * XIVE PC & VC cache updates for EAS, NVT and END + */ + case PC_VPC_SCRUB_TRIG: + case VC_IVC_SCRUB_TRIG: + case VC_EQC_SCRUB_TRIG: + xive->regs[reg] &= ~VC_SCRUB_VALID; + val = xive->regs[reg]; + break; + + /* + * XIVE PC & VC cache invalidation + */ + case PC_AT_KILL: + xive->regs[reg] &= ~PC_AT_KILL_VALID; + val = xive->regs[reg]; + break; + case VC_AT_MACRO_KILL: + xive->regs[reg] &= ~VC_KILL_VALID; + val = xive->regs[reg]; + break; + + /* + * XIVE synchronisation + */ + case VC_EQC_CONFIG: + val = VC_EQC_SYNC_MASK; + break; + + default: + xive_error(xive, "IC: invalid read reg=0x%"HWADDR_PRIx, offset); + } + + return val; +} + +static const MemoryRegionOps pnv_xive_ic_reg_ops = { + .read = pnv_xive_ic_reg_read, + .write = pnv_xive_ic_reg_write, + .endianness = DEVICE_BIG_ENDIAN, + .valid = { + .min_access_size = 8, + .max_access_size = 8, + }, + .impl = { + .min_access_size = 8, + .max_access_size = 8, + }, +}; + +/* + * IC - Notify MMIO port page (write only) + */ +#define PNV_XIVE_FORWARD_IPI 0x800 /* Forward IPI */ +#define PNV_XIVE_FORWARD_HW 0x880 /* Forward HW */ +#define PNV_XIVE_FORWARD_OS_ESC 0x900 /* Forward OS escalation */ +#define PNV_XIVE_FORWARD_HW_ESC 0x980 /* Forward Hyp escalation */ +#define PNV_XIVE_FORWARD_REDIS 0xa00 /* Forward Redistribution */ +#define PNV_XIVE_RESERVED5 0xa80 /* Cache line 5 PowerBUS operation */ +#define PNV_XIVE_RESERVED6 0xb00 /* Cache line 6 PowerBUS operation */ +#define PNV_XIVE_RESERVED7 0xb80 /* Cache line 7 PowerBUS operation */ + +/* VC synchronisation */ +#define PNV_XIVE_SYNC_IPI 0xc00 /* Sync IPI */ +#define PNV_XIVE_SYNC_HW 0xc80 /* Sync HW */ +#define PNV_XIVE_SYNC_OS_ESC 0xd00 /* Sync OS escalation */ +#define PNV_XIVE_SYNC_HW_ESC 0xd80 /* Sync Hyp escalation */ +#define PNV_XIVE_SYNC_REDIS 0xe00 /* Sync Redistribution */ + +/* PC synchronisation */ +#define PNV_XIVE_SYNC_PULL 0xe80 /* Sync pull context */ +#define PNV_XIVE_SYNC_PUSH 0xf00 /* Sync push context */ +#define PNV_XIVE_SYNC_VPC 0xf80 /* Sync remove VPC store */ + +static void pnv_xive_ic_hw_trigger(PnvXive *xive, hwaddr addr, uint64_t val) +{ + /* + * Forward the source event notification directly to the Router. + * The source interrupt number should already be correctly encoded + * with the chip block id by the sending device (PHB, PSI). + */ + xive_router_notify(XIVE_NOTIFIER(xive), val); +} + +static void pnv_xive_ic_notify_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) +{ + PnvXive *xive = PNV_XIVE(opaque); + + /* VC: HW triggers */ + switch (addr) { + case 0x000 ... 0x7FF: + pnv_xive_ic_hw_trigger(opaque, addr, val); + break; + + /* VC: Forwarded IRQs */ + case PNV_XIVE_FORWARD_IPI: + case PNV_XIVE_FORWARD_HW: + case PNV_XIVE_FORWARD_OS_ESC: + case PNV_XIVE_FORWARD_HW_ESC: + case PNV_XIVE_FORWARD_REDIS: + /* TODO: forwarded IRQs. Should be like HW triggers */ + xive_error(xive, "IC: forwarded at @0x%"HWADDR_PRIx" IRQ 0x%"PRIx64, + addr, val); + break; + + /* VC syncs */ + case PNV_XIVE_SYNC_IPI: + case PNV_XIVE_SYNC_HW: + case PNV_XIVE_SYNC_OS_ESC: + case PNV_XIVE_SYNC_HW_ESC: + case PNV_XIVE_SYNC_REDIS: + break; + + /* PC syncs */ + case PNV_XIVE_SYNC_PULL: + case PNV_XIVE_SYNC_PUSH: + case PNV_XIVE_SYNC_VPC: + break; + + default: + xive_error(xive, "IC: invalid notify write @%"HWADDR_PRIx, addr); + } +} + +static uint64_t pnv_xive_ic_notify_read(void *opaque, hwaddr addr, + unsigned size) +{ + PnvXive *xive = PNV_XIVE(opaque); + + /* loads are invalid */ + xive_error(xive, "IC: invalid notify read @%"HWADDR_PRIx, addr); + return -1; +} + +static const MemoryRegionOps pnv_xive_ic_notify_ops = { + .read = pnv_xive_ic_notify_read, + .write = pnv_xive_ic_notify_write, + .endianness = DEVICE_BIG_ENDIAN, + .valid = { + .min_access_size = 8, + .max_access_size = 8, + }, + .impl = { + .min_access_size = 8, + .max_access_size = 8, + }, +}; + +/* + * IC - LSI MMIO handlers (not modeled) + */ + +static void pnv_xive_ic_lsi_write(void *opaque, hwaddr addr, + uint64_t val, unsigned size) +{ + PnvXive *xive = PNV_XIVE(opaque); + + xive_error(xive, "IC: LSI invalid write @%"HWADDR_PRIx, addr); +} + +static uint64_t pnv_xive_ic_lsi_read(void *opaque, hwaddr addr, unsigned size) +{ + PnvXive *xive = PNV_XIVE(opaque); + + xive_error(xive, "IC: LSI invalid read @%"HWADDR_PRIx, addr); + return -1; +} + +static const MemoryRegionOps pnv_xive_ic_lsi_ops = { + .read = pnv_xive_ic_lsi_read, + .write = pnv_xive_ic_lsi_write, + .endianness = DEVICE_BIG_ENDIAN, + .valid = { + .min_access_size = 8, + .max_access_size = 8, + }, + .impl = { + .min_access_size = 8, + .max_access_size = 8, + }, +}; + +/* + * IC - Indirect TIMA MMIO handlers + */ + +/* + * When the TIMA is accessed from the indirect page, the thread id + * (PIR) has to be configured in the IC registers before. This is used + * for resets and for debug purpose also. + */ +static XiveTCTX *pnv_xive_get_indirect_tctx(PnvXive *xive, hwaddr offset) +{ + uint8_t page_offset = (offset >> TM_SHIFT) & 0x3; + uint64_t tctxt_indir = xive->regs[(PC_TCTXT_INDIR0 >> 3) + page_offset]; + PowerPCCPU *cpu = NULL; + int pir; + + if (!(tctxt_indir & PC_TCTXT_INDIR_VALID)) { + xive_error(xive, "IC: no indirect TIMA access in progress"); + return NULL; + } + + pir = GETFIELD(PC_TCTXT_INDIR_THRDID, tctxt_indir) & 0xff; + cpu = ppc_get_vcpu_by_pir(pir); + if (!cpu) { + xive_error(xive, "IC: invalid PIR %x for indirect access", pir); + return NULL; + } + + /* Check that HW thread is XIVE enabled */ + if (!(xive->regs[PC_THREAD_EN_REG0 >> 3] & PPC_BIT(pir))) { + xive_error(xive, "IC: CPU %x is not enabled", pir); + } + + return pnv_cpu_state(cpu)->tctx; +} + +static void xive_tm_indirect_write(void *opaque, hwaddr offset, + uint64_t value, unsigned size) +{ + XiveTCTX *tctx = pnv_xive_get_indirect_tctx(PNV_XIVE(opaque), offset); + + xive_tctx_tm_write(tctx, offset, value, size); +} + +static uint64_t xive_tm_indirect_read(void *opaque, hwaddr offset, + unsigned size) +{ + XiveTCTX *tctx = pnv_xive_get_indirect_tctx(PNV_XIVE(opaque), offset); + + return xive_tctx_tm_read(tctx, offset, size); +} + +static const MemoryRegionOps xive_tm_indirect_ops = { + .read = xive_tm_indirect_read, + .write = xive_tm_indirect_write, + .endianness = DEVICE_BIG_ENDIAN, + .valid = { + .min_access_size = 1, + .max_access_size = 8, + }, + .impl = { + .min_access_size = 1, + .max_access_size = 8, + }, +}; + +/* + * Interrupt controller XSCOM region. + */ +static uint64_t pnv_xive_xscom_read(void *opaque, hwaddr addr, unsigned size) +{ + switch (addr >> 3) { + case X_VC_EQC_CONFIG: + /* FIXME (skiboot): This is the only XSCOM load. Bizarre. */ + return VC_EQC_SYNC_MASK; + default: + return pnv_xive_ic_reg_read(opaque, addr, size); + } +} + +static void pnv_xive_xscom_write(void *opaque, hwaddr addr, + uint64_t val, unsigned size) +{ + pnv_xive_ic_reg_write(opaque, addr, val, size); +} + +static const MemoryRegionOps pnv_xive_xscom_ops = { + .read = pnv_xive_xscom_read, + .write = pnv_xive_xscom_write, + .endianness = DEVICE_BIG_ENDIAN, + .valid = { + .min_access_size = 8, + .max_access_size = 8, + }, + .impl = { + .min_access_size = 8, + .max_access_size = 8, + } +}; + +/* + * Virtualization Controller MMIO region containing the IPI and END ESB pages + */ +static uint64_t pnv_xive_vc_read(void *opaque, hwaddr offset, + unsigned size) +{ + PnvXive *xive = PNV_XIVE(opaque); + uint64_t edt_index = offset >> pnv_xive_edt_shift(xive); + uint64_t edt_type = 0; + uint64_t edt_offset; + MemTxResult result; + AddressSpace *edt_as = NULL; + uint64_t ret = -1; + + if (edt_index < XIVE_TABLE_EDT_MAX) { + edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[edt_index]); + } + + switch (edt_type) { + case CQ_TDR_EDT_IPI: + edt_as = &xive->ipi_as; + break; + case CQ_TDR_EDT_EQ: + edt_as = &xive->end_as; + break; + default: + xive_error(xive, "VC: invalid EDT type for read @%"HWADDR_PRIx, offset); + return -1; + } + + /* Remap the offset for the targeted address space */ + edt_offset = pnv_xive_edt_offset(xive, offset, edt_type); + + ret = address_space_ldq(edt_as, edt_offset, MEMTXATTRS_UNSPECIFIED, + &result); + + if (result != MEMTX_OK) { + xive_error(xive, "VC: %s read failed at @0x%"HWADDR_PRIx " -> @0x%" + HWADDR_PRIx, edt_type == CQ_TDR_EDT_IPI ? "IPI" : "END", + offset, edt_offset); + return -1; + } + + return ret; +} + +static void pnv_xive_vc_write(void *opaque, hwaddr offset, + uint64_t val, unsigned size) +{ + PnvXive *xive = PNV_XIVE(opaque); + uint64_t edt_index = offset >> pnv_xive_edt_shift(xive); + uint64_t edt_type = 0; + uint64_t edt_offset; + MemTxResult result; + AddressSpace *edt_as = NULL; + + if (edt_index < XIVE_TABLE_EDT_MAX) { + edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[edt_index]); + } + + switch (edt_type) { + case CQ_TDR_EDT_IPI: + edt_as = &xive->ipi_as; + break; + case CQ_TDR_EDT_EQ: + edt_as = &xive->end_as; + break; + default: + xive_error(xive, "VC: invalid EDT type for write @%"HWADDR_PRIx, + offset); + return; + } + + /* Remap the offset for the targeted address space */ + edt_offset = pnv_xive_edt_offset(xive, offset, edt_type); + + address_space_stq(edt_as, edt_offset, val, MEMTXATTRS_UNSPECIFIED, &result); + if (result != MEMTX_OK) { + xive_error(xive, "VC: write failed at @0x%"HWADDR_PRIx, edt_offset); + } +} + +static const MemoryRegionOps pnv_xive_vc_ops = { + .read = pnv_xive_vc_read, + .write = pnv_xive_vc_write, + .endianness = DEVICE_BIG_ENDIAN, + .valid = { + .min_access_size = 8, + .max_access_size = 8, + }, + .impl = { + .min_access_size = 8, + .max_access_size = 8, + }, +}; + +/* + * Presenter Controller MMIO region. The Virtualization Controller + * updates the IPB in the NVT table when required. Not modeled. + */ +static uint64_t pnv_xive_pc_read(void *opaque, hwaddr addr, + unsigned size) +{ + PnvXive *xive = PNV_XIVE(opaque); + + xive_error(xive, "PC: invalid read @%"HWADDR_PRIx, addr); + return -1; +} + +static void pnv_xive_pc_write(void *opaque, hwaddr addr, + uint64_t value, unsigned size) +{ + PnvXive *xive = PNV_XIVE(opaque); + + xive_error(xive, "PC: invalid write to VC @%"HWADDR_PRIx, addr); +} + +static const MemoryRegionOps pnv_xive_pc_ops = { + .read = pnv_xive_pc_read, + .write = pnv_xive_pc_write, + .endianness = DEVICE_BIG_ENDIAN, + .valid = { + .min_access_size = 8, + .max_access_size = 8, + }, + .impl = { + .min_access_size = 8, + .max_access_size = 8, + }, +}; + +void pnv_xive_pic_print_info(PnvXive *xive, Monitor *mon) +{ + XiveRouter *xrtr = XIVE_ROUTER(xive); + XiveEAS eas; + XiveEND end; + uint32_t endno = 0; + uint32_t srcno = 0; + uint32_t srcno0 = XIVE_SRCNO(xive->chip_id, 0); + + monitor_printf(mon, "XIVE[%x] Source %08x .. %08x\n", xive->chip_id, + srcno0, srcno0 + xive->nr_irqs - 1); + xive_source_pic_print_info(&xive->source, srcno0, mon); + + monitor_printf(mon, "XIVE[%x] EAT %08x .. %08x\n", xive->chip_id, + srcno0, srcno0 + xive->nr_irqs - 1); + while (!xive_router_get_eas(xrtr, xive->chip_id, srcno, &eas)) { + if (!xive_eas_is_masked(&eas)) { + xive_eas_pic_print_info(&eas, srcno, mon); + } + srcno++; + } + + monitor_printf(mon, "XIVE[%x] ENDT %08x .. %08x\n", xive->chip_id, + 0, xive->nr_ends - 1); + while (!xive_router_get_end(xrtr, xive->chip_id, endno, &end)) { + xive_end_pic_print_info(&end, endno++, mon); + } +} + +static void pnv_xive_reset(void *dev) +{ + PnvXive *xive = PNV_XIVE(dev); + XiveSource *xsrc = &xive->source; + XiveENDSource *end_xsrc = &xive->end_source; + + /* + * Use the PnvChip id to identify the XIVE interrupt controller. + * It can be overriden by configuration at runtime. + */ + xive->chip_id = xive->tctx_chipid = xive->chip->chip_id; + + /* Default page size (Should be changed at runtime to 64k) */ + xive->ic_shift = xive->vc_shift = xive->pc_shift = 12; + + /* Clear subregions */ + if (memory_region_is_mapped(&xsrc->esb_mmio)) { + memory_region_del_subregion(&xive->ipi_edt_mmio, &xsrc->esb_mmio); + } + + if (memory_region_is_mapped(&xive->ipi_edt_mmio)) { + memory_region_del_subregion(&xive->ipi_mmio, &xive->ipi_edt_mmio); + } + + if (memory_region_is_mapped(&end_xsrc->esb_mmio)) { + memory_region_del_subregion(&xive->end_edt_mmio, &end_xsrc->esb_mmio); + } + + if (memory_region_is_mapped(&xive->end_edt_mmio)) { + memory_region_del_subregion(&xive->end_mmio, &xive->end_edt_mmio); + } +} + +static void pnv_xive_init(Object *obj) +{ + PnvXive *xive = PNV_XIVE(obj); + + object_initialize(&xive->source, sizeof(xive->source), TYPE_XIVE_SOURCE); + object_property_add_child(obj, "source", OBJECT(&xive->source), NULL); + + object_initialize(&xive->end_source, sizeof(xive->end_source), + TYPE_XIVE_END_SOURCE); + object_property_add_child(obj, "end_source", OBJECT(&xive->end_source), + NULL); +} + +/* + * Maximum number of IRQs and ENDs supported by HW + */ +#define PNV_XIVE_NR_IRQS (PNV9_XIVE_VC_SIZE / (1ull << XIVE_ESB_64K_2PAGE)) +#define PNV_XIVE_NR_ENDS (PNV9_XIVE_VC_SIZE / (1ull << XIVE_ESB_64K_2PAGE)) + +static void pnv_xive_realize(DeviceState *dev, Error **errp) +{ + PnvXive *xive = PNV_XIVE(dev); + XiveSource *xsrc = &xive->source; + XiveENDSource *end_xsrc = &xive->end_source; + Error *local_err = NULL; + Object *obj; + + obj = object_property_get_link(OBJECT(dev), "chip", &local_err); + if (!obj) { + error_propagate(errp, local_err); + error_prepend(errp, "required link 'chip' not found: "); + return; + } + + /* The PnvChip id identifies the XIVE interrupt controller. */ + xive->chip = PNV_CHIP(obj); + + /* + * Xive Interrupt source and END source object with the maximum + * allowed HW configuration. The ESB MMIO regions will be resized + * dynamically when the controller is configured by the FW to + * limit accesses to resources not provisioned. + */ + object_property_set_int(OBJECT(xsrc), PNV_XIVE_NR_IRQS, "nr-irqs", + &error_fatal); + object_property_add_const_link(OBJECT(xsrc), "xive", OBJECT(xive), + &error_fatal); + object_property_set_bool(OBJECT(xsrc), true, "realized", &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + + object_property_set_int(OBJECT(end_xsrc), PNV_XIVE_NR_ENDS, "nr-ends", + &error_fatal); + object_property_add_const_link(OBJECT(end_xsrc), "xive", OBJECT(xive), + &error_fatal); + object_property_set_bool(OBJECT(end_xsrc), true, "realized", &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + + /* Default page size. Generally changed at runtime to 64k */ + xive->ic_shift = xive->vc_shift = xive->pc_shift = 12; + + /* XSCOM region, used for initial configuration of the BARs */ + memory_region_init_io(&xive->xscom_regs, OBJECT(dev), &pnv_xive_xscom_ops, + xive, "xscom-xive", PNV9_XSCOM_XIVE_SIZE << 3); + + /* Interrupt controller MMIO regions */ + memory_region_init(&xive->ic_mmio, OBJECT(dev), "xive-ic", + PNV9_XIVE_IC_SIZE); + + memory_region_init_io(&xive->ic_reg_mmio, OBJECT(dev), &pnv_xive_ic_reg_ops, + xive, "xive-ic-reg", 1 << xive->ic_shift); + memory_region_init_io(&xive->ic_notify_mmio, OBJECT(dev), + &pnv_xive_ic_notify_ops, + xive, "xive-ic-notify", 1 << xive->ic_shift); + + /* The Pervasive LSI trigger and EOI pages (not modeled) */ + memory_region_init_io(&xive->ic_lsi_mmio, OBJECT(dev), &pnv_xive_ic_lsi_ops, + xive, "xive-ic-lsi", 2 << xive->ic_shift); + + /* Thread Interrupt Management Area (Indirect) */ + memory_region_init_io(&xive->tm_indirect_mmio, OBJECT(dev), + &xive_tm_indirect_ops, + xive, "xive-tima-indirect", PNV9_XIVE_TM_SIZE); + /* + * Overall Virtualization Controller MMIO region containing the + * IPI ESB pages and END ESB pages. The layout is defined by the + * EDT "Domain table" and the accesses are dispatched using + * address spaces for each. + */ + memory_region_init_io(&xive->vc_mmio, OBJECT(xive), &pnv_xive_vc_ops, xive, + "xive-vc", PNV9_XIVE_VC_SIZE); + + memory_region_init(&xive->ipi_mmio, OBJECT(xive), "xive-vc-ipi", + PNV9_XIVE_VC_SIZE); + address_space_init(&xive->ipi_as, &xive->ipi_mmio, "xive-vc-ipi"); + memory_region_init(&xive->end_mmio, OBJECT(xive), "xive-vc-end", + PNV9_XIVE_VC_SIZE); + address_space_init(&xive->end_as, &xive->end_mmio, "xive-vc-end"); + + /* + * The MMIO windows exposing the IPI ESBs and the END ESBs in the + * VC region. Their size is configured by the FW in the EDT table. + */ + memory_region_init(&xive->ipi_edt_mmio, OBJECT(xive), "xive-vc-ipi-edt", 0); + memory_region_init(&xive->end_edt_mmio, OBJECT(xive), "xive-vc-end-edt", 0); + + /* Presenter Controller MMIO region (not modeled) */ + memory_region_init_io(&xive->pc_mmio, OBJECT(xive), &pnv_xive_pc_ops, xive, + "xive-pc", PNV9_XIVE_PC_SIZE); + + /* Thread Interrupt Management Area (Direct) */ + memory_region_init_io(&xive->tm_mmio, OBJECT(xive), &xive_tm_ops, + xive, "xive-tima", PNV9_XIVE_TM_SIZE); + + qemu_register_reset(pnv_xive_reset, dev); +} + +static int pnv_xive_dt_xscom(PnvXScomInterface *dev, void *fdt, + int xscom_offset) +{ + const char compat[] = "ibm,power9-xive-x"; + char *name; + int offset; + uint32_t lpc_pcba = PNV9_XSCOM_XIVE_BASE; + uint32_t reg[] = { + cpu_to_be32(lpc_pcba), + cpu_to_be32(PNV9_XSCOM_XIVE_SIZE) + }; + + name = g_strdup_printf("xive@%x", lpc_pcba); + offset = fdt_add_subnode(fdt, xscom_offset, name); + _FDT(offset); + g_free(name); + + _FDT((fdt_setprop(fdt, offset, "reg", reg, sizeof(reg)))); + _FDT((fdt_setprop(fdt, offset, "compatible", compat, + sizeof(compat)))); + return 0; +} + +static Property pnv_xive_properties[] = { + DEFINE_PROP_UINT64("ic-bar", PnvXive, ic_base, 0), + DEFINE_PROP_UINT64("vc-bar", PnvXive, vc_base, 0), + DEFINE_PROP_UINT64("pc-bar", PnvXive, pc_base, 0), + DEFINE_PROP_UINT64("tm-bar", PnvXive, tm_base, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static void pnv_xive_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PnvXScomInterfaceClass *xdc = PNV_XSCOM_INTERFACE_CLASS(klass); + XiveRouterClass *xrc = XIVE_ROUTER_CLASS(klass); + XiveNotifierClass *xnc = XIVE_NOTIFIER_CLASS(klass); + + xdc->dt_xscom = pnv_xive_dt_xscom; + + dc->desc = "PowerNV XIVE Interrupt Controller"; + dc->realize = pnv_xive_realize; + dc->props = pnv_xive_properties; + + xrc->get_eas = pnv_xive_get_eas; + xrc->get_end = pnv_xive_get_end; + xrc->write_end = pnv_xive_write_end; + xrc->get_nvt = pnv_xive_get_nvt; + xrc->write_nvt = pnv_xive_write_nvt; + xrc->get_tctx = pnv_xive_get_tctx; + + xnc->notify = pnv_xive_notify; +}; + +static const TypeInfo pnv_xive_info = { + .name = TYPE_PNV_XIVE, + .parent = TYPE_XIVE_ROUTER, + .instance_init = pnv_xive_init, + .instance_size = sizeof(PnvXive), + .class_init = pnv_xive_class_init, + .interfaces = (InterfaceInfo[]) { + { TYPE_PNV_XSCOM_INTERFACE }, + { } + } +}; + +static void pnv_xive_register_types(void) +{ + type_register_static(&pnv_xive_info); +} + +type_init(pnv_xive_register_types) diff --git a/hw/intc/xive.c b/hw/intc/xive.c index ee6e81425784..0e0e1dc9c1b7 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -54,6 +54,8 @@ static uint8_t exception_mask(uint8_t ring) switch (ring) { case TM_QW1_OS: return TM_QW1_NSR_EO; + case TM_QW3_HV_PHYS: + return TM_QW3_NSR_HE; default: g_assert_not_reached(); } @@ -88,7 +90,16 @@ static void xive_tctx_notify(XiveTCTX *tctx, uint8_t ring) uint8_t *regs = &tctx->regs[ring]; if (regs[TM_PIPR] < regs[TM_CPPR]) { - regs[TM_NSR] |= exception_mask(ring); + switch (ring) { + case TM_QW1_OS: + regs[TM_NSR] |= TM_QW1_NSR_EO; + break; + case TM_QW3_HV_PHYS: + regs[TM_NSR] |= (TM_QW3_NSR_HE_PHYS << 6); + break; + default: + g_assert_not_reached(); + } qemu_irq_raise(tctx->output); } } @@ -109,6 +120,38 @@ static void xive_tctx_set_cppr(XiveTCTX *tctx, uint8_t ring, uint8_t cppr) * XIVE Thread Interrupt Management Area (TIMA) */ +static void xive_tm_set_hv_cppr(XiveTCTX *tctx, hwaddr offset, + uint64_t value, unsigned size) +{ + xive_tctx_set_cppr(tctx, TM_QW3_HV_PHYS, value & 0xff); +} + +static uint64_t xive_tm_ack_hv_reg(XiveTCTX *tctx, hwaddr offset, unsigned size) +{ + return xive_tctx_accept(tctx, TM_QW3_HV_PHYS); +} + +static uint64_t xive_tm_pull_pool_ctx(XiveTCTX *tctx, hwaddr offset, + unsigned size) +{ + uint64_t ret; + + ret = tctx->regs[TM_QW2_HV_POOL + TM_WORD2] & TM_QW2W2_POOL_CAM; + tctx->regs[TM_QW2_HV_POOL + TM_WORD2] &= ~TM_QW2W2_POOL_CAM; + return ret; +} + +static void xive_tm_vt_push(XiveTCTX *tctx, hwaddr offset, + uint64_t value, unsigned size) +{ + tctx->regs[TM_QW3_HV_PHYS + TM_WORD2] = value & 0xff; +} + +static uint64_t xive_tm_vt_poll(XiveTCTX *tctx, hwaddr offset, unsigned size) +{ + return tctx->regs[TM_QW3_HV_PHYS + TM_WORD2] & 0xff; +} + /* * Define an access map for each page of the TIMA that we will use in * the memory region ops to filter values when doing loads and stores @@ -288,10 +331,16 @@ static const XiveTmOp xive_tm_operations[] = { * effects */ { XIVE_TM_OS_PAGE, TM_QW1_OS + TM_CPPR, 1, xive_tm_set_os_cppr, NULL }, + { XIVE_TM_HV_PAGE, TM_QW3_HV_PHYS + TM_CPPR, 1, xive_tm_set_hv_cppr, NULL }, + { XIVE_TM_HV_PAGE, TM_QW3_HV_PHYS + TM_WORD2, 1, xive_tm_vt_push, NULL }, + { XIVE_TM_HV_PAGE, TM_QW3_HV_PHYS + TM_WORD2, 1, NULL, xive_tm_vt_poll }, /* MMIOs above 2K : special operations with side effects */ { XIVE_TM_OS_PAGE, TM_SPC_ACK_OS_REG, 2, NULL, xive_tm_ack_os_reg }, { XIVE_TM_OS_PAGE, TM_SPC_SET_OS_PENDING, 1, xive_tm_set_os_pending, NULL }, + { XIVE_TM_HV_PAGE, TM_SPC_ACK_HV_REG, 2, NULL, xive_tm_ack_hv_reg }, + { XIVE_TM_HV_PAGE, TM_SPC_PULL_POOL_CTX, 4, NULL, xive_tm_pull_pool_ctx }, + { XIVE_TM_HV_PAGE, TM_SPC_PULL_POOL_CTX, 8, NULL, xive_tm_pull_pool_ctx }, }; static const XiveTmOp *xive_tm_find_op(hwaddr offset, unsigned size, bool write) @@ -323,7 +372,7 @@ void xive_tctx_tm_write(XiveTCTX *tctx, hwaddr offset, uint64_t value, const XiveTmOp *xto; /* - * TODO: check V bit in Q[0-3]W2, check PTER bit associated with CPU + * TODO: check V bit in Q[0-3]W2 */ /* @@ -360,7 +409,7 @@ uint64_t xive_tctx_tm_read(XiveTCTX *tctx, hwaddr offset, unsigned size) const XiveTmOp *xto; /* - * TODO: check V bit in Q[0-3]W2, check PTER bit associated with CPU + * TODO: check V bit in Q[0-3]W2 */ /* @@ -474,6 +523,8 @@ static void xive_tctx_reset(void *dev) */ tctx->regs[TM_QW1_OS + TM_PIPR] = ipb_to_pipr(tctx->regs[TM_QW1_OS + TM_IPB]); + tctx->regs[TM_QW3_HV_PHYS + TM_PIPR] = + ipb_to_pipr(tctx->regs[TM_QW3_HV_PHYS + TM_IPB]); } static void xive_tctx_realize(DeviceState *dev, Error **errp) @@ -1424,7 +1475,7 @@ static void xive_router_end_notify(XiveRouter *xrtr, uint8_t end_blk, /* TODO: Auto EOI. */ } -static void xive_router_notify(XiveNotifier *xn, uint32_t lisn) +void xive_router_notify(XiveNotifier *xn, uint32_t lisn) { XiveRouter *xrtr = XIVE_ROUTER(xn); uint8_t eas_blk = XIVE_SRCNO_BLOCK(lisn); diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 0c9de76b71ff..6bb0772367d4 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -279,7 +279,10 @@ static void pnv_dt_chip(PnvChip *chip, void *fdt) pnv_dt_core(chip, pnv_core, fdt); /* Interrupt Control Presenters (ICP). One per core. */ - pnv_dt_icp(chip, fdt, pnv_core->pir, CPU_CORE(pnv_core)->nr_threads); + if (!pnv_chip_is_power9(chip)) { + pnv_dt_icp(chip, fdt, pnv_core->pir, + CPU_CORE(pnv_core)->nr_threads); + } } if (chip->ram_size) { @@ -703,7 +706,23 @@ static uint32_t pnv_chip_core_pir_p9(PnvChip *chip, uint32_t core_id) static void pnv_chip_power9_intc_create(PnvChip *chip, PowerPCCPU *cpu, Error **errp) { - return; + Pnv9Chip *chip9 = PNV9_CHIP(chip); + Error *local_err = NULL; + Object *obj; + PnvCPUState *pnv_cpu = pnv_cpu_state(cpu); + + /* + * The core creates its interrupt presenter but the XIVE interrupt + * controller object is initialized afterwards. Hopefully, it's + * only used at runtime. + */ + obj = xive_tctx_create(OBJECT(cpu), XIVE_ROUTER(&chip9->xive), errp); + if (local_err) { + error_propagate(errp, local_err); + return; + } + + pnv_cpu->tctx = XIVE_TCTX(obj); } /* Allowed core identifiers on a POWER8 Processor Chip : @@ -885,11 +904,19 @@ static void pnv_chip_power8nvl_class_init(ObjectClass *klass, void *data) static void pnv_chip_power9_instance_init(Object *obj) { + Pnv9Chip *chip9 = PNV9_CHIP(obj); + + object_initialize(&chip9->xive, sizeof(chip9->xive), TYPE_PNV_XIVE); + object_property_add_child(obj, "xive", OBJECT(&chip9->xive), NULL); + object_property_add_const_link(OBJECT(&chip9->xive), "chip", obj, + &error_abort); } static void pnv_chip_power9_realize(DeviceState *dev, Error **errp) { PnvChipClass *pcc = PNV_CHIP_GET_CLASS(dev); + Pnv9Chip *chip9 = PNV9_CHIP(dev); + PnvChip *chip = PNV_CHIP(dev); Error *local_err = NULL; pcc->parent_realize(dev, &local_err); @@ -897,6 +924,24 @@ static void pnv_chip_power9_realize(DeviceState *dev, Error **errp) error_propagate(errp, local_err); return; } + + /* XIVE interrupt controller (POWER9) */ + object_property_set_int(OBJECT(&chip9->xive), PNV9_XIVE_IC_BASE(chip), + "ic-bar", &error_fatal); + object_property_set_int(OBJECT(&chip9->xive), PNV9_XIVE_VC_BASE(chip), + "vc-bar", &error_fatal); + object_property_set_int(OBJECT(&chip9->xive), PNV9_XIVE_PC_BASE(chip), + "pc-bar", &error_fatal); + object_property_set_int(OBJECT(&chip9->xive), PNV9_XIVE_TM_BASE(chip), + "tm-bar", &error_fatal); + object_property_set_bool(OBJECT(&chip9->xive), true, "realized", + &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + pnv_xscom_add_subregion(chip, PNV9_XSCOM_XIVE_BASE, + &chip9->xive.xscom_regs); } static void pnv_chip_power9_class_init(ObjectClass *klass, void *data) @@ -1097,12 +1142,25 @@ static void pnv_pic_print_info(InterruptStatsProvider *obj, CPU_FOREACH(cs) { PowerPCCPU *cpu = POWERPC_CPU(cs); - icp_pic_print_info(pnv_cpu_state(cpu)->icp, mon); + if (pnv_chip_is_power9(pnv->chips[0])) { + xive_tctx_pic_print_info(pnv_cpu_state(cpu)->tctx, mon); + } else { + icp_pic_print_info(pnv_cpu_state(cpu)->icp, mon); + } } for (i = 0; i < pnv->num_chips; i++) { - Pnv8Chip *chip8 = PNV8_CHIP(pnv->chips[i]); - ics_pic_print_info(&chip8->psi.ics, mon); + PnvChip *chip = pnv->chips[i]; + + if (pnv_chip_is_power9(pnv->chips[i])) { + Pnv9Chip *chip9 = PNV9_CHIP(chip); + + pnv_xive_pic_print_info(&chip9->xive, mon); + } else { + Pnv8Chip *chip8 = PNV8_CHIP(chip); + + ics_pic_print_info(&chip8->psi.ics, mon); + } } } diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index 301a8e972d91..df712c3e6c93 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -39,7 +39,7 @@ obj-$(CONFIG_XICS_SPAPR) += xics_spapr.o obj-$(CONFIG_XICS_KVM) += xics_kvm.o obj-$(CONFIG_XIVE) += xive.o obj-$(CONFIG_XIVE_SPAPR) += spapr_xive.o -obj-$(CONFIG_POWERNV) += xics_pnv.o +obj-$(CONFIG_POWERNV) += xics_pnv.o pnv_xive.o obj-$(CONFIG_ALLWINNER_A10_PIC) += allwinner-a10-pic.o obj-$(CONFIG_S390_FLIC) += s390_flic.o obj-$(CONFIG_S390_FLIC_KVM) += s390_flic_kvm.o -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 05/19] ppc/pnv: add XIVE support 2019-01-28 9:46 ` [Qemu-devel] [PATCH 05/19] ppc/pnv: add XIVE support Cédric Le Goater @ 2019-02-12 5:40 ` David Gibson 2019-02-19 7:31 ` Cédric Le Goater 0 siblings, 1 reply; 50+ messages in thread From: David Gibson @ 2019-02-12 5:40 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel [-- Attachment #1: Type: text/plain, Size: 92504 bytes --] On Mon, Jan 28, 2019 at 10:46:11AM +0100, Cédric Le Goater wrote: > This is simple model of the POWER9 XIVE interrupt controller for the > PowerNV machine. XIVE for baremetal is a complex controller and the > model only addresses the needs of the skiboot firmware. > > The PowerNV model reuses the common XIVE framework developed for sPAPR > and the fundamentals aspects are quite the same. The difference are > outlined below. > > The controller initial BAR configuration is performed using the XSCOM > bus from there, MMIO are used for further configuration. > > The MMIO regions exposed are : > > - Interrupt controller registers > - ESB pages for IPIs and ENDs > - Presenter MMIO (Not used) > - Thread Interrupt Management Area MMIO, direct and indirect > > The virtualization controller MMIO region containing the IPI ESB pages > and END ESB pages is sub-divided into "sets" which map portions of the > VC region to the different ESB pages. These are modeled with custom > address spaces and the XiveSource and XiveENDSource objects are sized > to the maximum allowed by HW. The memory regions are resized at > run-time using the configuration of EDT set translation table provided > by the firmware. > > The XIVE virtualization structure tables (EAT, ENDT, NVTT) are now in > the machine RAM and not in the hypervisor anymore. The firmware > (skiboot) configures these tables using Virtual Structure Descriptor > defining the characteristics of each table : SBE, EAS, END and > NVT. These are later used to access the virtual interrupt entries. The > internal cache of these tables in the interrupt controller is updated > and invalidated using a set of registers. > > Still to address to complete the model but not fully required is the > support for block grouping. Escalation support will be necessary for > KVM guests. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > hw/intc/pnv_xive_regs.h | 315 +++++++ > include/hw/ppc/pnv.h | 21 + > include/hw/ppc/pnv_core.h | 1 + > include/hw/ppc/pnv_xive.h | 95 ++ > include/hw/ppc/pnv_xscom.h | 3 + > include/hw/ppc/xive.h | 1 + > hw/intc/pnv_xive.c | 1698 ++++++++++++++++++++++++++++++++++++ > hw/intc/xive.c | 59 +- > hw/ppc/pnv.c | 68 +- > hw/intc/Makefile.objs | 2 +- > 10 files changed, 2253 insertions(+), 10 deletions(-) > create mode 100644 hw/intc/pnv_xive_regs.h > create mode 100644 include/hw/ppc/pnv_xive.h > create mode 100644 hw/intc/pnv_xive.c > > diff --git a/hw/intc/pnv_xive_regs.h b/hw/intc/pnv_xive_regs.h > new file mode 100644 > index 000000000000..96ac27701cee > --- /dev/null > +++ b/hw/intc/pnv_xive_regs.h > @@ -0,0 +1,315 @@ > +/* > + * QEMU PowerPC XIVE interrupt controller model > + * > + * Copyright (c) 2017-2018, IBM Corporation. > + * > + * This code is licensed under the GPL version 2 or later. See the > + * COPYING file in the top-level directory. > + */ > + > +#ifndef PPC_PNV_XIVE_REGS_H > +#define PPC_PNV_XIVE_REGS_H > + > +/* IC register offsets 0x0 - 0x400 */ > +#define CQ_SWI_CMD_HIST 0x020 > +#define CQ_SWI_CMD_POLL 0x028 > +#define CQ_SWI_CMD_BCAST 0x030 > +#define CQ_SWI_CMD_ASSIGN 0x038 > +#define CQ_SWI_CMD_BLK_UPD 0x040 > +#define CQ_SWI_RSP 0x048 > +#define X_CQ_CFG_PB_GEN 0x0a > +#define CQ_CFG_PB_GEN 0x050 > +#define CQ_INT_ADDR_OPT PPC_BITMASK(14, 15) > +#define X_CQ_IC_BAR 0x10 > +#define X_CQ_MSGSND 0x0b > +#define CQ_MSGSND 0x058 > +#define CQ_CNPM_SEL 0x078 > +#define CQ_IC_BAR 0x080 > +#define CQ_IC_BAR_VALID PPC_BIT(0) > +#define CQ_IC_BAR_64K PPC_BIT(1) > +#define X_CQ_TM1_BAR 0x12 > +#define CQ_TM1_BAR 0x90 > +#define X_CQ_TM2_BAR 0x014 > +#define CQ_TM2_BAR 0x0a0 > +#define CQ_TM_BAR_VALID PPC_BIT(0) > +#define CQ_TM_BAR_64K PPC_BIT(1) > +#define X_CQ_PC_BAR 0x16 > +#define CQ_PC_BAR 0x0b0 > +#define CQ_PC_BAR_VALID PPC_BIT(0) > +#define X_CQ_PC_BARM 0x17 > +#define CQ_PC_BARM 0x0b8 > +#define CQ_PC_BARM_MASK PPC_BITMASK(26, 38) > +#define X_CQ_VC_BAR 0x18 > +#define CQ_VC_BAR 0x0c0 > +#define CQ_VC_BAR_VALID PPC_BIT(0) > +#define X_CQ_VC_BARM 0x19 > +#define CQ_VC_BARM 0x0c8 > +#define CQ_VC_BARM_MASK PPC_BITMASK(21, 37) > +#define X_CQ_TAR 0x1e > +#define CQ_TAR 0x0f0 > +#define CQ_TAR_TBL_AUTOINC PPC_BIT(0) > +#define CQ_TAR_TSEL PPC_BITMASK(12, 15) > +#define CQ_TAR_TSEL_BLK PPC_BIT(12) > +#define CQ_TAR_TSEL_MIG PPC_BIT(13) > +#define CQ_TAR_TSEL_VDT PPC_BIT(14) > +#define CQ_TAR_TSEL_EDT PPC_BIT(15) > +#define CQ_TAR_TSEL_INDEX PPC_BITMASK(26, 31) > +#define X_CQ_TDR 0x1f > +#define CQ_TDR 0x0f8 > +#define CQ_TDR_VDT_VALID PPC_BIT(0) > +#define CQ_TDR_VDT_BLK PPC_BITMASK(11, 15) > +#define CQ_TDR_VDT_INDEX PPC_BITMASK(28, 31) > +#define CQ_TDR_EDT_TYPE PPC_BITMASK(0, 1) > +#define CQ_TDR_EDT_INVALID 0 > +#define CQ_TDR_EDT_IPI 1 > +#define CQ_TDR_EDT_EQ 2 > +#define CQ_TDR_EDT_BLK PPC_BITMASK(12, 15) > +#define CQ_TDR_EDT_INDEX PPC_BITMASK(26, 31) > +#define X_CQ_PBI_CTL 0x20 > +#define CQ_PBI_CTL 0x100 > +#define CQ_PBI_PC_64K PPC_BIT(5) > +#define CQ_PBI_VC_64K PPC_BIT(6) > +#define CQ_PBI_LNX_TRIG PPC_BIT(7) > +#define CQ_PBI_FORCE_TM_LOCAL PPC_BIT(22) > +#define CQ_PBO_CTL 0x108 > +#define CQ_AIB_CTL 0x110 > +#define X_CQ_RST_CTL 0x23 > +#define CQ_RST_CTL 0x118 > +#define X_CQ_FIRMASK 0x33 > +#define CQ_FIRMASK 0x198 > +#define X_CQ_FIRMASK_AND 0x34 > +#define CQ_FIRMASK_AND 0x1a0 > +#define X_CQ_FIRMASK_OR 0x35 > +#define CQ_FIRMASK_OR 0x1a8 > + > +/* PC LBS1 register offsets 0x400 - 0x800 */ > +#define X_PC_TCTXT_CFG 0x100 > +#define PC_TCTXT_CFG 0x400 > +#define PC_TCTXT_CFG_BLKGRP_EN PPC_BIT(0) > +#define PC_TCTXT_CFG_TARGET_EN PPC_BIT(1) > +#define PC_TCTXT_CFG_LGS_EN PPC_BIT(2) > +#define PC_TCTXT_CFG_STORE_ACK PPC_BIT(3) > +#define PC_TCTXT_CFG_HARD_CHIPID_BLK PPC_BIT(8) > +#define PC_TCTXT_CHIPID_OVERRIDE PPC_BIT(9) > +#define PC_TCTXT_CHIPID PPC_BITMASK(12, 15) > +#define PC_TCTXT_INIT_AGE PPC_BITMASK(30, 31) > +#define X_PC_TCTXT_TRACK 0x101 > +#define PC_TCTXT_TRACK 0x408 > +#define PC_TCTXT_TRACK_EN PPC_BIT(0) > +#define X_PC_TCTXT_INDIR0 0x104 > +#define PC_TCTXT_INDIR0 0x420 > +#define PC_TCTXT_INDIR_VALID PPC_BIT(0) > +#define PC_TCTXT_INDIR_THRDID PPC_BITMASK(9, 15) > +#define X_PC_TCTXT_INDIR1 0x105 > +#define PC_TCTXT_INDIR1 0x428 > +#define X_PC_TCTXT_INDIR2 0x106 > +#define PC_TCTXT_INDIR2 0x430 > +#define X_PC_TCTXT_INDIR3 0x107 > +#define PC_TCTXT_INDIR3 0x438 > +#define X_PC_THREAD_EN_REG0 0x108 > +#define PC_THREAD_EN_REG0 0x440 > +#define X_PC_THREAD_EN_REG0_SET 0x109 > +#define PC_THREAD_EN_REG0_SET 0x448 > +#define X_PC_THREAD_EN_REG0_CLR 0x10a > +#define PC_THREAD_EN_REG0_CLR 0x450 > +#define X_PC_THREAD_EN_REG1 0x10c > +#define PC_THREAD_EN_REG1 0x460 > +#define X_PC_THREAD_EN_REG1_SET 0x10d > +#define PC_THREAD_EN_REG1_SET 0x468 > +#define X_PC_THREAD_EN_REG1_CLR 0x10e > +#define PC_THREAD_EN_REG1_CLR 0x470 > +#define X_PC_GLOBAL_CONFIG 0x110 > +#define PC_GLOBAL_CONFIG 0x480 > +#define PC_GCONF_INDIRECT PPC_BIT(32) > +#define PC_GCONF_CHIPID_OVR PPC_BIT(40) > +#define PC_GCONF_CHIPID PPC_BITMASK(44, 47) > +#define X_PC_VSD_TABLE_ADDR 0x111 > +#define PC_VSD_TABLE_ADDR 0x488 > +#define X_PC_VSD_TABLE_DATA 0x112 > +#define PC_VSD_TABLE_DATA 0x490 > +#define X_PC_AT_KILL 0x116 > +#define PC_AT_KILL 0x4b0 > +#define PC_AT_KILL_VALID PPC_BIT(0) > +#define PC_AT_KILL_BLOCK_ID PPC_BITMASK(27, 31) > +#define PC_AT_KILL_OFFSET PPC_BITMASK(48, 60) > +#define X_PC_AT_KILL_MASK 0x117 > +#define PC_AT_KILL_MASK 0x4b8 > + > +/* PC LBS2 register offsets */ > +#define X_PC_VPC_CACHE_ENABLE 0x161 > +#define PC_VPC_CACHE_ENABLE 0x708 > +#define PC_VPC_CACHE_EN_MASK PPC_BITMASK(0, 31) > +#define X_PC_VPC_SCRUB_TRIG 0x162 > +#define PC_VPC_SCRUB_TRIG 0x710 > +#define X_PC_VPC_SCRUB_MASK 0x163 > +#define PC_VPC_SCRUB_MASK 0x718 > +#define PC_SCRUB_VALID PPC_BIT(0) > +#define PC_SCRUB_WANT_DISABLE PPC_BIT(1) > +#define PC_SCRUB_WANT_INVAL PPC_BIT(2) > +#define PC_SCRUB_BLOCK_ID PPC_BITMASK(27, 31) > +#define PC_SCRUB_OFFSET PPC_BITMASK(45, 63) > +#define X_PC_VPC_CWATCH_SPEC 0x167 > +#define PC_VPC_CWATCH_SPEC 0x738 > +#define PC_VPC_CWATCH_CONFLICT PPC_BIT(0) > +#define PC_VPC_CWATCH_FULL PPC_BIT(8) > +#define PC_VPC_CWATCH_BLOCKID PPC_BITMASK(27, 31) > +#define PC_VPC_CWATCH_OFFSET PPC_BITMASK(45, 63) > +#define X_PC_VPC_CWATCH_DAT0 0x168 > +#define PC_VPC_CWATCH_DAT0 0x740 > +#define X_PC_VPC_CWATCH_DAT1 0x169 > +#define PC_VPC_CWATCH_DAT1 0x748 > +#define X_PC_VPC_CWATCH_DAT2 0x16a > +#define PC_VPC_CWATCH_DAT2 0x750 > +#define X_PC_VPC_CWATCH_DAT3 0x16b > +#define PC_VPC_CWATCH_DAT3 0x758 > +#define X_PC_VPC_CWATCH_DAT4 0x16c > +#define PC_VPC_CWATCH_DAT4 0x760 > +#define X_PC_VPC_CWATCH_DAT5 0x16d > +#define PC_VPC_CWATCH_DAT5 0x768 > +#define X_PC_VPC_CWATCH_DAT6 0x16e > +#define PC_VPC_CWATCH_DAT6 0x770 > +#define X_PC_VPC_CWATCH_DAT7 0x16f > +#define PC_VPC_CWATCH_DAT7 0x778 > + > +/* VC0 register offsets 0x800 - 0xFFF */ > +#define X_VC_GLOBAL_CONFIG 0x200 > +#define VC_GLOBAL_CONFIG 0x800 > +#define VC_GCONF_INDIRECT PPC_BIT(32) > +#define X_VC_VSD_TABLE_ADDR 0x201 > +#define VC_VSD_TABLE_ADDR 0x808 > +#define X_VC_VSD_TABLE_DATA 0x202 > +#define VC_VSD_TABLE_DATA 0x810 > +#define VC_IVE_ISB_BLOCK_MODE 0x818 > +#define VC_EQD_BLOCK_MODE 0x820 > +#define VC_VPS_BLOCK_MODE 0x828 > +#define X_VC_IRQ_CONFIG_IPI 0x208 > +#define VC_IRQ_CONFIG_IPI 0x840 > +#define VC_IRQ_CONFIG_MEMB_EN PPC_BIT(45) > +#define VC_IRQ_CONFIG_MEMB_SZ PPC_BITMASK(46, 51) > +#define VC_IRQ_CONFIG_HW 0x848 > +#define VC_IRQ_CONFIG_CASCADE1 0x850 > +#define VC_IRQ_CONFIG_CASCADE2 0x858 > +#define VC_IRQ_CONFIG_REDIST 0x860 > +#define VC_IRQ_CONFIG_IPI_CASC 0x868 > +#define X_VC_AIB_TX_ORDER_TAG2 0x22d > +#define VC_AIB_TX_ORDER_TAG2_REL_TF PPC_BIT(20) > +#define VC_AIB_TX_ORDER_TAG2 0x890 > +#define X_VC_AT_MACRO_KILL 0x23e > +#define VC_AT_MACRO_KILL 0x8b0 > +#define X_VC_AT_MACRO_KILL_MASK 0x23f > +#define VC_AT_MACRO_KILL_MASK 0x8b8 > +#define VC_KILL_VALID PPC_BIT(0) > +#define VC_KILL_TYPE PPC_BITMASK(14, 15) > +#define VC_KILL_IRQ 0 > +#define VC_KILL_IVC 1 > +#define VC_KILL_SBC 2 > +#define VC_KILL_EQD 3 > +#define VC_KILL_BLOCK_ID PPC_BITMASK(27, 31) > +#define VC_KILL_OFFSET PPC_BITMASK(48, 60) > +#define X_VC_EQC_CACHE_ENABLE 0x211 > +#define VC_EQC_CACHE_ENABLE 0x908 > +#define VC_EQC_CACHE_EN_MASK PPC_BITMASK(0, 15) > +#define X_VC_EQC_SCRUB_TRIG 0x212 > +#define VC_EQC_SCRUB_TRIG 0x910 > +#define X_VC_EQC_SCRUB_MASK 0x213 > +#define VC_EQC_SCRUB_MASK 0x918 > +#define X_VC_EQC_CWATCH_SPEC 0x215 > +#define VC_EQC_CONFIG 0x920 > +#define X_VC_EQC_CONFIG 0x214 > +#define VC_EQC_CONF_SYNC_IPI PPC_BIT(32) > +#define VC_EQC_CONF_SYNC_HW PPC_BIT(33) > +#define VC_EQC_CONF_SYNC_ESC1 PPC_BIT(34) > +#define VC_EQC_CONF_SYNC_ESC2 PPC_BIT(35) > +#define VC_EQC_CONF_SYNC_REDI PPC_BIT(36) > +#define VC_EQC_CONF_EQP_INTERLEAVE PPC_BIT(38) > +#define VC_EQC_CONF_ENABLE_END_s_BIT PPC_BIT(39) > +#define VC_EQC_CONF_ENABLE_END_u_BIT PPC_BIT(40) > +#define VC_EQC_CONF_ENABLE_END_c_BIT PPC_BIT(41) > +#define VC_EQC_CONF_ENABLE_MORE_QSZ PPC_BIT(42) > +#define VC_EQC_CONF_SKIP_ESCALATE PPC_BIT(43) > +#define VC_EQC_CWATCH_SPEC 0x928 > +#define VC_EQC_CWATCH_CONFLICT PPC_BIT(0) > +#define VC_EQC_CWATCH_FULL PPC_BIT(8) > +#define VC_EQC_CWATCH_BLOCKID PPC_BITMASK(28, 31) > +#define VC_EQC_CWATCH_OFFSET PPC_BITMASK(40, 63) > +#define X_VC_EQC_CWATCH_DAT0 0x216 > +#define VC_EQC_CWATCH_DAT0 0x930 > +#define X_VC_EQC_CWATCH_DAT1 0x217 > +#define VC_EQC_CWATCH_DAT1 0x938 > +#define X_VC_EQC_CWATCH_DAT2 0x218 > +#define VC_EQC_CWATCH_DAT2 0x940 > +#define X_VC_EQC_CWATCH_DAT3 0x219 > +#define VC_EQC_CWATCH_DAT3 0x948 > +#define X_VC_IVC_SCRUB_TRIG 0x222 > +#define VC_IVC_SCRUB_TRIG 0x990 > +#define X_VC_IVC_SCRUB_MASK 0x223 > +#define VC_IVC_SCRUB_MASK 0x998 > +#define X_VC_SBC_SCRUB_TRIG 0x232 > +#define VC_SBC_SCRUB_TRIG 0xa10 > +#define X_VC_SBC_SCRUB_MASK 0x233 > +#define VC_SBC_SCRUB_MASK 0xa18 > +#define VC_SCRUB_VALID PPC_BIT(0) > +#define VC_SCRUB_WANT_DISABLE PPC_BIT(1) > +#define VC_SCRUB_WANT_INVAL PPC_BIT(2) /* EQC and SBC only */ > +#define VC_SCRUB_BLOCK_ID PPC_BITMASK(28, 31) > +#define VC_SCRUB_OFFSET PPC_BITMASK(40, 63) > +#define X_VC_IVC_CACHE_ENABLE 0x221 > +#define VC_IVC_CACHE_ENABLE 0x988 > +#define VC_IVC_CACHE_EN_MASK PPC_BITMASK(0, 15) > +#define X_VC_SBC_CACHE_ENABLE 0x231 > +#define VC_SBC_CACHE_ENABLE 0xa08 > +#define VC_SBC_CACHE_EN_MASK PPC_BITMASK(0, 15) > +#define VC_IVC_CACHE_SCRUB_TRIG 0x990 > +#define VC_IVC_CACHE_SCRUB_MASK 0x998 > +#define VC_SBC_CACHE_ENABLE 0xa08 > +#define VC_SBC_CACHE_SCRUB_TRIG 0xa10 > +#define VC_SBC_CACHE_SCRUB_MASK 0xa18 > +#define VC_SBC_CONFIG 0xa20 > +#define X_VC_SBC_CONFIG 0x234 > +#define VC_SBC_CONF_CPLX_CIST PPC_BIT(44) > +#define VC_SBC_CONF_CIST_BOTH PPC_BIT(45) > +#define VC_SBC_CONF_NO_UPD_PRF PPC_BIT(59) > + > +/* VC1 register offsets */ > + > +/* VSD Table address register definitions (shared) */ > +#define VST_ADDR_AUTOINC PPC_BIT(0) > +#define VST_TABLE_SELECT PPC_BITMASK(13, 15) > +#define VST_TSEL_IVT 0 > +#define VST_TSEL_SBE 1 > +#define VST_TSEL_EQDT 2 > +#define VST_TSEL_VPDT 3 > +#define VST_TSEL_IRQ 4 /* VC only */ > +#define VST_TABLE_BLOCK PPC_BITMASK(27, 31) > + > +/* Number of queue overflow pages */ > +#define VC_QUEUE_OVF_COUNT 6 > + > +/* > + * Bits in a VSD entry. > + * > + * Note: the address is naturally aligned, we don't use a PPC_BITMASK, > + * but just a mask to apply to the address before OR'ing it in. > + * > + * Note: VSD_FIRMWARE is a SW bit ! It hijacks an unused bit in the > + * VSD and is only meant to be used in indirect mode ! > + */ > +#define VSD_MODE PPC_BITMASK(0, 1) > +#define VSD_MODE_SHARED 1 > +#define VSD_MODE_EXCLUSIVE 2 > +#define VSD_MODE_FORWARD 3 > +#define VSD_ADDRESS_MASK 0x0ffffffffffff000ull > +#define VSD_MIGRATION_REG PPC_BITMASK(52, 55) > +#define VSD_INDIRECT PPC_BIT(56) > +#define VSD_TSIZE PPC_BITMASK(59, 63) > +#define VSD_FIRMWARE PPC_BIT(2) /* Read warning above */ > + > +#define VC_EQC_SYNC_MASK \ > + (VC_EQC_CONF_SYNC_IPI | \ > + VC_EQC_CONF_SYNC_HW | \ > + VC_EQC_CONF_SYNC_ESC1 | \ > + VC_EQC_CONF_SYNC_ESC2 | \ > + VC_EQC_CONF_SYNC_REDI) > + > + > +#endif /* PPC_PNV_XIVE_REGS_H */ > diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h > index 6b65397b7ebf..ebbb3d0e9aa7 100644 > --- a/include/hw/ppc/pnv.h > +++ b/include/hw/ppc/pnv.h > @@ -25,6 +25,7 @@ > #include "hw/ppc/pnv_lpc.h" > #include "hw/ppc/pnv_psi.h" > #include "hw/ppc/pnv_occ.h" > +#include "hw/ppc/pnv_xive.h" > > #define TYPE_PNV_CHIP "pnv-chip" > #define PNV_CHIP(obj) OBJECT_CHECK(PnvChip, (obj), TYPE_PNV_CHIP) > @@ -82,6 +83,7 @@ typedef struct Pnv9Chip { > PnvChip parent_obj; > > /*< public >*/ > + PnvXive xive; > } Pnv9Chip; > > typedef struct PnvChipClass { > @@ -215,4 +217,23 @@ void pnv_bmc_powerdown(IPMIBmc *bmc); > (0x0003ffe000000000ull + (uint64_t)PNV_CHIP_INDEX(chip) * \ > PNV_PSIHB_FSP_SIZE) > > +/* > + * POWER9 MMIO base addresses > + */ > +#define PNV9_CHIP_BASE(chip, base) \ > + ((base) + ((uint64_t) (chip)->chip_id << 42)) > + > +#define PNV9_XIVE_VC_SIZE 0x0000008000000000ull > +#define PNV9_XIVE_VC_BASE(chip) PNV9_CHIP_BASE(chip, 0x0006010000000000ull) > + > +#define PNV9_XIVE_PC_SIZE 0x0000001000000000ull > +#define PNV9_XIVE_PC_BASE(chip) PNV9_CHIP_BASE(chip, 0x0006018000000000ull) > + > +#define PNV9_XIVE_IC_SIZE 0x0000000000080000ull > +#define PNV9_XIVE_IC_BASE(chip) PNV9_CHIP_BASE(chip, 0x0006030203100000ull) > + > +#define PNV9_XIVE_TM_SIZE 0x0000000000040000ull > +#define PNV9_XIVE_TM_BASE(chip) PNV9_CHIP_BASE(chip, 0x0006030203180000ull) > + > + > #endif /* _PPC_PNV_H */ > diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h > index 9961ea3a92cd..8e57c064e661 100644 > --- a/include/hw/ppc/pnv_core.h > +++ b/include/hw/ppc/pnv_core.h > @@ -49,6 +49,7 @@ typedef struct PnvCoreClass { > > typedef struct PnvCPUState { > struct ICPState *icp; > + struct XiveTCTX *tctx; Unlike sPAPR, we really do always know in advance the interrupt controller for a particular machine. I think it makes sense to further split the POWER8 and POWER9 cases here, so we only track one for any given setup. > } PnvCPUState; > > static inline PnvCPUState *pnv_cpu_state(PowerPCCPU *cpu) > diff --git a/include/hw/ppc/pnv_xive.h b/include/hw/ppc/pnv_xive.h > new file mode 100644 > index 000000000000..4fc917d1dcf9 > --- /dev/null > +++ b/include/hw/ppc/pnv_xive.h > @@ -0,0 +1,95 @@ > +/* > + * QEMU PowerPC XIVE interrupt controller model > + * > + * Copyright (c) 2017-2019, IBM Corporation. > + * > + * This code is licensed under the GPL version 2 or later. See the > + * COPYING file in the top-level directory. > + */ > + > +#ifndef PPC_PNV_XIVE_H > +#define PPC_PNV_XIVE_H > + > +#include "hw/ppc/xive.h" > + > +#define TYPE_PNV_XIVE "pnv-xive" > +#define PNV_XIVE(obj) OBJECT_CHECK(PnvXive, (obj), TYPE_PNV_XIVE) > + > +#define XIVE_BLOCK_MAX 16 > + > +#define XIVE_TABLE_BLK_MAX 16 /* Block Scope Table (0-15) */ > +#define XIVE_TABLE_MIG_MAX 16 /* Migration Register Table (1-15) */ > +#define XIVE_TABLE_VDT_MAX 16 /* VDT Domain Table (0-15) */ > +#define XIVE_TABLE_EDT_MAX 64 /* EDT Domain Table (0-63) */ > + > +typedef struct PnvXive { > + XiveRouter parent_obj; > + > + /* Owning chip */ > + PnvChip *chip; > + > + /* XSCOM addresses giving access to the controller registers */ > + MemoryRegion xscom_regs; > + > + /* Main MMIO regions that can be configured by FW */ > + MemoryRegion ic_mmio; > + MemoryRegion ic_reg_mmio; > + MemoryRegion ic_notify_mmio; > + MemoryRegion ic_lsi_mmio; > + MemoryRegion tm_indirect_mmio; > + MemoryRegion vc_mmio; > + MemoryRegion pc_mmio; > + MemoryRegion tm_mmio; > + > + /* > + * IPI and END address spaces modeling the EDT segmentation in the > + * VC region > + */ > + AddressSpace ipi_as; > + MemoryRegion ipi_mmio; > + MemoryRegion ipi_edt_mmio; > + > + AddressSpace end_as; > + MemoryRegion end_mmio; > + MemoryRegion end_edt_mmio; > + > + /* Shortcut values for the Main MMIO regions */ > + hwaddr ic_base; > + uint32_t ic_shift; > + hwaddr vc_base; > + uint32_t vc_shift; > + hwaddr pc_base; > + uint32_t pc_shift; > + hwaddr tm_base; > + uint32_t tm_shift; > + > + /* Our XIVE source objects for IPIs and ENDs */ > + uint32_t nr_irqs; > + XiveSource source; Maybe nr_ipis and ipi_source to be clearer? > + uint32_t nr_ends; > + XiveENDSource end_source; > + > + /* Interrupt controller registers */ > + uint64_t regs[0x300]; > + > + /* Can be configured by FW */ > + uint32_t tctx_chipid; > + uint32_t chip_id; Can't you derive that since you have a pointer to the owning chip? > + /* > + * Virtual Structure Descriptor tables : EAT, SBE, ENDT, NVTT, IRQ > + * These are in a SRAM protected by ECC. > + */ > + uint64_t vsds[5][XIVE_BLOCK_MAX]; > + > + /* Translation tables */ > + uint64_t blk[XIVE_TABLE_BLK_MAX]; > + uint64_t mig[XIVE_TABLE_MIG_MAX]; > + uint64_t vdt[XIVE_TABLE_VDT_MAX]; > + uint64_t edt[XIVE_TABLE_EDT_MAX]; > +} PnvXive; > + > +void pnv_xive_pic_print_info(PnvXive *xive, Monitor *mon); > + > +#endif /* PPC_PNV_XIVE_H */ > diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h > index 255b26a5aaf6..6623ec54a7a8 100644 > --- a/include/hw/ppc/pnv_xscom.h > +++ b/include/hw/ppc/pnv_xscom.h > @@ -73,6 +73,9 @@ typedef struct PnvXScomInterfaceClass { > #define PNV_XSCOM_OCC_BASE 0x0066000 > #define PNV_XSCOM_OCC_SIZE 0x6000 > > +#define PNV9_XSCOM_XIVE_BASE 0x5013000 > +#define PNV9_XSCOM_XIVE_SIZE 0x300 > + > extern void pnv_xscom_realize(PnvChip *chip, Error **errp); > extern int pnv_dt_xscom(PnvChip *chip, void *fdt, int offset); > > diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h > index 763691e9bae9..2bad8526221b 100644 > --- a/include/hw/ppc/xive.h > +++ b/include/hw/ppc/xive.h > @@ -368,6 +368,7 @@ int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > XiveNVT *nvt, uint8_t word_number); > XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs, hwaddr offset); > +void xive_router_notify(XiveNotifier *xn, uint32_t lisn); > > /* > * XIVE END ESBs > diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c > new file mode 100644 > index 000000000000..4be9b69b76a3 > --- /dev/null > +++ b/hw/intc/pnv_xive.c > @@ -0,0 +1,1698 @@ > +/* > + * QEMU PowerPC XIVE interrupt controller model > + * > + * Copyright (c) 2017-2019, IBM Corporation. > + * > + * This code is licensed under the GPL version 2 or later. See the > + * COPYING file in the top-level directory. > + */ > + > +#include "qemu/osdep.h" > +#include "qemu/log.h" > +#include "qapi/error.h" > +#include "target/ppc/cpu.h" > +#include "sysemu/cpus.h" > +#include "sysemu/dma.h" > +#include "monitor/monitor.h" > +#include "hw/ppc/fdt.h" > +#include "hw/ppc/pnv.h" > +#include "hw/ppc/pnv_core.h" > +#include "hw/ppc/pnv_xscom.h" > +#include "hw/ppc/pnv_xive.h" > +#include "hw/ppc/xive_regs.h" > +#include "hw/ppc/ppc.h" > + > +#include <libfdt.h> > + > +#include "pnv_xive_regs.h" > + > +/* > + * Virtual structures table (VST) > + */ > +typedef struct XiveVstInfo { > + uint32_t type; > + const char *name; > + uint32_t size; > + uint32_t max_blocks; > +} XiveVstInfo; > + > +static const XiveVstInfo vst_infos[] = { > + [VST_TSEL_IVT] = { VST_TSEL_IVT, "EAT", sizeof(XiveEAS), 16 }, I don't love explicitly storing the type/index in each record, as well as it being implicit in the table slot. > + [VST_TSEL_SBE] = { VST_TSEL_SBE, "SBE", 0, 16 }, > + [VST_TSEL_EQDT] = { VST_TSEL_EQDT, "ENDT", sizeof(XiveEND), 16 }, > + [VST_TSEL_VPDT] = { VST_TSEL_VPDT, "VPDT", sizeof(XiveNVT), 32 }, > + > + /* > + * Interrupt fifo backing store table (not modeled) : > + * > + * 0 - IPI, > + * 1 - HWD, > + * 2 - First escalate, > + * 3 - Second escalate, > + * 4 - Redistribution, > + * 5 - IPI cascaded queue ? > + */ > + [VST_TSEL_IRQ] = { VST_TSEL_IRQ, "IRQ", 0, 6 }, > +}; > + > +#define xive_error(xive, fmt, ...) \ > + qemu_log_mask(LOG_GUEST_ERROR, "XIVE[%x] - " fmt "\n", (xive)->chip_id, \ > + ## __VA_ARGS__); > + > +/* > + * QEMU version of the GETFIELD/SETFIELD macros > + */ > +static inline uint64_t GETFIELD(uint64_t mask, uint64_t word) > +{ > + return (word & mask) >> ctz64(mask); > +} > + > +static inline uint64_t SETFIELD(uint64_t mask, uint64_t word, > + uint64_t value) > +{ > + return (word & ~mask) | ((value << ctz64(mask)) & mask); > +} It might be better to use the existing extract64() and deposit64() rather than making custom helpers. > + > +/* > + * Remote access to controllers. HW uses MMIOs. For now, a simple scan > + * of the chips is good enough. > + */ > +static PnvXive *pnv_xive_get_ic(PnvXive *xive, uint8_t blk) The 'xive' parameter is only used for an error message, for which it doesn't seem that meaningful. > +{ > + PnvMachineState *pnv = PNV_MACHINE(qdev_get_machine()); > + int i; > + > + for (i = 0; i < pnv->num_chips; i++) { > + Pnv9Chip *chip9 = PNV9_CHIP(pnv->chips[i]); > + PnvXive *ic_xive = &chip9->xive; > + bool chip_override = > + ic_xive->regs[PC_GLOBAL_CONFIG >> 3] & PC_GCONF_CHIPID_OVR; > + > + if (chip_override) { > + if (ic_xive->chip_id == blk) { > + return ic_xive; > + } > + } else { > + ; /* TODO: Block scope support */ > + } > + } > + xive_error(xive, "VST: unknown chip/block %d !?", blk); > + return NULL; > +} > + > +/* > + * VST accessors for SBE, EAT, ENDT, NVT > + */ > +static uint64_t pnv_xive_vst_addr_direct(PnvXive *xive, > + const XiveVstInfo *info, uint64_t vsd, > + uint8_t blk, uint32_t idx) > +{ > + uint64_t vst_addr = vsd & VSD_ADDRESS_MASK; > + uint64_t vst_tsize = 1ull << (GETFIELD(VSD_TSIZE, vsd) + 12); > + uint32_t idx_max = (vst_tsize / info->size) - 1; > + > + if (idx > idx_max) { > +#ifdef XIVE_DEBUG > + xive_error(xive, "VST: %s entry %x/%x out of range !?", info->name, > + blk, idx); > +#endif > + return 0; > + } > + > + return vst_addr + idx * info->size; > +} > + > +#define XIVE_VSD_SIZE 8 > + > +static uint64_t pnv_xive_vst_addr_indirect(PnvXive *xive, > + const XiveVstInfo *info, > + uint64_t vsd, uint8_t blk, > + uint32_t idx) > +{ > + uint64_t vsd_addr; > + uint64_t vst_addr; > + uint32_t page_shift; > + uint32_t page_mask; > + uint64_t vst_tsize = 1ull << (GETFIELD(VSD_TSIZE, vsd) + 12); > + uint32_t idx_max = (vst_tsize / XIVE_VSD_SIZE) - 1; > + > + if (idx > idx_max) { > +#ifdef XIVE_DEBUG > + xive_error(xive, "VST: %s entry %x/%x out of range !?", info->name, > + blk, idx); > +#endif > + return 0; > + } > + > + vsd_addr = vsd & VSD_ADDRESS_MASK; > + > + /* > + * Read the first descriptor to get the page size of each indirect > + * table. > + */ > + vsd = ldq_be_dma(&address_space_memory, vsd_addr); > + page_shift = GETFIELD(VSD_TSIZE, vsd) + 12; > + page_mask = (1ull << page_shift) - 1; > + > + /* Indirect page size can be 4K, 64K, 2M, 16M. */ > + if (page_shift != 12 && page_shift != 16 && page_shift != 21 > + && page_shift != 24) { > + xive_error(xive, "VST: invalid %s table shift %d", info->name, > + page_shift); > + } > + > + if (!(vsd & VSD_ADDRESS_MASK)) { > + xive_error(xive, "VST: invalid %s entry %x/%x !?", info->name, > + blk, 0); > + return 0; > + } > + > + /* Load the descriptor we are looking for, if not already done */ > + if (idx) { > + vsd_addr = vsd_addr + (idx >> page_shift); > + vsd = ldq_be_dma(&address_space_memory, vsd_addr); > + > + if (page_shift != GETFIELD(VSD_TSIZE, vsd) + 12) { > + xive_error(xive, "VST: %s entry %x/%x indirect page size differ !?", > + info->name, blk, idx); > + return 0; > + } > + } > + > + vst_addr = vsd & VSD_ADDRESS_MASK; > + > + return vst_addr + (idx & page_mask) * info->size; > +} > + > +static uint64_t pnv_xive_vst_addr(PnvXive *xive, const XiveVstInfo *info, > + uint8_t blk, uint32_t idx) > +{ > + uint64_t vsd; > + > + if (blk >= info->max_blocks) { > + xive_error(xive, "VST: invalid block id %d for VST %s %d !?", > + blk, info->name, idx); > + return 0; > + } > + > + vsd = xive->vsds[info->type][blk]; > + > + /* Remote VST access */ > + if (GETFIELD(VSD_MODE, vsd) == VSD_MODE_FORWARD) { > + xive = pnv_xive_get_ic(xive, blk); > + > + return xive ? pnv_xive_vst_addr(xive, info, blk, idx) : 0; > + } > + > + if (VSD_INDIRECT & vsd) { > + return pnv_xive_vst_addr_indirect(xive, info, vsd, blk, idx); > + } > + > + return pnv_xive_vst_addr_direct(xive, info, vsd, blk, idx); > +} > + > +static int pnv_xive_vst_read(PnvXive *xive, uint32_t type, uint8_t blk, > + uint32_t idx, void *data) > +{ > + const XiveVstInfo *info = &vst_infos[type]; > + uint64_t addr = pnv_xive_vst_addr(xive, info, blk, idx); > + > + if (!addr) { > + return -1; > + } > + > + cpu_physical_memory_read(addr, data, info->size); > + return 0; > +} > + > +/* TODO: take into account word_number */ > +static int pnv_xive_vst_write(PnvXive *xive, uint32_t type, uint8_t blk, > + uint32_t idx, void *data) > +{ > + const XiveVstInfo *info = &vst_infos[type]; > + uint64_t addr = pnv_xive_vst_addr(xive, info, blk, idx); > + > + if (!addr) { > + return -1; > + } > + > + cpu_physical_memory_write(addr, data, info->size); > + return 0; > +} > + > +static int pnv_xive_get_end(XiveRouter *xrtr, uint8_t blk, uint32_t idx, > + XiveEND *end) > +{ > + return pnv_xive_vst_read(PNV_XIVE(xrtr), VST_TSEL_EQDT, blk, idx, end); > +} > + > +static int pnv_xive_write_end(XiveRouter *xrtr, uint8_t blk, > + uint32_t idx, XiveEND *end, > + uint8_t word_number) > +{ Surely you need to use the word_number parameter somewhere? > + return pnv_xive_vst_write(PNV_XIVE(xrtr), VST_TSEL_EQDT, blk, idx, end); > +} > + > +static int pnv_xive_end_update(PnvXive *xive, uint8_t blk, uint32_t idx) > +{ > + int i; > + uint64_t eqc_watch[4]; > + > + for (i = 0; i < ARRAY_SIZE(eqc_watch); i++) { > + eqc_watch[i] = cpu_to_be64(xive->regs[(VC_EQC_CWATCH_DAT0 >> 3) + i]); > + } > + > + return pnv_xive_vst_write(xive, VST_TSEL_EQDT, blk, idx, eqc_watch); > +} > + > +static int pnv_xive_get_nvt(XiveRouter *xrtr, uint8_t blk, uint32_t idx, > + XiveNVT *nvt) > +{ > + return pnv_xive_vst_read(PNV_XIVE(xrtr), VST_TSEL_VPDT, blk, idx, nvt); > +} > + > +static int pnv_xive_write_nvt(XiveRouter *xrtr, uint8_t blk, uint32_t idx, > + XiveNVT *nvt, uint8_t word_number) > +{ > + return pnv_xive_vst_write(PNV_XIVE(xrtr), VST_TSEL_VPDT, blk, idx, nvt); > +} > + > +static int pnv_xive_nvt_update(PnvXive *xive, uint8_t blk, uint32_t idx) > +{ > + int i; > + uint64_t vpc_watch[8]; > + > + for (i = 0; i < ARRAY_SIZE(vpc_watch); i++) { > + vpc_watch[i] = cpu_to_be64(xive->regs[(PC_VPC_CWATCH_DAT0 >> 3) + i]); > + } > + > + return pnv_xive_vst_write(xive, VST_TSEL_VPDT, blk, idx, vpc_watch); > +} > + > +static int pnv_xive_get_eas(XiveRouter *xrtr, uint8_t blk, > + uint32_t idx, XiveEAS *eas) > +{ > + PnvXive *xive = PNV_XIVE(xrtr); > + > + /* TODO: check when remote EAS lookups are possible */ > + if (pnv_xive_get_ic(xive, blk) != xive) { > + xive_error(xive, "VST: EAS %x is remote !?", XIVE_SRCNO(blk, idx)); > + return -1; > + } > + > + return pnv_xive_vst_read(xive, VST_TSEL_IVT, blk, idx, eas); > +} > + > +static int pnv_xive_eas_update(PnvXive *xive, uint8_t blk, uint32_t idx) > +{ > + /* All done. */ > + return 0; > +} > + > +static XiveTCTX *pnv_xive_get_tctx(XiveRouter *xrtr, CPUState *cs, > + hwaddr offset) > +{ > + PowerPCCPU *cpu = POWERPC_CPU(cs); > + XiveTCTX *tctx = pnv_cpu_state(cpu)->tctx; > + PnvXive *xive = NULL; > + uint8_t chip_id; > + CPUPPCState *env = &cpu->env; > + int pir = env->spr_cb[SPR_PIR].default_value; > + > + /* > + * Perform an extra check on the CPU enablement. > + * > + * The TIMA is shared among the chips and to identify the chip > + * from which the access is being done, we extract the chip id > + * from the HW CAM line of XiveTCTX. > + */ > + chip_id = (tctx->hw_cam >> 7) & 0xf; > + > + xive = pnv_xive_get_ic(PNV_XIVE(xrtr), chip_id); > + if (!xive) { > + return NULL; > + } > + > + if (!(xive->regs[PC_THREAD_EN_REG0 >> 3] & PPC_BIT(pir & 0x3f))) { > + xive_error(PNV_XIVE(xrtr), "IC: CPU %x is not enabled", pir); > + } > + > + return tctx; > +} > + > +/* > + * The internal sources (IPIs) of the interrupt controller have no > + * knowledge of the XIVE chip on which they reside. Encode the block > + * id in the source interrupt number before forwarding the source > + * event notification to the Router. This is required on a multichip > + * system. > + */ > +static void pnv_xive_notify(XiveNotifier *xn, uint32_t srcno) > +{ > + PnvXive *xive = PNV_XIVE(xn); > + > + xive_router_notify(xn, XIVE_SRCNO(xive->chip_id, srcno)); > +} > + > +/* > + * XIVE helpers > + */ > + > +static uint64_t pnv_xive_vc_size(PnvXive *xive) > +{ > + return (~xive->regs[CQ_VC_BARM >> 3] + 1) & CQ_VC_BARM_MASK; > +} > + > +static uint64_t pnv_xive_edt_shift(PnvXive *xive) > +{ > + return ctz64(pnv_xive_vc_size(xive) / XIVE_TABLE_EDT_MAX); > +} > + > +static uint64_t pnv_xive_pc_size(PnvXive *xive) > +{ > + return (~xive->regs[CQ_PC_BARM >> 3] + 1) & CQ_PC_BARM_MASK; > +} > + > +/* > + * XIVE Table configuration > + * > + * The Virtualization Controller MMIO region containing the IPI ESB > + * pages and END ESB pages is sub-divided into "sets" which map > + * portions of the VC region to the different ESB pages. It is > + * configured at runtime through the EDT "Domain Table" to let the > + * firmware decide how to split the VC address space between IPI ESB > + * pages and END ESB pages. > + */ > +static int pnv_xive_table_set_data(PnvXive *xive, uint64_t val) > +{ > + uint64_t tsel = xive->regs[CQ_TAR >> 3] & CQ_TAR_TSEL; > + uint8_t tsel_index = GETFIELD(CQ_TAR_TSEL_INDEX, xive->regs[CQ_TAR >> 3]); > + uint64_t *xive_table; > + uint8_t max_index; > + > + switch (tsel) { > + case CQ_TAR_TSEL_BLK: > + max_index = ARRAY_SIZE(xive->blk); > + xive_table = xive->blk; > + break; > + case CQ_TAR_TSEL_MIG: > + max_index = ARRAY_SIZE(xive->mig); > + xive_table = xive->mig; > + break; > + case CQ_TAR_TSEL_EDT: > + max_index = ARRAY_SIZE(xive->edt); > + xive_table = xive->edt; > + break; > + case CQ_TAR_TSEL_VDT: > + max_index = ARRAY_SIZE(xive->vdt); > + xive_table = xive->vdt; > + break; > + default: > + xive_error(xive, "IC: invalid table %d", (int) tsel); > + return -1; > + } > + > + if (tsel_index >= max_index) { > + xive_error(xive, "IC: invalid index %d", (int) tsel_index); > + return -1; > + } > + > + xive_table[tsel_index] = val; > + > + if (xive->regs[CQ_TAR >> 3] & CQ_TAR_TBL_AUTOINC) { > + xive->regs[CQ_TAR >> 3] = > + SETFIELD(CQ_TAR_TSEL_INDEX, xive->regs[CQ_TAR >> 3], ++tsel_index); > + } > + > + return 0; > +} > + > +/* > + * Computes the overall size of the IPI or the END ESB pages > + */ > +static uint64_t pnv_xive_edt_size(PnvXive *xive, uint64_t type) > +{ > + uint64_t edt_size = 1ull << pnv_xive_edt_shift(xive); > + uint64_t size = 0; > + int i; > + > + for (i = 0; i < XIVE_TABLE_EDT_MAX; i++) { > + uint64_t edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[i]); > + > + if (edt_type == type) { > + size += edt_size; > + } > + } > + > + return size; > +} > + > +/* > + * Maps an offset of the VC region in the IPI or END region using the > + * layout defined by the EDT "Domaine Table" > + */ > +static uint64_t pnv_xive_edt_offset(PnvXive *xive, uint64_t vc_offset, > + uint64_t type) > +{ > + int i; > + uint64_t edt_size = 1ull << pnv_xive_edt_shift(xive); > + uint64_t edt_offset = vc_offset; > + > + for (i = 0; i < XIVE_TABLE_EDT_MAX && (i * edt_size) < vc_offset; i++) { > + uint64_t edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[i]); > + > + if (edt_type != type) { > + edt_offset -= edt_size; > + } > + } > + > + return edt_offset; > +} > + > +/* > + * The EDT "Domain Table" is used to size the MMIO window exposing the > + * IPI and the END ESBs in the VC region. > + */ > +static void pnv_xive_ipi_edt_resize(PnvXive *xive) > +{ > + uint64_t ipi_edt_size = pnv_xive_edt_size(xive, CQ_TDR_EDT_IPI); > + > + /* Resize the EDT window of the IPI ESBs in the VC region */ > + memory_region_set_size(&xive->ipi_edt_mmio, ipi_edt_size); > + memory_region_add_subregion(&xive->ipi_mmio, 0, &xive->ipi_edt_mmio); > + > + /* > + * The IPI ESBs region will be resized when the SBE backing store > + * is configured. > + */ > +} > + > +static void pnv_xive_end_edt_resize(PnvXive *xive) > +{ > + XiveENDSource *end_xsrc = &xive->end_source; > + uint64_t end_edt_size = pnv_xive_edt_size(xive, CQ_TDR_EDT_EQ); > + > + /* > + * Compute the number of provisioned ENDs from the END ESB MMIO > + * window size > + */ > + xive->nr_ends = end_edt_size / (1ull << (xive->vc_shift + 1)); Since this value is derived above, it would be better to avoid storing it again. > + > + /* Resize the EDT window of the END ESBs in the VC region */ > + memory_region_set_size(&xive->end_edt_mmio, end_edt_size); > + memory_region_add_subregion(&xive->end_mmio, 0, &xive->end_edt_mmio); > + > + /* Also resize the END ESBs region (This is a bit redundant) */ > + memory_region_set_size(&end_xsrc->esb_mmio, > + xive->nr_ends * (1ull << (end_xsrc->esb_shift + 1))); > + memory_region_add_subregion(&xive->end_edt_mmio, 0, &end_xsrc->esb_mmio); > +} > + > +/* > + * Virtual Structure Tables (VST) configuration > + */ > +static void pnv_xive_vst_set_exclusive(PnvXive *xive, uint8_t type, > + uint8_t blk, uint64_t vsd) > +{ > + XiveSource *xsrc = &xive->source; > + bool gconf_indirect = > + xive->regs[VC_GLOBAL_CONFIG >> 3] & VC_GCONF_INDIRECT; > + uint32_t vst_shift = GETFIELD(VSD_TSIZE, vsd) + 12; > + uint64_t vst_addr = vsd & VSD_ADDRESS_MASK; > + > + if (VSD_INDIRECT & vsd) { > + if (!gconf_indirect) { > + xive_error(xive, "VST: %s indirect tables not enabled", > + vst_infos[type].name); > + return; > + } > + } > + > + switch (type) { > + case VST_TSEL_IVT: > + pnv_xive_ipi_edt_resize(xive); > + break; > + > + case VST_TSEL_EQDT: > + pnv_xive_end_edt_resize(xive); > + break; > + > + case VST_TSEL_VPDT: > + /* FIXME (skiboot) : remove DD1 workaround on the NVT table size */ > + vst_shift = 16; > + break; > + > + case VST_TSEL_SBE: /* Not modeled */ > + /* > + * Contains the backing store pages for the source PQ bits. > + * > + * The XiveSource object has its own. We would need a custom > + * source object to use the PQ bits backed in RAM. We can > + * nevertheless compute the number of IRQs provisioned by FW > + * and resize the IPI ESB window accordingly. > + */ > + xive->nr_irqs = (1ull << vst_shift) * 4; > + memory_region_set_size(&xsrc->esb_mmio, > + xive->nr_irqs * (1ull << xsrc->esb_shift)); > + memory_region_add_subregion(&xive->ipi_edt_mmio, 0, &xsrc->esb_mmio); > + break; > + > + case VST_TSEL_IRQ: /* VC only. Not modeled */ > + /* > + * These tables contains the backing store pages for the > + * interrupt fifos of the VC sub-engine in case of overflow. > + */ > + break; > + default: > + g_assert_not_reached(); > + } > + > + if (!QEMU_IS_ALIGNED(vst_addr, 1ull << vst_shift)) { > + xive_error(xive, "VST: %s table address 0x%"PRIx64" is not aligned with" > + " page shift %d", vst_infos[type].name, vst_addr, vst_shift); > + } > + > + /* Keep the VSD for later use */ > + xive->vsds[type][blk] = vsd; > +} > + > +/* > + * Both PC and VC sub-engines are configured as each use the Virtual > + * Structure Tables : SBE, EAS, END and NVT. > + */ > +static void pnv_xive_vst_set_data(PnvXive *xive, uint64_t vsd, bool pc_engine) > +{ > + uint8_t mode = GETFIELD(VSD_MODE, vsd); > + uint8_t type = GETFIELD(VST_TABLE_SELECT, > + xive->regs[VC_VSD_TABLE_ADDR >> 3]); > + uint8_t blk = GETFIELD(VST_TABLE_BLOCK, > + xive->regs[VC_VSD_TABLE_ADDR >> 3]); > + uint64_t vst_addr = vsd & VSD_ADDRESS_MASK; > + > + if (type > VST_TSEL_IRQ) { > + xive_error(xive, "VST: invalid table type %d", type); > + return; > + } > + > + if (blk >= vst_infos[type].max_blocks) { > + xive_error(xive, "VST: invalid block id %d for" > + " %s table", blk, vst_infos[type].name); > + return; > + } > + > + /* > + * Only take the VC sub-engine configuration into account because > + * the XiveRouter model combines both VC and PC sub-engines > + */ > + if (pc_engine) { > + return; > + } > + > + if (!vst_addr) { > + xive_error(xive, "VST: invalid %s table address", vst_infos[type].name); > + return; > + } > + > + switch (mode) { > + case VSD_MODE_FORWARD: > + xive->vsds[type][blk] = vsd; > + break; > + > + case VSD_MODE_EXCLUSIVE: > + pnv_xive_vst_set_exclusive(xive, type, blk, vsd); > + break; > + > + default: > + xive_error(xive, "VST: unsupported table mode %d", mode); > + return; > + } > +} > + > +/* > + * Interrupt controller MMIO region. The layout is compatible between > + * 4K and 64K pages : > + * > + * Page 0 sub-engine BARs > + * 0x000 - 0x3FF IC registers > + * 0x400 - 0x7FF PC registers > + * 0x800 - 0xFFF VC registers > + * > + * Page 1 Notify page (writes only) > + * 0x000 - 0x7FF HW interrupt triggers (PSI, PHB) > + * 0x800 - 0xFFF forwards and syncs > + * > + * Page 2 LSI Trigger page (writes only) (not modeled) > + * Page 3 LSI SB EOI page (reads only) (not modeled) > + * > + * Page 4-7 indirect TIMA > + */ > + > +/* > + * IC - registers MMIO > + */ > +static void pnv_xive_ic_reg_write(void *opaque, hwaddr offset, > + uint64_t val, unsigned size) > +{ > + PnvXive *xive = PNV_XIVE(opaque); > + MemoryRegion *sysmem = get_system_memory(); > + uint32_t reg = offset >> 3; > + > + switch (offset) { > + > + /* > + * XIVE CQ (PowerBus bridge) settings > + */ > + case CQ_MSGSND: /* msgsnd for doorbells */ > + case CQ_FIRMASK_OR: /* FIR error reporting */ > + break; > + case CQ_PBI_CTL: > + if (val & CQ_PBI_PC_64K) { > + xive->pc_shift = 16; > + } > + if (val & CQ_PBI_VC_64K) { > + xive->vc_shift = 16; > + } > + break; > + case CQ_CFG_PB_GEN: /* PowerBus General Configuration */ > + /* > + * TODO: CQ_INT_ADDR_OPT for 1-block-per-chip mode > + */ > + break; > + > + /* > + * XIVE Virtualization Controller settings > + */ > + case VC_GLOBAL_CONFIG: > + break; > + > + /* > + * XIVE Presenter Controller settings > + */ > + case PC_GLOBAL_CONFIG: > + /* Overrides Int command Chip ID with the Chip ID field */ > + if (val & PC_GCONF_CHIPID_OVR) { > + xive->chip_id = GETFIELD(PC_GCONF_CHIPID, val); > + } > + break; > + case PC_TCTXT_CFG: > + /* > + * TODO: block group support > + * > + * PC_TCTXT_CFG_BLKGRP_EN > + * PC_TCTXT_CFG_HARD_CHIPID_BLK : > + * Moves the chipid into block field for hardwired CAM compares. > + * Block offset value is adjusted to 0b0..01 & ThrdId > + * > + * Will require changes in xive_presenter_tctx_match(). I am > + * not sure how to handle that yet. > + */ > + > + /* Overrides hardwired chip ID with the chip ID field */ > + if (val & PC_TCTXT_CHIPID_OVERRIDE) { > + xive->tctx_chipid = GETFIELD(PC_TCTXT_CHIPID, val); > + } > + break; > + case PC_TCTXT_TRACK: > + /* > + * PC_TCTXT_TRACK_EN: > + * enable block tracking and exchange of block ownership > + * information between Interrupt controllers > + */ > + break; > + > + /* > + * Misc settings > + */ > + case VC_SBC_CONFIG: /* Store EOI configuration */ > + /* > + * Configure store EOI if required by firwmare (skiboot has removed > + * support recently though) > + */ > + if (val & (VC_SBC_CONF_CPLX_CIST | VC_SBC_CONF_CIST_BOTH)) { > + object_property_set_int(OBJECT(&xive->source), XIVE_SRC_STORE_EOI, > + "flags", &error_fatal); > + } > + break; > + > + case VC_EQC_CONFIG: /* TODO: silent escalation */ > + case VC_AIB_TX_ORDER_TAG2: /* relax ordering */ > + break; > + > + /* > + * XIVE BAR settings (XSCOM only) > + */ > + case CQ_RST_CTL: > + /* bit4: resets all BAR registers */ > + break; > + > + case CQ_IC_BAR: /* IC BAR. 8 pages */ > + xive->ic_shift = val & CQ_IC_BAR_64K ? 16 : 12; > + if (!(val & CQ_IC_BAR_VALID)) { > + xive->ic_base = 0; > + if (xive->regs[reg] & CQ_IC_BAR_VALID) { > + memory_region_del_subregion(&xive->ic_mmio, > + &xive->ic_reg_mmio); > + memory_region_del_subregion(&xive->ic_mmio, > + &xive->ic_notify_mmio); > + memory_region_del_subregion(&xive->ic_mmio, > + &xive->ic_lsi_mmio); > + memory_region_del_subregion(&xive->ic_mmio, > + &xive->tm_indirect_mmio); > + > + memory_region_del_subregion(sysmem, &xive->ic_mmio); > + } > + } else { > + xive->ic_base = val & ~(CQ_IC_BAR_VALID | CQ_IC_BAR_64K); > + if (!(xive->regs[reg] & CQ_IC_BAR_VALID)) { > + memory_region_add_subregion(sysmem, xive->ic_base, > + &xive->ic_mmio); > + > + memory_region_add_subregion(&xive->ic_mmio, 0, > + &xive->ic_reg_mmio); > + memory_region_add_subregion(&xive->ic_mmio, > + 1ul << xive->ic_shift, > + &xive->ic_notify_mmio); > + memory_region_add_subregion(&xive->ic_mmio, > + 2ul << xive->ic_shift, > + &xive->ic_lsi_mmio); > + memory_region_add_subregion(&xive->ic_mmio, > + 4ull << xive->ic_shift, > + &xive->tm_indirect_mmio); > + } > + } > + break; > + > + case CQ_TM1_BAR: /* TM BAR. 4 pages. Map only once */ > + case CQ_TM2_BAR: /* second TM BAR. for hotplug. Not modeled */ > + xive->tm_shift = val & CQ_TM_BAR_64K ? 16 : 12; > + if (!(val & CQ_TM_BAR_VALID)) { > + xive->tm_base = 0; > + if (xive->regs[reg] & CQ_TM_BAR_VALID && xive->chip_id == 0) { > + memory_region_del_subregion(sysmem, &xive->tm_mmio); > + } > + } else { > + xive->tm_base = val & ~(CQ_TM_BAR_VALID | CQ_TM_BAR_64K); > + if (!(xive->regs[reg] & CQ_TM_BAR_VALID) && xive->chip_id == 0) { > + memory_region_add_subregion(sysmem, xive->tm_base, > + &xive->tm_mmio); > + } > + } > + break; > + > + case CQ_PC_BARM: > + xive->regs[reg] = val; As discussed elsewhere, this seems to be a big mix of writing things directly into regs[reg] and doing other things instead, and you really want to go one way or the other. I'd suggest dropping xive->regs[] and instead putting the state you need persistent into its own variables. > + memory_region_set_size(&xive->pc_mmio, pnv_xive_pc_size(xive)); > + break; > + case CQ_PC_BAR: /* From 32M to 512G */ > + if (!(val & CQ_PC_BAR_VALID)) { > + xive->pc_base = 0; > + if (xive->regs[reg] & CQ_PC_BAR_VALID) { > + memory_region_del_subregion(sysmem, &xive->pc_mmio); > + } > + } else { > + xive->pc_base = val & ~(CQ_PC_BAR_VALID); > + if (!(xive->regs[reg] & CQ_PC_BAR_VALID)) { > + memory_region_add_subregion(sysmem, xive->pc_base, > + &xive->pc_mmio); > + } > + } > + break; > + > + case CQ_VC_BARM: > + xive->regs[reg] = val; > + memory_region_set_size(&xive->vc_mmio, pnv_xive_vc_size(xive)); > + break; > + case CQ_VC_BAR: /* From 64M to 4TB */ > + if (!(val & CQ_VC_BAR_VALID)) { > + xive->vc_base = 0; > + if (xive->regs[reg] & CQ_VC_BAR_VALID) { > + memory_region_del_subregion(sysmem, &xive->vc_mmio); > + } > + } else { > + xive->vc_base = val & ~(CQ_VC_BAR_VALID); > + if (!(xive->regs[reg] & CQ_VC_BAR_VALID)) { > + memory_region_add_subregion(sysmem, xive->vc_base, > + &xive->vc_mmio); > + } > + } > + break; > + > + /* > + * XIVE Table settings. > + */ > + case CQ_TAR: /* Table Address */ > + break; > + case CQ_TDR: /* Table Data */ > + pnv_xive_table_set_data(xive, val); > + break; > + > + /* > + * XIVE VC & PC Virtual Structure Table settings > + */ > + case VC_VSD_TABLE_ADDR: > + case PC_VSD_TABLE_ADDR: /* Virtual table selector */ > + break; > + case VC_VSD_TABLE_DATA: /* Virtual table setting */ > + case PC_VSD_TABLE_DATA: > + pnv_xive_vst_set_data(xive, val, offset == PC_VSD_TABLE_DATA); > + break; > + > + /* > + * Interrupt fifo overflow in memory backing store (Not modeled) > + */ > + case VC_IRQ_CONFIG_IPI: > + case VC_IRQ_CONFIG_HW: > + case VC_IRQ_CONFIG_CASCADE1: > + case VC_IRQ_CONFIG_CASCADE2: > + case VC_IRQ_CONFIG_REDIST: > + case VC_IRQ_CONFIG_IPI_CASC: > + break; > + > + /* > + * XIVE hardware thread enablement > + */ > + case PC_THREAD_EN_REG0: /* Physical Thread Enable */ > + case PC_THREAD_EN_REG1: /* Physical Thread Enable (fused core) */ > + break; > + > + case PC_THREAD_EN_REG0_SET: > + xive->regs[PC_THREAD_EN_REG0 >> 3] |= val; > + break; > + case PC_THREAD_EN_REG1_SET: > + xive->regs[PC_THREAD_EN_REG1 >> 3] |= val; > + break; > + case PC_THREAD_EN_REG0_CLR: > + xive->regs[PC_THREAD_EN_REG0 >> 3] &= ~val; > + break; > + case PC_THREAD_EN_REG1_CLR: > + xive->regs[PC_THREAD_EN_REG1 >> 3] &= ~val; > + break; > + > + /* > + * Indirect TIMA access set up. Defines the PIR of the HW thread > + * to use. > + */ > + case PC_TCTXT_INDIR0 ... PC_TCTXT_INDIR3: > + break; > + > + /* > + * XIVE PC & VC cache updates for EAS, NVT and END > + */ > + case VC_IVC_SCRUB_MASK: > + break; > + case VC_IVC_SCRUB_TRIG: > + pnv_xive_eas_update(xive, GETFIELD(PC_SCRUB_BLOCK_ID, val), > + GETFIELD(VC_SCRUB_OFFSET, val)); > + break; > + > + case VC_EQC_SCRUB_MASK: > + case VC_EQC_CWATCH_SPEC: > + case VC_EQC_CWATCH_DAT0 ... VC_EQC_CWATCH_DAT3: > + break; > + case VC_EQC_SCRUB_TRIG: > + pnv_xive_end_update(xive, GETFIELD(VC_SCRUB_BLOCK_ID, val), > + GETFIELD(VC_SCRUB_OFFSET, val)); > + break; > + > + case PC_VPC_SCRUB_MASK: > + case PC_VPC_CWATCH_SPEC: > + case PC_VPC_CWATCH_DAT0 ... PC_VPC_CWATCH_DAT7: > + break; > + case PC_VPC_SCRUB_TRIG: > + pnv_xive_nvt_update(xive, GETFIELD(PC_SCRUB_BLOCK_ID, val), > + GETFIELD(PC_SCRUB_OFFSET, val)); > + break; > + > + > + /* > + * XIVE PC & VC cache invalidation > + */ > + case PC_AT_KILL: > + break; > + case VC_AT_MACRO_KILL: > + break; > + case PC_AT_KILL_MASK: > + case VC_AT_MACRO_KILL_MASK: > + break; > + > + default: > + xive_error(xive, "IC: invalid write to reg=0x%"HWADDR_PRIx, offset); > + return; > + } > + > + xive->regs[reg] = val; > +} > + > +static uint64_t pnv_xive_ic_reg_read(void *opaque, hwaddr offset, unsigned size) > +{ > + PnvXive *xive = PNV_XIVE(opaque); > + uint64_t val = 0; > + uint32_t reg = offset >> 3; > + > + switch (offset) { > + case CQ_CFG_PB_GEN: > + case CQ_IC_BAR: > + case CQ_TM1_BAR: > + case CQ_TM2_BAR: > + case CQ_PC_BAR: > + case CQ_PC_BARM: > + case CQ_VC_BAR: > + case CQ_VC_BARM: > + case CQ_TAR: > + case CQ_TDR: > + case CQ_PBI_CTL: > + > + case PC_TCTXT_CFG: > + case PC_TCTXT_TRACK: > + case PC_TCTXT_INDIR0: > + case PC_TCTXT_INDIR1: > + case PC_TCTXT_INDIR2: > + case PC_TCTXT_INDIR3: > + case PC_GLOBAL_CONFIG: > + > + case PC_VPC_SCRUB_MASK: > + case PC_VPC_CWATCH_SPEC: > + case PC_VPC_CWATCH_DAT0: > + case PC_VPC_CWATCH_DAT1: > + case PC_VPC_CWATCH_DAT2: > + case PC_VPC_CWATCH_DAT3: > + case PC_VPC_CWATCH_DAT4: > + case PC_VPC_CWATCH_DAT5: > + case PC_VPC_CWATCH_DAT6: > + case PC_VPC_CWATCH_DAT7: > + > + case VC_GLOBAL_CONFIG: > + case VC_AIB_TX_ORDER_TAG2: > + > + case VC_IRQ_CONFIG_IPI: > + case VC_IRQ_CONFIG_HW: > + case VC_IRQ_CONFIG_CASCADE1: > + case VC_IRQ_CONFIG_CASCADE2: > + case VC_IRQ_CONFIG_REDIST: > + case VC_IRQ_CONFIG_IPI_CASC: > + > + case VC_EQC_SCRUB_MASK: > + case VC_EQC_CWATCH_DAT0: > + case VC_EQC_CWATCH_DAT1: > + case VC_EQC_CWATCH_DAT2: > + case VC_EQC_CWATCH_DAT3: > + > + case VC_EQC_CWATCH_SPEC: > + case VC_IVC_SCRUB_MASK: > + case VC_SBC_CONFIG: > + case VC_AT_MACRO_KILL_MASK: > + case VC_VSD_TABLE_ADDR: > + case PC_VSD_TABLE_ADDR: > + case VC_VSD_TABLE_DATA: > + case PC_VSD_TABLE_DATA: > + case PC_THREAD_EN_REG0: > + case PC_THREAD_EN_REG1: > + val = xive->regs[reg]; > + break; > + > + /* > + * XIVE hardware thread enablement > + */ > + case PC_THREAD_EN_REG0_SET: > + case PC_THREAD_EN_REG0_CLR: > + val = xive->regs[PC_THREAD_EN_REG0 >> 3]; > + break; > + case PC_THREAD_EN_REG1_SET: > + case PC_THREAD_EN_REG1_CLR: > + val = xive->regs[PC_THREAD_EN_REG1 >> 3]; > + break; > + > + case CQ_MSGSND: /* Identifies which cores have msgsnd enabled. */ > + val = 0xffffff0000000000; > + break; > + > + /* > + * XIVE PC & VC cache updates for EAS, NVT and END > + */ > + case PC_VPC_SCRUB_TRIG: > + case VC_IVC_SCRUB_TRIG: > + case VC_EQC_SCRUB_TRIG: > + xive->regs[reg] &= ~VC_SCRUB_VALID; > + val = xive->regs[reg]; > + break; > + > + /* > + * XIVE PC & VC cache invalidation > + */ > + case PC_AT_KILL: > + xive->regs[reg] &= ~PC_AT_KILL_VALID; > + val = xive->regs[reg]; > + break; > + case VC_AT_MACRO_KILL: > + xive->regs[reg] &= ~VC_KILL_VALID; > + val = xive->regs[reg]; > + break; > + > + /* > + * XIVE synchronisation > + */ > + case VC_EQC_CONFIG: > + val = VC_EQC_SYNC_MASK; > + break; > + > + default: > + xive_error(xive, "IC: invalid read reg=0x%"HWADDR_PRIx, offset); > + } > + > + return val; > +} > + > +static const MemoryRegionOps pnv_xive_ic_reg_ops = { > + .read = pnv_xive_ic_reg_read, > + .write = pnv_xive_ic_reg_write, > + .endianness = DEVICE_BIG_ENDIAN, > + .valid = { > + .min_access_size = 8, > + .max_access_size = 8, > + }, > + .impl = { > + .min_access_size = 8, > + .max_access_size = 8, > + }, > +}; > + > +/* > + * IC - Notify MMIO port page (write only) > + */ > +#define PNV_XIVE_FORWARD_IPI 0x800 /* Forward IPI */ > +#define PNV_XIVE_FORWARD_HW 0x880 /* Forward HW */ > +#define PNV_XIVE_FORWARD_OS_ESC 0x900 /* Forward OS escalation */ > +#define PNV_XIVE_FORWARD_HW_ESC 0x980 /* Forward Hyp escalation */ > +#define PNV_XIVE_FORWARD_REDIS 0xa00 /* Forward Redistribution */ > +#define PNV_XIVE_RESERVED5 0xa80 /* Cache line 5 PowerBUS operation */ > +#define PNV_XIVE_RESERVED6 0xb00 /* Cache line 6 PowerBUS operation */ > +#define PNV_XIVE_RESERVED7 0xb80 /* Cache line 7 PowerBUS operation */ > + > +/* VC synchronisation */ > +#define PNV_XIVE_SYNC_IPI 0xc00 /* Sync IPI */ > +#define PNV_XIVE_SYNC_HW 0xc80 /* Sync HW */ > +#define PNV_XIVE_SYNC_OS_ESC 0xd00 /* Sync OS escalation */ > +#define PNV_XIVE_SYNC_HW_ESC 0xd80 /* Sync Hyp escalation */ > +#define PNV_XIVE_SYNC_REDIS 0xe00 /* Sync Redistribution */ > + > +/* PC synchronisation */ > +#define PNV_XIVE_SYNC_PULL 0xe80 /* Sync pull context */ > +#define PNV_XIVE_SYNC_PUSH 0xf00 /* Sync push context */ > +#define PNV_XIVE_SYNC_VPC 0xf80 /* Sync remove VPC store */ > + > +static void pnv_xive_ic_hw_trigger(PnvXive *xive, hwaddr addr, uint64_t val) > +{ > + /* > + * Forward the source event notification directly to the Router. > + * The source interrupt number should already be correctly encoded > + * with the chip block id by the sending device (PHB, PSI). > + */ > + xive_router_notify(XIVE_NOTIFIER(xive), val); > +} > + > +static void pnv_xive_ic_notify_write(void *opaque, hwaddr addr, uint64_t val, > + unsigned size) > +{ > + PnvXive *xive = PNV_XIVE(opaque); > + > + /* VC: HW triggers */ > + switch (addr) { > + case 0x000 ... 0x7FF: > + pnv_xive_ic_hw_trigger(opaque, addr, val); > + break; > + > + /* VC: Forwarded IRQs */ > + case PNV_XIVE_FORWARD_IPI: > + case PNV_XIVE_FORWARD_HW: > + case PNV_XIVE_FORWARD_OS_ESC: > + case PNV_XIVE_FORWARD_HW_ESC: > + case PNV_XIVE_FORWARD_REDIS: > + /* TODO: forwarded IRQs. Should be like HW triggers */ > + xive_error(xive, "IC: forwarded at @0x%"HWADDR_PRIx" IRQ 0x%"PRIx64, > + addr, val); > + break; > + > + /* VC syncs */ > + case PNV_XIVE_SYNC_IPI: > + case PNV_XIVE_SYNC_HW: > + case PNV_XIVE_SYNC_OS_ESC: > + case PNV_XIVE_SYNC_HW_ESC: > + case PNV_XIVE_SYNC_REDIS: > + break; > + > + /* PC syncs */ > + case PNV_XIVE_SYNC_PULL: > + case PNV_XIVE_SYNC_PUSH: > + case PNV_XIVE_SYNC_VPC: > + break; > + > + default: > + xive_error(xive, "IC: invalid notify write @%"HWADDR_PRIx, addr); > + } > +} > + > +static uint64_t pnv_xive_ic_notify_read(void *opaque, hwaddr addr, > + unsigned size) > +{ > + PnvXive *xive = PNV_XIVE(opaque); > + > + /* loads are invalid */ > + xive_error(xive, "IC: invalid notify read @%"HWADDR_PRIx, addr); > + return -1; > +} > + > +static const MemoryRegionOps pnv_xive_ic_notify_ops = { > + .read = pnv_xive_ic_notify_read, > + .write = pnv_xive_ic_notify_write, > + .endianness = DEVICE_BIG_ENDIAN, > + .valid = { > + .min_access_size = 8, > + .max_access_size = 8, > + }, > + .impl = { > + .min_access_size = 8, > + .max_access_size = 8, > + }, > +}; > + > +/* > + * IC - LSI MMIO handlers (not modeled) > + */ > + > +static void pnv_xive_ic_lsi_write(void *opaque, hwaddr addr, > + uint64_t val, unsigned size) > +{ > + PnvXive *xive = PNV_XIVE(opaque); > + > + xive_error(xive, "IC: LSI invalid write @%"HWADDR_PRIx, addr); > +} > + > +static uint64_t pnv_xive_ic_lsi_read(void *opaque, hwaddr addr, unsigned size) > +{ > + PnvXive *xive = PNV_XIVE(opaque); > + > + xive_error(xive, "IC: LSI invalid read @%"HWADDR_PRIx, addr); > + return -1; > +} > + > +static const MemoryRegionOps pnv_xive_ic_lsi_ops = { > + .read = pnv_xive_ic_lsi_read, > + .write = pnv_xive_ic_lsi_write, > + .endianness = DEVICE_BIG_ENDIAN, > + .valid = { > + .min_access_size = 8, > + .max_access_size = 8, > + }, > + .impl = { > + .min_access_size = 8, > + .max_access_size = 8, > + }, > +}; > + > +/* > + * IC - Indirect TIMA MMIO handlers > + */ > + > +/* > + * When the TIMA is accessed from the indirect page, the thread id > + * (PIR) has to be configured in the IC registers before. This is used > + * for resets and for debug purpose also. > + */ > +static XiveTCTX *pnv_xive_get_indirect_tctx(PnvXive *xive, hwaddr offset) > +{ > + uint8_t page_offset = (offset >> TM_SHIFT) & 0x3; > + uint64_t tctxt_indir = xive->regs[(PC_TCTXT_INDIR0 >> 3) + page_offset]; > + PowerPCCPU *cpu = NULL; > + int pir; > + > + if (!(tctxt_indir & PC_TCTXT_INDIR_VALID)) { > + xive_error(xive, "IC: no indirect TIMA access in progress"); > + return NULL; > + } > + > + pir = GETFIELD(PC_TCTXT_INDIR_THRDID, tctxt_indir) & 0xff; > + cpu = ppc_get_vcpu_by_pir(pir); > + if (!cpu) { > + xive_error(xive, "IC: invalid PIR %x for indirect access", pir); > + return NULL; > + } > + > + /* Check that HW thread is XIVE enabled */ > + if (!(xive->regs[PC_THREAD_EN_REG0 >> 3] & PPC_BIT(pir))) { > + xive_error(xive, "IC: CPU %x is not enabled", pir); > + } > + > + return pnv_cpu_state(cpu)->tctx; > +} > + > +static void xive_tm_indirect_write(void *opaque, hwaddr offset, > + uint64_t value, unsigned size) > +{ > + XiveTCTX *tctx = pnv_xive_get_indirect_tctx(PNV_XIVE(opaque), offset); > + > + xive_tctx_tm_write(tctx, offset, value, size); > +} > + > +static uint64_t xive_tm_indirect_read(void *opaque, hwaddr offset, > + unsigned size) > +{ > + XiveTCTX *tctx = pnv_xive_get_indirect_tctx(PNV_XIVE(opaque), offset); > + > + return xive_tctx_tm_read(tctx, offset, size); > +} > + > +static const MemoryRegionOps xive_tm_indirect_ops = { > + .read = xive_tm_indirect_read, > + .write = xive_tm_indirect_write, > + .endianness = DEVICE_BIG_ENDIAN, > + .valid = { > + .min_access_size = 1, > + .max_access_size = 8, > + }, > + .impl = { > + .min_access_size = 1, > + .max_access_size = 8, > + }, > +}; > + > +/* > + * Interrupt controller XSCOM region. > + */ > +static uint64_t pnv_xive_xscom_read(void *opaque, hwaddr addr, unsigned size) > +{ > + switch (addr >> 3) { > + case X_VC_EQC_CONFIG: > + /* FIXME (skiboot): This is the only XSCOM load. Bizarre. */ > + return VC_EQC_SYNC_MASK; > + default: > + return pnv_xive_ic_reg_read(opaque, addr, size); > + } > +} > + > +static void pnv_xive_xscom_write(void *opaque, hwaddr addr, > + uint64_t val, unsigned size) > +{ > + pnv_xive_ic_reg_write(opaque, addr, val, size); > +} > + > +static const MemoryRegionOps pnv_xive_xscom_ops = { > + .read = pnv_xive_xscom_read, > + .write = pnv_xive_xscom_write, > + .endianness = DEVICE_BIG_ENDIAN, > + .valid = { > + .min_access_size = 8, > + .max_access_size = 8, > + }, > + .impl = { > + .min_access_size = 8, > + .max_access_size = 8, > + } > +}; > + > +/* > + * Virtualization Controller MMIO region containing the IPI and END ESB pages > + */ > +static uint64_t pnv_xive_vc_read(void *opaque, hwaddr offset, > + unsigned size) > +{ > + PnvXive *xive = PNV_XIVE(opaque); > + uint64_t edt_index = offset >> pnv_xive_edt_shift(xive); > + uint64_t edt_type = 0; > + uint64_t edt_offset; > + MemTxResult result; > + AddressSpace *edt_as = NULL; > + uint64_t ret = -1; > + > + if (edt_index < XIVE_TABLE_EDT_MAX) { > + edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[edt_index]); > + } > + > + switch (edt_type) { > + case CQ_TDR_EDT_IPI: > + edt_as = &xive->ipi_as; > + break; > + case CQ_TDR_EDT_EQ: > + edt_as = &xive->end_as; I'm not entirely understanding the function of these AddressSpace objectz. > + break; > + default: > + xive_error(xive, "VC: invalid EDT type for read @%"HWADDR_PRIx, offset); > + return -1; > + } > + > + /* Remap the offset for the targeted address space */ > + edt_offset = pnv_xive_edt_offset(xive, offset, edt_type); > + > + ret = address_space_ldq(edt_as, edt_offset, MEMTXATTRS_UNSPECIFIED, > + &result); > + > + if (result != MEMTX_OK) { > + xive_error(xive, "VC: %s read failed at @0x%"HWADDR_PRIx " -> @0x%" > + HWADDR_PRIx, edt_type == CQ_TDR_EDT_IPI ? "IPI" : "END", > + offset, edt_offset); > + return -1; > + } > + > + return ret; > +} > + > +static void pnv_xive_vc_write(void *opaque, hwaddr offset, > + uint64_t val, unsigned size) > +{ > + PnvXive *xive = PNV_XIVE(opaque); > + uint64_t edt_index = offset >> pnv_xive_edt_shift(xive); > + uint64_t edt_type = 0; > + uint64_t edt_offset; > + MemTxResult result; > + AddressSpace *edt_as = NULL; > + > + if (edt_index < XIVE_TABLE_EDT_MAX) { > + edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[edt_index]); > + } > + > + switch (edt_type) { > + case CQ_TDR_EDT_IPI: > + edt_as = &xive->ipi_as; > + break; > + case CQ_TDR_EDT_EQ: > + edt_as = &xive->end_as; > + break; > + default: > + xive_error(xive, "VC: invalid EDT type for write @%"HWADDR_PRIx, > + offset); > + return; > + } > + > + /* Remap the offset for the targeted address space */ > + edt_offset = pnv_xive_edt_offset(xive, offset, edt_type); > + > + address_space_stq(edt_as, edt_offset, val, MEMTXATTRS_UNSPECIFIED, &result); > + if (result != MEMTX_OK) { > + xive_error(xive, "VC: write failed at @0x%"HWADDR_PRIx, edt_offset); > + } > +} > + > +static const MemoryRegionOps pnv_xive_vc_ops = { > + .read = pnv_xive_vc_read, > + .write = pnv_xive_vc_write, > + .endianness = DEVICE_BIG_ENDIAN, > + .valid = { > + .min_access_size = 8, > + .max_access_size = 8, > + }, > + .impl = { > + .min_access_size = 8, > + .max_access_size = 8, > + }, > +}; > + > +/* > + * Presenter Controller MMIO region. The Virtualization Controller > + * updates the IPB in the NVT table when required. Not modeled. > + */ > +static uint64_t pnv_xive_pc_read(void *opaque, hwaddr addr, > + unsigned size) > +{ > + PnvXive *xive = PNV_XIVE(opaque); > + > + xive_error(xive, "PC: invalid read @%"HWADDR_PRIx, addr); > + return -1; > +} > + > +static void pnv_xive_pc_write(void *opaque, hwaddr addr, > + uint64_t value, unsigned size) > +{ > + PnvXive *xive = PNV_XIVE(opaque); > + > + xive_error(xive, "PC: invalid write to VC @%"HWADDR_PRIx, addr); > +} > + > +static const MemoryRegionOps pnv_xive_pc_ops = { > + .read = pnv_xive_pc_read, > + .write = pnv_xive_pc_write, > + .endianness = DEVICE_BIG_ENDIAN, > + .valid = { > + .min_access_size = 8, > + .max_access_size = 8, > + }, > + .impl = { > + .min_access_size = 8, > + .max_access_size = 8, > + }, > +}; > + > +void pnv_xive_pic_print_info(PnvXive *xive, Monitor *mon) > +{ > + XiveRouter *xrtr = XIVE_ROUTER(xive); > + XiveEAS eas; > + XiveEND end; > + uint32_t endno = 0; > + uint32_t srcno = 0; > + uint32_t srcno0 = XIVE_SRCNO(xive->chip_id, 0); > + > + monitor_printf(mon, "XIVE[%x] Source %08x .. %08x\n", xive->chip_id, > + srcno0, srcno0 + xive->nr_irqs - 1); > + xive_source_pic_print_info(&xive->source, srcno0, mon); > + > + monitor_printf(mon, "XIVE[%x] EAT %08x .. %08x\n", xive->chip_id, > + srcno0, srcno0 + xive->nr_irqs - 1); > + while (!xive_router_get_eas(xrtr, xive->chip_id, srcno, &eas)) { > + if (!xive_eas_is_masked(&eas)) { > + xive_eas_pic_print_info(&eas, srcno, mon); > + } > + srcno++; > + } > + > + monitor_printf(mon, "XIVE[%x] ENDT %08x .. %08x\n", xive->chip_id, > + 0, xive->nr_ends - 1); > + while (!xive_router_get_end(xrtr, xive->chip_id, endno, &end)) { > + xive_end_pic_print_info(&end, endno++, mon); > + } > +} > + > +static void pnv_xive_reset(void *dev) > +{ > + PnvXive *xive = PNV_XIVE(dev); > + XiveSource *xsrc = &xive->source; > + XiveENDSource *end_xsrc = &xive->end_source; > + > + /* > + * Use the PnvChip id to identify the XIVE interrupt controller. > + * It can be overriden by configuration at runtime. > + */ > + xive->chip_id = xive->tctx_chipid = xive->chip->chip_id; > + > + /* Default page size (Should be changed at runtime to 64k) */ > + xive->ic_shift = xive->vc_shift = xive->pc_shift = 12; > + > + /* Clear subregions */ > + if (memory_region_is_mapped(&xsrc->esb_mmio)) { > + memory_region_del_subregion(&xive->ipi_edt_mmio, &xsrc->esb_mmio); > + } > + > + if (memory_region_is_mapped(&xive->ipi_edt_mmio)) { > + memory_region_del_subregion(&xive->ipi_mmio, &xive->ipi_edt_mmio); > + } > + > + if (memory_region_is_mapped(&end_xsrc->esb_mmio)) { > + memory_region_del_subregion(&xive->end_edt_mmio, &end_xsrc->esb_mmio); > + } > + > + if (memory_region_is_mapped(&xive->end_edt_mmio)) { > + memory_region_del_subregion(&xive->end_mmio, &xive->end_edt_mmio); > + } > +} > + > +static void pnv_xive_init(Object *obj) > +{ > + PnvXive *xive = PNV_XIVE(obj); > + > + object_initialize(&xive->source, sizeof(xive->source), TYPE_XIVE_SOURCE); > + object_property_add_child(obj, "source", OBJECT(&xive->source), NULL); > + > + object_initialize(&xive->end_source, sizeof(xive->end_source), > + TYPE_XIVE_END_SOURCE); > + object_property_add_child(obj, "end_source", OBJECT(&xive->end_source), > + NULL); > +} > + > +/* > + * Maximum number of IRQs and ENDs supported by HW > + */ > +#define PNV_XIVE_NR_IRQS (PNV9_XIVE_VC_SIZE / (1ull << XIVE_ESB_64K_2PAGE)) > +#define PNV_XIVE_NR_ENDS (PNV9_XIVE_VC_SIZE / (1ull << XIVE_ESB_64K_2PAGE)) > + > +static void pnv_xive_realize(DeviceState *dev, Error **errp) > +{ > + PnvXive *xive = PNV_XIVE(dev); > + XiveSource *xsrc = &xive->source; > + XiveENDSource *end_xsrc = &xive->end_source; > + Error *local_err = NULL; > + Object *obj; > + > + obj = object_property_get_link(OBJECT(dev), "chip", &local_err); > + if (!obj) { > + error_propagate(errp, local_err); > + error_prepend(errp, "required link 'chip' not found: "); > + return; > + } > + > + /* The PnvChip id identifies the XIVE interrupt controller. */ > + xive->chip = PNV_CHIP(obj); > + > + /* > + * Xive Interrupt source and END source object with the maximum > + * allowed HW configuration. The ESB MMIO regions will be resized > + * dynamically when the controller is configured by the FW to > + * limit accesses to resources not provisioned. > + */ > + object_property_set_int(OBJECT(xsrc), PNV_XIVE_NR_IRQS, "nr-irqs", > + &error_fatal); You have a constant here, but your router object also includes a nr_irqs field. What's up with that? > + object_property_add_const_link(OBJECT(xsrc), "xive", OBJECT(xive), > + &error_fatal); > + object_property_set_bool(OBJECT(xsrc), true, "realized", &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > + > + object_property_set_int(OBJECT(end_xsrc), PNV_XIVE_NR_ENDS, "nr-ends", > + &error_fatal); > + object_property_add_const_link(OBJECT(end_xsrc), "xive", OBJECT(xive), > + &error_fatal); > + object_property_set_bool(OBJECT(end_xsrc), true, "realized", &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > + > + /* Default page size. Generally changed at runtime to 64k */ > + xive->ic_shift = xive->vc_shift = xive->pc_shift = 12; > + > + /* XSCOM region, used for initial configuration of the BARs */ > + memory_region_init_io(&xive->xscom_regs, OBJECT(dev), &pnv_xive_xscom_ops, > + xive, "xscom-xive", PNV9_XSCOM_XIVE_SIZE << 3); > + > + /* Interrupt controller MMIO regions */ > + memory_region_init(&xive->ic_mmio, OBJECT(dev), "xive-ic", > + PNV9_XIVE_IC_SIZE); > + > + memory_region_init_io(&xive->ic_reg_mmio, OBJECT(dev), &pnv_xive_ic_reg_ops, > + xive, "xive-ic-reg", 1 << xive->ic_shift); > + memory_region_init_io(&xive->ic_notify_mmio, OBJECT(dev), > + &pnv_xive_ic_notify_ops, > + xive, "xive-ic-notify", 1 << xive->ic_shift); > + > + /* The Pervasive LSI trigger and EOI pages (not modeled) */ > + memory_region_init_io(&xive->ic_lsi_mmio, OBJECT(dev), &pnv_xive_ic_lsi_ops, > + xive, "xive-ic-lsi", 2 << xive->ic_shift); > + > + /* Thread Interrupt Management Area (Indirect) */ > + memory_region_init_io(&xive->tm_indirect_mmio, OBJECT(dev), > + &xive_tm_indirect_ops, > + xive, "xive-tima-indirect", PNV9_XIVE_TM_SIZE); > + /* > + * Overall Virtualization Controller MMIO region containing the > + * IPI ESB pages and END ESB pages. The layout is defined by the > + * EDT "Domain table" and the accesses are dispatched using > + * address spaces for each. > + */ > + memory_region_init_io(&xive->vc_mmio, OBJECT(xive), &pnv_xive_vc_ops, xive, > + "xive-vc", PNV9_XIVE_VC_SIZE); > + > + memory_region_init(&xive->ipi_mmio, OBJECT(xive), "xive-vc-ipi", > + PNV9_XIVE_VC_SIZE); > + address_space_init(&xive->ipi_as, &xive->ipi_mmio, "xive-vc-ipi"); > + memory_region_init(&xive->end_mmio, OBJECT(xive), "xive-vc-end", > + PNV9_XIVE_VC_SIZE); > + address_space_init(&xive->end_as, &xive->end_mmio, "xive-vc-end"); > + > + /* > + * The MMIO windows exposing the IPI ESBs and the END ESBs in the > + * VC region. Their size is configured by the FW in the EDT table. > + */ > + memory_region_init(&xive->ipi_edt_mmio, OBJECT(xive), "xive-vc-ipi-edt", 0); > + memory_region_init(&xive->end_edt_mmio, OBJECT(xive), "xive-vc-end-edt", 0); > + > + /* Presenter Controller MMIO region (not modeled) */ > + memory_region_init_io(&xive->pc_mmio, OBJECT(xive), &pnv_xive_pc_ops, xive, > + "xive-pc", PNV9_XIVE_PC_SIZE); > + > + /* Thread Interrupt Management Area (Direct) */ > + memory_region_init_io(&xive->tm_mmio, OBJECT(xive), &xive_tm_ops, > + xive, "xive-tima", PNV9_XIVE_TM_SIZE); > + > + qemu_register_reset(pnv_xive_reset, dev); > +} > + > +static int pnv_xive_dt_xscom(PnvXScomInterface *dev, void *fdt, > + int xscom_offset) > +{ > + const char compat[] = "ibm,power9-xive-x"; > + char *name; > + int offset; > + uint32_t lpc_pcba = PNV9_XSCOM_XIVE_BASE; > + uint32_t reg[] = { > + cpu_to_be32(lpc_pcba), > + cpu_to_be32(PNV9_XSCOM_XIVE_SIZE) > + }; > + > + name = g_strdup_printf("xive@%x", lpc_pcba); > + offset = fdt_add_subnode(fdt, xscom_offset, name); > + _FDT(offset); > + g_free(name); > + > + _FDT((fdt_setprop(fdt, offset, "reg", reg, sizeof(reg)))); > + _FDT((fdt_setprop(fdt, offset, "compatible", compat, > + sizeof(compat)))); > + return 0; > +} > + > +static Property pnv_xive_properties[] = { > + DEFINE_PROP_UINT64("ic-bar", PnvXive, ic_base, 0), > + DEFINE_PROP_UINT64("vc-bar", PnvXive, vc_base, 0), > + DEFINE_PROP_UINT64("pc-bar", PnvXive, pc_base, 0), > + DEFINE_PROP_UINT64("tm-bar", PnvXive, tm_base, 0), > + DEFINE_PROP_END_OF_LIST(), > +}; > + > +static void pnv_xive_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + PnvXScomInterfaceClass *xdc = PNV_XSCOM_INTERFACE_CLASS(klass); > + XiveRouterClass *xrc = XIVE_ROUTER_CLASS(klass); > + XiveNotifierClass *xnc = XIVE_NOTIFIER_CLASS(klass); > + > + xdc->dt_xscom = pnv_xive_dt_xscom; > + > + dc->desc = "PowerNV XIVE Interrupt Controller"; > + dc->realize = pnv_xive_realize; > + dc->props = pnv_xive_properties; > + > + xrc->get_eas = pnv_xive_get_eas; > + xrc->get_end = pnv_xive_get_end; > + xrc->write_end = pnv_xive_write_end; > + xrc->get_nvt = pnv_xive_get_nvt; > + xrc->write_nvt = pnv_xive_write_nvt; > + xrc->get_tctx = pnv_xive_get_tctx; > + > + xnc->notify = pnv_xive_notify; > +}; > + > +static const TypeInfo pnv_xive_info = { > + .name = TYPE_PNV_XIVE, > + .parent = TYPE_XIVE_ROUTER, > + .instance_init = pnv_xive_init, > + .instance_size = sizeof(PnvXive), > + .class_init = pnv_xive_class_init, > + .interfaces = (InterfaceInfo[]) { > + { TYPE_PNV_XSCOM_INTERFACE }, > + { } > + } > +}; > + > +static void pnv_xive_register_types(void) > +{ > + type_register_static(&pnv_xive_info); > +} > + > +type_init(pnv_xive_register_types) > diff --git a/hw/intc/xive.c b/hw/intc/xive.c > index ee6e81425784..0e0e1dc9c1b7 100644 > --- a/hw/intc/xive.c > +++ b/hw/intc/xive.c Might be a bit easier to review if these changes to the XIVE "guts" were in a separate patch from the Pnv specific XIVE object. > @@ -54,6 +54,8 @@ static uint8_t exception_mask(uint8_t ring) > switch (ring) { > case TM_QW1_OS: > return TM_QW1_NSR_EO; > + case TM_QW3_HV_PHYS: > + return TM_QW3_NSR_HE; > default: > g_assert_not_reached(); > } > @@ -88,7 +90,16 @@ static void xive_tctx_notify(XiveTCTX *tctx, uint8_t ring) > uint8_t *regs = &tctx->regs[ring]; > > if (regs[TM_PIPR] < regs[TM_CPPR]) { > - regs[TM_NSR] |= exception_mask(ring); > + switch (ring) { > + case TM_QW1_OS: > + regs[TM_NSR] |= TM_QW1_NSR_EO; > + break; > + case TM_QW3_HV_PHYS: > + regs[TM_NSR] |= (TM_QW3_NSR_HE_PHYS << 6); > + break; > + default: > + g_assert_not_reached(); > + } > qemu_irq_raise(tctx->output); > } > } > @@ -109,6 +120,38 @@ static void xive_tctx_set_cppr(XiveTCTX *tctx, uint8_t ring, uint8_t cppr) > * XIVE Thread Interrupt Management Area (TIMA) > */ > > +static void xive_tm_set_hv_cppr(XiveTCTX *tctx, hwaddr offset, > + uint64_t value, unsigned size) > +{ > + xive_tctx_set_cppr(tctx, TM_QW3_HV_PHYS, value & 0xff); > +} > + > +static uint64_t xive_tm_ack_hv_reg(XiveTCTX *tctx, hwaddr offset, unsigned size) > +{ > + return xive_tctx_accept(tctx, TM_QW3_HV_PHYS); > +} > + > +static uint64_t xive_tm_pull_pool_ctx(XiveTCTX *tctx, hwaddr offset, > + unsigned size) > +{ > + uint64_t ret; > + > + ret = tctx->regs[TM_QW2_HV_POOL + TM_WORD2] & TM_QW2W2_POOL_CAM; > + tctx->regs[TM_QW2_HV_POOL + TM_WORD2] &= ~TM_QW2W2_POOL_CAM; > + return ret; > +} > + > +static void xive_tm_vt_push(XiveTCTX *tctx, hwaddr offset, > + uint64_t value, unsigned size) > +{ > + tctx->regs[TM_QW3_HV_PHYS + TM_WORD2] = value & 0xff; > +} > + > +static uint64_t xive_tm_vt_poll(XiveTCTX *tctx, hwaddr offset, unsigned size) > +{ > + return tctx->regs[TM_QW3_HV_PHYS + TM_WORD2] & 0xff; > +} > + > /* > * Define an access map for each page of the TIMA that we will use in > * the memory region ops to filter values when doing loads and stores > @@ -288,10 +331,16 @@ static const XiveTmOp xive_tm_operations[] = { > * effects > */ > { XIVE_TM_OS_PAGE, TM_QW1_OS + TM_CPPR, 1, xive_tm_set_os_cppr, NULL }, > + { XIVE_TM_HV_PAGE, TM_QW3_HV_PHYS + TM_CPPR, 1, xive_tm_set_hv_cppr, NULL }, > + { XIVE_TM_HV_PAGE, TM_QW3_HV_PHYS + TM_WORD2, 1, xive_tm_vt_push, NULL }, > + { XIVE_TM_HV_PAGE, TM_QW3_HV_PHYS + TM_WORD2, 1, NULL, xive_tm_vt_poll }, > > /* MMIOs above 2K : special operations with side effects */ > { XIVE_TM_OS_PAGE, TM_SPC_ACK_OS_REG, 2, NULL, xive_tm_ack_os_reg }, > { XIVE_TM_OS_PAGE, TM_SPC_SET_OS_PENDING, 1, xive_tm_set_os_pending, NULL }, > + { XIVE_TM_HV_PAGE, TM_SPC_ACK_HV_REG, 2, NULL, xive_tm_ack_hv_reg }, > + { XIVE_TM_HV_PAGE, TM_SPC_PULL_POOL_CTX, 4, NULL, xive_tm_pull_pool_ctx }, > + { XIVE_TM_HV_PAGE, TM_SPC_PULL_POOL_CTX, 8, NULL, xive_tm_pull_pool_ctx }, > }; > > static const XiveTmOp *xive_tm_find_op(hwaddr offset, unsigned size, bool write) > @@ -323,7 +372,7 @@ void xive_tctx_tm_write(XiveTCTX *tctx, hwaddr offset, uint64_t value, > const XiveTmOp *xto; > > /* > - * TODO: check V bit in Q[0-3]W2, check PTER bit associated with CPU > + * TODO: check V bit in Q[0-3]W2 > */ > > /* > @@ -360,7 +409,7 @@ uint64_t xive_tctx_tm_read(XiveTCTX *tctx, hwaddr offset, unsigned size) > const XiveTmOp *xto; > > /* > - * TODO: check V bit in Q[0-3]W2, check PTER bit associated with CPU > + * TODO: check V bit in Q[0-3]W2 > */ > > /* > @@ -474,6 +523,8 @@ static void xive_tctx_reset(void *dev) > */ > tctx->regs[TM_QW1_OS + TM_PIPR] = > ipb_to_pipr(tctx->regs[TM_QW1_OS + TM_IPB]); > + tctx->regs[TM_QW3_HV_PHYS + TM_PIPR] = > + ipb_to_pipr(tctx->regs[TM_QW3_HV_PHYS + TM_IPB]); > } > > static void xive_tctx_realize(DeviceState *dev, Error **errp) > @@ -1424,7 +1475,7 @@ static void xive_router_end_notify(XiveRouter *xrtr, uint8_t end_blk, > /* TODO: Auto EOI. */ > } > > -static void xive_router_notify(XiveNotifier *xn, uint32_t lisn) > +void xive_router_notify(XiveNotifier *xn, uint32_t lisn) > { > XiveRouter *xrtr = XIVE_ROUTER(xn); > uint8_t eas_blk = XIVE_SRCNO_BLOCK(lisn); > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c > index 0c9de76b71ff..6bb0772367d4 100644 > --- a/hw/ppc/pnv.c > +++ b/hw/ppc/pnv.c > @@ -279,7 +279,10 @@ static void pnv_dt_chip(PnvChip *chip, void *fdt) > pnv_dt_core(chip, pnv_core, fdt); > > /* Interrupt Control Presenters (ICP). One per core. */ > - pnv_dt_icp(chip, fdt, pnv_core->pir, CPU_CORE(pnv_core)->nr_threads); > + if (!pnv_chip_is_power9(chip)) { > + pnv_dt_icp(chip, fdt, pnv_core->pir, > + CPU_CORE(pnv_core)->nr_threads); I guess it's not really in scope for this patch set, but I think having separate dt setup routines for the p8chip and p9chip which call a common() routine would be preferable to having an all-common routine which has a bunch of if(power9) conditionals. > + } > } > > if (chip->ram_size) { > @@ -703,7 +706,23 @@ static uint32_t pnv_chip_core_pir_p9(PnvChip *chip, uint32_t core_id) > static void pnv_chip_power9_intc_create(PnvChip *chip, PowerPCCPU *cpu, > Error **errp) > { > - return; > + Pnv9Chip *chip9 = PNV9_CHIP(chip); > + Error *local_err = NULL; > + Object *obj; > + PnvCPUState *pnv_cpu = pnv_cpu_state(cpu); > + > + /* > + * The core creates its interrupt presenter but the XIVE interrupt > + * controller object is initialized afterwards. Hopefully, it's > + * only used at runtime. > + */ > + obj = xive_tctx_create(OBJECT(cpu), XIVE_ROUTER(&chip9->xive), errp); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > + > + pnv_cpu->tctx = XIVE_TCTX(obj); > } > > /* Allowed core identifiers on a POWER8 Processor Chip : > @@ -885,11 +904,19 @@ static void pnv_chip_power8nvl_class_init(ObjectClass *klass, void *data) > > static void pnv_chip_power9_instance_init(Object *obj) > { > + Pnv9Chip *chip9 = PNV9_CHIP(obj); > + > + object_initialize(&chip9->xive, sizeof(chip9->xive), TYPE_PNV_XIVE); > + object_property_add_child(obj, "xive", OBJECT(&chip9->xive), NULL); > + object_property_add_const_link(OBJECT(&chip9->xive), "chip", obj, > + &error_abort); > } > > static void pnv_chip_power9_realize(DeviceState *dev, Error **errp) > { > PnvChipClass *pcc = PNV_CHIP_GET_CLASS(dev); > + Pnv9Chip *chip9 = PNV9_CHIP(dev); > + PnvChip *chip = PNV_CHIP(dev); > Error *local_err = NULL; > > pcc->parent_realize(dev, &local_err); > @@ -897,6 +924,24 @@ static void pnv_chip_power9_realize(DeviceState *dev, Error **errp) > error_propagate(errp, local_err); > return; > } > + > + /* XIVE interrupt controller (POWER9) */ > + object_property_set_int(OBJECT(&chip9->xive), PNV9_XIVE_IC_BASE(chip), > + "ic-bar", &error_fatal); > + object_property_set_int(OBJECT(&chip9->xive), PNV9_XIVE_VC_BASE(chip), > + "vc-bar", &error_fatal); > + object_property_set_int(OBJECT(&chip9->xive), PNV9_XIVE_PC_BASE(chip), > + "pc-bar", &error_fatal); > + object_property_set_int(OBJECT(&chip9->xive), PNV9_XIVE_TM_BASE(chip), > + "tm-bar", &error_fatal); > + object_property_set_bool(OBJECT(&chip9->xive), true, "realized", > + &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > + pnv_xscom_add_subregion(chip, PNV9_XSCOM_XIVE_BASE, > + &chip9->xive.xscom_regs); > } > > static void pnv_chip_power9_class_init(ObjectClass *klass, void *data) > @@ -1097,12 +1142,25 @@ static void pnv_pic_print_info(InterruptStatsProvider *obj, > CPU_FOREACH(cs) { > PowerPCCPU *cpu = POWERPC_CPU(cs); > > - icp_pic_print_info(pnv_cpu_state(cpu)->icp, mon); > + if (pnv_chip_is_power9(pnv->chips[0])) { > + xive_tctx_pic_print_info(pnv_cpu_state(cpu)->tctx, mon); > + } else { > + icp_pic_print_info(pnv_cpu_state(cpu)->icp, mon); > + } > } > > for (i = 0; i < pnv->num_chips; i++) { > - Pnv8Chip *chip8 = PNV8_CHIP(pnv->chips[i]); > - ics_pic_print_info(&chip8->psi.ics, mon); > + PnvChip *chip = pnv->chips[i]; > + > + if (pnv_chip_is_power9(pnv->chips[i])) { > + Pnv9Chip *chip9 = PNV9_CHIP(chip); > + > + pnv_xive_pic_print_info(&chip9->xive, mon); > + } else { > + Pnv8Chip *chip8 = PNV8_CHIP(chip); > + > + ics_pic_print_info(&chip8->psi.ics, mon); > + } > } > } > > diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs > index 301a8e972d91..df712c3e6c93 100644 > --- a/hw/intc/Makefile.objs > +++ b/hw/intc/Makefile.objs > @@ -39,7 +39,7 @@ obj-$(CONFIG_XICS_SPAPR) += xics_spapr.o > obj-$(CONFIG_XICS_KVM) += xics_kvm.o > obj-$(CONFIG_XIVE) += xive.o > obj-$(CONFIG_XIVE_SPAPR) += spapr_xive.o > -obj-$(CONFIG_POWERNV) += xics_pnv.o > +obj-$(CONFIG_POWERNV) += xics_pnv.o pnv_xive.o > obj-$(CONFIG_ALLWINNER_A10_PIC) += allwinner-a10-pic.o > obj-$(CONFIG_S390_FLIC) += s390_flic.o > obj-$(CONFIG_S390_FLIC_KVM) += s390_flic_kvm.o -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 05/19] ppc/pnv: add XIVE support 2019-02-12 5:40 ` David Gibson @ 2019-02-19 7:31 ` Cédric Le Goater 2019-02-21 3:13 ` David Gibson 0 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-02-19 7:31 UTC (permalink / raw) To: David Gibson; +Cc: qemu-ppc, qemu-devel On 2/12/19 6:40 AM, David Gibson wrote: > On Mon, Jan 28, 2019 at 10:46:11AM +0100, Cédric Le Goater wrote: >> This is simple model of the POWER9 XIVE interrupt controller for the >> PowerNV machine. XIVE for baremetal is a complex controller and the >> model only addresses the needs of the skiboot firmware. >> >> The PowerNV model reuses the common XIVE framework developed for sPAPR >> and the fundamentals aspects are quite the same. The difference are >> outlined below. >> >> The controller initial BAR configuration is performed using the XSCOM >> bus from there, MMIO are used for further configuration. >> >> The MMIO regions exposed are : >> >> - Interrupt controller registers >> - ESB pages for IPIs and ENDs >> - Presenter MMIO (Not used) >> - Thread Interrupt Management Area MMIO, direct and indirect >> >> The virtualization controller MMIO region containing the IPI ESB pages >> and END ESB pages is sub-divided into "sets" which map portions of the >> VC region to the different ESB pages. These are modeled with custom >> address spaces and the XiveSource and XiveENDSource objects are sized >> to the maximum allowed by HW. The memory regions are resized at >> run-time using the configuration of EDT set translation table provided >> by the firmware. >> >> The XIVE virtualization structure tables (EAT, ENDT, NVTT) are now in >> the machine RAM and not in the hypervisor anymore. The firmware >> (skiboot) configures these tables using Virtual Structure Descriptor >> defining the characteristics of each table : SBE, EAS, END and >> NVT. These are later used to access the virtual interrupt entries. The >> internal cache of these tables in the interrupt controller is updated >> and invalidated using a set of registers. >> >> Still to address to complete the model but not fully required is the >> support for block grouping. Escalation support will be necessary for >> KVM guests. >> >> Signed-off-by: Cédric Le Goater <clg@kaod.org> >> --- >> hw/intc/pnv_xive_regs.h | 315 +++++++ >> include/hw/ppc/pnv.h | 21 + >> include/hw/ppc/pnv_core.h | 1 + >> include/hw/ppc/pnv_xive.h | 95 ++ >> include/hw/ppc/pnv_xscom.h | 3 + >> include/hw/ppc/xive.h | 1 + >> hw/intc/pnv_xive.c | 1698 ++++++++++++++++++++++++++++++++++++ >> hw/intc/xive.c | 59 +- >> hw/ppc/pnv.c | 68 +- >> hw/intc/Makefile.objs | 2 +- >> 10 files changed, 2253 insertions(+), 10 deletions(-) >> create mode 100644 hw/intc/pnv_xive_regs.h >> create mode 100644 include/hw/ppc/pnv_xive.h >> create mode 100644 hw/intc/pnv_xive.c >> >> diff --git a/hw/intc/pnv_xive_regs.h b/hw/intc/pnv_xive_regs.h >> new file mode 100644 >> index 000000000000..96ac27701cee >> --- /dev/null >> +++ b/hw/intc/pnv_xive_regs.h >> @@ -0,0 +1,315 @@ >> +/* >> + * QEMU PowerPC XIVE interrupt controller model >> + * >> + * Copyright (c) 2017-2018, IBM Corporation. >> + * >> + * This code is licensed under the GPL version 2 or later. See the >> + * COPYING file in the top-level directory. >> + */ >> + >> +#ifndef PPC_PNV_XIVE_REGS_H >> +#define PPC_PNV_XIVE_REGS_H >> + >> +/* IC register offsets 0x0 - 0x400 */ >> +#define CQ_SWI_CMD_HIST 0x020 >> +#define CQ_SWI_CMD_POLL 0x028 >> +#define CQ_SWI_CMD_BCAST 0x030 >> +#define CQ_SWI_CMD_ASSIGN 0x038 >> +#define CQ_SWI_CMD_BLK_UPD 0x040 >> +#define CQ_SWI_RSP 0x048 >> +#define X_CQ_CFG_PB_GEN 0x0a >> +#define CQ_CFG_PB_GEN 0x050 >> +#define CQ_INT_ADDR_OPT PPC_BITMASK(14, 15) >> +#define X_CQ_IC_BAR 0x10 >> +#define X_CQ_MSGSND 0x0b >> +#define CQ_MSGSND 0x058 >> +#define CQ_CNPM_SEL 0x078 >> +#define CQ_IC_BAR 0x080 >> +#define CQ_IC_BAR_VALID PPC_BIT(0) >> +#define CQ_IC_BAR_64K PPC_BIT(1) >> +#define X_CQ_TM1_BAR 0x12 >> +#define CQ_TM1_BAR 0x90 >> +#define X_CQ_TM2_BAR 0x014 >> +#define CQ_TM2_BAR 0x0a0 >> +#define CQ_TM_BAR_VALID PPC_BIT(0) >> +#define CQ_TM_BAR_64K PPC_BIT(1) >> +#define X_CQ_PC_BAR 0x16 >> +#define CQ_PC_BAR 0x0b0 >> +#define CQ_PC_BAR_VALID PPC_BIT(0) >> +#define X_CQ_PC_BARM 0x17 >> +#define CQ_PC_BARM 0x0b8 >> +#define CQ_PC_BARM_MASK PPC_BITMASK(26, 38) >> +#define X_CQ_VC_BAR 0x18 >> +#define CQ_VC_BAR 0x0c0 >> +#define CQ_VC_BAR_VALID PPC_BIT(0) >> +#define X_CQ_VC_BARM 0x19 >> +#define CQ_VC_BARM 0x0c8 >> +#define CQ_VC_BARM_MASK PPC_BITMASK(21, 37) >> +#define X_CQ_TAR 0x1e >> +#define CQ_TAR 0x0f0 >> +#define CQ_TAR_TBL_AUTOINC PPC_BIT(0) >> +#define CQ_TAR_TSEL PPC_BITMASK(12, 15) >> +#define CQ_TAR_TSEL_BLK PPC_BIT(12) >> +#define CQ_TAR_TSEL_MIG PPC_BIT(13) >> +#define CQ_TAR_TSEL_VDT PPC_BIT(14) >> +#define CQ_TAR_TSEL_EDT PPC_BIT(15) >> +#define CQ_TAR_TSEL_INDEX PPC_BITMASK(26, 31) >> +#define X_CQ_TDR 0x1f >> +#define CQ_TDR 0x0f8 >> +#define CQ_TDR_VDT_VALID PPC_BIT(0) >> +#define CQ_TDR_VDT_BLK PPC_BITMASK(11, 15) >> +#define CQ_TDR_VDT_INDEX PPC_BITMASK(28, 31) >> +#define CQ_TDR_EDT_TYPE PPC_BITMASK(0, 1) >> +#define CQ_TDR_EDT_INVALID 0 >> +#define CQ_TDR_EDT_IPI 1 >> +#define CQ_TDR_EDT_EQ 2 >> +#define CQ_TDR_EDT_BLK PPC_BITMASK(12, 15) >> +#define CQ_TDR_EDT_INDEX PPC_BITMASK(26, 31) >> +#define X_CQ_PBI_CTL 0x20 >> +#define CQ_PBI_CTL 0x100 >> +#define CQ_PBI_PC_64K PPC_BIT(5) >> +#define CQ_PBI_VC_64K PPC_BIT(6) >> +#define CQ_PBI_LNX_TRIG PPC_BIT(7) >> +#define CQ_PBI_FORCE_TM_LOCAL PPC_BIT(22) >> +#define CQ_PBO_CTL 0x108 >> +#define CQ_AIB_CTL 0x110 >> +#define X_CQ_RST_CTL 0x23 >> +#define CQ_RST_CTL 0x118 >> +#define X_CQ_FIRMASK 0x33 >> +#define CQ_FIRMASK 0x198 >> +#define X_CQ_FIRMASK_AND 0x34 >> +#define CQ_FIRMASK_AND 0x1a0 >> +#define X_CQ_FIRMASK_OR 0x35 >> +#define CQ_FIRMASK_OR 0x1a8 >> + >> +/* PC LBS1 register offsets 0x400 - 0x800 */ >> +#define X_PC_TCTXT_CFG 0x100 >> +#define PC_TCTXT_CFG 0x400 >> +#define PC_TCTXT_CFG_BLKGRP_EN PPC_BIT(0) >> +#define PC_TCTXT_CFG_TARGET_EN PPC_BIT(1) >> +#define PC_TCTXT_CFG_LGS_EN PPC_BIT(2) >> +#define PC_TCTXT_CFG_STORE_ACK PPC_BIT(3) >> +#define PC_TCTXT_CFG_HARD_CHIPID_BLK PPC_BIT(8) >> +#define PC_TCTXT_CHIPID_OVERRIDE PPC_BIT(9) >> +#define PC_TCTXT_CHIPID PPC_BITMASK(12, 15) >> +#define PC_TCTXT_INIT_AGE PPC_BITMASK(30, 31) >> +#define X_PC_TCTXT_TRACK 0x101 >> +#define PC_TCTXT_TRACK 0x408 >> +#define PC_TCTXT_TRACK_EN PPC_BIT(0) >> +#define X_PC_TCTXT_INDIR0 0x104 >> +#define PC_TCTXT_INDIR0 0x420 >> +#define PC_TCTXT_INDIR_VALID PPC_BIT(0) >> +#define PC_TCTXT_INDIR_THRDID PPC_BITMASK(9, 15) >> +#define X_PC_TCTXT_INDIR1 0x105 >> +#define PC_TCTXT_INDIR1 0x428 >> +#define X_PC_TCTXT_INDIR2 0x106 >> +#define PC_TCTXT_INDIR2 0x430 >> +#define X_PC_TCTXT_INDIR3 0x107 >> +#define PC_TCTXT_INDIR3 0x438 >> +#define X_PC_THREAD_EN_REG0 0x108 >> +#define PC_THREAD_EN_REG0 0x440 >> +#define X_PC_THREAD_EN_REG0_SET 0x109 >> +#define PC_THREAD_EN_REG0_SET 0x448 >> +#define X_PC_THREAD_EN_REG0_CLR 0x10a >> +#define PC_THREAD_EN_REG0_CLR 0x450 >> +#define X_PC_THREAD_EN_REG1 0x10c >> +#define PC_THREAD_EN_REG1 0x460 >> +#define X_PC_THREAD_EN_REG1_SET 0x10d >> +#define PC_THREAD_EN_REG1_SET 0x468 >> +#define X_PC_THREAD_EN_REG1_CLR 0x10e >> +#define PC_THREAD_EN_REG1_CLR 0x470 >> +#define X_PC_GLOBAL_CONFIG 0x110 >> +#define PC_GLOBAL_CONFIG 0x480 >> +#define PC_GCONF_INDIRECT PPC_BIT(32) >> +#define PC_GCONF_CHIPID_OVR PPC_BIT(40) >> +#define PC_GCONF_CHIPID PPC_BITMASK(44, 47) >> +#define X_PC_VSD_TABLE_ADDR 0x111 >> +#define PC_VSD_TABLE_ADDR 0x488 >> +#define X_PC_VSD_TABLE_DATA 0x112 >> +#define PC_VSD_TABLE_DATA 0x490 >> +#define X_PC_AT_KILL 0x116 >> +#define PC_AT_KILL 0x4b0 >> +#define PC_AT_KILL_VALID PPC_BIT(0) >> +#define PC_AT_KILL_BLOCK_ID PPC_BITMASK(27, 31) >> +#define PC_AT_KILL_OFFSET PPC_BITMASK(48, 60) >> +#define X_PC_AT_KILL_MASK 0x117 >> +#define PC_AT_KILL_MASK 0x4b8 >> + >> +/* PC LBS2 register offsets */ >> +#define X_PC_VPC_CACHE_ENABLE 0x161 >> +#define PC_VPC_CACHE_ENABLE 0x708 >> +#define PC_VPC_CACHE_EN_MASK PPC_BITMASK(0, 31) >> +#define X_PC_VPC_SCRUB_TRIG 0x162 >> +#define PC_VPC_SCRUB_TRIG 0x710 >> +#define X_PC_VPC_SCRUB_MASK 0x163 >> +#define PC_VPC_SCRUB_MASK 0x718 >> +#define PC_SCRUB_VALID PPC_BIT(0) >> +#define PC_SCRUB_WANT_DISABLE PPC_BIT(1) >> +#define PC_SCRUB_WANT_INVAL PPC_BIT(2) >> +#define PC_SCRUB_BLOCK_ID PPC_BITMASK(27, 31) >> +#define PC_SCRUB_OFFSET PPC_BITMASK(45, 63) >> +#define X_PC_VPC_CWATCH_SPEC 0x167 >> +#define PC_VPC_CWATCH_SPEC 0x738 >> +#define PC_VPC_CWATCH_CONFLICT PPC_BIT(0) >> +#define PC_VPC_CWATCH_FULL PPC_BIT(8) >> +#define PC_VPC_CWATCH_BLOCKID PPC_BITMASK(27, 31) >> +#define PC_VPC_CWATCH_OFFSET PPC_BITMASK(45, 63) >> +#define X_PC_VPC_CWATCH_DAT0 0x168 >> +#define PC_VPC_CWATCH_DAT0 0x740 >> +#define X_PC_VPC_CWATCH_DAT1 0x169 >> +#define PC_VPC_CWATCH_DAT1 0x748 >> +#define X_PC_VPC_CWATCH_DAT2 0x16a >> +#define PC_VPC_CWATCH_DAT2 0x750 >> +#define X_PC_VPC_CWATCH_DAT3 0x16b >> +#define PC_VPC_CWATCH_DAT3 0x758 >> +#define X_PC_VPC_CWATCH_DAT4 0x16c >> +#define PC_VPC_CWATCH_DAT4 0x760 >> +#define X_PC_VPC_CWATCH_DAT5 0x16d >> +#define PC_VPC_CWATCH_DAT5 0x768 >> +#define X_PC_VPC_CWATCH_DAT6 0x16e >> +#define PC_VPC_CWATCH_DAT6 0x770 >> +#define X_PC_VPC_CWATCH_DAT7 0x16f >> +#define PC_VPC_CWATCH_DAT7 0x778 >> + >> +/* VC0 register offsets 0x800 - 0xFFF */ >> +#define X_VC_GLOBAL_CONFIG 0x200 >> +#define VC_GLOBAL_CONFIG 0x800 >> +#define VC_GCONF_INDIRECT PPC_BIT(32) >> +#define X_VC_VSD_TABLE_ADDR 0x201 >> +#define VC_VSD_TABLE_ADDR 0x808 >> +#define X_VC_VSD_TABLE_DATA 0x202 >> +#define VC_VSD_TABLE_DATA 0x810 >> +#define VC_IVE_ISB_BLOCK_MODE 0x818 >> +#define VC_EQD_BLOCK_MODE 0x820 >> +#define VC_VPS_BLOCK_MODE 0x828 >> +#define X_VC_IRQ_CONFIG_IPI 0x208 >> +#define VC_IRQ_CONFIG_IPI 0x840 >> +#define VC_IRQ_CONFIG_MEMB_EN PPC_BIT(45) >> +#define VC_IRQ_CONFIG_MEMB_SZ PPC_BITMASK(46, 51) >> +#define VC_IRQ_CONFIG_HW 0x848 >> +#define VC_IRQ_CONFIG_CASCADE1 0x850 >> +#define VC_IRQ_CONFIG_CASCADE2 0x858 >> +#define VC_IRQ_CONFIG_REDIST 0x860 >> +#define VC_IRQ_CONFIG_IPI_CASC 0x868 >> +#define X_VC_AIB_TX_ORDER_TAG2 0x22d >> +#define VC_AIB_TX_ORDER_TAG2_REL_TF PPC_BIT(20) >> +#define VC_AIB_TX_ORDER_TAG2 0x890 >> +#define X_VC_AT_MACRO_KILL 0x23e >> +#define VC_AT_MACRO_KILL 0x8b0 >> +#define X_VC_AT_MACRO_KILL_MASK 0x23f >> +#define VC_AT_MACRO_KILL_MASK 0x8b8 >> +#define VC_KILL_VALID PPC_BIT(0) >> +#define VC_KILL_TYPE PPC_BITMASK(14, 15) >> +#define VC_KILL_IRQ 0 >> +#define VC_KILL_IVC 1 >> +#define VC_KILL_SBC 2 >> +#define VC_KILL_EQD 3 >> +#define VC_KILL_BLOCK_ID PPC_BITMASK(27, 31) >> +#define VC_KILL_OFFSET PPC_BITMASK(48, 60) >> +#define X_VC_EQC_CACHE_ENABLE 0x211 >> +#define VC_EQC_CACHE_ENABLE 0x908 >> +#define VC_EQC_CACHE_EN_MASK PPC_BITMASK(0, 15) >> +#define X_VC_EQC_SCRUB_TRIG 0x212 >> +#define VC_EQC_SCRUB_TRIG 0x910 >> +#define X_VC_EQC_SCRUB_MASK 0x213 >> +#define VC_EQC_SCRUB_MASK 0x918 >> +#define X_VC_EQC_CWATCH_SPEC 0x215 >> +#define VC_EQC_CONFIG 0x920 >> +#define X_VC_EQC_CONFIG 0x214 >> +#define VC_EQC_CONF_SYNC_IPI PPC_BIT(32) >> +#define VC_EQC_CONF_SYNC_HW PPC_BIT(33) >> +#define VC_EQC_CONF_SYNC_ESC1 PPC_BIT(34) >> +#define VC_EQC_CONF_SYNC_ESC2 PPC_BIT(35) >> +#define VC_EQC_CONF_SYNC_REDI PPC_BIT(36) >> +#define VC_EQC_CONF_EQP_INTERLEAVE PPC_BIT(38) >> +#define VC_EQC_CONF_ENABLE_END_s_BIT PPC_BIT(39) >> +#define VC_EQC_CONF_ENABLE_END_u_BIT PPC_BIT(40) >> +#define VC_EQC_CONF_ENABLE_END_c_BIT PPC_BIT(41) >> +#define VC_EQC_CONF_ENABLE_MORE_QSZ PPC_BIT(42) >> +#define VC_EQC_CONF_SKIP_ESCALATE PPC_BIT(43) >> +#define VC_EQC_CWATCH_SPEC 0x928 >> +#define VC_EQC_CWATCH_CONFLICT PPC_BIT(0) >> +#define VC_EQC_CWATCH_FULL PPC_BIT(8) >> +#define VC_EQC_CWATCH_BLOCKID PPC_BITMASK(28, 31) >> +#define VC_EQC_CWATCH_OFFSET PPC_BITMASK(40, 63) >> +#define X_VC_EQC_CWATCH_DAT0 0x216 >> +#define VC_EQC_CWATCH_DAT0 0x930 >> +#define X_VC_EQC_CWATCH_DAT1 0x217 >> +#define VC_EQC_CWATCH_DAT1 0x938 >> +#define X_VC_EQC_CWATCH_DAT2 0x218 >> +#define VC_EQC_CWATCH_DAT2 0x940 >> +#define X_VC_EQC_CWATCH_DAT3 0x219 >> +#define VC_EQC_CWATCH_DAT3 0x948 >> +#define X_VC_IVC_SCRUB_TRIG 0x222 >> +#define VC_IVC_SCRUB_TRIG 0x990 >> +#define X_VC_IVC_SCRUB_MASK 0x223 >> +#define VC_IVC_SCRUB_MASK 0x998 >> +#define X_VC_SBC_SCRUB_TRIG 0x232 >> +#define VC_SBC_SCRUB_TRIG 0xa10 >> +#define X_VC_SBC_SCRUB_MASK 0x233 >> +#define VC_SBC_SCRUB_MASK 0xa18 >> +#define VC_SCRUB_VALID PPC_BIT(0) >> +#define VC_SCRUB_WANT_DISABLE PPC_BIT(1) >> +#define VC_SCRUB_WANT_INVAL PPC_BIT(2) /* EQC and SBC only */ >> +#define VC_SCRUB_BLOCK_ID PPC_BITMASK(28, 31) >> +#define VC_SCRUB_OFFSET PPC_BITMASK(40, 63) >> +#define X_VC_IVC_CACHE_ENABLE 0x221 >> +#define VC_IVC_CACHE_ENABLE 0x988 >> +#define VC_IVC_CACHE_EN_MASK PPC_BITMASK(0, 15) >> +#define X_VC_SBC_CACHE_ENABLE 0x231 >> +#define VC_SBC_CACHE_ENABLE 0xa08 >> +#define VC_SBC_CACHE_EN_MASK PPC_BITMASK(0, 15) >> +#define VC_IVC_CACHE_SCRUB_TRIG 0x990 >> +#define VC_IVC_CACHE_SCRUB_MASK 0x998 >> +#define VC_SBC_CACHE_ENABLE 0xa08 >> +#define VC_SBC_CACHE_SCRUB_TRIG 0xa10 >> +#define VC_SBC_CACHE_SCRUB_MASK 0xa18 >> +#define VC_SBC_CONFIG 0xa20 >> +#define X_VC_SBC_CONFIG 0x234 >> +#define VC_SBC_CONF_CPLX_CIST PPC_BIT(44) >> +#define VC_SBC_CONF_CIST_BOTH PPC_BIT(45) >> +#define VC_SBC_CONF_NO_UPD_PRF PPC_BIT(59) >> + >> +/* VC1 register offsets */ >> + >> +/* VSD Table address register definitions (shared) */ >> +#define VST_ADDR_AUTOINC PPC_BIT(0) >> +#define VST_TABLE_SELECT PPC_BITMASK(13, 15) >> +#define VST_TSEL_IVT 0 >> +#define VST_TSEL_SBE 1 >> +#define VST_TSEL_EQDT 2 >> +#define VST_TSEL_VPDT 3 >> +#define VST_TSEL_IRQ 4 /* VC only */ >> +#define VST_TABLE_BLOCK PPC_BITMASK(27, 31) >> + >> +/* Number of queue overflow pages */ >> +#define VC_QUEUE_OVF_COUNT 6 >> + >> +/* >> + * Bits in a VSD entry. >> + * >> + * Note: the address is naturally aligned, we don't use a PPC_BITMASK, >> + * but just a mask to apply to the address before OR'ing it in. >> + * >> + * Note: VSD_FIRMWARE is a SW bit ! It hijacks an unused bit in the >> + * VSD and is only meant to be used in indirect mode ! >> + */ >> +#define VSD_MODE PPC_BITMASK(0, 1) >> +#define VSD_MODE_SHARED 1 >> +#define VSD_MODE_EXCLUSIVE 2 >> +#define VSD_MODE_FORWARD 3 >> +#define VSD_ADDRESS_MASK 0x0ffffffffffff000ull >> +#define VSD_MIGRATION_REG PPC_BITMASK(52, 55) >> +#define VSD_INDIRECT PPC_BIT(56) >> +#define VSD_TSIZE PPC_BITMASK(59, 63) >> +#define VSD_FIRMWARE PPC_BIT(2) /* Read warning above */ >> + >> +#define VC_EQC_SYNC_MASK \ >> + (VC_EQC_CONF_SYNC_IPI | \ >> + VC_EQC_CONF_SYNC_HW | \ >> + VC_EQC_CONF_SYNC_ESC1 | \ >> + VC_EQC_CONF_SYNC_ESC2 | \ >> + VC_EQC_CONF_SYNC_REDI) >> + >> + >> +#endif /* PPC_PNV_XIVE_REGS_H */ >> diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h >> index 6b65397b7ebf..ebbb3d0e9aa7 100644 >> --- a/include/hw/ppc/pnv.h >> +++ b/include/hw/ppc/pnv.h >> @@ -25,6 +25,7 @@ >> #include "hw/ppc/pnv_lpc.h" >> #include "hw/ppc/pnv_psi.h" >> #include "hw/ppc/pnv_occ.h" >> +#include "hw/ppc/pnv_xive.h" >> >> #define TYPE_PNV_CHIP "pnv-chip" >> #define PNV_CHIP(obj) OBJECT_CHECK(PnvChip, (obj), TYPE_PNV_CHIP) >> @@ -82,6 +83,7 @@ typedef struct Pnv9Chip { >> PnvChip parent_obj; >> >> /*< public >*/ >> + PnvXive xive; >> } Pnv9Chip; >> >> typedef struct PnvChipClass { >> @@ -215,4 +217,23 @@ void pnv_bmc_powerdown(IPMIBmc *bmc); >> (0x0003ffe000000000ull + (uint64_t)PNV_CHIP_INDEX(chip) * \ >> PNV_PSIHB_FSP_SIZE) >> >> +/* >> + * POWER9 MMIO base addresses >> + */ >> +#define PNV9_CHIP_BASE(chip, base) \ >> + ((base) + ((uint64_t) (chip)->chip_id << 42)) >> + >> +#define PNV9_XIVE_VC_SIZE 0x0000008000000000ull >> +#define PNV9_XIVE_VC_BASE(chip) PNV9_CHIP_BASE(chip, 0x0006010000000000ull) >> + >> +#define PNV9_XIVE_PC_SIZE 0x0000001000000000ull >> +#define PNV9_XIVE_PC_BASE(chip) PNV9_CHIP_BASE(chip, 0x0006018000000000ull) >> + >> +#define PNV9_XIVE_IC_SIZE 0x0000000000080000ull >> +#define PNV9_XIVE_IC_BASE(chip) PNV9_CHIP_BASE(chip, 0x0006030203100000ull) >> + >> +#define PNV9_XIVE_TM_SIZE 0x0000000000040000ull >> +#define PNV9_XIVE_TM_BASE(chip) PNV9_CHIP_BASE(chip, 0x0006030203180000ull) >> + >> + >> #endif /* _PPC_PNV_H */ >> diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h >> index 9961ea3a92cd..8e57c064e661 100644 >> --- a/include/hw/ppc/pnv_core.h >> +++ b/include/hw/ppc/pnv_core.h >> @@ -49,6 +49,7 @@ typedef struct PnvCoreClass { >> >> typedef struct PnvCPUState { >> struct ICPState *icp; >> + struct XiveTCTX *tctx; > > Unlike sPAPR, we really do always know in advance the interrupt > controller for a particular machine. I think it makes sense to > further split the POWER8 and POWER9 cases here, so we only track one > for any given setup. So, you would define a : typedef struct Pnv9CPUState { struct XiveTCTX *tctx; } Pnv9CPUState; to be allocated when the core is realized ? and later the routine pnv_chip_power9_intc_create() would assign the ->tctx pointer. >> } PnvCPUState; >> >> static inline PnvCPUState *pnv_cpu_state(PowerPCCPU *cpu) >> diff --git a/include/hw/ppc/pnv_xive.h b/include/hw/ppc/pnv_xive.h >> new file mode 100644 >> index 000000000000..4fc917d1dcf9 >> --- /dev/null >> +++ b/include/hw/ppc/pnv_xive.h >> @@ -0,0 +1,95 @@ >> +/* >> + * QEMU PowerPC XIVE interrupt controller model >> + * >> + * Copyright (c) 2017-2019, IBM Corporation. >> + * >> + * This code is licensed under the GPL version 2 or later. See the >> + * COPYING file in the top-level directory. >> + */ >> + >> +#ifndef PPC_PNV_XIVE_H >> +#define PPC_PNV_XIVE_H >> + >> +#include "hw/ppc/xive.h" >> + >> +#define TYPE_PNV_XIVE "pnv-xive" >> +#define PNV_XIVE(obj) OBJECT_CHECK(PnvXive, (obj), TYPE_PNV_XIVE) >> + >> +#define XIVE_BLOCK_MAX 16 >> + >> +#define XIVE_TABLE_BLK_MAX 16 /* Block Scope Table (0-15) */ >> +#define XIVE_TABLE_MIG_MAX 16 /* Migration Register Table (1-15) */ >> +#define XIVE_TABLE_VDT_MAX 16 /* VDT Domain Table (0-15) */ >> +#define XIVE_TABLE_EDT_MAX 64 /* EDT Domain Table (0-63) */ >> + >> +typedef struct PnvXive { >> + XiveRouter parent_obj; >> + >> + /* Owning chip */ >> + PnvChip *chip; >> + >> + /* XSCOM addresses giving access to the controller registers */ >> + MemoryRegion xscom_regs; >> + >> + /* Main MMIO regions that can be configured by FW */ >> + MemoryRegion ic_mmio; >> + MemoryRegion ic_reg_mmio; >> + MemoryRegion ic_notify_mmio; >> + MemoryRegion ic_lsi_mmio; >> + MemoryRegion tm_indirect_mmio; >> + MemoryRegion vc_mmio; >> + MemoryRegion pc_mmio; >> + MemoryRegion tm_mmio; >> + >> + /* >> + * IPI and END address spaces modeling the EDT segmentation in the >> + * VC region >> + */ >> + AddressSpace ipi_as; >> + MemoryRegion ipi_mmio; >> + MemoryRegion ipi_edt_mmio; >> + >> + AddressSpace end_as; >> + MemoryRegion end_mmio; >> + MemoryRegion end_edt_mmio; >> + >> + /* Shortcut values for the Main MMIO regions */ >> + hwaddr ic_base; >> + uint32_t ic_shift; >> + hwaddr vc_base; >> + uint32_t vc_shift; >> + hwaddr pc_base; >> + uint32_t pc_shift; >> + hwaddr tm_base; >> + uint32_t tm_shift; >> + >> + /* Our XIVE source objects for IPIs and ENDs */ >> + uint32_t nr_irqs; >> + XiveSource source; > > Maybe nr_ipis and ipi_source to be clearer? yes. > >> + uint32_t nr_ends; >> + XiveENDSource end_source; >> + >> + /* Interrupt controller registers */ >> + uint64_t regs[0x300]; >> + >> + /* Can be configured by FW */ >> + uint32_t tctx_chipid; >> + uint32_t chip_id; > > Can't you derive that since you have a pointer to the owning chip? Not always, there are register fields to purposely override this value. I can improve the current code a little I think. > >> + /* >> + * Virtual Structure Descriptor tables : EAT, SBE, ENDT, NVTT, IRQ >> + * These are in a SRAM protected by ECC. >> + */ >> + uint64_t vsds[5][XIVE_BLOCK_MAX]; >> + >> + /* Translation tables */ >> + uint64_t blk[XIVE_TABLE_BLK_MAX]; >> + uint64_t mig[XIVE_TABLE_MIG_MAX]; >> + uint64_t vdt[XIVE_TABLE_VDT_MAX]; >> + uint64_t edt[XIVE_TABLE_EDT_MAX]; >> +} PnvXive; >> + >> +void pnv_xive_pic_print_info(PnvXive *xive, Monitor *mon); >> + >> +#endif /* PPC_PNV_XIVE_H */ >> diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h >> index 255b26a5aaf6..6623ec54a7a8 100644 >> --- a/include/hw/ppc/pnv_xscom.h >> +++ b/include/hw/ppc/pnv_xscom.h >> @@ -73,6 +73,9 @@ typedef struct PnvXScomInterfaceClass { >> #define PNV_XSCOM_OCC_BASE 0x0066000 >> #define PNV_XSCOM_OCC_SIZE 0x6000 >> >> +#define PNV9_XSCOM_XIVE_BASE 0x5013000 >> +#define PNV9_XSCOM_XIVE_SIZE 0x300 >> + >> extern void pnv_xscom_realize(PnvChip *chip, Error **errp); >> extern int pnv_dt_xscom(PnvChip *chip, void *fdt, int offset); >> >> diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h >> index 763691e9bae9..2bad8526221b 100644 >> --- a/include/hw/ppc/xive.h >> +++ b/include/hw/ppc/xive.h >> @@ -368,6 +368,7 @@ int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >> int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >> XiveNVT *nvt, uint8_t word_number); >> XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs, hwaddr offset); >> +void xive_router_notify(XiveNotifier *xn, uint32_t lisn); >> >> /* >> * XIVE END ESBs >> diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c >> new file mode 100644 >> index 000000000000..4be9b69b76a3 >> --- /dev/null >> +++ b/hw/intc/pnv_xive.c >> @@ -0,0 +1,1698 @@ >> +/* >> + * QEMU PowerPC XIVE interrupt controller model >> + * >> + * Copyright (c) 2017-2019, IBM Corporation. >> + * >> + * This code is licensed under the GPL version 2 or later. See the >> + * COPYING file in the top-level directory. >> + */ >> + >> +#include "qemu/osdep.h" >> +#include "qemu/log.h" >> +#include "qapi/error.h" >> +#include "target/ppc/cpu.h" >> +#include "sysemu/cpus.h" >> +#include "sysemu/dma.h" >> +#include "monitor/monitor.h" >> +#include "hw/ppc/fdt.h" >> +#include "hw/ppc/pnv.h" >> +#include "hw/ppc/pnv_core.h" >> +#include "hw/ppc/pnv_xscom.h" >> +#include "hw/ppc/pnv_xive.h" >> +#include "hw/ppc/xive_regs.h" >> +#include "hw/ppc/ppc.h" >> + >> +#include <libfdt.h> >> + >> +#include "pnv_xive_regs.h" >> + >> +/* >> + * Virtual structures table (VST) >> + */ >> +typedef struct XiveVstInfo { >> + uint32_t type; >> + const char *name; >> + uint32_t size; >> + uint32_t max_blocks; >> +} XiveVstInfo; >> + >> +static const XiveVstInfo vst_infos[] = { >> + [VST_TSEL_IVT] = { VST_TSEL_IVT, "EAT", sizeof(XiveEAS), 16 }, > > I don't love explicitly storing the type/index in each record, as well > as it being implicit in the table slot. The 'vst_infos' table decribes the different table types and the 'type' field is used to index the runtime table of VSDs. See pnv_xive_vst_addr() > >> + [VST_TSEL_SBE] = { VST_TSEL_SBE, "SBE", 0, 16 }, >> + [VST_TSEL_EQDT] = { VST_TSEL_EQDT, "ENDT", sizeof(XiveEND), 16 }, >> + [VST_TSEL_VPDT] = { VST_TSEL_VPDT, "VPDT", sizeof(XiveNVT), 32 }, >> + >> + /* >> + * Interrupt fifo backing store table (not modeled) : >> + * >> + * 0 - IPI, >> + * 1 - HWD, >> + * 2 - First escalate, >> + * 3 - Second escalate, >> + * 4 - Redistribution, >> + * 5 - IPI cascaded queue ? >> + */ >> + [VST_TSEL_IRQ] = { VST_TSEL_IRQ, "IRQ", 0, 6 }, >> +}; >> + >> +#define xive_error(xive, fmt, ...) \ >> + qemu_log_mask(LOG_GUEST_ERROR, "XIVE[%x] - " fmt "\n", (xive)->chip_id, \ >> + ## __VA_ARGS__); >> + >> +/* >> + * QEMU version of the GETFIELD/SETFIELD macros >> + */ >> +static inline uint64_t GETFIELD(uint64_t mask, uint64_t word) >> +{ >> + return (word & mask) >> ctz64(mask); >> +} >> + >> +static inline uint64_t SETFIELD(uint64_t mask, uint64_t word, >> + uint64_t value) >> +{ >> + return (word & ~mask) | ((value << ctz64(mask)) & mask); >> +} > > It might be better to use the existing extract64() and deposit64() > rather than making custom helpers. ok. I was also considering the macros in hw/registerfields.h but it would require a lot of work. >> + >> +/* >> + * Remote access to controllers. HW uses MMIOs. For now, a simple scan >> + * of the chips is good enough. >> + */ >> +static PnvXive *pnv_xive_get_ic(PnvXive *xive, uint8_t blk) > > The 'xive' parameter is only used for an error message, for which it > doesn't seem that meaningful. yes. >> +{ >> + PnvMachineState *pnv = PNV_MACHINE(qdev_get_machine()); >> + int i; >> + >> + for (i = 0; i < pnv->num_chips; i++) { >> + Pnv9Chip *chip9 = PNV9_CHIP(pnv->chips[i]); >> + PnvXive *ic_xive = &chip9->xive; >> + bool chip_override = >> + ic_xive->regs[PC_GLOBAL_CONFIG >> 3] & PC_GCONF_CHIPID_OVR; >> + >> + if (chip_override) { >> + if (ic_xive->chip_id == blk) { >> + return ic_xive; >> + } >> + } else { >> + ; /* TODO: Block scope support */ >> + } >> + } >> + xive_error(xive, "VST: unknown chip/block %d !?", blk); >> + return NULL; >> +} >> + >> +/* >> + * VST accessors for SBE, EAT, ENDT, NVT >> + */ >> +static uint64_t pnv_xive_vst_addr_direct(PnvXive *xive, >> + const XiveVstInfo *info, uint64_t vsd, >> + uint8_t blk, uint32_t idx) >> +{ >> + uint64_t vst_addr = vsd & VSD_ADDRESS_MASK; >> + uint64_t vst_tsize = 1ull << (GETFIELD(VSD_TSIZE, vsd) + 12); >> + uint32_t idx_max = (vst_tsize / info->size) - 1; >> + >> + if (idx > idx_max) { >> +#ifdef XIVE_DEBUG >> + xive_error(xive, "VST: %s entry %x/%x out of range !?", info->name, >> + blk, idx); >> +#endif >> + return 0; >> + } >> + >> + return vst_addr + idx * info->size; >> +} >> + >> +#define XIVE_VSD_SIZE 8 >> + >> +static uint64_t pnv_xive_vst_addr_indirect(PnvXive *xive, >> + const XiveVstInfo *info, >> + uint64_t vsd, uint8_t blk, >> + uint32_t idx) >> +{ >> + uint64_t vsd_addr; >> + uint64_t vst_addr; >> + uint32_t page_shift; >> + uint32_t page_mask; >> + uint64_t vst_tsize = 1ull << (GETFIELD(VSD_TSIZE, vsd) + 12); >> + uint32_t idx_max = (vst_tsize / XIVE_VSD_SIZE) - 1; >> + >> + if (idx > idx_max) { >> +#ifdef XIVE_DEBUG >> + xive_error(xive, "VST: %s entry %x/%x out of range !?", info->name, >> + blk, idx); >> +#endif >> + return 0; >> + } >> + >> + vsd_addr = vsd & VSD_ADDRESS_MASK; >> + >> + /* >> + * Read the first descriptor to get the page size of each indirect >> + * table. >> + */ >> + vsd = ldq_be_dma(&address_space_memory, vsd_addr); >> + page_shift = GETFIELD(VSD_TSIZE, vsd) + 12; >> + page_mask = (1ull << page_shift) - 1; >> + >> + /* Indirect page size can be 4K, 64K, 2M, 16M. */ >> + if (page_shift != 12 && page_shift != 16 && page_shift != 21 >> + && page_shift != 24) { >> + xive_error(xive, "VST: invalid %s table shift %d", info->name, >> + page_shift); >> + } >> + >> + if (!(vsd & VSD_ADDRESS_MASK)) { >> + xive_error(xive, "VST: invalid %s entry %x/%x !?", info->name, >> + blk, 0); >> + return 0; >> + } >> + >> + /* Load the descriptor we are looking for, if not already done */ >> + if (idx) { >> + vsd_addr = vsd_addr + (idx >> page_shift); >> + vsd = ldq_be_dma(&address_space_memory, vsd_addr); >> + >> + if (page_shift != GETFIELD(VSD_TSIZE, vsd) + 12) { >> + xive_error(xive, "VST: %s entry %x/%x indirect page size differ !?", >> + info->name, blk, idx); >> + return 0; >> + } >> + } >> + >> + vst_addr = vsd & VSD_ADDRESS_MASK; >> + >> + return vst_addr + (idx & page_mask) * info->size; >> +} >> + >> +static uint64_t pnv_xive_vst_addr(PnvXive *xive, const XiveVstInfo *info, >> + uint8_t blk, uint32_t idx) >> +{ >> + uint64_t vsd; >> + >> + if (blk >= info->max_blocks) { >> + xive_error(xive, "VST: invalid block id %d for VST %s %d !?", >> + blk, info->name, idx); >> + return 0; >> + } >> + >> + vsd = xive->vsds[info->type][blk]; >> + >> + /* Remote VST access */ >> + if (GETFIELD(VSD_MODE, vsd) == VSD_MODE_FORWARD) { >> + xive = pnv_xive_get_ic(xive, blk); >> + >> + return xive ? pnv_xive_vst_addr(xive, info, blk, idx) : 0; >> + } >> + >> + if (VSD_INDIRECT & vsd) { >> + return pnv_xive_vst_addr_indirect(xive, info, vsd, blk, idx); >> + } >> + >> + return pnv_xive_vst_addr_direct(xive, info, vsd, blk, idx); >> +} >> + >> +static int pnv_xive_vst_read(PnvXive *xive, uint32_t type, uint8_t blk, >> + uint32_t idx, void *data) >> +{ >> + const XiveVstInfo *info = &vst_infos[type]; >> + uint64_t addr = pnv_xive_vst_addr(xive, info, blk, idx); >> + >> + if (!addr) { >> + return -1; >> + } >> + >> + cpu_physical_memory_read(addr, data, info->size); >> + return 0; >> +} >> + >> +/* TODO: take into account word_number */ >> +static int pnv_xive_vst_write(PnvXive *xive, uint32_t type, uint8_t blk, >> + uint32_t idx, void *data) >> +{ >> + const XiveVstInfo *info = &vst_infos[type]; >> + uint64_t addr = pnv_xive_vst_addr(xive, info, blk, idx); >> + >> + if (!addr) { >> + return -1; >> + } >> + >> + cpu_physical_memory_write(addr, data, info->size); >> + return 0; >> +} >> + >> +static int pnv_xive_get_end(XiveRouter *xrtr, uint8_t blk, uint32_t idx, >> + XiveEND *end) >> +{ >> + return pnv_xive_vst_read(PNV_XIVE(xrtr), VST_TSEL_EQDT, blk, idx, end); >> +} >> + >> +static int pnv_xive_write_end(XiveRouter *xrtr, uint8_t blk, >> + uint32_t idx, XiveEND *end, >> + uint8_t word_number) >> +{ > > Surely you need to use the word_number parameter somewhere? yes in the TODO above :) I will come with something. >> + return pnv_xive_vst_write(PNV_XIVE(xrtr), VST_TSEL_EQDT, blk, idx, end); >> +} >> + >> +static int pnv_xive_end_update(PnvXive *xive, uint8_t blk, uint32_t idx) >> +{ >> + int i; >> + uint64_t eqc_watch[4]; >> + >> + for (i = 0; i < ARRAY_SIZE(eqc_watch); i++) { >> + eqc_watch[i] = cpu_to_be64(xive->regs[(VC_EQC_CWATCH_DAT0 >> 3) + i]); >> + } >> + >> + return pnv_xive_vst_write(xive, VST_TSEL_EQDT, blk, idx, eqc_watch); >> +} >> + >> +static int pnv_xive_get_nvt(XiveRouter *xrtr, uint8_t blk, uint32_t idx, >> + XiveNVT *nvt) >> +{ >> + return pnv_xive_vst_read(PNV_XIVE(xrtr), VST_TSEL_VPDT, blk, idx, nvt); >> +} >> + >> +static int pnv_xive_write_nvt(XiveRouter *xrtr, uint8_t blk, uint32_t idx, >> + XiveNVT *nvt, uint8_t word_number) >> +{ >> + return pnv_xive_vst_write(PNV_XIVE(xrtr), VST_TSEL_VPDT, blk, idx, nvt); >> +} >> + >> +static int pnv_xive_nvt_update(PnvXive *xive, uint8_t blk, uint32_t idx) >> +{ >> + int i; >> + uint64_t vpc_watch[8]; >> + >> + for (i = 0; i < ARRAY_SIZE(vpc_watch); i++) { >> + vpc_watch[i] = cpu_to_be64(xive->regs[(PC_VPC_CWATCH_DAT0 >> 3) + i]); >> + } >> + >> + return pnv_xive_vst_write(xive, VST_TSEL_VPDT, blk, idx, vpc_watch); >> +} >> + >> +static int pnv_xive_get_eas(XiveRouter *xrtr, uint8_t blk, >> + uint32_t idx, XiveEAS *eas) >> +{ >> + PnvXive *xive = PNV_XIVE(xrtr); >> + >> + /* TODO: check when remote EAS lookups are possible */ >> + if (pnv_xive_get_ic(xive, blk) != xive) { >> + xive_error(xive, "VST: EAS %x is remote !?", XIVE_SRCNO(blk, idx)); >> + return -1; >> + } >> + >> + return pnv_xive_vst_read(xive, VST_TSEL_IVT, blk, idx, eas); >> +} >> + >> +static int pnv_xive_eas_update(PnvXive *xive, uint8_t blk, uint32_t idx) >> +{ >> + /* All done. */ >> + return 0; >> +} >> + >> +static XiveTCTX *pnv_xive_get_tctx(XiveRouter *xrtr, CPUState *cs, >> + hwaddr offset) >> +{ >> + PowerPCCPU *cpu = POWERPC_CPU(cs); >> + XiveTCTX *tctx = pnv_cpu_state(cpu)->tctx; >> + PnvXive *xive = NULL; >> + uint8_t chip_id; >> + CPUPPCState *env = &cpu->env; >> + int pir = env->spr_cb[SPR_PIR].default_value; >> + >> + /* >> + * Perform an extra check on the CPU enablement. >> + * >> + * The TIMA is shared among the chips and to identify the chip >> + * from which the access is being done, we extract the chip id >> + * from the HW CAM line of XiveTCTX. >> + */ >> + chip_id = (tctx->hw_cam >> 7) & 0xf; >> + >> + xive = pnv_xive_get_ic(PNV_XIVE(xrtr), chip_id); >> + if (!xive) { >> + return NULL; >> + } >> + >> + if (!(xive->regs[PC_THREAD_EN_REG0 >> 3] & PPC_BIT(pir & 0x3f))) { >> + xive_error(PNV_XIVE(xrtr), "IC: CPU %x is not enabled", pir); >> + } >> + >> + return tctx; >> +} >> + >> +/* >> + * The internal sources (IPIs) of the interrupt controller have no >> + * knowledge of the XIVE chip on which they reside. Encode the block >> + * id in the source interrupt number before forwarding the source >> + * event notification to the Router. This is required on a multichip >> + * system. >> + */ >> +static void pnv_xive_notify(XiveNotifier *xn, uint32_t srcno) >> +{ >> + PnvXive *xive = PNV_XIVE(xn); >> + >> + xive_router_notify(xn, XIVE_SRCNO(xive->chip_id, srcno)); >> +} >> + >> +/* >> + * XIVE helpers >> + */ >> + >> +static uint64_t pnv_xive_vc_size(PnvXive *xive) >> +{ >> + return (~xive->regs[CQ_VC_BARM >> 3] + 1) & CQ_VC_BARM_MASK; >> +} >> + >> +static uint64_t pnv_xive_edt_shift(PnvXive *xive) >> +{ >> + return ctz64(pnv_xive_vc_size(xive) / XIVE_TABLE_EDT_MAX); >> +} >> + >> +static uint64_t pnv_xive_pc_size(PnvXive *xive) >> +{ >> + return (~xive->regs[CQ_PC_BARM >> 3] + 1) & CQ_PC_BARM_MASK; >> +} >> + >> +/* >> + * XIVE Table configuration >> + * >> + * The Virtualization Controller MMIO region containing the IPI ESB >> + * pages and END ESB pages is sub-divided into "sets" which map >> + * portions of the VC region to the different ESB pages. It is >> + * configured at runtime through the EDT "Domain Table" to let the >> + * firmware decide how to split the VC address space between IPI ESB >> + * pages and END ESB pages. >> + */ >> +static int pnv_xive_table_set_data(PnvXive *xive, uint64_t val) >> +{ >> + uint64_t tsel = xive->regs[CQ_TAR >> 3] & CQ_TAR_TSEL; >> + uint8_t tsel_index = GETFIELD(CQ_TAR_TSEL_INDEX, xive->regs[CQ_TAR >> 3]); >> + uint64_t *xive_table; >> + uint8_t max_index; >> + >> + switch (tsel) { >> + case CQ_TAR_TSEL_BLK: >> + max_index = ARRAY_SIZE(xive->blk); >> + xive_table = xive->blk; >> + break; >> + case CQ_TAR_TSEL_MIG: >> + max_index = ARRAY_SIZE(xive->mig); >> + xive_table = xive->mig; >> + break; >> + case CQ_TAR_TSEL_EDT: >> + max_index = ARRAY_SIZE(xive->edt); >> + xive_table = xive->edt; >> + break; >> + case CQ_TAR_TSEL_VDT: >> + max_index = ARRAY_SIZE(xive->vdt); >> + xive_table = xive->vdt; >> + break; >> + default: >> + xive_error(xive, "IC: invalid table %d", (int) tsel); >> + return -1; >> + } >> + >> + if (tsel_index >= max_index) { >> + xive_error(xive, "IC: invalid index %d", (int) tsel_index); >> + return -1; >> + } >> + >> + xive_table[tsel_index] = val; >> + >> + if (xive->regs[CQ_TAR >> 3] & CQ_TAR_TBL_AUTOINC) { >> + xive->regs[CQ_TAR >> 3] = >> + SETFIELD(CQ_TAR_TSEL_INDEX, xive->regs[CQ_TAR >> 3], ++tsel_index); >> + } >> + >> + return 0; >> +} >> + >> +/* >> + * Computes the overall size of the IPI or the END ESB pages >> + */ >> +static uint64_t pnv_xive_edt_size(PnvXive *xive, uint64_t type) >> +{ >> + uint64_t edt_size = 1ull << pnv_xive_edt_shift(xive); >> + uint64_t size = 0; >> + int i; >> + >> + for (i = 0; i < XIVE_TABLE_EDT_MAX; i++) { >> + uint64_t edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[i]); >> + >> + if (edt_type == type) { >> + size += edt_size; >> + } >> + } >> + >> + return size; >> +} >> + >> +/* >> + * Maps an offset of the VC region in the IPI or END region using the >> + * layout defined by the EDT "Domaine Table" >> + */ >> +static uint64_t pnv_xive_edt_offset(PnvXive *xive, uint64_t vc_offset, >> + uint64_t type) >> +{ >> + int i; >> + uint64_t edt_size = 1ull << pnv_xive_edt_shift(xive); >> + uint64_t edt_offset = vc_offset; >> + >> + for (i = 0; i < XIVE_TABLE_EDT_MAX && (i * edt_size) < vc_offset; i++) { >> + uint64_t edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[i]); >> + >> + if (edt_type != type) { >> + edt_offset -= edt_size; >> + } >> + } >> + >> + return edt_offset; >> +} >> + >> +/* >> + * The EDT "Domain Table" is used to size the MMIO window exposing the >> + * IPI and the END ESBs in the VC region. >> + */ >> +static void pnv_xive_ipi_edt_resize(PnvXive *xive) >> +{ >> + uint64_t ipi_edt_size = pnv_xive_edt_size(xive, CQ_TDR_EDT_IPI); >> + >> + /* Resize the EDT window of the IPI ESBs in the VC region */ >> + memory_region_set_size(&xive->ipi_edt_mmio, ipi_edt_size); >> + memory_region_add_subregion(&xive->ipi_mmio, 0, &xive->ipi_edt_mmio); >> + >> + /* >> + * The IPI ESBs region will be resized when the SBE backing store >> + * is configured. >> + */ >> +} >> + >> +static void pnv_xive_end_edt_resize(PnvXive *xive) >> +{ >> + XiveENDSource *end_xsrc = &xive->end_source; >> + uint64_t end_edt_size = pnv_xive_edt_size(xive, CQ_TDR_EDT_EQ); >> + >> + /* >> + * Compute the number of provisioned ENDs from the END ESB MMIO >> + * window size >> + */ >> + xive->nr_ends = end_edt_size / (1ull << (xive->vc_shift + 1)); > > Since this value is derived above, it would be better to avoid storing > it again. it's pratical. But I can provide a small helper routine. > >> + >> + /* Resize the EDT window of the END ESBs in the VC region */ >> + memory_region_set_size(&xive->end_edt_mmio, end_edt_size); >> + memory_region_add_subregion(&xive->end_mmio, 0, &xive->end_edt_mmio); >> + >> + /* Also resize the END ESBs region (This is a bit redundant) */ >> + memory_region_set_size(&end_xsrc->esb_mmio, >> + xive->nr_ends * (1ull << (end_xsrc->esb_shift + 1))); >> + memory_region_add_subregion(&xive->end_edt_mmio, 0, &end_xsrc->esb_mmio); >> +} >> + >> +/* >> + * Virtual Structure Tables (VST) configuration >> + */ >> +static void pnv_xive_vst_set_exclusive(PnvXive *xive, uint8_t type, >> + uint8_t blk, uint64_t vsd) >> +{ >> + XiveSource *xsrc = &xive->source; >> + bool gconf_indirect = >> + xive->regs[VC_GLOBAL_CONFIG >> 3] & VC_GCONF_INDIRECT; >> + uint32_t vst_shift = GETFIELD(VSD_TSIZE, vsd) + 12; >> + uint64_t vst_addr = vsd & VSD_ADDRESS_MASK; >> + >> + if (VSD_INDIRECT & vsd) { >> + if (!gconf_indirect) { >> + xive_error(xive, "VST: %s indirect tables not enabled", >> + vst_infos[type].name); >> + return; >> + } >> + } >> + >> + switch (type) { >> + case VST_TSEL_IVT: >> + pnv_xive_ipi_edt_resize(xive); >> + break; >> + >> + case VST_TSEL_EQDT: >> + pnv_xive_end_edt_resize(xive); >> + break; >> + >> + case VST_TSEL_VPDT: >> + /* FIXME (skiboot) : remove DD1 workaround on the NVT table size */ >> + vst_shift = 16; >> + break; >> + >> + case VST_TSEL_SBE: /* Not modeled */ >> + /* >> + * Contains the backing store pages for the source PQ bits. >> + * >> + * The XiveSource object has its own. We would need a custom >> + * source object to use the PQ bits backed in RAM. We can >> + * nevertheless compute the number of IRQs provisioned by FW >> + * and resize the IPI ESB window accordingly. >> + */ >> + xive->nr_irqs = (1ull << vst_shift) * 4; >> + memory_region_set_size(&xsrc->esb_mmio, >> + xive->nr_irqs * (1ull << xsrc->esb_shift)); >> + memory_region_add_subregion(&xive->ipi_edt_mmio, 0, &xsrc->esb_mmio); >> + break; >> + >> + case VST_TSEL_IRQ: /* VC only. Not modeled */ >> + /* >> + * These tables contains the backing store pages for the >> + * interrupt fifos of the VC sub-engine in case of overflow. >> + */ >> + break; >> + default: >> + g_assert_not_reached(); >> + } >> + >> + if (!QEMU_IS_ALIGNED(vst_addr, 1ull << vst_shift)) { >> + xive_error(xive, "VST: %s table address 0x%"PRIx64" is not aligned with" >> + " page shift %d", vst_infos[type].name, vst_addr, vst_shift); >> + } >> + >> + /* Keep the VSD for later use */ >> + xive->vsds[type][blk] = vsd; >> +} >> + >> +/* >> + * Both PC and VC sub-engines are configured as each use the Virtual >> + * Structure Tables : SBE, EAS, END and NVT. >> + */ >> +static void pnv_xive_vst_set_data(PnvXive *xive, uint64_t vsd, bool pc_engine) >> +{ >> + uint8_t mode = GETFIELD(VSD_MODE, vsd); >> + uint8_t type = GETFIELD(VST_TABLE_SELECT, >> + xive->regs[VC_VSD_TABLE_ADDR >> 3]); >> + uint8_t blk = GETFIELD(VST_TABLE_BLOCK, >> + xive->regs[VC_VSD_TABLE_ADDR >> 3]); >> + uint64_t vst_addr = vsd & VSD_ADDRESS_MASK; >> + >> + if (type > VST_TSEL_IRQ) { >> + xive_error(xive, "VST: invalid table type %d", type); >> + return; >> + } >> + >> + if (blk >= vst_infos[type].max_blocks) { >> + xive_error(xive, "VST: invalid block id %d for" >> + " %s table", blk, vst_infos[type].name); >> + return; >> + } >> + >> + /* >> + * Only take the VC sub-engine configuration into account because >> + * the XiveRouter model combines both VC and PC sub-engines >> + */ >> + if (pc_engine) { >> + return; >> + } >> + >> + if (!vst_addr) { >> + xive_error(xive, "VST: invalid %s table address", vst_infos[type].name); >> + return; >> + } >> + >> + switch (mode) { >> + case VSD_MODE_FORWARD: >> + xive->vsds[type][blk] = vsd; >> + break; >> + >> + case VSD_MODE_EXCLUSIVE: >> + pnv_xive_vst_set_exclusive(xive, type, blk, vsd); >> + break; >> + >> + default: >> + xive_error(xive, "VST: unsupported table mode %d", mode); >> + return; >> + } >> +} >> + >> +/* >> + * Interrupt controller MMIO region. The layout is compatible between >> + * 4K and 64K pages : >> + * >> + * Page 0 sub-engine BARs >> + * 0x000 - 0x3FF IC registers >> + * 0x400 - 0x7FF PC registers >> + * 0x800 - 0xFFF VC registers >> + * >> + * Page 1 Notify page (writes only) >> + * 0x000 - 0x7FF HW interrupt triggers (PSI, PHB) >> + * 0x800 - 0xFFF forwards and syncs >> + * >> + * Page 2 LSI Trigger page (writes only) (not modeled) >> + * Page 3 LSI SB EOI page (reads only) (not modeled) >> + * >> + * Page 4-7 indirect TIMA >> + */ >> + >> +/* >> + * IC - registers MMIO >> + */ >> +static void pnv_xive_ic_reg_write(void *opaque, hwaddr offset, >> + uint64_t val, unsigned size) >> +{ >> + PnvXive *xive = PNV_XIVE(opaque); >> + MemoryRegion *sysmem = get_system_memory(); >> + uint32_t reg = offset >> 3; >> + >> + switch (offset) { >> + >> + /* >> + * XIVE CQ (PowerBus bridge) settings >> + */ >> + case CQ_MSGSND: /* msgsnd for doorbells */ >> + case CQ_FIRMASK_OR: /* FIR error reporting */ >> + break; >> + case CQ_PBI_CTL: >> + if (val & CQ_PBI_PC_64K) { >> + xive->pc_shift = 16; >> + } >> + if (val & CQ_PBI_VC_64K) { >> + xive->vc_shift = 16; >> + } >> + break; >> + case CQ_CFG_PB_GEN: /* PowerBus General Configuration */ >> + /* >> + * TODO: CQ_INT_ADDR_OPT for 1-block-per-chip mode >> + */ >> + break; >> + >> + /* >> + * XIVE Virtualization Controller settings >> + */ >> + case VC_GLOBAL_CONFIG: >> + break; >> + >> + /* >> + * XIVE Presenter Controller settings >> + */ >> + case PC_GLOBAL_CONFIG: >> + /* Overrides Int command Chip ID with the Chip ID field */ >> + if (val & PC_GCONF_CHIPID_OVR) { >> + xive->chip_id = GETFIELD(PC_GCONF_CHIPID, val); >> + } >> + break; >> + case PC_TCTXT_CFG: >> + /* >> + * TODO: block group support >> + * >> + * PC_TCTXT_CFG_BLKGRP_EN >> + * PC_TCTXT_CFG_HARD_CHIPID_BLK : >> + * Moves the chipid into block field for hardwired CAM compares. >> + * Block offset value is adjusted to 0b0..01 & ThrdId >> + * >> + * Will require changes in xive_presenter_tctx_match(). I am >> + * not sure how to handle that yet. >> + */ >> + >> + /* Overrides hardwired chip ID with the chip ID field */ >> + if (val & PC_TCTXT_CHIPID_OVERRIDE) { >> + xive->tctx_chipid = GETFIELD(PC_TCTXT_CHIPID, val); >> + } >> + break; >> + case PC_TCTXT_TRACK: >> + /* >> + * PC_TCTXT_TRACK_EN: >> + * enable block tracking and exchange of block ownership >> + * information between Interrupt controllers >> + */ >> + break; >> + >> + /* >> + * Misc settings >> + */ >> + case VC_SBC_CONFIG: /* Store EOI configuration */ >> + /* >> + * Configure store EOI if required by firwmare (skiboot has removed >> + * support recently though) >> + */ >> + if (val & (VC_SBC_CONF_CPLX_CIST | VC_SBC_CONF_CIST_BOTH)) { >> + object_property_set_int(OBJECT(&xive->source), XIVE_SRC_STORE_EOI, >> + "flags", &error_fatal); >> + } >> + break; >> + >> + case VC_EQC_CONFIG: /* TODO: silent escalation */ >> + case VC_AIB_TX_ORDER_TAG2: /* relax ordering */ >> + break; >> + >> + /* >> + * XIVE BAR settings (XSCOM only) >> + */ >> + case CQ_RST_CTL: >> + /* bit4: resets all BAR registers */ >> + break; >> + >> + case CQ_IC_BAR: /* IC BAR. 8 pages */ >> + xive->ic_shift = val & CQ_IC_BAR_64K ? 16 : 12; >> + if (!(val & CQ_IC_BAR_VALID)) { >> + xive->ic_base = 0; >> + if (xive->regs[reg] & CQ_IC_BAR_VALID) { >> + memory_region_del_subregion(&xive->ic_mmio, >> + &xive->ic_reg_mmio); >> + memory_region_del_subregion(&xive->ic_mmio, >> + &xive->ic_notify_mmio); >> + memory_region_del_subregion(&xive->ic_mmio, >> + &xive->ic_lsi_mmio); >> + memory_region_del_subregion(&xive->ic_mmio, >> + &xive->tm_indirect_mmio); >> + >> + memory_region_del_subregion(sysmem, &xive->ic_mmio); >> + } >> + } else { >> + xive->ic_base = val & ~(CQ_IC_BAR_VALID | CQ_IC_BAR_64K); >> + if (!(xive->regs[reg] & CQ_IC_BAR_VALID)) { >> + memory_region_add_subregion(sysmem, xive->ic_base, >> + &xive->ic_mmio); >> + >> + memory_region_add_subregion(&xive->ic_mmio, 0, >> + &xive->ic_reg_mmio); >> + memory_region_add_subregion(&xive->ic_mmio, >> + 1ul << xive->ic_shift, >> + &xive->ic_notify_mmio); >> + memory_region_add_subregion(&xive->ic_mmio, >> + 2ul << xive->ic_shift, >> + &xive->ic_lsi_mmio); >> + memory_region_add_subregion(&xive->ic_mmio, >> + 4ull << xive->ic_shift, >> + &xive->tm_indirect_mmio); >> + } >> + } >> + break; >> + >> + case CQ_TM1_BAR: /* TM BAR. 4 pages. Map only once */ >> + case CQ_TM2_BAR: /* second TM BAR. for hotplug. Not modeled */ >> + xive->tm_shift = val & CQ_TM_BAR_64K ? 16 : 12; >> + if (!(val & CQ_TM_BAR_VALID)) { >> + xive->tm_base = 0; >> + if (xive->regs[reg] & CQ_TM_BAR_VALID && xive->chip_id == 0) { >> + memory_region_del_subregion(sysmem, &xive->tm_mmio); >> + } >> + } else { >> + xive->tm_base = val & ~(CQ_TM_BAR_VALID | CQ_TM_BAR_64K); >> + if (!(xive->regs[reg] & CQ_TM_BAR_VALID) && xive->chip_id == 0) { >> + memory_region_add_subregion(sysmem, xive->tm_base, >> + &xive->tm_mmio); >> + } >> + } >> + break; >> + >> + case CQ_PC_BARM: >> + xive->regs[reg] = val; > > As discussed elsewhere, this seems to be a big mix of writing things > directly into regs[reg] and doing other things instead, and you really > want to go one way or the other. I'd suggest dropping xive->regs[] > and instead putting the state you need persistent into its own > variables. I made a big effort to introduce helper routines to avoid storing values that can be calculated under the PnvXive model, as you asked for it. The assignment above is only necessary for the pnv_xive_pc_size() below and I don't know how handle this current case without duplicating the switch statement, which I think is ugly. So, I will keep the xive->regs[] and make the couple of fixes still needed. >> + memory_region_set_size(&xive->pc_mmio, pnv_xive_pc_size(xive)); >> + break; >> + case CQ_PC_BAR: /* From 32M to 512G */ >> + if (!(val & CQ_PC_BAR_VALID)) { >> + xive->pc_base = 0; >> + if (xive->regs[reg] & CQ_PC_BAR_VALID) { >> + memory_region_del_subregion(sysmem, &xive->pc_mmio); >> + } >> + } else { >> + xive->pc_base = val & ~(CQ_PC_BAR_VALID); >> + if (!(xive->regs[reg] & CQ_PC_BAR_VALID)) { >> + memory_region_add_subregion(sysmem, xive->pc_base, >> + &xive->pc_mmio); >> + } >> + } >> + break; >> + >> + case CQ_VC_BARM: >> + xive->regs[reg] = val; >> + memory_region_set_size(&xive->vc_mmio, pnv_xive_vc_size(xive)); >> + break; >> + case CQ_VC_BAR: /* From 64M to 4TB */ >> + if (!(val & CQ_VC_BAR_VALID)) { >> + xive->vc_base = 0; >> + if (xive->regs[reg] & CQ_VC_BAR_VALID) { >> + memory_region_del_subregion(sysmem, &xive->vc_mmio); >> + } >> + } else { >> + xive->vc_base = val & ~(CQ_VC_BAR_VALID); >> + if (!(xive->regs[reg] & CQ_VC_BAR_VALID)) { >> + memory_region_add_subregion(sysmem, xive->vc_base, >> + &xive->vc_mmio); >> + } >> + } >> + break; >> + >> + /* >> + * XIVE Table settings. >> + */ >> + case CQ_TAR: /* Table Address */ >> + break; >> + case CQ_TDR: /* Table Data */ >> + pnv_xive_table_set_data(xive, val); >> + break; >> + >> + /* >> + * XIVE VC & PC Virtual Structure Table settings >> + */ >> + case VC_VSD_TABLE_ADDR: >> + case PC_VSD_TABLE_ADDR: /* Virtual table selector */ >> + break; >> + case VC_VSD_TABLE_DATA: /* Virtual table setting */ >> + case PC_VSD_TABLE_DATA: >> + pnv_xive_vst_set_data(xive, val, offset == PC_VSD_TABLE_DATA); >> + break; >> + >> + /* >> + * Interrupt fifo overflow in memory backing store (Not modeled) >> + */ >> + case VC_IRQ_CONFIG_IPI: >> + case VC_IRQ_CONFIG_HW: >> + case VC_IRQ_CONFIG_CASCADE1: >> + case VC_IRQ_CONFIG_CASCADE2: >> + case VC_IRQ_CONFIG_REDIST: >> + case VC_IRQ_CONFIG_IPI_CASC: >> + break; >> + >> + /* >> + * XIVE hardware thread enablement >> + */ >> + case PC_THREAD_EN_REG0: /* Physical Thread Enable */ >> + case PC_THREAD_EN_REG1: /* Physical Thread Enable (fused core) */ >> + break; >> + >> + case PC_THREAD_EN_REG0_SET: >> + xive->regs[PC_THREAD_EN_REG0 >> 3] |= val; >> + break; >> + case PC_THREAD_EN_REG1_SET: >> + xive->regs[PC_THREAD_EN_REG1 >> 3] |= val; >> + break; >> + case PC_THREAD_EN_REG0_CLR: >> + xive->regs[PC_THREAD_EN_REG0 >> 3] &= ~val; >> + break; >> + case PC_THREAD_EN_REG1_CLR: >> + xive->regs[PC_THREAD_EN_REG1 >> 3] &= ~val; >> + break; >> + >> + /* >> + * Indirect TIMA access set up. Defines the PIR of the HW thread >> + * to use. >> + */ >> + case PC_TCTXT_INDIR0 ... PC_TCTXT_INDIR3: >> + break; >> + >> + /* >> + * XIVE PC & VC cache updates for EAS, NVT and END >> + */ >> + case VC_IVC_SCRUB_MASK: >> + break; >> + case VC_IVC_SCRUB_TRIG: >> + pnv_xive_eas_update(xive, GETFIELD(PC_SCRUB_BLOCK_ID, val), >> + GETFIELD(VC_SCRUB_OFFSET, val)); >> + break; >> + >> + case VC_EQC_SCRUB_MASK: >> + case VC_EQC_CWATCH_SPEC: >> + case VC_EQC_CWATCH_DAT0 ... VC_EQC_CWATCH_DAT3: >> + break; >> + case VC_EQC_SCRUB_TRIG: >> + pnv_xive_end_update(xive, GETFIELD(VC_SCRUB_BLOCK_ID, val), >> + GETFIELD(VC_SCRUB_OFFSET, val)); >> + break; >> + >> + case PC_VPC_SCRUB_MASK: >> + case PC_VPC_CWATCH_SPEC: >> + case PC_VPC_CWATCH_DAT0 ... PC_VPC_CWATCH_DAT7: >> + break; >> + case PC_VPC_SCRUB_TRIG: >> + pnv_xive_nvt_update(xive, GETFIELD(PC_SCRUB_BLOCK_ID, val), >> + GETFIELD(PC_SCRUB_OFFSET, val)); >> + break; >> + >> + >> + /* >> + * XIVE PC & VC cache invalidation >> + */ >> + case PC_AT_KILL: >> + break; >> + case VC_AT_MACRO_KILL: >> + break; >> + case PC_AT_KILL_MASK: >> + case VC_AT_MACRO_KILL_MASK: >> + break; >> + >> + default: >> + xive_error(xive, "IC: invalid write to reg=0x%"HWADDR_PRIx, offset); >> + return; >> + } >> + >> + xive->regs[reg] = val; >> +} >> + >> +static uint64_t pnv_xive_ic_reg_read(void *opaque, hwaddr offset, unsigned size) >> +{ >> + PnvXive *xive = PNV_XIVE(opaque); >> + uint64_t val = 0; >> + uint32_t reg = offset >> 3; >> + >> + switch (offset) { >> + case CQ_CFG_PB_GEN: >> + case CQ_IC_BAR: >> + case CQ_TM1_BAR: >> + case CQ_TM2_BAR: >> + case CQ_PC_BAR: >> + case CQ_PC_BARM: >> + case CQ_VC_BAR: >> + case CQ_VC_BARM: >> + case CQ_TAR: >> + case CQ_TDR: >> + case CQ_PBI_CTL: >> + >> + case PC_TCTXT_CFG: >> + case PC_TCTXT_TRACK: >> + case PC_TCTXT_INDIR0: >> + case PC_TCTXT_INDIR1: >> + case PC_TCTXT_INDIR2: >> + case PC_TCTXT_INDIR3: >> + case PC_GLOBAL_CONFIG: >> + >> + case PC_VPC_SCRUB_MASK: >> + case PC_VPC_CWATCH_SPEC: >> + case PC_VPC_CWATCH_DAT0: >> + case PC_VPC_CWATCH_DAT1: >> + case PC_VPC_CWATCH_DAT2: >> + case PC_VPC_CWATCH_DAT3: >> + case PC_VPC_CWATCH_DAT4: >> + case PC_VPC_CWATCH_DAT5: >> + case PC_VPC_CWATCH_DAT6: >> + case PC_VPC_CWATCH_DAT7: >> + >> + case VC_GLOBAL_CONFIG: >> + case VC_AIB_TX_ORDER_TAG2: >> + >> + case VC_IRQ_CONFIG_IPI: >> + case VC_IRQ_CONFIG_HW: >> + case VC_IRQ_CONFIG_CASCADE1: >> + case VC_IRQ_CONFIG_CASCADE2: >> + case VC_IRQ_CONFIG_REDIST: >> + case VC_IRQ_CONFIG_IPI_CASC: >> + >> + case VC_EQC_SCRUB_MASK: >> + case VC_EQC_CWATCH_DAT0: >> + case VC_EQC_CWATCH_DAT1: >> + case VC_EQC_CWATCH_DAT2: >> + case VC_EQC_CWATCH_DAT3: >> + >> + case VC_EQC_CWATCH_SPEC: >> + case VC_IVC_SCRUB_MASK: >> + case VC_SBC_CONFIG: >> + case VC_AT_MACRO_KILL_MASK: >> + case VC_VSD_TABLE_ADDR: >> + case PC_VSD_TABLE_ADDR: >> + case VC_VSD_TABLE_DATA: >> + case PC_VSD_TABLE_DATA: >> + case PC_THREAD_EN_REG0: >> + case PC_THREAD_EN_REG1: >> + val = xive->regs[reg]; >> + break; >> + >> + /* >> + * XIVE hardware thread enablement >> + */ >> + case PC_THREAD_EN_REG0_SET: >> + case PC_THREAD_EN_REG0_CLR: >> + val = xive->regs[PC_THREAD_EN_REG0 >> 3]; >> + break; >> + case PC_THREAD_EN_REG1_SET: >> + case PC_THREAD_EN_REG1_CLR: >> + val = xive->regs[PC_THREAD_EN_REG1 >> 3]; >> + break; >> + >> + case CQ_MSGSND: /* Identifies which cores have msgsnd enabled. */ >> + val = 0xffffff0000000000; >> + break; >> + >> + /* >> + * XIVE PC & VC cache updates for EAS, NVT and END >> + */ >> + case PC_VPC_SCRUB_TRIG: >> + case VC_IVC_SCRUB_TRIG: >> + case VC_EQC_SCRUB_TRIG: >> + xive->regs[reg] &= ~VC_SCRUB_VALID; >> + val = xive->regs[reg]; >> + break; >> + >> + /* >> + * XIVE PC & VC cache invalidation >> + */ >> + case PC_AT_KILL: >> + xive->regs[reg] &= ~PC_AT_KILL_VALID; >> + val = xive->regs[reg]; >> + break; >> + case VC_AT_MACRO_KILL: >> + xive->regs[reg] &= ~VC_KILL_VALID; >> + val = xive->regs[reg]; >> + break; >> + >> + /* >> + * XIVE synchronisation >> + */ >> + case VC_EQC_CONFIG: >> + val = VC_EQC_SYNC_MASK; >> + break; >> + >> + default: >> + xive_error(xive, "IC: invalid read reg=0x%"HWADDR_PRIx, offset); >> + } >> + >> + return val; >> +} >> + >> +static const MemoryRegionOps pnv_xive_ic_reg_ops = { >> + .read = pnv_xive_ic_reg_read, >> + .write = pnv_xive_ic_reg_write, >> + .endianness = DEVICE_BIG_ENDIAN, >> + .valid = { >> + .min_access_size = 8, >> + .max_access_size = 8, >> + }, >> + .impl = { >> + .min_access_size = 8, >> + .max_access_size = 8, >> + }, >> +}; >> + >> +/* >> + * IC - Notify MMIO port page (write only) >> + */ >> +#define PNV_XIVE_FORWARD_IPI 0x800 /* Forward IPI */ >> +#define PNV_XIVE_FORWARD_HW 0x880 /* Forward HW */ >> +#define PNV_XIVE_FORWARD_OS_ESC 0x900 /* Forward OS escalation */ >> +#define PNV_XIVE_FORWARD_HW_ESC 0x980 /* Forward Hyp escalation */ >> +#define PNV_XIVE_FORWARD_REDIS 0xa00 /* Forward Redistribution */ >> +#define PNV_XIVE_RESERVED5 0xa80 /* Cache line 5 PowerBUS operation */ >> +#define PNV_XIVE_RESERVED6 0xb00 /* Cache line 6 PowerBUS operation */ >> +#define PNV_XIVE_RESERVED7 0xb80 /* Cache line 7 PowerBUS operation */ >> + >> +/* VC synchronisation */ >> +#define PNV_XIVE_SYNC_IPI 0xc00 /* Sync IPI */ >> +#define PNV_XIVE_SYNC_HW 0xc80 /* Sync HW */ >> +#define PNV_XIVE_SYNC_OS_ESC 0xd00 /* Sync OS escalation */ >> +#define PNV_XIVE_SYNC_HW_ESC 0xd80 /* Sync Hyp escalation */ >> +#define PNV_XIVE_SYNC_REDIS 0xe00 /* Sync Redistribution */ >> + >> +/* PC synchronisation */ >> +#define PNV_XIVE_SYNC_PULL 0xe80 /* Sync pull context */ >> +#define PNV_XIVE_SYNC_PUSH 0xf00 /* Sync push context */ >> +#define PNV_XIVE_SYNC_VPC 0xf80 /* Sync remove VPC store */ >> + >> +static void pnv_xive_ic_hw_trigger(PnvXive *xive, hwaddr addr, uint64_t val) >> +{ >> + /* >> + * Forward the source event notification directly to the Router. >> + * The source interrupt number should already be correctly encoded >> + * with the chip block id by the sending device (PHB, PSI). >> + */ >> + xive_router_notify(XIVE_NOTIFIER(xive), val); >> +} >> + >> +static void pnv_xive_ic_notify_write(void *opaque, hwaddr addr, uint64_t val, >> + unsigned size) >> +{ >> + PnvXive *xive = PNV_XIVE(opaque); >> + >> + /* VC: HW triggers */ >> + switch (addr) { >> + case 0x000 ... 0x7FF: >> + pnv_xive_ic_hw_trigger(opaque, addr, val); >> + break; >> + >> + /* VC: Forwarded IRQs */ >> + case PNV_XIVE_FORWARD_IPI: >> + case PNV_XIVE_FORWARD_HW: >> + case PNV_XIVE_FORWARD_OS_ESC: >> + case PNV_XIVE_FORWARD_HW_ESC: >> + case PNV_XIVE_FORWARD_REDIS: >> + /* TODO: forwarded IRQs. Should be like HW triggers */ >> + xive_error(xive, "IC: forwarded at @0x%"HWADDR_PRIx" IRQ 0x%"PRIx64, >> + addr, val); >> + break; >> + >> + /* VC syncs */ >> + case PNV_XIVE_SYNC_IPI: >> + case PNV_XIVE_SYNC_HW: >> + case PNV_XIVE_SYNC_OS_ESC: >> + case PNV_XIVE_SYNC_HW_ESC: >> + case PNV_XIVE_SYNC_REDIS: >> + break; >> + >> + /* PC syncs */ >> + case PNV_XIVE_SYNC_PULL: >> + case PNV_XIVE_SYNC_PUSH: >> + case PNV_XIVE_SYNC_VPC: >> + break; >> + >> + default: >> + xive_error(xive, "IC: invalid notify write @%"HWADDR_PRIx, addr); >> + } >> +} >> + >> +static uint64_t pnv_xive_ic_notify_read(void *opaque, hwaddr addr, >> + unsigned size) >> +{ >> + PnvXive *xive = PNV_XIVE(opaque); >> + >> + /* loads are invalid */ >> + xive_error(xive, "IC: invalid notify read @%"HWADDR_PRIx, addr); >> + return -1; >> +} >> + >> +static const MemoryRegionOps pnv_xive_ic_notify_ops = { >> + .read = pnv_xive_ic_notify_read, >> + .write = pnv_xive_ic_notify_write, >> + .endianness = DEVICE_BIG_ENDIAN, >> + .valid = { >> + .min_access_size = 8, >> + .max_access_size = 8, >> + }, >> + .impl = { >> + .min_access_size = 8, >> + .max_access_size = 8, >> + }, >> +}; >> + >> +/* >> + * IC - LSI MMIO handlers (not modeled) >> + */ >> + >> +static void pnv_xive_ic_lsi_write(void *opaque, hwaddr addr, >> + uint64_t val, unsigned size) >> +{ >> + PnvXive *xive = PNV_XIVE(opaque); >> + >> + xive_error(xive, "IC: LSI invalid write @%"HWADDR_PRIx, addr); >> +} >> + >> +static uint64_t pnv_xive_ic_lsi_read(void *opaque, hwaddr addr, unsigned size) >> +{ >> + PnvXive *xive = PNV_XIVE(opaque); >> + >> + xive_error(xive, "IC: LSI invalid read @%"HWADDR_PRIx, addr); >> + return -1; >> +} >> + >> +static const MemoryRegionOps pnv_xive_ic_lsi_ops = { >> + .read = pnv_xive_ic_lsi_read, >> + .write = pnv_xive_ic_lsi_write, >> + .endianness = DEVICE_BIG_ENDIAN, >> + .valid = { >> + .min_access_size = 8, >> + .max_access_size = 8, >> + }, >> + .impl = { >> + .min_access_size = 8, >> + .max_access_size = 8, >> + }, >> +}; >> + >> +/* >> + * IC - Indirect TIMA MMIO handlers >> + */ >> + >> +/* >> + * When the TIMA is accessed from the indirect page, the thread id >> + * (PIR) has to be configured in the IC registers before. This is used >> + * for resets and for debug purpose also. >> + */ >> +static XiveTCTX *pnv_xive_get_indirect_tctx(PnvXive *xive, hwaddr offset) >> +{ >> + uint8_t page_offset = (offset >> TM_SHIFT) & 0x3; >> + uint64_t tctxt_indir = xive->regs[(PC_TCTXT_INDIR0 >> 3) + page_offset]; >> + PowerPCCPU *cpu = NULL; >> + int pir; >> + >> + if (!(tctxt_indir & PC_TCTXT_INDIR_VALID)) { >> + xive_error(xive, "IC: no indirect TIMA access in progress"); >> + return NULL; >> + } >> + >> + pir = GETFIELD(PC_TCTXT_INDIR_THRDID, tctxt_indir) & 0xff; >> + cpu = ppc_get_vcpu_by_pir(pir); >> + if (!cpu) { >> + xive_error(xive, "IC: invalid PIR %x for indirect access", pir); >> + return NULL; >> + } >> + >> + /* Check that HW thread is XIVE enabled */ >> + if (!(xive->regs[PC_THREAD_EN_REG0 >> 3] & PPC_BIT(pir))) { >> + xive_error(xive, "IC: CPU %x is not enabled", pir); >> + } >> + >> + return pnv_cpu_state(cpu)->tctx; >> +} >> + >> +static void xive_tm_indirect_write(void *opaque, hwaddr offset, >> + uint64_t value, unsigned size) >> +{ >> + XiveTCTX *tctx = pnv_xive_get_indirect_tctx(PNV_XIVE(opaque), offset); >> + >> + xive_tctx_tm_write(tctx, offset, value, size); >> +} >> + >> +static uint64_t xive_tm_indirect_read(void *opaque, hwaddr offset, >> + unsigned size) >> +{ >> + XiveTCTX *tctx = pnv_xive_get_indirect_tctx(PNV_XIVE(opaque), offset); >> + >> + return xive_tctx_tm_read(tctx, offset, size); >> +} >> + >> +static const MemoryRegionOps xive_tm_indirect_ops = { >> + .read = xive_tm_indirect_read, >> + .write = xive_tm_indirect_write, >> + .endianness = DEVICE_BIG_ENDIAN, >> + .valid = { >> + .min_access_size = 1, >> + .max_access_size = 8, >> + }, >> + .impl = { >> + .min_access_size = 1, >> + .max_access_size = 8, >> + }, >> +}; >> + >> +/* >> + * Interrupt controller XSCOM region. >> + */ >> +static uint64_t pnv_xive_xscom_read(void *opaque, hwaddr addr, unsigned size) >> +{ >> + switch (addr >> 3) { >> + case X_VC_EQC_CONFIG: >> + /* FIXME (skiboot): This is the only XSCOM load. Bizarre. */ >> + return VC_EQC_SYNC_MASK; >> + default: >> + return pnv_xive_ic_reg_read(opaque, addr, size); >> + } >> +} >> + >> +static void pnv_xive_xscom_write(void *opaque, hwaddr addr, >> + uint64_t val, unsigned size) >> +{ >> + pnv_xive_ic_reg_write(opaque, addr, val, size); >> +} >> + >> +static const MemoryRegionOps pnv_xive_xscom_ops = { >> + .read = pnv_xive_xscom_read, >> + .write = pnv_xive_xscom_write, >> + .endianness = DEVICE_BIG_ENDIAN, >> + .valid = { >> + .min_access_size = 8, >> + .max_access_size = 8, >> + }, >> + .impl = { >> + .min_access_size = 8, >> + .max_access_size = 8, >> + } >> +}; >> + >> +/* >> + * Virtualization Controller MMIO region containing the IPI and END ESB pages >> + */ >> +static uint64_t pnv_xive_vc_read(void *opaque, hwaddr offset, >> + unsigned size) >> +{ >> + PnvXive *xive = PNV_XIVE(opaque); >> + uint64_t edt_index = offset >> pnv_xive_edt_shift(xive); >> + uint64_t edt_type = 0; >> + uint64_t edt_offset; >> + MemTxResult result; >> + AddressSpace *edt_as = NULL; >> + uint64_t ret = -1; >> + >> + if (edt_index < XIVE_TABLE_EDT_MAX) { >> + edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[edt_index]); >> + } >> + >> + switch (edt_type) { >> + case CQ_TDR_EDT_IPI: >> + edt_as = &xive->ipi_as; >> + break; >> + case CQ_TDR_EDT_EQ: >> + edt_as = &xive->end_as; > > I'm not entirely understanding the function of these AddressSpace objectz. The IPI and END ESB pages are exposed in the same VC region. But this VC region is not splitted between the two types with a single offset. It is segmented with the EDT tables which defines the type of each segment. The purpose of these address spaces is to translate the load/stores in the VC region in the equivalent IPI or END region exposing contigously ESB pages of the same type: 'end_edt_mmio' and 'ipi_edt_mmio'. The memory regions of the XiveENDSource and the XiveSource for the IPIs are mapped in 'end_edt_mmio' and 'ipi_edt_mmio'. (This is changing for P10, should be simpler) >> + break; >> + default: >> + xive_error(xive, "VC: invalid EDT type for read @%"HWADDR_PRIx, offset); >> + return -1; >> + } >> + >> + /* Remap the offset for the targeted address space */ >> + edt_offset = pnv_xive_edt_offset(xive, offset, edt_type); >> + >> + ret = address_space_ldq(edt_as, edt_offset, MEMTXATTRS_UNSPECIFIED, >> + &result); >> + >> + if (result != MEMTX_OK) { >> + xive_error(xive, "VC: %s read failed at @0x%"HWADDR_PRIx " -> @0x%" >> + HWADDR_PRIx, edt_type == CQ_TDR_EDT_IPI ? "IPI" : "END", >> + offset, edt_offset); >> + return -1; >> + } >> + >> + return ret; >> +} >> + >> +static void pnv_xive_vc_write(void *opaque, hwaddr offset, >> + uint64_t val, unsigned size) >> +{ >> + PnvXive *xive = PNV_XIVE(opaque); >> + uint64_t edt_index = offset >> pnv_xive_edt_shift(xive); >> + uint64_t edt_type = 0; >> + uint64_t edt_offset; >> + MemTxResult result; >> + AddressSpace *edt_as = NULL; >> + >> + if (edt_index < XIVE_TABLE_EDT_MAX) { >> + edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[edt_index]); >> + } >> + >> + switch (edt_type) { >> + case CQ_TDR_EDT_IPI: >> + edt_as = &xive->ipi_as; >> + break; >> + case CQ_TDR_EDT_EQ: >> + edt_as = &xive->end_as; >> + break; >> + default: >> + xive_error(xive, "VC: invalid EDT type for write @%"HWADDR_PRIx, >> + offset); >> + return; >> + } >> + >> + /* Remap the offset for the targeted address space */ >> + edt_offset = pnv_xive_edt_offset(xive, offset, edt_type); >> + >> + address_space_stq(edt_as, edt_offset, val, MEMTXATTRS_UNSPECIFIED, &result); >> + if (result != MEMTX_OK) { >> + xive_error(xive, "VC: write failed at @0x%"HWADDR_PRIx, edt_offset); >> + } >> +} >> + >> +static const MemoryRegionOps pnv_xive_vc_ops = { >> + .read = pnv_xive_vc_read, >> + .write = pnv_xive_vc_write, >> + .endianness = DEVICE_BIG_ENDIAN, >> + .valid = { >> + .min_access_size = 8, >> + .max_access_size = 8, >> + }, >> + .impl = { >> + .min_access_size = 8, >> + .max_access_size = 8, >> + }, >> +}; >> + >> +/* >> + * Presenter Controller MMIO region. The Virtualization Controller >> + * updates the IPB in the NVT table when required. Not modeled. >> + */ >> +static uint64_t pnv_xive_pc_read(void *opaque, hwaddr addr, >> + unsigned size) >> +{ >> + PnvXive *xive = PNV_XIVE(opaque); >> + >> + xive_error(xive, "PC: invalid read @%"HWADDR_PRIx, addr); >> + return -1; >> +} >> + >> +static void pnv_xive_pc_write(void *opaque, hwaddr addr, >> + uint64_t value, unsigned size) >> +{ >> + PnvXive *xive = PNV_XIVE(opaque); >> + >> + xive_error(xive, "PC: invalid write to VC @%"HWADDR_PRIx, addr); >> +} >> + >> +static const MemoryRegionOps pnv_xive_pc_ops = { >> + .read = pnv_xive_pc_read, >> + .write = pnv_xive_pc_write, >> + .endianness = DEVICE_BIG_ENDIAN, >> + .valid = { >> + .min_access_size = 8, >> + .max_access_size = 8, >> + }, >> + .impl = { >> + .min_access_size = 8, >> + .max_access_size = 8, >> + }, >> +}; >> + >> +void pnv_xive_pic_print_info(PnvXive *xive, Monitor *mon) >> +{ >> + XiveRouter *xrtr = XIVE_ROUTER(xive); >> + XiveEAS eas; >> + XiveEND end; >> + uint32_t endno = 0; >> + uint32_t srcno = 0; >> + uint32_t srcno0 = XIVE_SRCNO(xive->chip_id, 0); >> + >> + monitor_printf(mon, "XIVE[%x] Source %08x .. %08x\n", xive->chip_id, >> + srcno0, srcno0 + xive->nr_irqs - 1); >> + xive_source_pic_print_info(&xive->source, srcno0, mon); >> + >> + monitor_printf(mon, "XIVE[%x] EAT %08x .. %08x\n", xive->chip_id, >> + srcno0, srcno0 + xive->nr_irqs - 1); >> + while (!xive_router_get_eas(xrtr, xive->chip_id, srcno, &eas)) { >> + if (!xive_eas_is_masked(&eas)) { >> + xive_eas_pic_print_info(&eas, srcno, mon); >> + } >> + srcno++; >> + } >> + >> + monitor_printf(mon, "XIVE[%x] ENDT %08x .. %08x\n", xive->chip_id, >> + 0, xive->nr_ends - 1); >> + while (!xive_router_get_end(xrtr, xive->chip_id, endno, &end)) { >> + xive_end_pic_print_info(&end, endno++, mon); >> + } >> +} >> + >> +static void pnv_xive_reset(void *dev) >> +{ >> + PnvXive *xive = PNV_XIVE(dev); >> + XiveSource *xsrc = &xive->source; >> + XiveENDSource *end_xsrc = &xive->end_source; >> + >> + /* >> + * Use the PnvChip id to identify the XIVE interrupt controller. >> + * It can be overriden by configuration at runtime. >> + */ >> + xive->chip_id = xive->tctx_chipid = xive->chip->chip_id; >> + >> + /* Default page size (Should be changed at runtime to 64k) */ >> + xive->ic_shift = xive->vc_shift = xive->pc_shift = 12; >> + >> + /* Clear subregions */ >> + if (memory_region_is_mapped(&xsrc->esb_mmio)) { >> + memory_region_del_subregion(&xive->ipi_edt_mmio, &xsrc->esb_mmio); >> + } >> + >> + if (memory_region_is_mapped(&xive->ipi_edt_mmio)) { >> + memory_region_del_subregion(&xive->ipi_mmio, &xive->ipi_edt_mmio); >> + } >> + >> + if (memory_region_is_mapped(&end_xsrc->esb_mmio)) { >> + memory_region_del_subregion(&xive->end_edt_mmio, &end_xsrc->esb_mmio); >> + } >> + >> + if (memory_region_is_mapped(&xive->end_edt_mmio)) { >> + memory_region_del_subregion(&xive->end_mmio, &xive->end_edt_mmio); >> + } >> +} >> + >> +static void pnv_xive_init(Object *obj) >> +{ >> + PnvXive *xive = PNV_XIVE(obj); >> + >> + object_initialize(&xive->source, sizeof(xive->source), TYPE_XIVE_SOURCE); >> + object_property_add_child(obj, "source", OBJECT(&xive->source), NULL); >> + >> + object_initialize(&xive->end_source, sizeof(xive->end_source), >> + TYPE_XIVE_END_SOURCE); >> + object_property_add_child(obj, "end_source", OBJECT(&xive->end_source), >> + NULL); >> +} >> + >> +/* >> + * Maximum number of IRQs and ENDs supported by HW >> + */ >> +#define PNV_XIVE_NR_IRQS (PNV9_XIVE_VC_SIZE / (1ull << XIVE_ESB_64K_2PAGE)) >> +#define PNV_XIVE_NR_ENDS (PNV9_XIVE_VC_SIZE / (1ull << XIVE_ESB_64K_2PAGE)) >> + >> +static void pnv_xive_realize(DeviceState *dev, Error **errp) >> +{ >> + PnvXive *xive = PNV_XIVE(dev); >> + XiveSource *xsrc = &xive->source; >> + XiveENDSource *end_xsrc = &xive->end_source; >> + Error *local_err = NULL; >> + Object *obj; >> + >> + obj = object_property_get_link(OBJECT(dev), "chip", &local_err); >> + if (!obj) { >> + error_propagate(errp, local_err); >> + error_prepend(errp, "required link 'chip' not found: "); >> + return; >> + } >> + >> + /* The PnvChip id identifies the XIVE interrupt controller. */ >> + xive->chip = PNV_CHIP(obj); >> + >> + /* >> + * Xive Interrupt source and END source object with the maximum >> + * allowed HW configuration. The ESB MMIO regions will be resized >> + * dynamically when the controller is configured by the FW to >> + * limit accesses to resources not provisioned. >> + */ >> + object_property_set_int(OBJECT(xsrc), PNV_XIVE_NR_IRQS, "nr-irqs", >> + &error_fatal); > > You have a constant here, but your router object also includes a > nr_irqs field. What's up with that? The XiveSource object of PnvXive is realized for the maximum size allowed by HW because we don't know how much IRQs the FW will provision for. The 'nr_irqs' is the number of IRQs configured by the FW (We changed the name to 'nr_ipis') See routine pnv_xive_vst_set_exclusive() >> + object_property_add_const_link(OBJECT(xsrc), "xive", OBJECT(xive), >> + &error_fatal); >> + object_property_set_bool(OBJECT(xsrc), true, "realized", &local_err); >> + if (local_err) { >> + error_propagate(errp, local_err); >> + return; >> + } >> + >> + object_property_set_int(OBJECT(end_xsrc), PNV_XIVE_NR_ENDS, "nr-ends", >> + &error_fatal); >> + object_property_add_const_link(OBJECT(end_xsrc), "xive", OBJECT(xive), >> + &error_fatal); >> + object_property_set_bool(OBJECT(end_xsrc), true, "realized", &local_err); >> + if (local_err) { >> + error_propagate(errp, local_err); >> + return; >> + } >> + >> + /* Default page size. Generally changed at runtime to 64k */ >> + xive->ic_shift = xive->vc_shift = xive->pc_shift = 12; >> + >> + /* XSCOM region, used for initial configuration of the BARs */ >> + memory_region_init_io(&xive->xscom_regs, OBJECT(dev), &pnv_xive_xscom_ops, >> + xive, "xscom-xive", PNV9_XSCOM_XIVE_SIZE << 3); >> + >> + /* Interrupt controller MMIO regions */ >> + memory_region_init(&xive->ic_mmio, OBJECT(dev), "xive-ic", >> + PNV9_XIVE_IC_SIZE); >> + >> + memory_region_init_io(&xive->ic_reg_mmio, OBJECT(dev), &pnv_xive_ic_reg_ops, >> + xive, "xive-ic-reg", 1 << xive->ic_shift); >> + memory_region_init_io(&xive->ic_notify_mmio, OBJECT(dev), >> + &pnv_xive_ic_notify_ops, >> + xive, "xive-ic-notify", 1 << xive->ic_shift); >> + >> + /* The Pervasive LSI trigger and EOI pages (not modeled) */ >> + memory_region_init_io(&xive->ic_lsi_mmio, OBJECT(dev), &pnv_xive_ic_lsi_ops, >> + xive, "xive-ic-lsi", 2 << xive->ic_shift); >> + >> + /* Thread Interrupt Management Area (Indirect) */ >> + memory_region_init_io(&xive->tm_indirect_mmio, OBJECT(dev), >> + &xive_tm_indirect_ops, >> + xive, "xive-tima-indirect", PNV9_XIVE_TM_SIZE); >> + /* >> + * Overall Virtualization Controller MMIO region containing the >> + * IPI ESB pages and END ESB pages. The layout is defined by the >> + * EDT "Domain table" and the accesses are dispatched using >> + * address spaces for each. >> + */ >> + memory_region_init_io(&xive->vc_mmio, OBJECT(xive), &pnv_xive_vc_ops, xive, >> + "xive-vc", PNV9_XIVE_VC_SIZE); >> + >> + memory_region_init(&xive->ipi_mmio, OBJECT(xive), "xive-vc-ipi", >> + PNV9_XIVE_VC_SIZE); >> + address_space_init(&xive->ipi_as, &xive->ipi_mmio, "xive-vc-ipi"); >> + memory_region_init(&xive->end_mmio, OBJECT(xive), "xive-vc-end", >> + PNV9_XIVE_VC_SIZE); >> + address_space_init(&xive->end_as, &xive->end_mmio, "xive-vc-end"); >> + >> + /* >> + * The MMIO windows exposing the IPI ESBs and the END ESBs in the >> + * VC region. Their size is configured by the FW in the EDT table. >> + */ >> + memory_region_init(&xive->ipi_edt_mmio, OBJECT(xive), "xive-vc-ipi-edt", 0); >> + memory_region_init(&xive->end_edt_mmio, OBJECT(xive), "xive-vc-end-edt", 0); >> + >> + /* Presenter Controller MMIO region (not modeled) */ >> + memory_region_init_io(&xive->pc_mmio, OBJECT(xive), &pnv_xive_pc_ops, xive, >> + "xive-pc", PNV9_XIVE_PC_SIZE); >> + >> + /* Thread Interrupt Management Area (Direct) */ >> + memory_region_init_io(&xive->tm_mmio, OBJECT(xive), &xive_tm_ops, >> + xive, "xive-tima", PNV9_XIVE_TM_SIZE); >> + >> + qemu_register_reset(pnv_xive_reset, dev); >> +} >> + >> +static int pnv_xive_dt_xscom(PnvXScomInterface *dev, void *fdt, >> + int xscom_offset) >> +{ >> + const char compat[] = "ibm,power9-xive-x"; >> + char *name; >> + int offset; >> + uint32_t lpc_pcba = PNV9_XSCOM_XIVE_BASE; >> + uint32_t reg[] = { >> + cpu_to_be32(lpc_pcba), >> + cpu_to_be32(PNV9_XSCOM_XIVE_SIZE) >> + }; >> + >> + name = g_strdup_printf("xive@%x", lpc_pcba); >> + offset = fdt_add_subnode(fdt, xscom_offset, name); >> + _FDT(offset); >> + g_free(name); >> + >> + _FDT((fdt_setprop(fdt, offset, "reg", reg, sizeof(reg)))); >> + _FDT((fdt_setprop(fdt, offset, "compatible", compat, >> + sizeof(compat)))); >> + return 0; >> +} >> + >> +static Property pnv_xive_properties[] = { >> + DEFINE_PROP_UINT64("ic-bar", PnvXive, ic_base, 0), >> + DEFINE_PROP_UINT64("vc-bar", PnvXive, vc_base, 0), >> + DEFINE_PROP_UINT64("pc-bar", PnvXive, pc_base, 0), >> + DEFINE_PROP_UINT64("tm-bar", PnvXive, tm_base, 0), >> + DEFINE_PROP_END_OF_LIST(), >> +}; >> + >> +static void pnv_xive_class_init(ObjectClass *klass, void *data) >> +{ >> + DeviceClass *dc = DEVICE_CLASS(klass); >> + PnvXScomInterfaceClass *xdc = PNV_XSCOM_INTERFACE_CLASS(klass); >> + XiveRouterClass *xrc = XIVE_ROUTER_CLASS(klass); >> + XiveNotifierClass *xnc = XIVE_NOTIFIER_CLASS(klass); >> + >> + xdc->dt_xscom = pnv_xive_dt_xscom; >> + >> + dc->desc = "PowerNV XIVE Interrupt Controller"; >> + dc->realize = pnv_xive_realize; >> + dc->props = pnv_xive_properties; >> + >> + xrc->get_eas = pnv_xive_get_eas; >> + xrc->get_end = pnv_xive_get_end; >> + xrc->write_end = pnv_xive_write_end; >> + xrc->get_nvt = pnv_xive_get_nvt; >> + xrc->write_nvt = pnv_xive_write_nvt; >> + xrc->get_tctx = pnv_xive_get_tctx; >> + >> + xnc->notify = pnv_xive_notify; >> +}; >> + >> +static const TypeInfo pnv_xive_info = { >> + .name = TYPE_PNV_XIVE, >> + .parent = TYPE_XIVE_ROUTER, >> + .instance_init = pnv_xive_init, >> + .instance_size = sizeof(PnvXive), >> + .class_init = pnv_xive_class_init, >> + .interfaces = (InterfaceInfo[]) { >> + { TYPE_PNV_XSCOM_INTERFACE }, >> + { } >> + } >> +}; >> + >> +static void pnv_xive_register_types(void) >> +{ >> + type_register_static(&pnv_xive_info); >> +} >> + >> +type_init(pnv_xive_register_types) >> diff --git a/hw/intc/xive.c b/hw/intc/xive.c >> index ee6e81425784..0e0e1dc9c1b7 100644 >> --- a/hw/intc/xive.c >> +++ b/hw/intc/xive.c > > Might be a bit easier to review if these changes to the XIVE "guts" > were in a separate patch from the Pnv specific XIVE object. Yes. I can extract a couple of the changes below and move them in their own patch. > >> @@ -54,6 +54,8 @@ static uint8_t exception_mask(uint8_t ring) >> switch (ring) { >> case TM_QW1_OS: >> return TM_QW1_NSR_EO; >> + case TM_QW3_HV_PHYS: >> + return TM_QW3_NSR_HE; >> default: >> g_assert_not_reached(); >> } >> @@ -88,7 +90,16 @@ static void xive_tctx_notify(XiveTCTX *tctx, uint8_t ring) >> uint8_t *regs = &tctx->regs[ring]; >> >> if (regs[TM_PIPR] < regs[TM_CPPR]) { >> - regs[TM_NSR] |= exception_mask(ring); >> + switch (ring) { >> + case TM_QW1_OS: >> + regs[TM_NSR] |= TM_QW1_NSR_EO; >> + break; >> + case TM_QW3_HV_PHYS: >> + regs[TM_NSR] |= (TM_QW3_NSR_HE_PHYS << 6); >> + break; >> + default: >> + g_assert_not_reached(); >> + } >> qemu_irq_raise(tctx->output); >> } >> } >> @@ -109,6 +120,38 @@ static void xive_tctx_set_cppr(XiveTCTX *tctx, uint8_t ring, uint8_t cppr) >> * XIVE Thread Interrupt Management Area (TIMA) >> */ >> >> +static void xive_tm_set_hv_cppr(XiveTCTX *tctx, hwaddr offset, >> + uint64_t value, unsigned size) >> +{ >> + xive_tctx_set_cppr(tctx, TM_QW3_HV_PHYS, value & 0xff); >> +} >> + >> +static uint64_t xive_tm_ack_hv_reg(XiveTCTX *tctx, hwaddr offset, unsigned size) >> +{ >> + return xive_tctx_accept(tctx, TM_QW3_HV_PHYS); >> +} >> + >> +static uint64_t xive_tm_pull_pool_ctx(XiveTCTX *tctx, hwaddr offset, >> + unsigned size) >> +{ >> + uint64_t ret; >> + >> + ret = tctx->regs[TM_QW2_HV_POOL + TM_WORD2] & TM_QW2W2_POOL_CAM; >> + tctx->regs[TM_QW2_HV_POOL + TM_WORD2] &= ~TM_QW2W2_POOL_CAM; >> + return ret; >> +} >> + >> +static void xive_tm_vt_push(XiveTCTX *tctx, hwaddr offset, >> + uint64_t value, unsigned size) >> +{ >> + tctx->regs[TM_QW3_HV_PHYS + TM_WORD2] = value & 0xff; >> +} >> + >> +static uint64_t xive_tm_vt_poll(XiveTCTX *tctx, hwaddr offset, unsigned size) >> +{ >> + return tctx->regs[TM_QW3_HV_PHYS + TM_WORD2] & 0xff; >> +} >> + >> /* >> * Define an access map for each page of the TIMA that we will use in >> * the memory region ops to filter values when doing loads and stores >> @@ -288,10 +331,16 @@ static const XiveTmOp xive_tm_operations[] = { >> * effects >> */ >> { XIVE_TM_OS_PAGE, TM_QW1_OS + TM_CPPR, 1, xive_tm_set_os_cppr, NULL }, >> + { XIVE_TM_HV_PAGE, TM_QW3_HV_PHYS + TM_CPPR, 1, xive_tm_set_hv_cppr, NULL }, >> + { XIVE_TM_HV_PAGE, TM_QW3_HV_PHYS + TM_WORD2, 1, xive_tm_vt_push, NULL }, >> + { XIVE_TM_HV_PAGE, TM_QW3_HV_PHYS + TM_WORD2, 1, NULL, xive_tm_vt_poll }, >> >> /* MMIOs above 2K : special operations with side effects */ >> { XIVE_TM_OS_PAGE, TM_SPC_ACK_OS_REG, 2, NULL, xive_tm_ack_os_reg }, >> { XIVE_TM_OS_PAGE, TM_SPC_SET_OS_PENDING, 1, xive_tm_set_os_pending, NULL }, >> + { XIVE_TM_HV_PAGE, TM_SPC_ACK_HV_REG, 2, NULL, xive_tm_ack_hv_reg }, >> + { XIVE_TM_HV_PAGE, TM_SPC_PULL_POOL_CTX, 4, NULL, xive_tm_pull_pool_ctx }, >> + { XIVE_TM_HV_PAGE, TM_SPC_PULL_POOL_CTX, 8, NULL, xive_tm_pull_pool_ctx }, >> }; >> >> static const XiveTmOp *xive_tm_find_op(hwaddr offset, unsigned size, bool write) >> @@ -323,7 +372,7 @@ void xive_tctx_tm_write(XiveTCTX *tctx, hwaddr offset, uint64_t value, >> const XiveTmOp *xto; >> >> /* >> - * TODO: check V bit in Q[0-3]W2, check PTER bit associated with CPU >> + * TODO: check V bit in Q[0-3]W2 >> */ >> >> /* >> @@ -360,7 +409,7 @@ uint64_t xive_tctx_tm_read(XiveTCTX *tctx, hwaddr offset, unsigned size) >> const XiveTmOp *xto; >> >> /* >> - * TODO: check V bit in Q[0-3]W2, check PTER bit associated with CPU >> + * TODO: check V bit in Q[0-3]W2 >> */ >> >> /* >> @@ -474,6 +523,8 @@ static void xive_tctx_reset(void *dev) >> */ >> tctx->regs[TM_QW1_OS + TM_PIPR] = >> ipb_to_pipr(tctx->regs[TM_QW1_OS + TM_IPB]); >> + tctx->regs[TM_QW3_HV_PHYS + TM_PIPR] = >> + ipb_to_pipr(tctx->regs[TM_QW3_HV_PHYS + TM_IPB]); >> } >> >> static void xive_tctx_realize(DeviceState *dev, Error **errp) >> @@ -1424,7 +1475,7 @@ static void xive_router_end_notify(XiveRouter *xrtr, uint8_t end_blk, >> /* TODO: Auto EOI. */ >> } >> >> -static void xive_router_notify(XiveNotifier *xn, uint32_t lisn) >> +void xive_router_notify(XiveNotifier *xn, uint32_t lisn) >> { >> XiveRouter *xrtr = XIVE_ROUTER(xn); >> uint8_t eas_blk = XIVE_SRCNO_BLOCK(lisn); >> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c >> index 0c9de76b71ff..6bb0772367d4 100644 >> --- a/hw/ppc/pnv.c >> +++ b/hw/ppc/pnv.c >> @@ -279,7 +279,10 @@ static void pnv_dt_chip(PnvChip *chip, void *fdt) >> pnv_dt_core(chip, pnv_core, fdt); >> >> /* Interrupt Control Presenters (ICP). One per core. */ >> - pnv_dt_icp(chip, fdt, pnv_core->pir, CPU_CORE(pnv_core)->nr_threads); >> + if (!pnv_chip_is_power9(chip)) { >> + pnv_dt_icp(chip, fdt, pnv_core->pir, >> + CPU_CORE(pnv_core)->nr_threads); > > I guess it's not really in scope for this patch set, but I think > having separate dt setup routines for the p8chip and p9chip which call > a common() routine would be preferable to having an all-common routine > which has a bunch of if(power9) conditionals. OK. I will take a look. Thanks, C. > >> + } >> } >> >> if (chip->ram_size) { >> @@ -703,7 +706,23 @@ static uint32_t pnv_chip_core_pir_p9(PnvChip *chip, uint32_t core_id) >> static void pnv_chip_power9_intc_create(PnvChip *chip, PowerPCCPU *cpu, >> Error **errp) >> { >> - return; >> + Pnv9Chip *chip9 = PNV9_CHIP(chip); >> + Error *local_err = NULL; >> + Object *obj; >> + PnvCPUState *pnv_cpu = pnv_cpu_state(cpu); >> + >> + /* >> + * The core creates its interrupt presenter but the XIVE interrupt >> + * controller object is initialized afterwards. Hopefully, it's >> + * only used at runtime. >> + */ >> + obj = xive_tctx_create(OBJECT(cpu), XIVE_ROUTER(&chip9->xive), errp); >> + if (local_err) { >> + error_propagate(errp, local_err); >> + return; >> + } >> + >> + pnv_cpu->tctx = XIVE_TCTX(obj); >> } >> >> /* Allowed core identifiers on a POWER8 Processor Chip : >> @@ -885,11 +904,19 @@ static void pnv_chip_power8nvl_class_init(ObjectClass *klass, void *data) >> >> static void pnv_chip_power9_instance_init(Object *obj) >> { >> + Pnv9Chip *chip9 = PNV9_CHIP(obj); >> + >> + object_initialize(&chip9->xive, sizeof(chip9->xive), TYPE_PNV_XIVE); >> + object_property_add_child(obj, "xive", OBJECT(&chip9->xive), NULL); >> + object_property_add_const_link(OBJECT(&chip9->xive), "chip", obj, >> + &error_abort); >> } >> >> static void pnv_chip_power9_realize(DeviceState *dev, Error **errp) >> { >> PnvChipClass *pcc = PNV_CHIP_GET_CLASS(dev); >> + Pnv9Chip *chip9 = PNV9_CHIP(dev); >> + PnvChip *chip = PNV_CHIP(dev); >> Error *local_err = NULL; >> >> pcc->parent_realize(dev, &local_err); >> @@ -897,6 +924,24 @@ static void pnv_chip_power9_realize(DeviceState *dev, Error **errp) >> error_propagate(errp, local_err); >> return; >> } >> + >> + /* XIVE interrupt controller (POWER9) */ >> + object_property_set_int(OBJECT(&chip9->xive), PNV9_XIVE_IC_BASE(chip), >> + "ic-bar", &error_fatal); >> + object_property_set_int(OBJECT(&chip9->xive), PNV9_XIVE_VC_BASE(chip), >> + "vc-bar", &error_fatal); >> + object_property_set_int(OBJECT(&chip9->xive), PNV9_XIVE_PC_BASE(chip), >> + "pc-bar", &error_fatal); >> + object_property_set_int(OBJECT(&chip9->xive), PNV9_XIVE_TM_BASE(chip), >> + "tm-bar", &error_fatal); >> + object_property_set_bool(OBJECT(&chip9->xive), true, "realized", >> + &local_err); >> + if (local_err) { >> + error_propagate(errp, local_err); >> + return; >> + } >> + pnv_xscom_add_subregion(chip, PNV9_XSCOM_XIVE_BASE, >> + &chip9->xive.xscom_regs); >> } >> >> static void pnv_chip_power9_class_init(ObjectClass *klass, void *data) >> @@ -1097,12 +1142,25 @@ static void pnv_pic_print_info(InterruptStatsProvider *obj, >> CPU_FOREACH(cs) { >> PowerPCCPU *cpu = POWERPC_CPU(cs); >> >> - icp_pic_print_info(pnv_cpu_state(cpu)->icp, mon); >> + if (pnv_chip_is_power9(pnv->chips[0])) { >> + xive_tctx_pic_print_info(pnv_cpu_state(cpu)->tctx, mon); >> + } else { >> + icp_pic_print_info(pnv_cpu_state(cpu)->icp, mon); >> + } >> } >> >> for (i = 0; i < pnv->num_chips; i++) { >> - Pnv8Chip *chip8 = PNV8_CHIP(pnv->chips[i]); >> - ics_pic_print_info(&chip8->psi.ics, mon); >> + PnvChip *chip = pnv->chips[i]; >> + >> + if (pnv_chip_is_power9(pnv->chips[i])) { >> + Pnv9Chip *chip9 = PNV9_CHIP(chip); >> + >> + pnv_xive_pic_print_info(&chip9->xive, mon); >> + } else { >> + Pnv8Chip *chip8 = PNV8_CHIP(chip); >> + >> + ics_pic_print_info(&chip8->psi.ics, mon); >> + } >> } >> } >> >> diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs >> index 301a8e972d91..df712c3e6c93 100644 >> --- a/hw/intc/Makefile.objs >> +++ b/hw/intc/Makefile.objs >> @@ -39,7 +39,7 @@ obj-$(CONFIG_XICS_SPAPR) += xics_spapr.o >> obj-$(CONFIG_XICS_KVM) += xics_kvm.o >> obj-$(CONFIG_XIVE) += xive.o >> obj-$(CONFIG_XIVE_SPAPR) += spapr_xive.o >> -obj-$(CONFIG_POWERNV) += xics_pnv.o >> +obj-$(CONFIG_POWERNV) += xics_pnv.o pnv_xive.o >> obj-$(CONFIG_ALLWINNER_A10_PIC) += allwinner-a10-pic.o >> obj-$(CONFIG_S390_FLIC) += s390_flic.o >> obj-$(CONFIG_S390_FLIC_KVM) += s390_flic_kvm.o > ^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 05/19] ppc/pnv: add XIVE support 2019-02-19 7:31 ` Cédric Le Goater @ 2019-02-21 3:13 ` David Gibson 2019-02-21 8:32 ` Cédric Le Goater 0 siblings, 1 reply; 50+ messages in thread From: David Gibson @ 2019-02-21 3:13 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel [-- Attachment #1: Type: text/plain, Size: 8338 bytes --] On Tue, Feb 19, 2019 at 08:31:25AM +0100, Cédric Le Goater wrote: > On 2/12/19 6:40 AM, David Gibson wrote: > > On Mon, Jan 28, 2019 at 10:46:11AM +0100, Cédric Le Goater wrote: [snip] > >> #endif /* _PPC_PNV_H */ > >> diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h > >> index 9961ea3a92cd..8e57c064e661 100644 > >> --- a/include/hw/ppc/pnv_core.h > >> +++ b/include/hw/ppc/pnv_core.h > >> @@ -49,6 +49,7 @@ typedef struct PnvCoreClass { > >> > >> typedef struct PnvCPUState { > >> struct ICPState *icp; > >> + struct XiveTCTX *tctx; > > > > Unlike sPAPR, we really do always know in advance the interrupt > > controller for a particular machine. I think it makes sense to > > further split the POWER8 and POWER9 cases here, so we only track one > > for any given setup. > > So, you would define a : > > typedef struct Pnv9CPUState { > struct XiveTCTX *tctx; > } Pnv9CPUState; > > to be allocated when the core is realized ? and later the routine > pnv_chip_power9_intc_create() would assign the ->tctx pointer. Sounds about right. [snip] > >> + uint32_t nr_ends; > >> + XiveENDSource end_source; > >> + > >> + /* Interrupt controller registers */ > >> + uint64_t regs[0x300]; > >> + > >> + /* Can be configured by FW */ > >> + uint32_t tctx_chipid; > >> + uint32_t chip_id; > > > > Can't you derive that since you have a pointer to the owning chip? > > Not always, there are register fields to purposely override this value. > I can improve the current code a little I think. Ok. [snip] > >> +/* > >> + * Virtual structures table (VST) > >> + */ > >> +typedef struct XiveVstInfo { > >> + uint32_t type; > >> + const char *name; > >> + uint32_t size; > >> + uint32_t max_blocks; > >> +} XiveVstInfo; > >> + > >> +static const XiveVstInfo vst_infos[] = { > >> + [VST_TSEL_IVT] = { VST_TSEL_IVT, "EAT", sizeof(XiveEAS), 16 }, > > > > I don't love explicitly storing the type/index in each record, as well > > as it being implicit in the table slot. > > The 'vst_infos' table decribes the different table types and the 'type' > field is used to index the runtime table of VSDs. See > pnv_xive_vst_addr() Yes, I know what it's for but it's still redundant information. You could avoid it, for example, by passing around an index instead of a pointer to a vst_infos[] slot - then you can look up both vst_infos and the other table using that index. [snip] > >> + case CQ_TM1_BAR: /* TM BAR. 4 pages. Map only once */ > >> + case CQ_TM2_BAR: /* second TM BAR. for hotplug. Not modeled */ > >> + xive->tm_shift = val & CQ_TM_BAR_64K ? 16 : 12; > >> + if (!(val & CQ_TM_BAR_VALID)) { > >> + xive->tm_base = 0; > >> + if (xive->regs[reg] & CQ_TM_BAR_VALID && xive->chip_id == 0) { > >> + memory_region_del_subregion(sysmem, &xive->tm_mmio); > >> + } > >> + } else { > >> + xive->tm_base = val & ~(CQ_TM_BAR_VALID | CQ_TM_BAR_64K); > >> + if (!(xive->regs[reg] & CQ_TM_BAR_VALID) && xive->chip_id == 0) { > >> + memory_region_add_subregion(sysmem, xive->tm_base, > >> + &xive->tm_mmio); > >> + } > >> + } > >> + break; > >> + > >> + case CQ_PC_BARM: > >> + xive->regs[reg] = val; > > > > As discussed elsewhere, this seems to be a big mix of writing things > > directly into regs[reg] and doing other things instead, and you really > > want to go one way or the other. I'd suggest dropping xive->regs[] > > and instead putting the state you need persistent into its own > > variables. > > I made a big effort to introduce helper routines to avoid storing values > that can be calculated under the PnvXive model, as you asked for it. > The assignment above is only necessary for the pnv_xive_pc_size() below > and I don't know how handle this current case without duplicating the > switch statement, which I think is ugly. I'm not sure quite what you mean about duplicating the case. The point here is that since you're only storing in a couple of the switch cases, you can just have explicit data backing just those values and write to those in the switch cases instead of having a great big regs[] array of which only a few bits are used. > So, I will keep the xive->regs[] and make the couple of fixes still needed. [snip] > >> +/* > >> + * Virtualization Controller MMIO region containing the IPI and END ESB pages > >> + */ > >> +static uint64_t pnv_xive_vc_read(void *opaque, hwaddr offset, > >> + unsigned size) > >> +{ > >> + PnvXive *xive = PNV_XIVE(opaque); > >> + uint64_t edt_index = offset >> pnv_xive_edt_shift(xive); > >> + uint64_t edt_type = 0; > >> + uint64_t edt_offset; > >> + MemTxResult result; > >> + AddressSpace *edt_as = NULL; > >> + uint64_t ret = -1; > >> + > >> + if (edt_index < XIVE_TABLE_EDT_MAX) { > >> + edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[edt_index]); > >> + } > >> + > >> + switch (edt_type) { > >> + case CQ_TDR_EDT_IPI: > >> + edt_as = &xive->ipi_as; > >> + break; > >> + case CQ_TDR_EDT_EQ: > >> + edt_as = &xive->end_as; > > > > I'm not entirely understanding the function of these AddressSpace objectz. > > The IPI and END ESB pages are exposed in the same VC region. But this VC > region is not splitted between the two types with a single offset. It > is segmented with the EDT tables which defines the type of each segment. > > The purpose of these address spaces is to translate the load/stores in > the VC region in the equivalent IPI or END region exposing contigously > ESB pages of the same type: 'end_edt_mmio' and 'ipi_edt_mmio'. > > The memory regions of the XiveENDSource and the XiveSource for the IPIs > are mapped in 'end_edt_mmio' and 'ipi_edt_mmio'. Hmm. Ok, I'm not immediately seeing why you can't map the various IPI or END blocks directly into address_space memory rather than having this extra internal layer of indirection. > (This is changing for P10, should be simpler) [snip] > >> +/* > >> + * Maximum number of IRQs and ENDs supported by HW > >> + */ > >> +#define PNV_XIVE_NR_IRQS (PNV9_XIVE_VC_SIZE / (1ull << XIVE_ESB_64K_2PAGE)) > >> +#define PNV_XIVE_NR_ENDS (PNV9_XIVE_VC_SIZE / (1ull << XIVE_ESB_64K_2PAGE)) > >> + > >> +static void pnv_xive_realize(DeviceState *dev, Error **errp) > >> +{ > >> + PnvXive *xive = PNV_XIVE(dev); > >> + XiveSource *xsrc = &xive->source; > >> + XiveENDSource *end_xsrc = &xive->end_source; > >> + Error *local_err = NULL; > >> + Object *obj; > >> + > >> + obj = object_property_get_link(OBJECT(dev), "chip", &local_err); > >> + if (!obj) { > >> + error_propagate(errp, local_err); > >> + error_prepend(errp, "required link 'chip' not found: "); > >> + return; > >> + } > >> + > >> + /* The PnvChip id identifies the XIVE interrupt controller. */ > >> + xive->chip = PNV_CHIP(obj); > >> + > >> + /* > >> + * Xive Interrupt source and END source object with the maximum > >> + * allowed HW configuration. The ESB MMIO regions will be resized > >> + * dynamically when the controller is configured by the FW to > >> + * limit accesses to resources not provisioned. > >> + */ > >> + object_property_set_int(OBJECT(xsrc), PNV_XIVE_NR_IRQS, "nr-irqs", > >> + &error_fatal); > > > > You have a constant here, but your router object also includes a > > nr_irqs field. What's up with that? > > The XiveSource object of PnvXive is realized for the maximum size allowed > by HW because we don't know how much IRQs the FW will provision for. > > The 'nr_irqs' is the number of IRQs configured by the FW (We changed the > name to 'nr_ipis') See routine pnv_xive_vst_set_exclusive() Ah, ok. -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 05/19] ppc/pnv: add XIVE support 2019-02-21 3:13 ` David Gibson @ 2019-02-21 8:32 ` Cédric Le Goater 2019-03-05 3:42 ` David Gibson 0 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-02-21 8:32 UTC (permalink / raw) To: David Gibson; +Cc: qemu-ppc, qemu-devel On 2/21/19 4:13 AM, David Gibson wrote: > On Tue, Feb 19, 2019 at 08:31:25AM +0100, Cédric Le Goater wrote: >> On 2/12/19 6:40 AM, David Gibson wrote: >>> On Mon, Jan 28, 2019 at 10:46:11AM +0100, Cédric Le Goater wrote: > [snip] >>>> #endif /* _PPC_PNV_H */ >>>> diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h >>>> index 9961ea3a92cd..8e57c064e661 100644 >>>> --- a/include/hw/ppc/pnv_core.h >>>> +++ b/include/hw/ppc/pnv_core.h >>>> @@ -49,6 +49,7 @@ typedef struct PnvCoreClass { >>>> >>>> typedef struct PnvCPUState { >>>> struct ICPState *icp; >>>> + struct XiveTCTX *tctx; >>> >>> Unlike sPAPR, we really do always know in advance the interrupt >>> controller for a particular machine. I think it makes sense to >>> further split the POWER8 and POWER9 cases here, so we only track one >>> for any given setup. >> >> So, you would define a : >> >> typedef struct Pnv9CPUState { >> struct XiveTCTX *tctx; >> } Pnv9CPUState; >> >> to be allocated when the core is realized ? and later the routine >> pnv_chip_power9_intc_create() would assign the ->tctx pointer. > > Sounds about right. > > [snip] >>>> + uint32_t nr_ends; >>>> + XiveENDSource end_source; >>>> + >>>> + /* Interrupt controller registers */ >>>> + uint64_t regs[0x300]; >>>> + >>>> + /* Can be configured by FW */ >>>> + uint32_t tctx_chipid; >>>> + uint32_t chip_id; >>> >>> Can't you derive that since you have a pointer to the owning chip? >> >> Not always, there are register fields to purposely override this value. >> I can improve the current code a little I think. > > Ok. > > [snip] >>>> +/* >>>> + * Virtual structures table (VST) >>>> + */ >>>> +typedef struct XiveVstInfo { >>>> + uint32_t type; >>>> + const char *name; >>>> + uint32_t size; >>>> + uint32_t max_blocks; >>>> +} XiveVstInfo; >>>> + >>>> +static const XiveVstInfo vst_infos[] = { >>>> + [VST_TSEL_IVT] = { VST_TSEL_IVT, "EAT", sizeof(XiveEAS), 16 }, >>> >>> I don't love explicitly storing the type/index in each record, as well >>> as it being implicit in the table slot. >> >> The 'vst_infos' table decribes the different table types and the 'type' >> field is used to index the runtime table of VSDs. See >> pnv_xive_vst_addr() > > Yes, I know what it's for but it's still redundant information. You > could avoid it, for example, by passing around an index instead of a > pointer to a vst_infos[] slot - then you can look up both vst_infos > and the other table using that index. :) This is exactly what the code was doing before and I thought passing the pointer was cleaner ! No problem. This is minor. I will revert. > [snip] >>>> + case CQ_TM1_BAR: /* TM BAR. 4 pages. Map only once */ >>>> + case CQ_TM2_BAR: /* second TM BAR. for hotplug. Not modeled */ >>>> + xive->tm_shift = val & CQ_TM_BAR_64K ? 16 : 12; >>>> + if (!(val & CQ_TM_BAR_VALID)) { >>>> + xive->tm_base = 0; >>>> + if (xive->regs[reg] & CQ_TM_BAR_VALID && xive->chip_id == 0) { >>>> + memory_region_del_subregion(sysmem, &xive->tm_mmio); >>>> + } >>>> + } else { >>>> + xive->tm_base = val & ~(CQ_TM_BAR_VALID | CQ_TM_BAR_64K); >>>> + if (!(xive->regs[reg] & CQ_TM_BAR_VALID) && xive->chip_id == 0) { >>>> + memory_region_add_subregion(sysmem, xive->tm_base, >>>> + &xive->tm_mmio); >>>> + } >>>> + } >>>> + break; >>>> + >>>> + case CQ_PC_BARM: >>>> + xive->regs[reg] = val; >>> >>> As discussed elsewhere, this seems to be a big mix of writing things >>> directly into regs[reg] and doing other things instead, and you really >>> want to go one way or the other. I'd suggest dropping xive->regs[] >>> and instead putting the state you need persistent into its own >>> variables. >> >> I made a big effort to introduce helper routines to avoid storing values >> that can be calculated under the PnvXive model, as you asked for it. >> The assignment above is only necessary for the pnv_xive_pc_size() below >> and I don't know how handle this current case without duplicating the >> switch statement, which I think is ugly. > > I'm not sure quite what you mean about duplicating the case. >> The point here is that since you're only storing in a couple of the > switch cases, you can just have explicit data backing just those > values and write to those in the switch cases instead of having a > great big regs[] array of which only a few bits are used. The model uses these registers : xive->regs[PC_GLOBAL_CONFIG >> 3] xive->regs[CQ_VC_BARM >> 3] xive->regs[CQ_PC_BARM >> 3] xive->regs[CQ_TAR >> 3] xive->regs[VC_GLOBAL_CONFIG >> 3] xive->regs[VC_VSD_TABLE_ADDR >> 3]); xive->regs[CQ_IC_BAR] xive->regs[CQ_TM1_BAR] xive->regs[CQ_VC_BAR] xive->regs[PC_THREAD_EN_REG0 >> 3] xive->regs[PC_THREAD_EN_REG1 >> 3] xive->regs[(VC_EQC_CWATCH_DAT0 >> 3) + i]; xive->regs[(PC_VPC_CWATCH_DAT0 >> 3) + i] xive->regs[VC_EQC_CONFIG]; xive->regs[VC_EQC_SCRUB_TRIG] xive->regs[PC_AT_KILL]; xive->regs[VC_AT_MACRO_KILL] xive->regs[(PC_TCTXT_INDIR0 >> 3) + i] The regs array is useful for the different cache watch but apart from that, yes, we could use independent fields. I will see how much energy I have to put into this change. All the registers change in P10, may be this will be a better time to share a common PnvXive model and isolate the HW interface of each processor. >> So, I will keep the xive->regs[] and make the couple of fixes still needed. > > [snip] >>>> +/* >>>> + * Virtualization Controller MMIO region containing the IPI and END ESB pages >>>> + */ >>>> +static uint64_t pnv_xive_vc_read(void *opaque, hwaddr offset, >>>> + unsigned size) >>>> +{ >>>> + PnvXive *xive = PNV_XIVE(opaque); >>>> + uint64_t edt_index = offset >> pnv_xive_edt_shift(xive); >>>> + uint64_t edt_type = 0; >>>> + uint64_t edt_offset; >>>> + MemTxResult result; >>>> + AddressSpace *edt_as = NULL; >>>> + uint64_t ret = -1; >>>> + >>>> + if (edt_index < XIVE_TABLE_EDT_MAX) { >>>> + edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[edt_index]); >>>> + } >>>> + >>>> + switch (edt_type) { >>>> + case CQ_TDR_EDT_IPI: >>>> + edt_as = &xive->ipi_as; >>>> + break; >>>> + case CQ_TDR_EDT_EQ: >>>> + edt_as = &xive->end_as; >>> >>> I'm not entirely understanding the function of these AddressSpace objectz. >> >> The IPI and END ESB pages are exposed in the same VC region. But this VC >> region is not splitted between the two types with a single offset. It >> is segmented with the EDT tables which defines the type of each segment. >> >> The purpose of these address spaces is to translate the load/stores in >> the VC region in the equivalent IPI or END region exposing contigously >> ESB pages of the same type: 'end_edt_mmio' and 'ipi_edt_mmio'. >> >> The memory regions of the XiveENDSource and the XiveSource for the IPIs >> are mapped in 'end_edt_mmio' and 'ipi_edt_mmio'. > > Hmm. Ok, I'm not immediately seeing why you can't map the various IPI > or END blocks directly into address_space memory rather than having > this extra internal layer of indirection. I think I see what you mean. You would get rid of the intermediate MR &xive->ipi_edt_mmio and map directly &xsrc->esb_mmio into &xive->ipi_mmio same for the ENDs, map directly &end_xsrc->esb_mmio in &xive->end_mmio That might be overkill indeed. I will check. >> (This is changing for P10, should be simpler) > > [snip] >>>> +/* >>>> + * Maximum number of IRQs and ENDs supported by HW >>>> + */ >>>> +#define PNV_XIVE_NR_IRQS (PNV9_XIVE_VC_SIZE / (1ull << XIVE_ESB_64K_2PAGE)) >>>> +#define PNV_XIVE_NR_ENDS (PNV9_XIVE_VC_SIZE / (1ull << XIVE_ESB_64K_2PAGE)) >>>> + >>>> +static void pnv_xive_realize(DeviceState *dev, Error **errp) >>>> +{ >>>> + PnvXive *xive = PNV_XIVE(dev); >>>> + XiveSource *xsrc = &xive->source; >>>> + XiveENDSource *end_xsrc = &xive->end_source; >>>> + Error *local_err = NULL; >>>> + Object *obj; >>>> + >>>> + obj = object_property_get_link(OBJECT(dev), "chip", &local_err); >>>> + if (!obj) { >>>> + error_propagate(errp, local_err); >>>> + error_prepend(errp, "required link 'chip' not found: "); >>>> + return; >>>> + } >>>> + >>>> + /* The PnvChip id identifies the XIVE interrupt controller. */ >>>> + xive->chip = PNV_CHIP(obj); >>>> + >>>> + /* >>>> + * Xive Interrupt source and END source object with the maximum >>>> + * allowed HW configuration. The ESB MMIO regions will be resized >>>> + * dynamically when the controller is configured by the FW to >>>> + * limit accesses to resources not provisioned. >>>> + */ >>>> + object_property_set_int(OBJECT(xsrc), PNV_XIVE_NR_IRQS, "nr-irqs", >>>> + &error_fatal); >>> >>> You have a constant here, but your router object also includes a >>> nr_irqs field. What's up with that? >> >> The XiveSource object of PnvXive is realized for the maximum size allowed >> by HW because we don't know how much IRQs the FW will provision for. >> >> The 'nr_irqs' is the number of IRQs configured by the FW (We changed the >> name to 'nr_ipis') See routine pnv_xive_vst_set_exclusive() > > Ah, ok. > I will try to get that done for 4.0. PSI and LPC P9 models should be less complex to review. Thanks, C. ^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 05/19] ppc/pnv: add XIVE support 2019-02-21 8:32 ` Cédric Le Goater @ 2019-03-05 3:42 ` David Gibson 0 siblings, 0 replies; 50+ messages in thread From: David Gibson @ 2019-03-05 3:42 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel [-- Attachment #1: Type: text/plain, Size: 10737 bytes --] On Thu, Feb 21, 2019 at 09:32:44AM +0100, Cédric Le Goater wrote: > On 2/21/19 4:13 AM, David Gibson wrote: > > On Tue, Feb 19, 2019 at 08:31:25AM +0100, Cédric Le Goater wrote: > >> On 2/12/19 6:40 AM, David Gibson wrote: > >>> On Mon, Jan 28, 2019 at 10:46:11AM +0100, Cédric Le Goater wrote: > > [snip] > >>>> #endif /* _PPC_PNV_H */ > >>>> diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h > >>>> index 9961ea3a92cd..8e57c064e661 100644 > >>>> --- a/include/hw/ppc/pnv_core.h > >>>> +++ b/include/hw/ppc/pnv_core.h > >>>> @@ -49,6 +49,7 @@ typedef struct PnvCoreClass { > >>>> > >>>> typedef struct PnvCPUState { > >>>> struct ICPState *icp; > >>>> + struct XiveTCTX *tctx; > >>> > >>> Unlike sPAPR, we really do always know in advance the interrupt > >>> controller for a particular machine. I think it makes sense to > >>> further split the POWER8 and POWER9 cases here, so we only track one > >>> for any given setup. > >> > >> So, you would define a : > >> > >> typedef struct Pnv9CPUState { > >> struct XiveTCTX *tctx; > >> } Pnv9CPUState; > >> > >> to be allocated when the core is realized ? and later the routine > >> pnv_chip_power9_intc_create() would assign the ->tctx pointer. > > > > Sounds about right. > > > > [snip] > >>>> + uint32_t nr_ends; > >>>> + XiveENDSource end_source; > >>>> + > >>>> + /* Interrupt controller registers */ > >>>> + uint64_t regs[0x300]; > >>>> + > >>>> + /* Can be configured by FW */ > >>>> + uint32_t tctx_chipid; > >>>> + uint32_t chip_id; > >>> > >>> Can't you derive that since you have a pointer to the owning chip? > >> > >> Not always, there are register fields to purposely override this value. > >> I can improve the current code a little I think. > > > > Ok. > > > > [snip] > >>>> +/* > >>>> + * Virtual structures table (VST) > >>>> + */ > >>>> +typedef struct XiveVstInfo { > >>>> + uint32_t type; > >>>> + const char *name; > >>>> + uint32_t size; > >>>> + uint32_t max_blocks; > >>>> +} XiveVstInfo; > >>>> + > >>>> +static const XiveVstInfo vst_infos[] = { > >>>> + [VST_TSEL_IVT] = { VST_TSEL_IVT, "EAT", sizeof(XiveEAS), 16 }, > >>> > >>> I don't love explicitly storing the type/index in each record, as well > >>> as it being implicit in the table slot. > >> > >> The 'vst_infos' table decribes the different table types and the 'type' > >> field is used to index the runtime table of VSDs. See > >> pnv_xive_vst_addr() > > > > Yes, I know what it's for but it's still redundant information. You > > could avoid it, for example, by passing around an index instead of a > > pointer to a vst_infos[] slot - then you can look up both vst_infos > > and the other table using that index. > > :) This is exactly what the code was doing before and I thought passing > the pointer was cleaner ! No problem. This is minor. I will revert. > > > [snip] > >>>> + case CQ_TM1_BAR: /* TM BAR. 4 pages. Map only once */ > >>>> + case CQ_TM2_BAR: /* second TM BAR. for hotplug. Not modeled */ > >>>> + xive->tm_shift = val & CQ_TM_BAR_64K ? 16 : 12; > >>>> + if (!(val & CQ_TM_BAR_VALID)) { > >>>> + xive->tm_base = 0; > >>>> + if (xive->regs[reg] & CQ_TM_BAR_VALID && xive->chip_id == 0) { > >>>> + memory_region_del_subregion(sysmem, &xive->tm_mmio); > >>>> + } > >>>> + } else { > >>>> + xive->tm_base = val & ~(CQ_TM_BAR_VALID | CQ_TM_BAR_64K); > >>>> + if (!(xive->regs[reg] & CQ_TM_BAR_VALID) && xive->chip_id == 0) { > >>>> + memory_region_add_subregion(sysmem, xive->tm_base, > >>>> + &xive->tm_mmio); > >>>> + } > >>>> + } > >>>> + break; > >>>> + > >>>> + case CQ_PC_BARM: > >>>> + xive->regs[reg] = val; > >>> > >>> As discussed elsewhere, this seems to be a big mix of writing things > >>> directly into regs[reg] and doing other things instead, and you really > >>> want to go one way or the other. I'd suggest dropping xive->regs[] > >>> and instead putting the state you need persistent into its own > >>> variables. > >> > >> I made a big effort to introduce helper routines to avoid storing values > >> that can be calculated under the PnvXive model, as you asked for it. > >> The assignment above is only necessary for the pnv_xive_pc_size() below > >> and I don't know how handle this current case without duplicating the > >> switch statement, which I think is ugly. > > > > I'm not sure quite what you mean about duplicating the case. > >> The point here is that since you're only storing in a couple of the > > switch cases, you can just have explicit data backing just those > > values and write to those in the switch cases instead of having a > > great big regs[] array of which only a few bits are used. > > The model uses these registers : > > xive->regs[PC_GLOBAL_CONFIG >> 3] > xive->regs[CQ_VC_BARM >> 3] > xive->regs[CQ_PC_BARM >> 3] > xive->regs[CQ_TAR >> 3] > xive->regs[VC_GLOBAL_CONFIG >> 3] > xive->regs[VC_VSD_TABLE_ADDR >> 3]); > xive->regs[CQ_IC_BAR] > xive->regs[CQ_TM1_BAR] > xive->regs[CQ_VC_BAR] > xive->regs[PC_THREAD_EN_REG0 >> 3] > xive->regs[PC_THREAD_EN_REG1 >> 3] > xive->regs[(VC_EQC_CWATCH_DAT0 >> 3) + i]; > xive->regs[(PC_VPC_CWATCH_DAT0 >> 3) + i] > xive->regs[VC_EQC_CONFIG]; > xive->regs[VC_EQC_SCRUB_TRIG] > xive->regs[PC_AT_KILL]; > xive->regs[VC_AT_MACRO_KILL] > xive->regs[(PC_TCTXT_INDIR0 >> 3) + i] > > The regs array is useful for the different cache watch but apart > from that, yes, we could use independent fields. I will see how much > energy I have to put into this change. > > All the registers change in P10, may be this will be a better time > to share a common PnvXive model and isolate the HW interface of each > processor. Changes on P10 does seem like a pretty good reason to decouple the qemu internal state from the P9 register interface layout. > >> So, I will keep the xive->regs[] and make the couple of fixes still needed. > > > > [snip] > >>>> +/* > >>>> + * Virtualization Controller MMIO region containing the IPI and END ESB pages > >>>> + */ > >>>> +static uint64_t pnv_xive_vc_read(void *opaque, hwaddr offset, > >>>> + unsigned size) > >>>> +{ > >>>> + PnvXive *xive = PNV_XIVE(opaque); > >>>> + uint64_t edt_index = offset >> pnv_xive_edt_shift(xive); > >>>> + uint64_t edt_type = 0; > >>>> + uint64_t edt_offset; > >>>> + MemTxResult result; > >>>> + AddressSpace *edt_as = NULL; > >>>> + uint64_t ret = -1; > >>>> + > >>>> + if (edt_index < XIVE_TABLE_EDT_MAX) { > >>>> + edt_type = GETFIELD(CQ_TDR_EDT_TYPE, xive->edt[edt_index]); > >>>> + } > >>>> + > >>>> + switch (edt_type) { > >>>> + case CQ_TDR_EDT_IPI: > >>>> + edt_as = &xive->ipi_as; > >>>> + break; > >>>> + case CQ_TDR_EDT_EQ: > >>>> + edt_as = &xive->end_as; > >>> > >>> I'm not entirely understanding the function of these AddressSpace objectz. > >> > >> The IPI and END ESB pages are exposed in the same VC region. But this VC > >> region is not splitted between the two types with a single offset. It > >> is segmented with the EDT tables which defines the type of each segment. > >> > >> The purpose of these address spaces is to translate the load/stores in > >> the VC region in the equivalent IPI or END region exposing contigously > >> ESB pages of the same type: 'end_edt_mmio' and 'ipi_edt_mmio'. > >> > >> The memory regions of the XiveENDSource and the XiveSource for the IPIs > >> are mapped in 'end_edt_mmio' and 'ipi_edt_mmio'. > > > > Hmm. Ok, I'm not immediately seeing why you can't map the various IPI > > or END blocks directly into address_space memory rather than having > > this extra internal layer of indirection. > > I think I see what you mean. > > You would get rid of the intermediate MR &xive->ipi_edt_mmio and map > directly &xsrc->esb_mmio into &xive->ipi_mmio > > same for the ENDs, map directly &end_xsrc->esb_mmio in &xive->end_mmio > > That might be overkill indeed. I will check. > > >> (This is changing for P10, should be simpler) > > > > [snip] > >>>> +/* > >>>> + * Maximum number of IRQs and ENDs supported by HW > >>>> + */ > >>>> +#define PNV_XIVE_NR_IRQS (PNV9_XIVE_VC_SIZE / (1ull << XIVE_ESB_64K_2PAGE)) > >>>> +#define PNV_XIVE_NR_ENDS (PNV9_XIVE_VC_SIZE / (1ull << XIVE_ESB_64K_2PAGE)) > >>>> + > >>>> +static void pnv_xive_realize(DeviceState *dev, Error **errp) > >>>> +{ > >>>> + PnvXive *xive = PNV_XIVE(dev); > >>>> + XiveSource *xsrc = &xive->source; > >>>> + XiveENDSource *end_xsrc = &xive->end_source; > >>>> + Error *local_err = NULL; > >>>> + Object *obj; > >>>> + > >>>> + obj = object_property_get_link(OBJECT(dev), "chip", &local_err); > >>>> + if (!obj) { > >>>> + error_propagate(errp, local_err); > >>>> + error_prepend(errp, "required link 'chip' not found: "); > >>>> + return; > >>>> + } > >>>> + > >>>> + /* The PnvChip id identifies the XIVE interrupt controller. */ > >>>> + xive->chip = PNV_CHIP(obj); > >>>> + > >>>> + /* > >>>> + * Xive Interrupt source and END source object with the maximum > >>>> + * allowed HW configuration. The ESB MMIO regions will be resized > >>>> + * dynamically when the controller is configured by the FW to > >>>> + * limit accesses to resources not provisioned. > >>>> + */ > >>>> + object_property_set_int(OBJECT(xsrc), PNV_XIVE_NR_IRQS, "nr-irqs", > >>>> + &error_fatal); > >>> > >>> You have a constant here, but your router object also includes a > >>> nr_irqs field. What's up with that? > >> > >> The XiveSource object of PnvXive is realized for the maximum size allowed > >> by HW because we don't know how much IRQs the FW will provision for. > >> > >> The 'nr_irqs' is the number of IRQs configured by the FW (We changed the > >> name to 'nr_ipis') See routine pnv_xive_vst_set_exclusive() > > > > Ah, ok. > > > > I will try to get that done for 4.0. > > PSI and LPC P9 models should be less complex to review. > > Thanks, > > C. > -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 06/19] target/ppc: Remove some #if 0'ed code 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (4 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 05/19] ppc/pnv: add XIVE support Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-12 5:41 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 07/19] target/ppc: Make special ORs match x86 pause and don't generate on mttcg Cédric Le Goater ` (12 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> Some debug stuff we don't need to keep there Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- target/ppc/excp_helper.c | 12 ------------ target/ppc/mmu_helper.c | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 0ec7ae1ad4ce..751d759fcc1d 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -748,13 +748,7 @@ void ppc_cpu_do_interrupt(CPUState *cs) static void ppc_hw_interrupt(CPUPPCState *env) { PowerPCCPU *cpu = ppc_env_get_cpu(env); -#if 0 - CPUState *cs = CPU(cpu); - qemu_log_mask(CPU_LOG_INT, "%s: %p pending %08x req %08x me %d ee %d\n", - __func__, env, env->pending_interrupts, - cs->interrupt_request, (int)msr_me, (int)msr_ee); -#endif /* External reset */ if (env->pending_interrupts & (1 << PPC_INTERRUPT_RESET)) { env->pending_interrupts &= ~(1 << PPC_INTERRUPT_RESET); @@ -797,12 +791,6 @@ static void ppc_hw_interrupt(CPUPPCState *env) if (msr_ce != 0) { /* External critical interrupt */ if (env->pending_interrupts & (1 << PPC_INTERRUPT_CEXT)) { - /* Taking a critical external interrupt does not clear the external - * critical interrupt status - */ -#if 0 - env->pending_interrupts &= ~(1 << PPC_INTERRUPT_CEXT); -#endif powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_CRITICAL); return; } diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index cefed34da4f2..bcf19da61d56 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -1415,10 +1415,6 @@ static int get_physical_address_wtlb( bool real_mode = (access_type == ACCESS_CODE && msr_ir == 0) || (access_type != ACCESS_CODE && msr_dr == 0); -#if 0 - qemu_log("%s\n", __func__); -#endif - switch (env->mmu_model) { case POWERPC_MMU_SOFT_6xx: case POWERPC_MMU_SOFT_74xx: @@ -1468,10 +1464,6 @@ static int get_physical_address_wtlb( cpu_abort(CPU(cpu), "Unknown or invalid MMU model\n"); return -1; } -#if 0 - qemu_log("%s address " TARGET_FMT_lx " => %d " TARGET_FMT_plx "\n", - __func__, eaddr, ret, ctx->raddr); -#endif return ret; } @@ -1805,10 +1797,6 @@ static int cpu_ppc_handle_mmu_fault(CPUPPCState *env, target_ulong address, break; } } -#if 0 - printf("%s: set exception to %d %02x\n", __func__, - cs->exception, env->error_code); -#endif ret = 1; } -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 06/19] target/ppc: Remove some #if 0'ed code 2019-01-28 9:46 ` [Qemu-devel] [PATCH 06/19] target/ppc: Remove some #if 0'ed code Cédric Le Goater @ 2019-02-12 5:41 ` David Gibson 0 siblings, 0 replies; 50+ messages in thread From: David Gibson @ 2019-02-12 5:41 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 3314 bytes --] On Mon, Jan 28, 2019 at 10:46:12AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > Some debug stuff we don't need to keep there > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> This looks a good idea independent of the rest of the series, so I've applied it to ppc-for-4.0. > --- > target/ppc/excp_helper.c | 12 ------------ > target/ppc/mmu_helper.c | 12 ------------ > 2 files changed, 24 deletions(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 0ec7ae1ad4ce..751d759fcc1d 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -748,13 +748,7 @@ void ppc_cpu_do_interrupt(CPUState *cs) > static void ppc_hw_interrupt(CPUPPCState *env) > { > PowerPCCPU *cpu = ppc_env_get_cpu(env); > -#if 0 > - CPUState *cs = CPU(cpu); > > - qemu_log_mask(CPU_LOG_INT, "%s: %p pending %08x req %08x me %d ee %d\n", > - __func__, env, env->pending_interrupts, > - cs->interrupt_request, (int)msr_me, (int)msr_ee); > -#endif > /* External reset */ > if (env->pending_interrupts & (1 << PPC_INTERRUPT_RESET)) { > env->pending_interrupts &= ~(1 << PPC_INTERRUPT_RESET); > @@ -797,12 +791,6 @@ static void ppc_hw_interrupt(CPUPPCState *env) > if (msr_ce != 0) { > /* External critical interrupt */ > if (env->pending_interrupts & (1 << PPC_INTERRUPT_CEXT)) { > - /* Taking a critical external interrupt does not clear the external > - * critical interrupt status > - */ > -#if 0 > - env->pending_interrupts &= ~(1 << PPC_INTERRUPT_CEXT); > -#endif > powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_CRITICAL); > return; > } > diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c > index cefed34da4f2..bcf19da61d56 100644 > --- a/target/ppc/mmu_helper.c > +++ b/target/ppc/mmu_helper.c > @@ -1415,10 +1415,6 @@ static int get_physical_address_wtlb( > bool real_mode = (access_type == ACCESS_CODE && msr_ir == 0) > || (access_type != ACCESS_CODE && msr_dr == 0); > > -#if 0 > - qemu_log("%s\n", __func__); > -#endif > - > switch (env->mmu_model) { > case POWERPC_MMU_SOFT_6xx: > case POWERPC_MMU_SOFT_74xx: > @@ -1468,10 +1464,6 @@ static int get_physical_address_wtlb( > cpu_abort(CPU(cpu), "Unknown or invalid MMU model\n"); > return -1; > } > -#if 0 > - qemu_log("%s address " TARGET_FMT_lx " => %d " TARGET_FMT_plx "\n", > - __func__, eaddr, ret, ctx->raddr); > -#endif > > return ret; > } > @@ -1805,10 +1797,6 @@ static int cpu_ppc_handle_mmu_fault(CPUPPCState *env, target_ulong address, > break; > } > } > -#if 0 > - printf("%s: set exception to %d %02x\n", __func__, > - cs->exception, env->error_code); > -#endif > ret = 1; > } > -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 07/19] target/ppc: Make special ORs match x86 pause and don't generate on mttcg 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (5 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 06/19] target/ppc: Remove some #if 0'ed code Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-12 5:59 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 08/19] target/ppc: Fix nip on power management instructions Cédric Le Goater ` (11 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> There's no point in going out of translation on an SMT OR with mttcg since the backend won't do anything useful such as pausing, it's only useful on traditional TCG to give time to other processors. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- target/ppc/translate.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/ppc/translate.c b/target/ppc/translate.c index e169c43643a1..7d40a1fbe6bd 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -1580,7 +1580,7 @@ static void gen_pause(DisasContext *ctx) tcg_temp_free_i32(t0); /* Stop translation, this gives other CPUs a chance to run */ - gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); + gen_exception_nip(ctx, EXCP_INTERRUPT, ctx->base.pc_next); } #endif /* defined(TARGET_PPC64) */ @@ -1662,7 +1662,9 @@ static void gen_or(DisasContext *ctx) * than no-op, e.g., miso(rs=26), yield(27), mdoio(29), mdoom(30), * and all currently undefined. */ - gen_pause(ctx); + if (!mttcg_enabled) { + gen_pause(ctx); + } #endif #endif } -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 07/19] target/ppc: Make special ORs match x86 pause and don't generate on mttcg 2019-01-28 9:46 ` [Qemu-devel] [PATCH 07/19] target/ppc: Make special ORs match x86 pause and don't generate on mttcg Cédric Le Goater @ 2019-02-12 5:59 ` David Gibson 2019-02-13 0:03 ` Benjamin Herrenschmidt 0 siblings, 1 reply; 50+ messages in thread From: David Gibson @ 2019-02-12 5:59 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 1743 bytes --] On Mon, Jan 28, 2019 at 10:46:13AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > There's no point in going out of translation on an SMT OR with > mttcg since the backend won't do anything useful such as pausing, > it's only useful on traditional TCG to give time to other > processors. Is it actively harmful in the MTTCG case, or just pointless? > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > target/ppc/translate.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index e169c43643a1..7d40a1fbe6bd 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -1580,7 +1580,7 @@ static void gen_pause(DisasContext *ctx) > tcg_temp_free_i32(t0); > > /* Stop translation, this gives other CPUs a chance to run */ > - gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); > + gen_exception_nip(ctx, EXCP_INTERRUPT, ctx->base.pc_next); I don't see how this change relates to the rest. > } > #endif /* defined(TARGET_PPC64) */ > > @@ -1662,7 +1662,9 @@ static void gen_or(DisasContext *ctx) > * than no-op, e.g., miso(rs=26), yield(27), mdoio(29), mdoom(30), > * and all currently undefined. > */ > - gen_pause(ctx); > + if (!mttcg_enabled) { > + gen_pause(ctx); > + } > #endif > #endif > } -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 07/19] target/ppc: Make special ORs match x86 pause and don't generate on mttcg 2019-02-12 5:59 ` David Gibson @ 2019-02-13 0:03 ` Benjamin Herrenschmidt 2019-02-13 4:54 ` David Gibson 0 siblings, 1 reply; 50+ messages in thread From: Benjamin Herrenschmidt @ 2019-02-13 0:03 UTC (permalink / raw) To: David Gibson, Cédric Le Goater; +Cc: qemu-ppc, qemu-devel On Tue, 2019-02-12 at 16:59 +1100, David Gibson wrote: > On Mon, Jan 28, 2019 at 10:46:13AM +0100, Cédric Le Goater wrote: > > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > > > There's no point in going out of translation on an SMT OR with > > mttcg since the backend won't do anything useful such as pausing, > > it's only useful on traditional TCG to give time to other > > processors. > > Is it actively harmful in the MTTCG case, or just pointless? I think it can hurt performance, I don't remember for sure :) > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > > --- > > target/ppc/translate.c | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > > index e169c43643a1..7d40a1fbe6bd 100644 > > --- a/target/ppc/translate.c > > +++ b/target/ppc/translate.c > > @@ -1580,7 +1580,7 @@ static void gen_pause(DisasContext *ctx) > > tcg_temp_free_i32(t0); > > > > /* Stop translation, this gives other CPUs a chance to run */ > > - gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); > > + gen_exception_nip(ctx, EXCP_INTERRUPT, ctx->base.pc_next); > > I don't see how this change relates to the rest. Yeah not sure anymore :-) > > } > > #endif /* defined(TARGET_PPC64) */ > > > > @@ -1662,7 +1662,9 @@ static void gen_or(DisasContext *ctx) > > * than no-op, e.g., miso(rs=26), yield(27), mdoio(29), mdoom(30), > > * and all currently undefined. > > */ > > - gen_pause(ctx); > > + if (!mttcg_enabled) { > > + gen_pause(ctx); > > + } > > #endif > > #endif > > } ^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 07/19] target/ppc: Make special ORs match x86 pause and don't generate on mttcg 2019-02-13 0:03 ` Benjamin Herrenschmidt @ 2019-02-13 4:54 ` David Gibson 2019-02-13 8:07 ` Cédric Le Goater 0 siblings, 1 reply; 50+ messages in thread From: David Gibson @ 2019-02-13 4:54 UTC (permalink / raw) To: Benjamin Herrenschmidt; +Cc: Cédric Le Goater, qemu-ppc, qemu-devel [-- Attachment #1: Type: text/plain, Size: 2364 bytes --] On Wed, Feb 13, 2019 at 11:03:12AM +1100, Benjamin Herrenschmidt wrote: > On Tue, 2019-02-12 at 16:59 +1100, David Gibson wrote: > > On Mon, Jan 28, 2019 at 10:46:13AM +0100, Cédric Le Goater wrote: > > > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > > > > > There's no point in going out of translation on an SMT OR with > > > mttcg since the backend won't do anything useful such as pausing, > > > it's only useful on traditional TCG to give time to other > > > processors. > > > > Is it actively harmful in the MTTCG case, or just pointless? > > I think it can hurt performance, I don't remember for sure :) > > > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > > > --- > > > target/ppc/translate.c | 6 ++++-- > > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > > > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > > > index e169c43643a1..7d40a1fbe6bd 100644 > > > --- a/target/ppc/translate.c > > > +++ b/target/ppc/translate.c > > > @@ -1580,7 +1580,7 @@ static void gen_pause(DisasContext *ctx) > > > tcg_temp_free_i32(t0); > > > > > > /* Stop translation, this gives other CPUs a chance to run */ > > > - gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); > > > + gen_exception_nip(ctx, EXCP_INTERRUPT, ctx->base.pc_next); > > > > I don't see how this change relates to the rest. > > Yeah not sure anymore :-) Oh. That certainly doesn't make this easier to review. So, all these target/ppc patches are only indirectly related to XIVE pnv support. Cédric, can you split them out into their own series on the next spin. > > > > } > > > #endif /* defined(TARGET_PPC64) */ > > > > > > @@ -1662,7 +1662,9 @@ static void gen_or(DisasContext *ctx) > > > * than no-op, e.g., miso(rs=26), yield(27), mdoio(29), mdoom(30), > > > * and all currently undefined. > > > */ > > > - gen_pause(ctx); > > > + if (!mttcg_enabled) { > > > + gen_pause(ctx); > > > + } > > > #endif > > > #endif > > > } > -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 07/19] target/ppc: Make special ORs match x86 pause and don't generate on mttcg 2019-02-13 4:54 ` David Gibson @ 2019-02-13 8:07 ` Cédric Le Goater 0 siblings, 0 replies; 50+ messages in thread From: Cédric Le Goater @ 2019-02-13 8:07 UTC (permalink / raw) To: David Gibson, Benjamin Herrenschmidt; +Cc: qemu-ppc, qemu-devel On 2/13/19 5:54 AM, David Gibson wrote: > On Wed, Feb 13, 2019 at 11:03:12AM +1100, Benjamin Herrenschmidt wrote: >> On Tue, 2019-02-12 at 16:59 +1100, David Gibson wrote: >>> On Mon, Jan 28, 2019 at 10:46:13AM +0100, Cédric Le Goater wrote: >>>> From: Benjamin Herrenschmidt <benh@kernel.crashing.org> >>>> >>>> There's no point in going out of translation on an SMT OR with >>>> mttcg since the backend won't do anything useful such as pausing, >>>> it's only useful on traditional TCG to give time to other >>>> processors. >>> >>> Is it actively harmful in the MTTCG case, or just pointless? >> >> I think it can hurt performance, I don't remember for sure :) >> >>>> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> >>>> Signed-off-by: Cédric Le Goater <clg@kaod.org> >>>> --- >>>> target/ppc/translate.c | 6 ++++-- >>>> 1 file changed, 4 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/target/ppc/translate.c b/target/ppc/translate.c >>>> index e169c43643a1..7d40a1fbe6bd 100644 >>>> --- a/target/ppc/translate.c >>>> +++ b/target/ppc/translate.c >>>> @@ -1580,7 +1580,7 @@ static void gen_pause(DisasContext *ctx) >>>> tcg_temp_free_i32(t0); >>>> >>>> /* Stop translation, this gives other CPUs a chance to run */ >>>> - gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); >>>> + gen_exception_nip(ctx, EXCP_INTERRUPT, ctx->base.pc_next); >>> >>> I don't see how this change relates to the rest. >> >> Yeah not sure anymore :-) > > Oh. That certainly doesn't make this easier to review. > > So, all these target/ppc patches are only indirectly related to XIVE > pnv support. Cédric, can you split them out into their own series on > the next spin. Sure. I will address your comments and resend them first. Thanks, C. > >> >>>> } >>>> #endif /* defined(TARGET_PPC64) */ >>>> >>>> @@ -1662,7 +1662,9 @@ static void gen_or(DisasContext *ctx) >>>> * than no-op, e.g., miso(rs=26), yield(27), mdoio(29), mdoom(30), >>>> * and all currently undefined. >>>> */ >>>> - gen_pause(ctx); >>>> + if (!mttcg_enabled) { >>>> + gen_pause(ctx); >>>> + } >>>> #endif >>>> #endif >>>> } >> > ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 08/19] target/ppc: Fix nip on power management instructions 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (6 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 07/19] target/ppc: Make special ORs match x86 pause and don't generate on mttcg Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-12 6:02 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 09/19] target/ppc: Don't clobber MSR:EE on PM instructions Cédric Le Goater ` (10 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> Those instructions currently raise an exception from within the helper. This tends to result in a bogus nip value in the env context (typically the beginning of the TB). Such a helper needs a gen_update_nip() first. This fixes it with a different approach which is to throw the exception from translate.c instead of the helper using gen_exception_nip() which does the right thing. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- target/ppc/excp_helper.c | 1 - target/ppc/translate.c | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 751d759fcc1d..8407e0ade938 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -958,7 +958,6 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) * but this doesn't seem to be a problem. */ env->msr |= (1ull << MSR_EE); - raise_exception(env, EXCP_HLT); } #endif /* defined(TARGET_PPC64) */ diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 7d40a1fbe6bd..55281a8975e0 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -3571,7 +3571,8 @@ static void gen_doze(DisasContext *ctx) t = tcg_const_i32(PPC_PM_DOZE); gen_helper_pminsn(cpu_env, t); tcg_temp_free_i32(t); - gen_stop_exception(ctx); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); #endif /* defined(CONFIG_USER_ONLY) */ } @@ -3586,7 +3587,8 @@ static void gen_nap(DisasContext *ctx) t = tcg_const_i32(PPC_PM_NAP); gen_helper_pminsn(cpu_env, t); tcg_temp_free_i32(t); - gen_stop_exception(ctx); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); #endif /* defined(CONFIG_USER_ONLY) */ } @@ -3606,7 +3608,8 @@ static void gen_sleep(DisasContext *ctx) t = tcg_const_i32(PPC_PM_SLEEP); gen_helper_pminsn(cpu_env, t); tcg_temp_free_i32(t); - gen_stop_exception(ctx); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); #endif /* defined(CONFIG_USER_ONLY) */ } @@ -3621,7 +3624,8 @@ static void gen_rvwinkle(DisasContext *ctx) t = tcg_const_i32(PPC_PM_RVWINKLE); gen_helper_pminsn(cpu_env, t); tcg_temp_free_i32(t); - gen_stop_exception(ctx); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); #endif /* defined(CONFIG_USER_ONLY) */ } #endif /* #if defined(TARGET_PPC64) */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 08/19] target/ppc: Fix nip on power management instructions 2019-01-28 9:46 ` [Qemu-devel] [PATCH 08/19] target/ppc: Fix nip on power management instructions Cédric Le Goater @ 2019-02-12 6:02 ` David Gibson 2019-02-13 0:04 ` Benjamin Herrenschmidt 0 siblings, 1 reply; 50+ messages in thread From: David Gibson @ 2019-02-12 6:02 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 3328 bytes --] On Mon, Jan 28, 2019 at 10:46:14AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > Those instructions currently raise an exception from within > the helper. This tends to result in a bogus nip value in > the env context (typically the beginning of the TB). Such > a helper needs a gen_update_nip() first. > > This fixes it with a different approach which is to throw > the exception from translate.c instead of the helper using > gen_exception_nip() which does the right thing. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > target/ppc/excp_helper.c | 1 - > target/ppc/translate.c | 12 ++++++++---- > 2 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 751d759fcc1d..8407e0ade938 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -958,7 +958,6 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) > * but this doesn't seem to be a problem. > */ > env->msr |= (1ull << MSR_EE); > - raise_exception(env, EXCP_HLT); > } > #endif /* defined(TARGET_PPC64) */ > > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index 7d40a1fbe6bd..55281a8975e0 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -3571,7 +3571,8 @@ static void gen_doze(DisasContext *ctx) > t = tcg_const_i32(PPC_PM_DOZE); > gen_helper_pminsn(cpu_env, t); > tcg_temp_free_i32(t); > - gen_stop_exception(ctx); > + /* Stop translation, as the CPU is supposed to sleep from now */ > + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); IIUC this also changes from EXCP_STOP to EXCP_HLT, is that intentional? > #endif /* defined(CONFIG_USER_ONLY) */ > } > > @@ -3586,7 +3587,8 @@ static void gen_nap(DisasContext *ctx) > t = tcg_const_i32(PPC_PM_NAP); > gen_helper_pminsn(cpu_env, t); > tcg_temp_free_i32(t); > - gen_stop_exception(ctx); > + /* Stop translation, as the CPU is supposed to sleep from now */ > + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); > #endif /* defined(CONFIG_USER_ONLY) */ > } > > @@ -3606,7 +3608,8 @@ static void gen_sleep(DisasContext *ctx) > t = tcg_const_i32(PPC_PM_SLEEP); > gen_helper_pminsn(cpu_env, t); > tcg_temp_free_i32(t); > - gen_stop_exception(ctx); > + /* Stop translation, as the CPU is supposed to sleep from now */ > + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); > #endif /* defined(CONFIG_USER_ONLY) */ > } > > @@ -3621,7 +3624,8 @@ static void gen_rvwinkle(DisasContext *ctx) > t = tcg_const_i32(PPC_PM_RVWINKLE); > gen_helper_pminsn(cpu_env, t); > tcg_temp_free_i32(t); > - gen_stop_exception(ctx); > + /* Stop translation, as the CPU is supposed to sleep from now */ > + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); > #endif /* defined(CONFIG_USER_ONLY) */ > } > #endif /* #if defined(TARGET_PPC64) */ -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 08/19] target/ppc: Fix nip on power management instructions 2019-02-12 6:02 ` David Gibson @ 2019-02-13 0:04 ` Benjamin Herrenschmidt 2019-02-15 15:30 ` Cédric Le Goater 0 siblings, 1 reply; 50+ messages in thread From: Benjamin Herrenschmidt @ 2019-02-13 0:04 UTC (permalink / raw) To: David Gibson, Cédric Le Goater; +Cc: qemu-ppc, qemu-devel On Tue, 2019-02-12 at 17:02 +1100, David Gibson wrote: > On Mon, Jan 28, 2019 at 10:46:14AM +0100, Cédric Le Goater wrote: > > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > > > Those instructions currently raise an exception from within > > the helper. This tends to result in a bogus nip value in > > the env context (typically the beginning of the TB). Such > > a helper needs a gen_update_nip() first. > > > > This fixes it with a different approach which is to throw > > the exception from translate.c instead of the helper using > > gen_exception_nip() which does the right thing. > > > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > > --- > > target/ppc/excp_helper.c | 1 - > > target/ppc/translate.c | 12 ++++++++---- > > 2 files changed, 8 insertions(+), 5 deletions(-) > > > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > > index 751d759fcc1d..8407e0ade938 100644 > > --- a/target/ppc/excp_helper.c > > +++ b/target/ppc/excp_helper.c > > @@ -958,7 +958,6 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) > > * but this doesn't seem to be a problem. > > */ > > env->msr |= (1ull << MSR_EE); > > - raise_exception(env, EXCP_HLT); > > } > > #endif /* defined(TARGET_PPC64) */ > > > > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > > index 7d40a1fbe6bd..55281a8975e0 100644 > > --- a/target/ppc/translate.c > > +++ b/target/ppc/translate.c > > @@ -3571,7 +3571,8 @@ static void gen_doze(DisasContext *ctx) > > t = tcg_const_i32(PPC_PM_DOZE); > > gen_helper_pminsn(cpu_env, t); > > tcg_temp_free_i32(t); > > - gen_stop_exception(ctx); > > + /* Stop translation, as the CPU is supposed to sleep from now */ > > + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); > > IIUC this also changes from EXCP_STOP to EXCP_HLT, is that intentional? Off the top of my head, it might be to break out of the outer exec loop, but I don't remember off hand. > > #endif /* defined(CONFIG_USER_ONLY) */ > > } > > > > @@ -3586,7 +3587,8 @@ static void gen_nap(DisasContext *ctx) > > t = tcg_const_i32(PPC_PM_NAP); > > gen_helper_pminsn(cpu_env, t); > > tcg_temp_free_i32(t); > > - gen_stop_exception(ctx); > > + /* Stop translation, as the CPU is supposed to sleep from now */ > > + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); > > #endif /* defined(CONFIG_USER_ONLY) */ > > } > > > > @@ -3606,7 +3608,8 @@ static void gen_sleep(DisasContext *ctx) > > t = tcg_const_i32(PPC_PM_SLEEP); > > gen_helper_pminsn(cpu_env, t); > > tcg_temp_free_i32(t); > > - gen_stop_exception(ctx); > > + /* Stop translation, as the CPU is supposed to sleep from now */ > > + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); > > #endif /* defined(CONFIG_USER_ONLY) */ > > } > > > > @@ -3621,7 +3624,8 @@ static void gen_rvwinkle(DisasContext *ctx) > > t = tcg_const_i32(PPC_PM_RVWINKLE); > > gen_helper_pminsn(cpu_env, t); > > tcg_temp_free_i32(t); > > - gen_stop_exception(ctx); > > + /* Stop translation, as the CPU is supposed to sleep from now */ > > + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); > > #endif /* defined(CONFIG_USER_ONLY) */ > > } > > #endif /* #if defined(TARGET_PPC64) */ ^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 08/19] target/ppc: Fix nip on power management instructions 2019-02-13 0:04 ` Benjamin Herrenschmidt @ 2019-02-15 15:30 ` Cédric Le Goater 0 siblings, 0 replies; 50+ messages in thread From: Cédric Le Goater @ 2019-02-15 15:30 UTC (permalink / raw) To: Benjamin Herrenschmidt, David Gibson; +Cc: qemu-ppc, qemu-devel On 2/13/19 1:04 AM, Benjamin Herrenschmidt wrote: > On Tue, 2019-02-12 at 17:02 +1100, David Gibson wrote: >> On Mon, Jan 28, 2019 at 10:46:14AM +0100, Cédric Le Goater wrote: >>> From: Benjamin Herrenschmidt <benh@kernel.crashing.org> >>> >>> Those instructions currently raise an exception from within >>> the helper. This tends to result in a bogus nip value in >>> the env context (typically the beginning of the TB). Such >>> a helper needs a gen_update_nip() first. >>> >>> This fixes it with a different approach which is to throw >>> the exception from translate.c instead of the helper using >>> gen_exception_nip() which does the right thing. >>> >>> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> >>> Signed-off-by: Cédric Le Goater <clg@kaod.org> >>> --- >>> target/ppc/excp_helper.c | 1 - >>> target/ppc/translate.c | 12 ++++++++---- >>> 2 files changed, 8 insertions(+), 5 deletions(-) >>> >>> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c >>> index 751d759fcc1d..8407e0ade938 100644 >>> --- a/target/ppc/excp_helper.c >>> +++ b/target/ppc/excp_helper.c >>> @@ -958,7 +958,6 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) >>> * but this doesn't seem to be a problem. >>> */ >>> env->msr |= (1ull << MSR_EE); >>> - raise_exception(env, EXCP_HLT); >>> } >>> #endif /* defined(TARGET_PPC64) */ >>> >>> diff --git a/target/ppc/translate.c b/target/ppc/translate.c >>> index 7d40a1fbe6bd..55281a8975e0 100644 >>> --- a/target/ppc/translate.c >>> +++ b/target/ppc/translate.c >>> @@ -3571,7 +3571,8 @@ static void gen_doze(DisasContext *ctx) >>> t = tcg_const_i32(PPC_PM_DOZE); >>> gen_helper_pminsn(cpu_env, t); >>> tcg_temp_free_i32(t); >>> - gen_stop_exception(ctx); >>> + /* Stop translation, as the CPU is supposed to sleep from now */ >>> + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); >> >> IIUC this also changes from EXCP_STOP to EXCP_HLT, is that intentional? > > Off the top of my head, it might be to break out of the outer exec > loop, but I don't remember off hand. yes and POWERPC_EXCP_STOP is only used under linux-user, which is the wrong value to exit from the cpu exec loop. I think this is correct. C. >>> #endif /* defined(CONFIG_USER_ONLY) */ >>> } >>> >>> @@ -3586,7 +3587,8 @@ static void gen_nap(DisasContext *ctx) >>> t = tcg_const_i32(PPC_PM_NAP); >>> gen_helper_pminsn(cpu_env, t); >>> tcg_temp_free_i32(t); >>> - gen_stop_exception(ctx); >>> + /* Stop translation, as the CPU is supposed to sleep from now */ >>> + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); >>> #endif /* defined(CONFIG_USER_ONLY) */ >>> } >>> >>> @@ -3606,7 +3608,8 @@ static void gen_sleep(DisasContext *ctx) >>> t = tcg_const_i32(PPC_PM_SLEEP); >>> gen_helper_pminsn(cpu_env, t); >>> tcg_temp_free_i32(t); >>> - gen_stop_exception(ctx); >>> + /* Stop translation, as the CPU is supposed to sleep from now */ >>> + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); >>> #endif /* defined(CONFIG_USER_ONLY) */ >>> } >>> >>> @@ -3621,7 +3624,8 @@ static void gen_rvwinkle(DisasContext *ctx) >>> t = tcg_const_i32(PPC_PM_RVWINKLE); >>> gen_helper_pminsn(cpu_env, t); >>> tcg_temp_free_i32(t); >>> - gen_stop_exception(ctx); >>> + /* Stop translation, as the CPU is supposed to sleep from now */ >>> + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); >>> #endif /* defined(CONFIG_USER_ONLY) */ >>> } >>> #endif /* #if defined(TARGET_PPC64) */ > ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 09/19] target/ppc: Don't clobber MSR:EE on PM instructions 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (7 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 08/19] target/ppc: Fix nip on power management instructions Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-12 6:05 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 10/19] target/ppc: Fix support for "STOP light" states on POWER9 Cédric Le Goater ` (9 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> When issuing a power management instruction, we set MSR:EE to force ppc_hw_interrupt() into calling powerpc_excp() to deal with the fact that on P7 and P8, the system reset caused by the wakeup needs to be generated regardless of the MSR:EE value (using LPCR only). This however means that the OS will see a bogus SRR1:EE value which is a problem. It also prevents properly implementing P9 STOP "light". So fix this by instead putting some logic in ppc_hw_interrupt() to decide whether to deliver or not by taking into account the fact that we are waking up from sleep. The LPCR isn't checked as this is done in the has_work() test. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- target/ppc/excp_helper.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 8407e0ade938..7c7c8d1b9dc6 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -748,6 +748,7 @@ void ppc_cpu_do_interrupt(CPUState *cs) static void ppc_hw_interrupt(CPUPPCState *env) { PowerPCCPU *cpu = ppc_env_get_cpu(env); + bool async_deliver; /* External reset */ if (env->pending_interrupts & (1 << PPC_INTERRUPT_RESET)) { @@ -769,11 +770,20 @@ static void ppc_hw_interrupt(CPUPPCState *env) return; } #endif + + /* + * For interrupts that gate on MSR:EE, we need to do something a + * bit more subtle, as we need to let them through even when EE is + * clear when coming out of some power management states (in order + * for them to become a 0x100). + */ + async_deliver = (msr_ee != 0) || env->in_pm_state; + /* Hypervisor decrementer exception */ if (env->pending_interrupts & (1 << PPC_INTERRUPT_HDECR)) { /* LPCR will be clear when not supported so this will work */ bool hdice = !!(env->spr[SPR_LPCR] & LPCR_HDICE); - if ((msr_ee != 0 || msr_hv == 0) && hdice) { + if ((async_deliver || msr_hv == 0) && hdice) { /* HDEC clears on delivery */ env->pending_interrupts &= ~(1 << PPC_INTERRUPT_HDECR); powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_HDECR); @@ -783,7 +793,7 @@ static void ppc_hw_interrupt(CPUPPCState *env) /* Extermal interrupt can ignore MSR:EE under some circumstances */ if (env->pending_interrupts & (1 << PPC_INTERRUPT_EXT)) { bool lpes0 = !!(env->spr[SPR_LPCR] & LPCR_LPES0); - if (msr_ee != 0 || (env->has_hv_mode && msr_hv == 0 && !lpes0)) { + if (async_deliver || (env->has_hv_mode && msr_hv == 0 && !lpes0)) { powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_EXTERNAL); return; } @@ -795,7 +805,7 @@ static void ppc_hw_interrupt(CPUPPCState *env) return; } } - if (msr_ee != 0) { + if (async_deliver != 0) { /* Watchdog timer on embedded PowerPC */ if (env->pending_interrupts & (1 << PPC_INTERRUPT_WDT)) { env->pending_interrupts &= ~(1 << PPC_INTERRUPT_WDT); @@ -943,21 +953,14 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) cs = CPU(ppc_env_get_cpu(env)); cs->halted = 1; - env->in_pm_state = true; /* The architecture specifies that HDEC interrupts are * discarded in PM states */ env->pending_interrupts &= ~(1 << PPC_INTERRUPT_HDECR); - /* Technically, nap doesn't set EE, but if we don't set it - * then ppc_hw_interrupt() won't deliver. We could add some - * other tests there based on LPCR but it's simpler to just - * whack EE in. It will be cleared by the 0x100 at wakeup - * anyway. It will still be observable by the guest in SRR1 - * but this doesn't seem to be a problem. - */ - env->msr |= (1ull << MSR_EE); + /* Condition for waking up at 0x100 */ + env->in_pm_state = true; } #endif /* defined(TARGET_PPC64) */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 09/19] target/ppc: Don't clobber MSR:EE on PM instructions 2019-01-28 9:46 ` [Qemu-devel] [PATCH 09/19] target/ppc: Don't clobber MSR:EE on PM instructions Cédric Le Goater @ 2019-02-12 6:05 ` David Gibson 0 siblings, 0 replies; 50+ messages in thread From: David Gibson @ 2019-02-12 6:05 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 4674 bytes --] On Mon, Jan 28, 2019 at 10:46:15AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > When issuing a power management instruction, we set MSR:EE > to force ppc_hw_interrupt() into calling powerpc_excp() > to deal with the fact that on P7 and P8, the system reset > caused by the wakeup needs to be generated regardless of > the MSR:EE value (using LPCR only). > > This however means that the OS will see a bogus SRR1:EE > value which is a problem. It also prevents properly > implementing P9 STOP "light". > > So fix this by instead putting some logic in ppc_hw_interrupt() > to decide whether to deliver or not by taking into account the > fact that we are waking up from sleep. > > The LPCR isn't checked as this is done in the has_work() test. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > target/ppc/excp_helper.c | 27 +++++++++++++++------------ > 1 file changed, 15 insertions(+), 12 deletions(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 8407e0ade938..7c7c8d1b9dc6 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -748,6 +748,7 @@ void ppc_cpu_do_interrupt(CPUState *cs) > static void ppc_hw_interrupt(CPUPPCState *env) > { > PowerPCCPU *cpu = ppc_env_get_cpu(env); > + bool async_deliver; > > /* External reset */ > if (env->pending_interrupts & (1 << PPC_INTERRUPT_RESET)) { > @@ -769,11 +770,20 @@ static void ppc_hw_interrupt(CPUPPCState *env) > return; > } > #endif > + > + /* > + * For interrupts that gate on MSR:EE, we need to do something a > + * bit more subtle, as we need to let them through even when EE is > + * clear when coming out of some power management states (in order > + * for them to become a 0x100). > + */ > + async_deliver = (msr_ee != 0) || env->in_pm_state; > + > /* Hypervisor decrementer exception */ > if (env->pending_interrupts & (1 << PPC_INTERRUPT_HDECR)) { > /* LPCR will be clear when not supported so this will work */ > bool hdice = !!(env->spr[SPR_LPCR] & LPCR_HDICE); > - if ((msr_ee != 0 || msr_hv == 0) && hdice) { > + if ((async_deliver || msr_hv == 0) && hdice) { > /* HDEC clears on delivery */ > env->pending_interrupts &= ~(1 << PPC_INTERRUPT_HDECR); > powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_HDECR); > @@ -783,7 +793,7 @@ static void ppc_hw_interrupt(CPUPPCState *env) > /* Extermal interrupt can ignore MSR:EE under some circumstances */ > if (env->pending_interrupts & (1 << PPC_INTERRUPT_EXT)) { > bool lpes0 = !!(env->spr[SPR_LPCR] & LPCR_LPES0); > - if (msr_ee != 0 || (env->has_hv_mode && msr_hv == 0 && !lpes0)) { > + if (async_deliver || (env->has_hv_mode && msr_hv == 0 && !lpes0)) { > powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_EXTERNAL); > return; > } > @@ -795,7 +805,7 @@ static void ppc_hw_interrupt(CPUPPCState *env) > return; > } > } > - if (msr_ee != 0) { > + if (async_deliver != 0) { > /* Watchdog timer on embedded PowerPC */ > if (env->pending_interrupts & (1 << PPC_INTERRUPT_WDT)) { > env->pending_interrupts &= ~(1 << PPC_INTERRUPT_WDT); > @@ -943,21 +953,14 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) > > cs = CPU(ppc_env_get_cpu(env)); > cs->halted = 1; > - env->in_pm_state = true; > > /* The architecture specifies that HDEC interrupts are > * discarded in PM states > */ > env->pending_interrupts &= ~(1 << PPC_INTERRUPT_HDECR); > > - /* Technically, nap doesn't set EE, but if we don't set it > - * then ppc_hw_interrupt() won't deliver. We could add some > - * other tests there based on LPCR but it's simpler to just > - * whack EE in. It will be cleared by the 0x100 at wakeup > - * anyway. It will still be observable by the guest in SRR1 > - * but this doesn't seem to be a problem. > - */ > - env->msr |= (1ull << MSR_EE); > + /* Condition for waking up at 0x100 */ > + env->in_pm_state = true; > } > #endif /* defined(TARGET_PPC64) */ > -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 10/19] target/ppc: Fix support for "STOP light" states on POWER9 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (8 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 09/19] target/ppc: Don't clobber MSR:EE on PM instructions Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-13 5:05 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 11/19] target/ppc: Move "wakeup reset" code to a separate function Cédric Le Goater ` (8 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> STOP must act differently based on PSSCR:EC on POWER9. When set, it acts like the P7/P8 power management instructions and wake up at 0x100 based on the wakeup conditions in LPCR. When PSSCR:EC is clear however it will wakeup at the next instruction after STOP (if EE is clear) or take the corresponding interrupts (if EE is set). Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- target/ppc/cpu-qom.h | 1 + target/ppc/cpu.h | 12 +++++++++--- target/ppc/excp_helper.c | 8 ++++++-- target/ppc/translate.c | 13 ++++++++++++- target/ppc/translate_init.inc.c | 7 +++++++ 5 files changed, 35 insertions(+), 6 deletions(-) diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 4ea67692e2a6..7c54093a7122 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -122,6 +122,7 @@ typedef enum { PPC_PM_NAP, PPC_PM_SLEEP, PPC_PM_RVWINKLE, + PPC_PM_STOP, } powerpc_pm_insn_t; /*****************************************************************************/ diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 2c22292e7f41..7ff65c804b57 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -413,6 +413,10 @@ struct ppc_slb_t { #define LPCR_HVICE PPC_BIT(62) /* HV Virtualisation Int Enable */ #define LPCR_HDICE PPC_BIT(63) +/* PSSCR bits */ +#define PSSCR_ESL PPC_BIT(42) /* Enable State Loss */ +#define PSSCR_EC PPC_BIT(43) /* Exit Criterion */ + #define msr_sf ((env->msr >> MSR_SF) & 1) #define msr_isf ((env->msr >> MSR_ISF) & 1) #define msr_shv ((env->msr >> MSR_SHV) & 1) @@ -1109,9 +1113,11 @@ struct CPUPPCState { * instructions and SPRs are diallowed if MSR:HV is 0 */ bool has_hv_mode; - /* On P7/P8, set when in PM state, we need to handle resume - * in a special way (such as routing some resume causes to - * 0x100), so flag this here. + + /* + * On P7/P8/P9, set when in PM state, we need to handle resume in + * a special way (such as routing some resume causes to 0x100), so + * flag this here. */ bool in_pm_state; #endif diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 7c7c8d1b9dc6..97503193ef43 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -97,7 +97,10 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) asrr0 = -1; asrr1 = -1; - /* check for special resume at 0x100 from doze/nap/sleep/winkle on P7/P8 */ + /* + * check for special resume at 0x100 from doze/nap/sleep/winkle on + * P7/P8/P9 + */ if (env->in_pm_state) { env->in_pm_state = false; @@ -960,7 +963,8 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) env->pending_interrupts &= ~(1 << PPC_INTERRUPT_HDECR); /* Condition for waking up at 0x100 */ - env->in_pm_state = true; + env->in_pm_state = (insn != PPC_PM_STOP) || + (env->spr[SPR_PSSCR] & PSSCR_EC); } #endif /* defined(TARGET_PPC64) */ diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 55281a8975e0..07bedbb8f1ce 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -3594,7 +3594,18 @@ static void gen_nap(DisasContext *ctx) static void gen_stop(DisasContext *ctx) { - gen_nap(ctx); +#if defined(CONFIG_USER_ONLY) + GEN_PRIV; +#else + TCGv_i32 t; + + CHK_HV; + t = tcg_const_i32(PPC_PM_STOP); + gen_helper_pminsn(cpu_env, t); + tcg_temp_free_i32(t); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); +#endif /* defined(CONFIG_USER_ONLY) */ } static void gen_sleep(DisasContext *ctx) diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index 59e0b8676236..076d94f45755 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -8801,9 +8801,16 @@ static bool cpu_has_work_POWER9(CPUState *cs) CPUPPCState *env = &cpu->env; if (cs->halted) { + uint64_t psscr = env->spr[SPR_PSSCR]; + if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) { return false; } + + /* If EC is clear, just return true on any pending interrupt */ + if (!(psscr & PSSCR_EC)) { + return true; + } /* External Exception */ if ((env->pending_interrupts & (1u << PPC_INTERRUPT_EXT)) && (env->spr[SPR_LPCR] & LPCR_EEE)) { -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 10/19] target/ppc: Fix support for "STOP light" states on POWER9 2019-01-28 9:46 ` [Qemu-devel] [PATCH 10/19] target/ppc: Fix support for "STOP light" states on POWER9 Cédric Le Goater @ 2019-02-13 5:05 ` David Gibson 0 siblings, 0 replies; 50+ messages in thread From: David Gibson @ 2019-02-13 5:05 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 5333 bytes --] On Mon, Jan 28, 2019 at 10:46:16AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > STOP must act differently based on PSSCR:EC on POWER9. When set, it > acts like the P7/P8 power management instructions and wake up at 0x100 > based on the wakeup conditions in LPCR. > > When PSSCR:EC is clear however it will wakeup at the next instruction > after STOP (if EE is clear) or take the corresponding interrupts (if > EE is set). > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > target/ppc/cpu-qom.h | 1 + > target/ppc/cpu.h | 12 +++++++++--- > target/ppc/excp_helper.c | 8 ++++++-- > target/ppc/translate.c | 13 ++++++++++++- > target/ppc/translate_init.inc.c | 7 +++++++ > 5 files changed, 35 insertions(+), 6 deletions(-) > > diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h > index 4ea67692e2a6..7c54093a7122 100644 > --- a/target/ppc/cpu-qom.h > +++ b/target/ppc/cpu-qom.h > @@ -122,6 +122,7 @@ typedef enum { > PPC_PM_NAP, > PPC_PM_SLEEP, > PPC_PM_RVWINKLE, > + PPC_PM_STOP, > } powerpc_pm_insn_t; > > /*****************************************************************************/ > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index 2c22292e7f41..7ff65c804b57 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -413,6 +413,10 @@ struct ppc_slb_t { > #define LPCR_HVICE PPC_BIT(62) /* HV Virtualisation Int Enable */ > #define LPCR_HDICE PPC_BIT(63) > > +/* PSSCR bits */ > +#define PSSCR_ESL PPC_BIT(42) /* Enable State Loss */ > +#define PSSCR_EC PPC_BIT(43) /* Exit Criterion */ > + > #define msr_sf ((env->msr >> MSR_SF) & 1) > #define msr_isf ((env->msr >> MSR_ISF) & 1) > #define msr_shv ((env->msr >> MSR_SHV) & 1) > @@ -1109,9 +1113,11 @@ struct CPUPPCState { > * instructions and SPRs are diallowed if MSR:HV is 0 > */ > bool has_hv_mode; > - /* On P7/P8, set when in PM state, we need to handle resume > - * in a special way (such as routing some resume causes to > - * 0x100), so flag this here. > + > + /* > + * On P7/P8/P9, set when in PM state, we need to handle resume in > + * a special way (such as routing some resume causes to 0x100), so > + * flag this here. > */ > bool in_pm_state; > #endif > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 7c7c8d1b9dc6..97503193ef43 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -97,7 +97,10 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) > asrr0 = -1; > asrr1 = -1; > > - /* check for special resume at 0x100 from doze/nap/sleep/winkle on P7/P8 */ > + /* > + * check for special resume at 0x100 from doze/nap/sleep/winkle on > + * P7/P8/P9 > + */ > if (env->in_pm_state) { > env->in_pm_state = false; > > @@ -960,7 +963,8 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) > env->pending_interrupts &= ~(1 << PPC_INTERRUPT_HDECR); > > /* Condition for waking up at 0x100 */ > - env->in_pm_state = true; > + env->in_pm_state = (insn != PPC_PM_STOP) || > + (env->spr[SPR_PSSCR] & PSSCR_EC); > } > #endif /* defined(TARGET_PPC64) */ > > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index 55281a8975e0..07bedbb8f1ce 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -3594,7 +3594,18 @@ static void gen_nap(DisasContext *ctx) > > static void gen_stop(DisasContext *ctx) > { > - gen_nap(ctx); > +#if defined(CONFIG_USER_ONLY) > + GEN_PRIV; > +#else > + TCGv_i32 t; > + > + CHK_HV; > + t = tcg_const_i32(PPC_PM_STOP); > + gen_helper_pminsn(cpu_env, t); > + tcg_temp_free_i32(t); > + /* Stop translation, as the CPU is supposed to sleep from now */ > + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); > +#endif /* defined(CONFIG_USER_ONLY) */ > } > > static void gen_sleep(DisasContext *ctx) > diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c > index 59e0b8676236..076d94f45755 100644 > --- a/target/ppc/translate_init.inc.c > +++ b/target/ppc/translate_init.inc.c > @@ -8801,9 +8801,16 @@ static bool cpu_has_work_POWER9(CPUState *cs) > CPUPPCState *env = &cpu->env; > > if (cs->halted) { > + uint64_t psscr = env->spr[SPR_PSSCR]; > + > if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) { > return false; > } > + > + /* If EC is clear, just return true on any pending interrupt */ > + if (!(psscr & PSSCR_EC)) { > + return true; > + } > /* External Exception */ > if ((env->pending_interrupts & (1u << PPC_INTERRUPT_EXT)) && > (env->spr[SPR_LPCR] & LPCR_EEE)) { -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 11/19] target/ppc: Move "wakeup reset" code to a separate function 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (9 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 10/19] target/ppc: Fix support for "STOP light" states on POWER9 Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-13 5:06 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 12/19] target/ppc: Disable ISA 2.06 PM instructions on POWER9 Cédric Le Goater ` (7 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> This moves the code to handle waking up from the 0x100 vector from powerpc_excp() to a separate function, as the former is already way too big as it is. No functional change. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- target/ppc/excp_helper.c | 75 ++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 97503193ef43..489a54f51b90 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -65,6 +65,46 @@ static inline void dump_syscall(CPUPPCState *env) ppc_dump_gpr(env, 6), env->nip); } +static int powerpc_reset_wakeup(CPUState *cs, CPUPPCState *env, int excp, + target_ulong *msr) +{ + /* We no longer are in a PM state */ + env->in_pm_state = false; + + /* Pretend to be returning from doze always as we don't lose state */ + *msr |= (0x1ull << (63 - 47)); + + /* Machine checks are sent normally */ + if (excp == POWERPC_EXCP_MCHECK) { + return excp; + } + switch (excp) { + case POWERPC_EXCP_RESET: + *msr |= 0x4ull << (63 - 45); + break; + case POWERPC_EXCP_EXTERNAL: + *msr |= 0x8ull << (63 - 45); + break; + case POWERPC_EXCP_DECR: + *msr |= 0x6ull << (63 - 45); + break; + case POWERPC_EXCP_SDOOR: + *msr |= 0x5ull << (63 - 45); + break; + case POWERPC_EXCP_SDOOR_HV: + *msr |= 0x3ull << (63 - 45); + break; + case POWERPC_EXCP_HV_MAINT: + *msr |= 0xaull << (63 - 45); + break; + default: + cpu_abort(cs, "Unsupported exception %d in Power Save mode\n", + excp); + } + return POWERPC_EXCP_RESET; +} + + /* Note that this function should be greatly optimized * when called with a constant excp, from ppc_hw_interrupt */ @@ -102,40 +142,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) * P7/P8/P9 */ if (env->in_pm_state) { - env->in_pm_state = false; - - /* Pretend to be returning from doze always as we don't lose state */ - msr |= (0x1ull << (63 - 47)); - - /* Non-machine check are routed to 0x100 with a wakeup cause - * encoded in SRR1 - */ - if (excp != POWERPC_EXCP_MCHECK) { - switch (excp) { - case POWERPC_EXCP_RESET: - msr |= 0x4ull << (63 - 45); - break; - case POWERPC_EXCP_EXTERNAL: - msr |= 0x8ull << (63 - 45); - break; - case POWERPC_EXCP_DECR: - msr |= 0x6ull << (63 - 45); - break; - case POWERPC_EXCP_SDOOR: - msr |= 0x5ull << (63 - 45); - break; - case POWERPC_EXCP_SDOOR_HV: - msr |= 0x3ull << (63 - 45); - break; - case POWERPC_EXCP_HV_MAINT: - msr |= 0xaull << (63 - 45); - break; - default: - cpu_abort(cs, "Unsupported exception %d in Power Save mode\n", - excp); - } - excp = POWERPC_EXCP_RESET; - } + excp = powerpc_reset_wakeup(cs, env, excp, &msr); } /* Exception targetting modifiers -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 11/19] target/ppc: Move "wakeup reset" code to a separate function 2019-01-28 9:46 ` [Qemu-devel] [PATCH 11/19] target/ppc: Move "wakeup reset" code to a separate function Cédric Le Goater @ 2019-02-13 5:06 ` David Gibson 0 siblings, 0 replies; 50+ messages in thread From: David Gibson @ 2019-02-13 5:06 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 4106 bytes --] On Mon, Jan 28, 2019 at 10:46:17AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > This moves the code to handle waking up from the 0x100 vector > from powerpc_excp() to a separate function, as the former is > already way too big as it is. > > No functional change. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > target/ppc/excp_helper.c | 75 ++++++++++++++++++++++------------------ > 1 file changed, 41 insertions(+), 34 deletions(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 97503193ef43..489a54f51b90 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -65,6 +65,46 @@ static inline void dump_syscall(CPUPPCState *env) > ppc_dump_gpr(env, 6), env->nip); > } > > +static int powerpc_reset_wakeup(CPUState *cs, CPUPPCState *env, int excp, > + target_ulong *msr) > +{ > + /* We no longer are in a PM state */ > + env->in_pm_state = false; > + > + /* Pretend to be returning from doze always as we don't lose state */ > + *msr |= (0x1ull << (63 - 47)); > + > + /* Machine checks are sent normally */ > + if (excp == POWERPC_EXCP_MCHECK) { > + return excp; > + } > + switch (excp) { > + case POWERPC_EXCP_RESET: > + *msr |= 0x4ull << (63 - 45); > + break; > + case POWERPC_EXCP_EXTERNAL: > + *msr |= 0x8ull << (63 - 45); > + break; > + case POWERPC_EXCP_DECR: > + *msr |= 0x6ull << (63 - 45); > + break; > + case POWERPC_EXCP_SDOOR: > + *msr |= 0x5ull << (63 - 45); > + break; > + case POWERPC_EXCP_SDOOR_HV: > + *msr |= 0x3ull << (63 - 45); > + break; > + case POWERPC_EXCP_HV_MAINT: > + *msr |= 0xaull << (63 - 45); > + break; > + default: > + cpu_abort(cs, "Unsupported exception %d in Power Save mode\n", > + excp); > + } > + return POWERPC_EXCP_RESET; > +} > + > + > /* Note that this function should be greatly optimized > * when called with a constant excp, from ppc_hw_interrupt > */ > @@ -102,40 +142,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) > * P7/P8/P9 > */ > if (env->in_pm_state) { > - env->in_pm_state = false; > - > - /* Pretend to be returning from doze always as we don't lose state */ > - msr |= (0x1ull << (63 - 47)); > - > - /* Non-machine check are routed to 0x100 with a wakeup cause > - * encoded in SRR1 > - */ > - if (excp != POWERPC_EXCP_MCHECK) { > - switch (excp) { > - case POWERPC_EXCP_RESET: > - msr |= 0x4ull << (63 - 45); > - break; > - case POWERPC_EXCP_EXTERNAL: > - msr |= 0x8ull << (63 - 45); > - break; > - case POWERPC_EXCP_DECR: > - msr |= 0x6ull << (63 - 45); > - break; > - case POWERPC_EXCP_SDOOR: > - msr |= 0x5ull << (63 - 45); > - break; > - case POWERPC_EXCP_SDOOR_HV: > - msr |= 0x3ull << (63 - 45); > - break; > - case POWERPC_EXCP_HV_MAINT: > - msr |= 0xaull << (63 - 45); > - break; > - default: > - cpu_abort(cs, "Unsupported exception %d in Power Save mode\n", > - excp); > - } > - excp = POWERPC_EXCP_RESET; > - } > + excp = powerpc_reset_wakeup(cs, env, excp, &msr); > } > > /* Exception targetting modifiers -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 12/19] target/ppc: Disable ISA 2.06 PM instructions on POWER9 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (10 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 11/19] target/ppc: Move "wakeup reset" code to a separate function Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-13 5:07 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 13/19] target/ppc: Rename "in_pm_state" to "resume_as_sreset" Cédric Le Goater ` (6 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> The ISA 2.06/2.07 Power Management instructions (doze, nap & rvwinkle) don't exist on POWER9, don't enable them. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- target/ppc/translate_init.inc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index 076d94f45755..f235162a1f6b 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -8880,7 +8880,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64 | - PPC2_TM | PPC2_PM_ISA206 | PPC2_ISA300 | PPC2_PRCNTL; + PPC2_TM | PPC2_ISA300 | PPC2_PRCNTL; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_TM) | (1ull << MSR_VR) | -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 12/19] target/ppc: Disable ISA 2.06 PM instructions on POWER9 2019-01-28 9:46 ` [Qemu-devel] [PATCH 12/19] target/ppc: Disable ISA 2.06 PM instructions on POWER9 Cédric Le Goater @ 2019-02-13 5:07 ` David Gibson 0 siblings, 0 replies; 50+ messages in thread From: David Gibson @ 2019-02-13 5:07 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 1538 bytes --] On Mon, Jan 28, 2019 at 10:46:18AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > The ISA 2.06/2.07 Power Management instructions (doze, nap & rvwinkle) > don't exist on POWER9, don't enable them. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> This looks like a correct fix regardless of the rest of the series, applied to ppc-for-4.0. > --- > target/ppc/translate_init.inc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c > index 076d94f45755..f235162a1f6b 100644 > --- a/target/ppc/translate_init.inc.c > +++ b/target/ppc/translate_init.inc.c > @@ -8880,7 +8880,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) > PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | > PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | > PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64 | > - PPC2_TM | PPC2_PM_ISA206 | PPC2_ISA300 | PPC2_PRCNTL; > + PPC2_TM | PPC2_ISA300 | PPC2_PRCNTL; > pcc->msr_mask = (1ull << MSR_SF) | > (1ull << MSR_TM) | > (1ull << MSR_VR) | -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 13/19] target/ppc: Rename "in_pm_state" to "resume_as_sreset" 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (11 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 12/19] target/ppc: Disable ISA 2.06 PM instructions on POWER9 Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-13 5:08 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 14/19] target/ppc: Add POWER9 exception model Cédric Le Goater ` (5 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> To better reflect what this does, as it's specific to some of the P7/P8/P9 PM states, not generic. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- target/ppc/cpu.h | 6 +++--- hw/ppc/ppc.c | 2 +- target/ppc/excp_helper.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 7ff65c804b57..b69410ea2541 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1116,10 +1116,10 @@ struct CPUPPCState { /* * On P7/P8/P9, set when in PM state, we need to handle resume in - * a special way (such as routing some resume causes to 0x100), so - * flag this here. + * a special way (such as routing some resume causes to 0x100, ie, + * sreset), so flag this here. */ - bool in_pm_state; + bool resume_as_sreset; #endif /* Those resources are used only during code translation */ diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 9292f986eba7..608405f6f2ca 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -722,7 +722,7 @@ static inline void cpu_ppc_hdecr_excp(PowerPCCPU *cpu) * interrupts in a PM state. Not only they don't cause a * wakeup but they also get effectively discarded. */ - if (!env->in_pm_state) { + if (!env->resume_as_sreset) { ppc_set_irq(cpu, PPC_INTERRUPT_HDECR, 1); } } diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 489a54f51b90..7536620a4133 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -69,7 +69,7 @@ static int powerpc_reset_wakeup(CPUState *cs, CPUPPCState *env, int excp, target_ulong *msr) { /* We no longer are in a PM state */ - env->in_pm_state = false; + env->resume_as_sreset = false; /* Pretend to be returning from doze always as we don't lose state */ *msr |= (0x1ull << (63 - 47)); @@ -141,7 +141,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) * check for special resume at 0x100 from doze/nap/sleep/winkle on * P7/P8/P9 */ - if (env->in_pm_state) { + if (env->resume_as_sreset) { excp = powerpc_reset_wakeup(cs, env, excp, &msr); } @@ -787,7 +787,7 @@ static void ppc_hw_interrupt(CPUPPCState *env) * clear when coming out of some power management states (in order * for them to become a 0x100). */ - async_deliver = (msr_ee != 0) || env->in_pm_state; + async_deliver = (msr_ee != 0) || env->resume_as_sreset; /* Hypervisor decrementer exception */ if (env->pending_interrupts & (1 << PPC_INTERRUPT_HDECR)) { @@ -970,7 +970,7 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) env->pending_interrupts &= ~(1 << PPC_INTERRUPT_HDECR); /* Condition for waking up at 0x100 */ - env->in_pm_state = (insn != PPC_PM_STOP) || + env->resume_as_sreset = (insn != PPC_PM_STOP) || (env->spr[SPR_PSSCR] & PSSCR_EC); } #endif /* defined(TARGET_PPC64) */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 13/19] target/ppc: Rename "in_pm_state" to "resume_as_sreset" 2019-01-28 9:46 ` [Qemu-devel] [PATCH 13/19] target/ppc: Rename "in_pm_state" to "resume_as_sreset" Cédric Le Goater @ 2019-02-13 5:08 ` David Gibson 0 siblings, 0 replies; 50+ messages in thread From: David Gibson @ 2019-02-13 5:08 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 3702 bytes --] On Mon, Jan 28, 2019 at 10:46:19AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > To better reflect what this does, as it's specific to some of the > P7/P8/P9 PM states, not generic. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > target/ppc/cpu.h | 6 +++--- > hw/ppc/ppc.c | 2 +- > target/ppc/excp_helper.c | 8 ++++---- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index 7ff65c804b57..b69410ea2541 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -1116,10 +1116,10 @@ struct CPUPPCState { > > /* > * On P7/P8/P9, set when in PM state, we need to handle resume in > - * a special way (such as routing some resume causes to 0x100), so > - * flag this here. > + * a special way (such as routing some resume causes to 0x100, ie, > + * sreset), so flag this here. > */ > - bool in_pm_state; > + bool resume_as_sreset; > #endif > > /* Those resources are used only during code translation */ > diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c > index 9292f986eba7..608405f6f2ca 100644 > --- a/hw/ppc/ppc.c > +++ b/hw/ppc/ppc.c > @@ -722,7 +722,7 @@ static inline void cpu_ppc_hdecr_excp(PowerPCCPU *cpu) > * interrupts in a PM state. Not only they don't cause a > * wakeup but they also get effectively discarded. > */ > - if (!env->in_pm_state) { > + if (!env->resume_as_sreset) { > ppc_set_irq(cpu, PPC_INTERRUPT_HDECR, 1); > } > } > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 489a54f51b90..7536620a4133 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -69,7 +69,7 @@ static int powerpc_reset_wakeup(CPUState *cs, CPUPPCState *env, int excp, > target_ulong *msr) > { > /* We no longer are in a PM state */ > - env->in_pm_state = false; > + env->resume_as_sreset = false; > > /* Pretend to be returning from doze always as we don't lose state */ > *msr |= (0x1ull << (63 - 47)); > @@ -141,7 +141,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) > * check for special resume at 0x100 from doze/nap/sleep/winkle on > * P7/P8/P9 > */ > - if (env->in_pm_state) { > + if (env->resume_as_sreset) { > excp = powerpc_reset_wakeup(cs, env, excp, &msr); > } > > @@ -787,7 +787,7 @@ static void ppc_hw_interrupt(CPUPPCState *env) > * clear when coming out of some power management states (in order > * for them to become a 0x100). > */ > - async_deliver = (msr_ee != 0) || env->in_pm_state; > + async_deliver = (msr_ee != 0) || env->resume_as_sreset; > > /* Hypervisor decrementer exception */ > if (env->pending_interrupts & (1 << PPC_INTERRUPT_HDECR)) { > @@ -970,7 +970,7 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) > env->pending_interrupts &= ~(1 << PPC_INTERRUPT_HDECR); > > /* Condition for waking up at 0x100 */ > - env->in_pm_state = (insn != PPC_PM_STOP) || > + env->resume_as_sreset = (insn != PPC_PM_STOP) || > (env->spr[SPR_PSSCR] & PSSCR_EC); > } > #endif /* defined(TARGET_PPC64) */ -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 14/19] target/ppc: Add POWER9 exception model 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (12 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 13/19] target/ppc: Rename "in_pm_state" to "resume_as_sreset" Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-13 5:10 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 15/19] target/ppc: Detect erroneous condition in interrupt delivery Cédric Le Goater ` (4 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> And use it to get the correct HILE bit in HID0 Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- target/ppc/cpu-qom.h | 2 ++ target/ppc/excp_helper.c | 17 +++++++++++++---- target/ppc/translate.c | 3 ++- target/ppc/translate_init.inc.c | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 7c54093a7122..7ff8b2d68632 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -113,6 +113,8 @@ enum powerpc_excp_t { POWERPC_EXCP_POWER7, /* POWER8 exception model */ POWERPC_EXCP_POWER8, + /* POWER9 exception model */ + POWERPC_EXCP_POWER9, }; /*****************************************************************************/ diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 7536620a4133..37546bb0f0fe 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -147,7 +147,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) /* Exception targetting modifiers * - * LPES0 is supported on POWER7/8 + * LPES0 is supported on POWER7/8/9 * LPES1 is not supported (old iSeries mode) * * On anything else, we behave as if LPES0 is 1 @@ -158,9 +158,10 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) */ #if defined(TARGET_PPC64) if (excp_model == POWERPC_EXCP_POWER7 || - excp_model == POWERPC_EXCP_POWER8) { + excp_model == POWERPC_EXCP_POWER8 || + excp_model == POWERPC_EXCP_POWER9) { lpes0 = !!(env->spr[SPR_LPCR] & LPCR_LPES0); - if (excp_model == POWERPC_EXCP_POWER8) { + if (excp_model != POWERPC_EXCP_POWER7) { ail = (env->spr[SPR_LPCR] & LPCR_AIL) >> LPCR_AIL_SHIFT; } else { ail = 0; @@ -662,7 +663,15 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) } } else if (excp_model == POWERPC_EXCP_POWER8) { if (new_msr & MSR_HVB) { - if (env->spr[SPR_HID0] & (HID0_HILE | HID0_POWER9_HILE)) { + if (env->spr[SPR_HID0] & HID0_HILE) { + new_msr |= (target_ulong)1 << MSR_LE; + } + } else if (env->spr[SPR_LPCR] & LPCR_ILE) { + new_msr |= (target_ulong)1 << MSR_LE; + } + } else if (excp_model == POWERPC_EXCP_POWER9) { + if (new_msr & MSR_HVB) { + if (env->spr[SPR_HID0] & HID0_POWER9_HILE) { new_msr |= (target_ulong)1 << MSR_LE; } } else if (env->spr[SPR_LPCR] & LPCR_ILE) { diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 07bedbb8f1ce..62a9a57e4a65 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -7483,7 +7483,8 @@ void ppc_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, #if defined(TARGET_PPC64) if (env->excp_model == POWERPC_EXCP_POWER7 || - env->excp_model == POWERPC_EXCP_POWER8) { + env->excp_model == POWERPC_EXCP_POWER8 || + env->excp_model == POWERPC_EXCP_POWER9) { cpu_fprintf(f, "HSRR0 " TARGET_FMT_lx " HSRR1 " TARGET_FMT_lx "\n", env->spr[SPR_HSRR0], env->spr[SPR_HSRR1]); } diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index f235162a1f6b..c1719c46a383 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -8905,7 +8905,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) pcc->hash64_opts = &ppc_hash64_opts_POWER7; pcc->radix_page_info = &POWER9_radix_page_info; #endif - pcc->excp_model = POWERPC_EXCP_POWER8; + pcc->excp_model = POWERPC_EXCP_POWER9; pcc->bus_model = PPC_FLAGS_INPUT_POWER7; pcc->bfd_mach = bfd_mach_ppc64; pcc->flags = POWERPC_FLAG_VRE | POWERPC_FLAG_SE | -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 14/19] target/ppc: Add POWER9 exception model 2019-01-28 9:46 ` [Qemu-devel] [PATCH 14/19] target/ppc: Add POWER9 exception model Cédric Le Goater @ 2019-02-13 5:10 ` David Gibson 0 siblings, 0 replies; 50+ messages in thread From: David Gibson @ 2019-02-13 5:10 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 4608 bytes --] On Mon, Jan 28, 2019 at 10:46:20AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > And use it to get the correct HILE bit in HID0 > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > target/ppc/cpu-qom.h | 2 ++ > target/ppc/excp_helper.c | 17 +++++++++++++---- > target/ppc/translate.c | 3 ++- > target/ppc/translate_init.inc.c | 2 +- > 4 files changed, 18 insertions(+), 6 deletions(-) > > diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h > index 7c54093a7122..7ff8b2d68632 100644 > --- a/target/ppc/cpu-qom.h > +++ b/target/ppc/cpu-qom.h > @@ -113,6 +113,8 @@ enum powerpc_excp_t { > POWERPC_EXCP_POWER7, > /* POWER8 exception model */ > POWERPC_EXCP_POWER8, > + /* POWER9 exception model */ > + POWERPC_EXCP_POWER9, > }; > > /*****************************************************************************/ > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 7536620a4133..37546bb0f0fe 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -147,7 +147,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) > > /* Exception targetting modifiers > * > - * LPES0 is supported on POWER7/8 > + * LPES0 is supported on POWER7/8/9 > * LPES1 is not supported (old iSeries mode) > * > * On anything else, we behave as if LPES0 is 1 > @@ -158,9 +158,10 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) > */ > #if defined(TARGET_PPC64) > if (excp_model == POWERPC_EXCP_POWER7 || > - excp_model == POWERPC_EXCP_POWER8) { > + excp_model == POWERPC_EXCP_POWER8 || > + excp_model == POWERPC_EXCP_POWER9) { > lpes0 = !!(env->spr[SPR_LPCR] & LPCR_LPES0); > - if (excp_model == POWERPC_EXCP_POWER8) { > + if (excp_model != POWERPC_EXCP_POWER7) { > ail = (env->spr[SPR_LPCR] & LPCR_AIL) >> LPCR_AIL_SHIFT; > } else { > ail = 0; > @@ -662,7 +663,15 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) > } > } else if (excp_model == POWERPC_EXCP_POWER8) { > if (new_msr & MSR_HVB) { > - if (env->spr[SPR_HID0] & (HID0_HILE | HID0_POWER9_HILE)) { > + if (env->spr[SPR_HID0] & HID0_HILE) { > + new_msr |= (target_ulong)1 << MSR_LE; > + } > + } else if (env->spr[SPR_LPCR] & LPCR_ILE) { > + new_msr |= (target_ulong)1 << MSR_LE; > + } > + } else if (excp_model == POWERPC_EXCP_POWER9) { > + if (new_msr & MSR_HVB) { > + if (env->spr[SPR_HID0] & HID0_POWER9_HILE) { > new_msr |= (target_ulong)1 << MSR_LE; > } > } else if (env->spr[SPR_LPCR] & LPCR_ILE) { > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index 07bedbb8f1ce..62a9a57e4a65 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -7483,7 +7483,8 @@ void ppc_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, > > #if defined(TARGET_PPC64) > if (env->excp_model == POWERPC_EXCP_POWER7 || > - env->excp_model == POWERPC_EXCP_POWER8) { > + env->excp_model == POWERPC_EXCP_POWER8 || > + env->excp_model == POWERPC_EXCP_POWER9) { > cpu_fprintf(f, "HSRR0 " TARGET_FMT_lx " HSRR1 " TARGET_FMT_lx "\n", > env->spr[SPR_HSRR0], env->spr[SPR_HSRR1]); > } > diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c > index f235162a1f6b..c1719c46a383 100644 > --- a/target/ppc/translate_init.inc.c > +++ b/target/ppc/translate_init.inc.c > @@ -8905,7 +8905,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) > pcc->hash64_opts = &ppc_hash64_opts_POWER7; > pcc->radix_page_info = &POWER9_radix_page_info; > #endif > - pcc->excp_model = POWERPC_EXCP_POWER8; > + pcc->excp_model = POWERPC_EXCP_POWER9; > pcc->bus_model = PPC_FLAGS_INPUT_POWER7; > pcc->bfd_mach = bfd_mach_ppc64; > pcc->flags = POWERPC_FLAG_VRE | POWERPC_FLAG_SE | -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 15/19] target/ppc: Detect erroneous condition in interrupt delivery 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (13 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 14/19] target/ppc: Add POWER9 exception model Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-13 5:11 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 16/19] target/ppc: Add Hypervisor Virtualization Interrupt on POWER9 Cédric Le Goater ` (3 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> It's very easy for the CPU specific has_work() implementation and the logic in ppc_hw_interrupt() to be subtly out of sync. This can occasionally allow a CPU to wakeup from a PM state and resume executing past the PM instruction when it should resume at the 0x100 vector. This detects if it happens and aborts, making it a lot easier to catch such bugs when testing rather than chasing obscure guest misbehaviour. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- target/ppc/excp_helper.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 37546bb0f0fe..1a2f469a5fa2 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -878,6 +878,22 @@ static void ppc_hw_interrupt(CPUPPCState *env) return; } } + + if (env->resume_as_sreset) { + /* + * This is a bug ! It means that has_work took us out of halt without + * anything to deliver while in a PM state that requires getting + * out via a 0x100 + * + * This means we will incorrectly execute past the power management + * instruction instead of triggering a reset. + * + * It generally means a discrepancy between the wakup conditions in the + * processor has_work implementation and the logic in this function. + */ + cpu_abort(CPU(ppc_env_get_cpu(env)), + "Wakeup from PM state but interrupt Undelivered"); + } } void ppc_cpu_do_system_reset(CPUState *cs) -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 15/19] target/ppc: Detect erroneous condition in interrupt delivery 2019-01-28 9:46 ` [Qemu-devel] [PATCH 15/19] target/ppc: Detect erroneous condition in interrupt delivery Cédric Le Goater @ 2019-02-13 5:11 ` David Gibson 0 siblings, 0 replies; 50+ messages in thread From: David Gibson @ 2019-02-13 5:11 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 2138 bytes --] On Mon, Jan 28, 2019 at 10:46:21AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > It's very easy for the CPU specific has_work() implementation > and the logic in ppc_hw_interrupt() to be subtly out of sync. > > This can occasionally allow a CPU to wakeup from a PM state > and resume executing past the PM instruction when it should > resume at the 0x100 vector. > > This detects if it happens and aborts, making it a lot easier > to catch such bugs when testing rather than chasing obscure > guest misbehaviour. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > target/ppc/excp_helper.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 37546bb0f0fe..1a2f469a5fa2 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -878,6 +878,22 @@ static void ppc_hw_interrupt(CPUPPCState *env) > return; > } > } > + > + if (env->resume_as_sreset) { > + /* > + * This is a bug ! It means that has_work took us out of halt without > + * anything to deliver while in a PM state that requires getting > + * out via a 0x100 > + * > + * This means we will incorrectly execute past the power management > + * instruction instead of triggering a reset. > + * > + * It generally means a discrepancy between the wakup conditions in the > + * processor has_work implementation and the logic in this function. > + */ > + cpu_abort(CPU(ppc_env_get_cpu(env)), > + "Wakeup from PM state but interrupt Undelivered"); > + } > } > > void ppc_cpu_do_system_reset(CPUState *cs) -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 16/19] target/ppc: Add Hypervisor Virtualization Interrupt on POWER9 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (14 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 15/19] target/ppc: Detect erroneous condition in interrupt delivery Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-13 5:12 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 17/19] target/ppc: Add POWER9 external interrupt model Cédric Le Goater ` (2 subsequent siblings) 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> This adds support for delivering that exception Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- target/ppc/cpu.h | 5 ++++- target/ppc/excp_helper.c | 17 ++++++++++++++++- target/ppc/translate_init.inc.c | 16 +++++++++++++++- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index b69410ea2541..385d33bd37ff 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -160,8 +160,10 @@ enum { /* Server doorbell variants */ POWERPC_EXCP_SDOOR = 99, POWERPC_EXCP_SDOOR_HV = 100, + /* ISA 3.00 additions */ + POWERPC_EXCP_HVIRT = 101, /* EOL */ - POWERPC_EXCP_NB = 101, + POWERPC_EXCP_NB = 102, /* QEMU exceptions: used internally during code translation */ POWERPC_EXCP_STOP = 0x200, /* stop translation */ POWERPC_EXCP_BRANCH = 0x201, /* branch instruction */ @@ -2344,6 +2346,7 @@ enum { PPC_INTERRUPT_PERFM, /* Performance monitor interrupt */ PPC_INTERRUPT_HMI, /* Hypervisor Maintainance interrupt */ PPC_INTERRUPT_HDOORBELL, /* Hypervisor Doorbell interrupt */ + PPC_INTERRUPT_HVIRT, /* Hypervisor virtualization interrupt */ }; /* Processor Compatibility mask (PCR) */ diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 1a2f469a5fa2..d171a5eb6236 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -97,6 +97,9 @@ static int powerpc_reset_wakeup(CPUState *cs, CPUPPCState *env, int excp, case POWERPC_EXCP_HV_MAINT: *msr |= 0xaull << (63 - 45); break; + case POWERPC_EXCP_HVIRT: + *msr |= 0x9ull << (63 - 45); + break; default: cpu_abort(cs, "Unsupported exception %d in Power Save mode\n", excp); @@ -427,6 +430,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) case POWERPC_EXCP_HISEG: /* Hypervisor instruction segment exception */ case POWERPC_EXCP_SDOOR_HV: /* Hypervisor Doorbell interrupt */ case POWERPC_EXCP_HV_EMU: + case POWERPC_EXCP_HVIRT: /* Hypervisor virtualization */ srr0 = SPR_HSRR0; srr1 = SPR_HSRR1; new_msr |= (target_ulong)MSR_HVB; @@ -809,7 +813,18 @@ static void ppc_hw_interrupt(CPUPPCState *env) return; } } - /* Extermal interrupt can ignore MSR:EE under some circumstances */ + + /* Hypervisor virtualization interrupt */ + if (env->pending_interrupts & (1 << PPC_INTERRUPT_HVIRT)) { + /* LPCR will be clear when not supported so this will work */ + bool hvice = !!(env->spr[SPR_LPCR] & LPCR_HVICE); + if ((async_deliver || msr_hv == 0) && hvice) { + powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_HVIRT); + return; + } + } + + /* External interrupt can ignore MSR:EE under some circumstances */ if (env->pending_interrupts & (1 << PPC_INTERRUPT_EXT)) { bool lpes0 = !!(env->spr[SPR_LPCR] & LPCR_LPES0); if (async_deliver || (env->has_hv_mode && msr_hv == 0 && !lpes0)) { diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index c1719c46a383..6ffa4a8fe0fa 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -3313,6 +3313,15 @@ static void init_excp_POWER8(CPUPPCState *env) #endif } +static void init_excp_POWER9(CPUPPCState *env) +{ + init_excp_POWER8(env); + +#if !defined(CONFIG_USER_ONLY) + env->excp_vectors[POWERPC_EXCP_HVIRT] = 0x00000EA0; +#endif +} + #endif /*****************************************************************************/ @@ -8783,7 +8792,7 @@ static void init_proc_POWER9(CPUPPCState *env) env->icache_line_size = 128; /* Allocate hardware IRQ controller */ - init_excp_POWER8(env); + init_excp_POWER9(env); ppcPOWER7_irq_init(ppc_env_get_cpu(env)); } @@ -8836,6 +8845,11 @@ static bool cpu_has_work_POWER9(CPUState *cs) (env->spr[SPR_LPCR] & LPCR_HDEE)) { return true; } + /* Hypervisor virtualization exception */ + if ((env->pending_interrupts & (1u << PPC_INTERRUPT_HVIRT)) && + (env->spr[SPR_LPCR] & LPCR_HVEE)) { + return true; + } if (env->pending_interrupts & (1u << PPC_INTERRUPT_RESET)) { return true; } -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 16/19] target/ppc: Add Hypervisor Virtualization Interrupt on POWER9 2019-01-28 9:46 ` [Qemu-devel] [PATCH 16/19] target/ppc: Add Hypervisor Virtualization Interrupt on POWER9 Cédric Le Goater @ 2019-02-13 5:12 ` David Gibson 0 siblings, 0 replies; 50+ messages in thread From: David Gibson @ 2019-02-13 5:12 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 5374 bytes --] On Mon, Jan 28, 2019 at 10:46:22AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > This adds support for delivering that exception > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > target/ppc/cpu.h | 5 ++++- > target/ppc/excp_helper.c | 17 ++++++++++++++++- > target/ppc/translate_init.inc.c | 16 +++++++++++++++- > 3 files changed, 35 insertions(+), 3 deletions(-) > > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index b69410ea2541..385d33bd37ff 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -160,8 +160,10 @@ enum { > /* Server doorbell variants */ > POWERPC_EXCP_SDOOR = 99, > POWERPC_EXCP_SDOOR_HV = 100, > + /* ISA 3.00 additions */ > + POWERPC_EXCP_HVIRT = 101, > /* EOL */ > - POWERPC_EXCP_NB = 101, > + POWERPC_EXCP_NB = 102, > /* QEMU exceptions: used internally during code translation */ > POWERPC_EXCP_STOP = 0x200, /* stop translation */ > POWERPC_EXCP_BRANCH = 0x201, /* branch instruction */ > @@ -2344,6 +2346,7 @@ enum { > PPC_INTERRUPT_PERFM, /* Performance monitor interrupt */ > PPC_INTERRUPT_HMI, /* Hypervisor Maintainance interrupt */ > PPC_INTERRUPT_HDOORBELL, /* Hypervisor Doorbell interrupt */ > + PPC_INTERRUPT_HVIRT, /* Hypervisor virtualization interrupt */ > }; > > /* Processor Compatibility mask (PCR) */ > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 1a2f469a5fa2..d171a5eb6236 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -97,6 +97,9 @@ static int powerpc_reset_wakeup(CPUState *cs, CPUPPCState *env, int excp, > case POWERPC_EXCP_HV_MAINT: > *msr |= 0xaull << (63 - 45); > break; > + case POWERPC_EXCP_HVIRT: > + *msr |= 0x9ull << (63 - 45); > + break; > default: > cpu_abort(cs, "Unsupported exception %d in Power Save mode\n", > excp); > @@ -427,6 +430,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) > case POWERPC_EXCP_HISEG: /* Hypervisor instruction segment exception */ > case POWERPC_EXCP_SDOOR_HV: /* Hypervisor Doorbell interrupt */ > case POWERPC_EXCP_HV_EMU: > + case POWERPC_EXCP_HVIRT: /* Hypervisor virtualization */ > srr0 = SPR_HSRR0; > srr1 = SPR_HSRR1; > new_msr |= (target_ulong)MSR_HVB; > @@ -809,7 +813,18 @@ static void ppc_hw_interrupt(CPUPPCState *env) > return; > } > } > - /* Extermal interrupt can ignore MSR:EE under some circumstances */ > + > + /* Hypervisor virtualization interrupt */ > + if (env->pending_interrupts & (1 << PPC_INTERRUPT_HVIRT)) { > + /* LPCR will be clear when not supported so this will work */ > + bool hvice = !!(env->spr[SPR_LPCR] & LPCR_HVICE); > + if ((async_deliver || msr_hv == 0) && hvice) { > + powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_HVIRT); > + return; > + } > + } > + > + /* External interrupt can ignore MSR:EE under some circumstances */ > if (env->pending_interrupts & (1 << PPC_INTERRUPT_EXT)) { > bool lpes0 = !!(env->spr[SPR_LPCR] & LPCR_LPES0); > if (async_deliver || (env->has_hv_mode && msr_hv == 0 && !lpes0)) { > diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c > index c1719c46a383..6ffa4a8fe0fa 100644 > --- a/target/ppc/translate_init.inc.c > +++ b/target/ppc/translate_init.inc.c > @@ -3313,6 +3313,15 @@ static void init_excp_POWER8(CPUPPCState *env) > #endif > } > > +static void init_excp_POWER9(CPUPPCState *env) > +{ > + init_excp_POWER8(env); > + > +#if !defined(CONFIG_USER_ONLY) > + env->excp_vectors[POWERPC_EXCP_HVIRT] = 0x00000EA0; > +#endif > +} > + > #endif > > /*****************************************************************************/ > @@ -8783,7 +8792,7 @@ static void init_proc_POWER9(CPUPPCState *env) > env->icache_line_size = 128; > > /* Allocate hardware IRQ controller */ > - init_excp_POWER8(env); > + init_excp_POWER9(env); > ppcPOWER7_irq_init(ppc_env_get_cpu(env)); > } > > @@ -8836,6 +8845,11 @@ static bool cpu_has_work_POWER9(CPUState *cs) > (env->spr[SPR_LPCR] & LPCR_HDEE)) { > return true; > } > + /* Hypervisor virtualization exception */ > + if ((env->pending_interrupts & (1u << PPC_INTERRUPT_HVIRT)) && > + (env->spr[SPR_LPCR] & LPCR_HVEE)) { > + return true; > + } > if (env->pending_interrupts & (1u << PPC_INTERRUPT_RESET)) { > return true; > } -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 17/19] target/ppc: Add POWER9 external interrupt model 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (15 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 16/19] target/ppc: Add Hypervisor Virtualization Interrupt on POWER9 Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-13 5:16 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 18/19] ppc/xive: Make XIVE generate the proper interrupt types Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 19/19] target/ppc: Add support for LPCR:HEIC on POWER9 Cédric Le Goater 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> Adds support for the Hypervisor directed interrupts in addition to the OS ones. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- include/hw/ppc/ppc.h | 2 ++ target/ppc/cpu-qom.h | 2 ++ target/ppc/cpu.h | 7 +++++++ hw/intc/xics.c | 1 + hw/intc/xive.c | 2 +- hw/ppc/ppc.c | 14 ++++++++++++++ target/ppc/translate_init.inc.c | 4 ++-- 7 files changed, 29 insertions(+), 3 deletions(-) diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h index daaa04a22dbf..4bdcb8bacd4e 100644 --- a/include/hw/ppc/ppc.h +++ b/include/hw/ppc/ppc.h @@ -74,6 +74,7 @@ static inline void ppc40x_irq_init(PowerPCCPU *cpu) {} static inline void ppc6xx_irq_init(PowerPCCPU *cpu) {} static inline void ppc970_irq_init(PowerPCCPU *cpu) {} static inline void ppcPOWER7_irq_init(PowerPCCPU *cpu) {} +static inline void ppcPOWER9_irq_init(PowerPCCPU *cpu) {} static inline void ppce500_irq_init(PowerPCCPU *cpu) {} #else void ppc40x_irq_init(PowerPCCPU *cpu); @@ -81,6 +82,7 @@ void ppce500_irq_init(PowerPCCPU *cpu); void ppc6xx_irq_init(PowerPCCPU *cpu); void ppc970_irq_init(PowerPCCPU *cpu); void ppcPOWER7_irq_init(PowerPCCPU *cpu); +void ppcPOWER9_irq_init(PowerPCCPU *cpu); #endif /* PPC machines for OpenBIOS */ diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 7ff8b2d68632..079fbb9d8718 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -142,6 +142,8 @@ enum powerpc_input_t { PPC_FLAGS_INPUT_970, /* PowerPC POWER7 bus */ PPC_FLAGS_INPUT_POWER7, + /* PowerPC POWER9 bus */ + PPC_FLAGS_INPUT_POWER9, /* PowerPC 401 bus */ PPC_FLAGS_INPUT_401, /* Freescale RCPU bus */ diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 385d33bd37ff..cc41ae6f3017 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -2322,6 +2322,13 @@ enum { * them */ POWER7_INPUT_NB, }; + +enum { + /* POWER9 input pins */ + POWER9_INPUT_INT = 0, /* Must match POWER7_INPUT_INT */ + POWER9_INPUT_HINT = 1, + POWER9_INPUT_NB, +}; #endif /* Hardware exceptions definitions */ diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 16e8ffa2aaf7..1f786175168f 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -342,6 +342,7 @@ static void icp_realize(DeviceState *dev, Error **errp) env = &cpu->env; switch (PPC_INPUT(env)) { case PPC_FLAGS_INPUT_POWER7: + case PPC_FLAGS_INPUT_POWER9: /* For SPAPR xics emulation */ icp->output = env->irq_inputs[POWER7_INPUT_INT]; break; diff --git a/hw/intc/xive.c b/hw/intc/xive.c index 0e0e1dc9c1b7..119bb02d345d 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -553,7 +553,7 @@ static void xive_tctx_realize(DeviceState *dev, Error **errp) env = &cpu->env; switch (PPC_INPUT(env)) { - case PPC_FLAGS_INPUT_POWER7: + case PPC_FLAGS_INPUT_POWER9: tctx->output = env->irq_inputs[POWER7_INPUT_INT]; break; diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 608405f6f2ca..1a5e087c9b1e 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -289,6 +289,12 @@ static void power7_set_irq(void *opaque, int pin, int level) __func__, level); ppc_set_irq(cpu, PPC_INTERRUPT_EXT, level); break; + case POWER9_INPUT_HINT: + /* Level sensitive - active high */ + LOG_IRQ("%s: set the external IRQ state to %d\n", + __func__, level); + ppc_set_irq(cpu, PPC_INTERRUPT_HVIRT, level); + break; default: /* Unknown pin - do nothing */ LOG_IRQ("%s: unknown IRQ pin %d\n", __func__, pin); @@ -308,6 +314,14 @@ void ppcPOWER7_irq_init(PowerPCCPU *cpu) env->irq_inputs = (void **)qemu_allocate_irqs(&power7_set_irq, cpu, POWER7_INPUT_NB); } + +void ppcPOWER9_irq_init(PowerPCCPU *cpu) +{ + CPUPPCState *env = &cpu->env; + + env->irq_inputs = (void **)qemu_allocate_irqs(&power7_set_irq, cpu, + POWER9_INPUT_NB); +} #endif /* defined(TARGET_PPC64) */ /* PowerPC 40x internal IRQ controller */ diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index 6ffa4a8fe0fa..7f25215f0192 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -8793,7 +8793,7 @@ static void init_proc_POWER9(CPUPPCState *env) /* Allocate hardware IRQ controller */ init_excp_POWER9(env); - ppcPOWER7_irq_init(ppc_env_get_cpu(env)); + ppcPOWER9_irq_init(ppc_env_get_cpu(env)); } static bool ppc_pvr_match_power9(PowerPCCPUClass *pcc, uint32_t pvr) @@ -8920,7 +8920,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) pcc->radix_page_info = &POWER9_radix_page_info; #endif pcc->excp_model = POWERPC_EXCP_POWER9; - pcc->bus_model = PPC_FLAGS_INPUT_POWER7; + pcc->bus_model = PPC_FLAGS_INPUT_POWER9; pcc->bfd_mach = bfd_mach_ppc64; pcc->flags = POWERPC_FLAG_VRE | POWERPC_FLAG_SE | POWERPC_FLAG_BE | POWERPC_FLAG_PMM | -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 17/19] target/ppc: Add POWER9 external interrupt model 2019-01-28 9:46 ` [Qemu-devel] [PATCH 17/19] target/ppc: Add POWER9 external interrupt model Cédric Le Goater @ 2019-02-13 5:16 ` David Gibson 2019-02-15 15:43 ` Cédric Le Goater 0 siblings, 1 reply; 50+ messages in thread From: David Gibson @ 2019-02-13 5:16 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 6279 bytes --] On Mon, Jan 28, 2019 at 10:46:23AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > Adds support for the Hypervisor directed interrupts in addition to the > OS ones. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > include/hw/ppc/ppc.h | 2 ++ > target/ppc/cpu-qom.h | 2 ++ > target/ppc/cpu.h | 7 +++++++ > hw/intc/xics.c | 1 + > hw/intc/xive.c | 2 +- > hw/ppc/ppc.c | 14 ++++++++++++++ > target/ppc/translate_init.inc.c | 4 ++-- > 7 files changed, 29 insertions(+), 3 deletions(-) > > diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h > index daaa04a22dbf..4bdcb8bacd4e 100644 > --- a/include/hw/ppc/ppc.h > +++ b/include/hw/ppc/ppc.h > @@ -74,6 +74,7 @@ static inline void ppc40x_irq_init(PowerPCCPU *cpu) {} > static inline void ppc6xx_irq_init(PowerPCCPU *cpu) {} > static inline void ppc970_irq_init(PowerPCCPU *cpu) {} > static inline void ppcPOWER7_irq_init(PowerPCCPU *cpu) {} > +static inline void ppcPOWER9_irq_init(PowerPCCPU *cpu) {} > static inline void ppce500_irq_init(PowerPCCPU *cpu) {} > #else > void ppc40x_irq_init(PowerPCCPU *cpu); > @@ -81,6 +82,7 @@ void ppce500_irq_init(PowerPCCPU *cpu); > void ppc6xx_irq_init(PowerPCCPU *cpu); > void ppc970_irq_init(PowerPCCPU *cpu); > void ppcPOWER7_irq_init(PowerPCCPU *cpu); > +void ppcPOWER9_irq_init(PowerPCCPU *cpu); > #endif > > /* PPC machines for OpenBIOS */ > diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h > index 7ff8b2d68632..079fbb9d8718 100644 > --- a/target/ppc/cpu-qom.h > +++ b/target/ppc/cpu-qom.h > @@ -142,6 +142,8 @@ enum powerpc_input_t { > PPC_FLAGS_INPUT_970, > /* PowerPC POWER7 bus */ > PPC_FLAGS_INPUT_POWER7, > + /* PowerPC POWER9 bus */ > + PPC_FLAGS_INPUT_POWER9, > /* PowerPC 401 bus */ > PPC_FLAGS_INPUT_401, > /* Freescale RCPU bus */ > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index 385d33bd37ff..cc41ae6f3017 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -2322,6 +2322,13 @@ enum { > * them */ > POWER7_INPUT_NB, > }; > + > +enum { > + /* POWER9 input pins */ > + POWER9_INPUT_INT = 0, /* Must match POWER7_INPUT_INT */ Rather than having this vital comment here... > + POWER9_INPUT_HINT = 1, > + POWER9_INPUT_NB, > +}; > #endif > > /* Hardware exceptions definitions */ > diff --git a/hw/intc/xics.c b/hw/intc/xics.c > index 16e8ffa2aaf7..1f786175168f 100644 > --- a/hw/intc/xics.c > +++ b/hw/intc/xics.c > @@ -342,6 +342,7 @@ static void icp_realize(DeviceState *dev, Error **errp) > env = &cpu->env; > switch (PPC_INPUT(env)) { > case PPC_FLAGS_INPUT_POWER7: > + case PPC_FLAGS_INPUT_POWER9: /* For SPAPR xics emulation */ .. you could just split the cases here. It's a little more verbose, but it's more robust. > icp->output = env->irq_inputs[POWER7_INPUT_INT]; > break; > > diff --git a/hw/intc/xive.c b/hw/intc/xive.c > index 0e0e1dc9c1b7..119bb02d345d 100644 > --- a/hw/intc/xive.c > +++ b/hw/intc/xive.c > @@ -553,7 +553,7 @@ static void xive_tctx_realize(DeviceState *dev, Error **errp) > > env = &cpu->env; > switch (PPC_INPUT(env)) { > - case PPC_FLAGS_INPUT_POWER7: > + case PPC_FLAGS_INPUT_POWER9: And here, of course. > tctx->output = env->irq_inputs[POWER7_INPUT_INT]; > break; > > diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c > index 608405f6f2ca..1a5e087c9b1e 100644 > --- a/hw/ppc/ppc.c > +++ b/hw/ppc/ppc.c > @@ -289,6 +289,12 @@ static void power7_set_irq(void *opaque, int pin, int level) > __func__, level); > ppc_set_irq(cpu, PPC_INTERRUPT_EXT, level); > break; > + case POWER9_INPUT_HINT: Having a POWER9 specific case in a function named for power7 is pretty odd. Best to split these as well, I think. > + /* Level sensitive - active high */ > + LOG_IRQ("%s: set the external IRQ state to %d\n", > + __func__, level); > + ppc_set_irq(cpu, PPC_INTERRUPT_HVIRT, level); > + break; > default: > /* Unknown pin - do nothing */ > LOG_IRQ("%s: unknown IRQ pin %d\n", __func__, pin); > @@ -308,6 +314,14 @@ void ppcPOWER7_irq_init(PowerPCCPU *cpu) > env->irq_inputs = (void **)qemu_allocate_irqs(&power7_set_irq, cpu, > POWER7_INPUT_NB); > } > + > +void ppcPOWER9_irq_init(PowerPCCPU *cpu) > +{ > + CPUPPCState *env = &cpu->env; > + > + env->irq_inputs = (void **)qemu_allocate_irqs(&power7_set_irq, cpu, > + POWER9_INPUT_NB); > +} > #endif /* defined(TARGET_PPC64) */ > > /* PowerPC 40x internal IRQ controller */ > diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c > index 6ffa4a8fe0fa..7f25215f0192 100644 > --- a/target/ppc/translate_init.inc.c > +++ b/target/ppc/translate_init.inc.c > @@ -8793,7 +8793,7 @@ static void init_proc_POWER9(CPUPPCState *env) > > /* Allocate hardware IRQ controller */ > init_excp_POWER9(env); > - ppcPOWER7_irq_init(ppc_env_get_cpu(env)); > + ppcPOWER9_irq_init(ppc_env_get_cpu(env)); > } > > static bool ppc_pvr_match_power9(PowerPCCPUClass *pcc, uint32_t pvr) > @@ -8920,7 +8920,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) > pcc->radix_page_info = &POWER9_radix_page_info; > #endif > pcc->excp_model = POWERPC_EXCP_POWER9; > - pcc->bus_model = PPC_FLAGS_INPUT_POWER7; > + pcc->bus_model = PPC_FLAGS_INPUT_POWER9; > pcc->bfd_mach = bfd_mach_ppc64; > pcc->flags = POWERPC_FLAG_VRE | POWERPC_FLAG_SE | > POWERPC_FLAG_BE | POWERPC_FLAG_PMM | -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 17/19] target/ppc: Add POWER9 external interrupt model 2019-02-13 5:16 ` David Gibson @ 2019-02-15 15:43 ` Cédric Le Goater 0 siblings, 0 replies; 50+ messages in thread From: Cédric Le Goater @ 2019-02-15 15:43 UTC (permalink / raw) To: David Gibson; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt On 2/13/19 6:16 AM, David Gibson wrote: > On Mon, Jan 28, 2019 at 10:46:23AM +0100, Cédric Le Goater wrote: >> From: Benjamin Herrenschmidt <benh@kernel.crashing.org> >> >> Adds support for the Hypervisor directed interrupts in addition to the >> OS ones. >> >> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> >> Signed-off-by: Cédric Le Goater <clg@kaod.org> >> --- >> include/hw/ppc/ppc.h | 2 ++ >> target/ppc/cpu-qom.h | 2 ++ >> target/ppc/cpu.h | 7 +++++++ >> hw/intc/xics.c | 1 + >> hw/intc/xive.c | 2 +- >> hw/ppc/ppc.c | 14 ++++++++++++++ >> target/ppc/translate_init.inc.c | 4 ++-- >> 7 files changed, 29 insertions(+), 3 deletions(-) >> >> diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h >> index daaa04a22dbf..4bdcb8bacd4e 100644 >> --- a/include/hw/ppc/ppc.h >> +++ b/include/hw/ppc/ppc.h >> @@ -74,6 +74,7 @@ static inline void ppc40x_irq_init(PowerPCCPU *cpu) {} >> static inline void ppc6xx_irq_init(PowerPCCPU *cpu) {} >> static inline void ppc970_irq_init(PowerPCCPU *cpu) {} >> static inline void ppcPOWER7_irq_init(PowerPCCPU *cpu) {} >> +static inline void ppcPOWER9_irq_init(PowerPCCPU *cpu) {} >> static inline void ppce500_irq_init(PowerPCCPU *cpu) {} >> #else >> void ppc40x_irq_init(PowerPCCPU *cpu); >> @@ -81,6 +82,7 @@ void ppce500_irq_init(PowerPCCPU *cpu); >> void ppc6xx_irq_init(PowerPCCPU *cpu); >> void ppc970_irq_init(PowerPCCPU *cpu); >> void ppcPOWER7_irq_init(PowerPCCPU *cpu); >> +void ppcPOWER9_irq_init(PowerPCCPU *cpu); >> #endif >> >> /* PPC machines for OpenBIOS */ >> diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h >> index 7ff8b2d68632..079fbb9d8718 100644 >> --- a/target/ppc/cpu-qom.h >> +++ b/target/ppc/cpu-qom.h >> @@ -142,6 +142,8 @@ enum powerpc_input_t { >> PPC_FLAGS_INPUT_970, >> /* PowerPC POWER7 bus */ >> PPC_FLAGS_INPUT_POWER7, >> + /* PowerPC POWER9 bus */ >> + PPC_FLAGS_INPUT_POWER9, >> /* PowerPC 401 bus */ >> PPC_FLAGS_INPUT_401, >> /* Freescale RCPU bus */ >> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h >> index 385d33bd37ff..cc41ae6f3017 100644 >> --- a/target/ppc/cpu.h >> +++ b/target/ppc/cpu.h >> @@ -2322,6 +2322,13 @@ enum { >> * them */ >> POWER7_INPUT_NB, >> }; >> + >> +enum { >> + /* POWER9 input pins */ >> + POWER9_INPUT_INT = 0, /* Must match POWER7_INPUT_INT */ > > Rather than having this vital comment here... > >> + POWER9_INPUT_HINT = 1, >> + POWER9_INPUT_NB, >> +}; >> #endif >> >> /* Hardware exceptions definitions */ >> diff --git a/hw/intc/xics.c b/hw/intc/xics.c >> index 16e8ffa2aaf7..1f786175168f 100644 >> --- a/hw/intc/xics.c >> +++ b/hw/intc/xics.c >> @@ -342,6 +342,7 @@ static void icp_realize(DeviceState *dev, Error **errp) >> env = &cpu->env; >> switch (PPC_INPUT(env)) { >> case PPC_FLAGS_INPUT_POWER7: >> + case PPC_FLAGS_INPUT_POWER9: /* For SPAPR xics emulation */ > > .. you could just split the cases here. It's a little more verbose, > but it's more robust. Yes clearly. This is much better. Thanks, C. >> icp->output = env->irq_inputs[POWER7_INPUT_INT]; >> break; >> >> diff --git a/hw/intc/xive.c b/hw/intc/xive.c >> index 0e0e1dc9c1b7..119bb02d345d 100644 >> --- a/hw/intc/xive.c >> +++ b/hw/intc/xive.c >> @@ -553,7 +553,7 @@ static void xive_tctx_realize(DeviceState *dev, Error **errp) >> >> env = &cpu->env; >> switch (PPC_INPUT(env)) { >> - case PPC_FLAGS_INPUT_POWER7: >> + case PPC_FLAGS_INPUT_POWER9: > > And here, of course. > >> tctx->output = env->irq_inputs[POWER7_INPUT_INT]; >> break; >> >> diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c >> index 608405f6f2ca..1a5e087c9b1e 100644 >> --- a/hw/ppc/ppc.c >> +++ b/hw/ppc/ppc.c >> @@ -289,6 +289,12 @@ static void power7_set_irq(void *opaque, int pin, int level) >> __func__, level); >> ppc_set_irq(cpu, PPC_INTERRUPT_EXT, level); >> break; >> + case POWER9_INPUT_HINT: > > Having a POWER9 specific case in a function named for power7 is pretty > odd. Best to split these as well, I think. > >> + /* Level sensitive - active high */ >> + LOG_IRQ("%s: set the external IRQ state to %d\n", >> + __func__, level); >> + ppc_set_irq(cpu, PPC_INTERRUPT_HVIRT, level); >> + break; >> default: >> /* Unknown pin - do nothing */ >> LOG_IRQ("%s: unknown IRQ pin %d\n", __func__, pin); >> @@ -308,6 +314,14 @@ void ppcPOWER7_irq_init(PowerPCCPU *cpu) >> env->irq_inputs = (void **)qemu_allocate_irqs(&power7_set_irq, cpu, >> POWER7_INPUT_NB); >> } >> + >> +void ppcPOWER9_irq_init(PowerPCCPU *cpu) >> +{ >> + CPUPPCState *env = &cpu->env; >> + >> + env->irq_inputs = (void **)qemu_allocate_irqs(&power7_set_irq, cpu, >> + POWER9_INPUT_NB); >> +} >> #endif /* defined(TARGET_PPC64) */ >> >> /* PowerPC 40x internal IRQ controller */ >> diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c >> index 6ffa4a8fe0fa..7f25215f0192 100644 >> --- a/target/ppc/translate_init.inc.c >> +++ b/target/ppc/translate_init.inc.c >> @@ -8793,7 +8793,7 @@ static void init_proc_POWER9(CPUPPCState *env) >> >> /* Allocate hardware IRQ controller */ >> init_excp_POWER9(env); >> - ppcPOWER7_irq_init(ppc_env_get_cpu(env)); >> + ppcPOWER9_irq_init(ppc_env_get_cpu(env)); >> } >> >> static bool ppc_pvr_match_power9(PowerPCCPUClass *pcc, uint32_t pvr) >> @@ -8920,7 +8920,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) >> pcc->radix_page_info = &POWER9_radix_page_info; >> #endif >> pcc->excp_model = POWERPC_EXCP_POWER9; >> - pcc->bus_model = PPC_FLAGS_INPUT_POWER7; >> + pcc->bus_model = PPC_FLAGS_INPUT_POWER9; >> pcc->bfd_mach = bfd_mach_ppc64; >> pcc->flags = POWERPC_FLAG_VRE | POWERPC_FLAG_SE | >> POWERPC_FLAG_BE | POWERPC_FLAG_PMM | > ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 18/19] ppc/xive: Make XIVE generate the proper interrupt types 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (16 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 17/19] target/ppc: Add POWER9 external interrupt model Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-13 5:17 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 19/19] target/ppc: Add support for LPCR:HEIC on POWER9 Cédric Le Goater 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> 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 <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- include/hw/ppc/xive.h | 3 ++- hw/intc/xive.c | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index 2bad8526221b..82e9aef677c5 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -316,7 +316,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]; uint32_t hw_cam; diff --git a/hw/intc/xive.c b/hw/intc/xive.c index 119bb02d345d..14b854181ab7 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -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)); } } @@ -554,7 +569,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[POWER7_INPUT_INT]; + tctx->hv_output = env->irq_inputs[POWER9_INPUT_HINT]; + tctx->os_output = env->irq_inputs[POWER9_INPUT_INT]; break; default: -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 18/19] ppc/xive: Make XIVE generate the proper interrupt types 2019-01-28 9:46 ` [Qemu-devel] [PATCH 18/19] ppc/xive: Make XIVE generate the proper interrupt types Cédric Le Goater @ 2019-02-13 5:17 ` David Gibson 0 siblings, 0 replies; 50+ messages in thread From: David Gibson @ 2019-02-13 5:17 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 3100 bytes --] On Mon, Jan 28, 2019 at 10:46:24AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > 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 <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > include/hw/ppc/xive.h | 3 ++- > hw/intc/xive.c | 22 +++++++++++++++++++--- > 2 files changed, 21 insertions(+), 4 deletions(-) > > diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h > index 2bad8526221b..82e9aef677c5 100644 > --- a/include/hw/ppc/xive.h > +++ b/include/hw/ppc/xive.h > @@ -316,7 +316,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]; > uint32_t hw_cam; > diff --git a/hw/intc/xive.c b/hw/intc/xive.c > index 119bb02d345d..14b854181ab7 100644 > --- a/hw/intc/xive.c > +++ b/hw/intc/xive.c > @@ -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)); > } > } > > @@ -554,7 +569,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[POWER7_INPUT_INT]; > + tctx->hv_output = env->irq_inputs[POWER9_INPUT_HINT]; > + tctx->os_output = env->irq_inputs[POWER9_INPUT_INT]; > break; > > default: -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
* [Qemu-devel] [PATCH 19/19] target/ppc: Add support for LPCR:HEIC on POWER9 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater ` (17 preceding siblings ...) 2019-01-28 9:46 ` [Qemu-devel] [PATCH 18/19] ppc/xive: Make XIVE generate the proper interrupt types Cédric Le Goater @ 2019-01-28 9:46 ` Cédric Le Goater 2019-02-13 5:18 ` David Gibson 18 siblings, 1 reply; 50+ messages in thread From: Cédric Le Goater @ 2019-01-28 9:46 UTC (permalink / raw) To: David Gibson Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt, Cédric Le Goater From: Benjamin Herrenschmidt <benh@kernel.crashing.org> This controls whether the External Interrupt (0x500) can be delivered to the hypervisor or not. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- target/ppc/excp_helper.c | 5 ++++- target/ppc/translate_init.inc.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index d171a5eb6236..39bedbb11db0 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -827,7 +827,10 @@ static void ppc_hw_interrupt(CPUPPCState *env) /* External interrupt can ignore MSR:EE under some circumstances */ if (env->pending_interrupts & (1 << PPC_INTERRUPT_EXT)) { bool lpes0 = !!(env->spr[SPR_LPCR] & LPCR_LPES0); - if (async_deliver || (env->has_hv_mode && msr_hv == 0 && !lpes0)) { + bool heic = !!(env->spr[SPR_LPCR] & LPCR_HEIC); + /* HEIC blocks delivery to the hypervisor */ + if ((async_deliver && !(heic && msr_hv && !msr_pr)) || + (env->has_hv_mode && msr_hv == 0 && !lpes0)) { powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_EXTERNAL); return; } diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index 7f25215f0192..63ded33ea7ea 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -8823,7 +8823,10 @@ static bool cpu_has_work_POWER9(CPUState *cs) /* External Exception */ if ((env->pending_interrupts & (1u << PPC_INTERRUPT_EXT)) && (env->spr[SPR_LPCR] & LPCR_EEE)) { - return true; + bool heic = !!(env->spr[SPR_LPCR] & LPCR_HEIC); + if (heic == 0 || !msr_hv || msr_pr) { + return true; + } } /* Decrementer Exception */ if ((env->pending_interrupts & (1u << PPC_INTERRUPT_DECR)) && -- 2.20.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [Qemu-devel] [PATCH 19/19] target/ppc: Add support for LPCR:HEIC on POWER9 2019-01-28 9:46 ` [Qemu-devel] [PATCH 19/19] target/ppc: Add support for LPCR:HEIC on POWER9 Cédric Le Goater @ 2019-02-13 5:18 ` David Gibson 0 siblings, 0 replies; 50+ messages in thread From: David Gibson @ 2019-02-13 5:18 UTC (permalink / raw) To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, Benjamin Herrenschmidt [-- Attachment #1: Type: text/plain, Size: 2427 bytes --] On Mon, Jan 28, 2019 at 10:46:25AM +0100, Cédric Le Goater wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > This controls whether the External Interrupt (0x500) can be > delivered to the hypervisor or not. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > target/ppc/excp_helper.c | 5 ++++- > target/ppc/translate_init.inc.c | 5 ++++- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index d171a5eb6236..39bedbb11db0 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -827,7 +827,10 @@ static void ppc_hw_interrupt(CPUPPCState *env) > /* External interrupt can ignore MSR:EE under some circumstances */ > if (env->pending_interrupts & (1 << PPC_INTERRUPT_EXT)) { > bool lpes0 = !!(env->spr[SPR_LPCR] & LPCR_LPES0); > - if (async_deliver || (env->has_hv_mode && msr_hv == 0 && !lpes0)) { > + bool heic = !!(env->spr[SPR_LPCR] & LPCR_HEIC); > + /* HEIC blocks delivery to the hypervisor */ > + if ((async_deliver && !(heic && msr_hv && !msr_pr)) || > + (env->has_hv_mode && msr_hv == 0 && !lpes0)) { > powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_EXTERNAL); > return; > } > diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c > index 7f25215f0192..63ded33ea7ea 100644 > --- a/target/ppc/translate_init.inc.c > +++ b/target/ppc/translate_init.inc.c > @@ -8823,7 +8823,10 @@ static bool cpu_has_work_POWER9(CPUState *cs) > /* External Exception */ > if ((env->pending_interrupts & (1u << PPC_INTERRUPT_EXT)) && > (env->spr[SPR_LPCR] & LPCR_EEE)) { > - return true; > + bool heic = !!(env->spr[SPR_LPCR] & LPCR_HEIC); > + if (heic == 0 || !msr_hv || msr_pr) { > + return true; > + } > } > /* Decrementer Exception */ > if ((env->pending_interrupts & (1u << PPC_INTERRUPT_DECR)) && -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 50+ messages in thread
end of thread, other threads:[~2019-03-05 5:03 UTC | newest] Thread overview: 50+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-01-28 9:46 [Qemu-devel] [PATCH 00/19] ppc: support for the baremetal XIVE interrupt controller (POWER9) Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 01/19] ppc/xive: hardwire the Physical CAM line of the thread context Cédric Le Goater 2019-02-08 5:44 ` David Gibson 2019-02-08 7:28 ` Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 02/19] ppc: externalize ppc_get_vcpu_by_pir() Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 03/19] xive: extend the XiveRouter get_tctx() method with the page offset Cédric Le Goater 2019-02-12 4:34 ` David Gibson 2019-02-12 8:25 ` Cédric Le Goater 2019-02-12 20:31 ` Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 04/19] ppc/pnv: xive: export the TIMA memory accessors Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 05/19] ppc/pnv: add XIVE support Cédric Le Goater 2019-02-12 5:40 ` David Gibson 2019-02-19 7:31 ` Cédric Le Goater 2019-02-21 3:13 ` David Gibson 2019-02-21 8:32 ` Cédric Le Goater 2019-03-05 3:42 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 06/19] target/ppc: Remove some #if 0'ed code Cédric Le Goater 2019-02-12 5:41 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 07/19] target/ppc: Make special ORs match x86 pause and don't generate on mttcg Cédric Le Goater 2019-02-12 5:59 ` David Gibson 2019-02-13 0:03 ` Benjamin Herrenschmidt 2019-02-13 4:54 ` David Gibson 2019-02-13 8:07 ` Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 08/19] target/ppc: Fix nip on power management instructions Cédric Le Goater 2019-02-12 6:02 ` David Gibson 2019-02-13 0:04 ` Benjamin Herrenschmidt 2019-02-15 15:30 ` Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 09/19] target/ppc: Don't clobber MSR:EE on PM instructions Cédric Le Goater 2019-02-12 6:05 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 10/19] target/ppc: Fix support for "STOP light" states on POWER9 Cédric Le Goater 2019-02-13 5:05 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 11/19] target/ppc: Move "wakeup reset" code to a separate function Cédric Le Goater 2019-02-13 5:06 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 12/19] target/ppc: Disable ISA 2.06 PM instructions on POWER9 Cédric Le Goater 2019-02-13 5:07 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 13/19] target/ppc: Rename "in_pm_state" to "resume_as_sreset" Cédric Le Goater 2019-02-13 5:08 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 14/19] target/ppc: Add POWER9 exception model Cédric Le Goater 2019-02-13 5:10 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 15/19] target/ppc: Detect erroneous condition in interrupt delivery Cédric Le Goater 2019-02-13 5:11 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 16/19] target/ppc: Add Hypervisor Virtualization Interrupt on POWER9 Cédric Le Goater 2019-02-13 5:12 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 17/19] target/ppc: Add POWER9 external interrupt model Cédric Le Goater 2019-02-13 5:16 ` David Gibson 2019-02-15 15:43 ` Cédric Le Goater 2019-01-28 9:46 ` [Qemu-devel] [PATCH 18/19] ppc/xive: Make XIVE generate the proper interrupt types Cédric Le Goater 2019-02-13 5:17 ` David Gibson 2019-01-28 9:46 ` [Qemu-devel] [PATCH 19/19] target/ppc: Add support for LPCR:HEIC on POWER9 Cédric Le Goater 2019-02-13 5:18 ` David Gibson
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.