qemu-ppc
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-ppc] [PATCH 06/27] ppc/pnv: add a XIVE interrupt controller mo


From: David Gibson
Subject: Re: [Qemu-ppc] [PATCH 06/27] ppc/pnv: add a XIVE interrupt controller model for POWER9
Date: Thu, 7 Mar 2019 12:37:30 +1100
User-agent: Mutt/1.11.3 (2019-02-01)

On Wed, Mar 06, 2019 at 09:50:11AM +0100, Cédric Le Goater wrote:
> This is a simple model of the POWER9 XIVE interrupt controller for the
> PowerNV machine which only addresses the needs of the skiboot
> firmware. The PowerNV model reuses the common XIVE framework developed
> for sPAPR as 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 <address@hidden>

[snip]

> +typedef struct PnvXive {
> +    XiveRouter    parent_obj;
> +
> +    /* Owning chip */
> +    struct 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 */
> +    XiveSource    ipi_source;
> +    XiveENDSource end_source;
> +
> +    /* Interrupt controller registers */
> +    uint64_t      regs[0x300];

I'm still pretty dubious about whether encoding the registers this way
is a good idea.  But, the pnv model isn't migratable so it's something
we can fix later.  Therefore, applied to ppc-for-4.0.


> +
> +    /* Can be configured by FW */
> +    uint32_t      tctx_chipid;
> +
> +    /*
> +     * 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/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c
> new file mode 100644
> index 000000000000..bb0877cbdf3b
> --- /dev/null
> +++ b/hw/intc/pnv_xive.c
> @@ -0,0 +1,1753 @@
> +/*
> + * 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"
> +
> +#define XIVE_DEBUG
> +
> +/*
> + * Virtual structures table (VST)
> + */
> +#define SBE_PER_BYTE   4
> +
> +typedef struct XiveVstInfo {
> +    const char *name;
> +    uint32_t    size;
> +    uint32_t    max_blocks;
> +} XiveVstInfo;
> +
> +static const XiveVstInfo vst_infos[] = {
> +    [VST_TSEL_IVT]  = { "EAT",  sizeof(XiveEAS), 16 },
> +    [VST_TSEL_SBE]  = { "SBE",  1,               16 },
> +    [VST_TSEL_EQDT] = { "ENDT", sizeof(XiveEND), 16 },
> +    [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]  = { "IRQ",  1,               6  },
> +};
> +
> +#define xive_error(xive, fmt, ...)                                      \
> +    qemu_log_mask(LOG_GUEST_ERROR, "XIVE[%x] - " fmt "\n",              \
> +                  (xive)->chip->chip_id, ## __VA_ARGS__);
> +
> +/*
> + * QEMU version of the GETFIELD/SETFIELD macros
> + *
> + * TODO: It might be better to use the existing extract64() and
> + * deposit64() but this means that all the register definitions will
> + * change and become incompatible with the ones found in skiboot.
> + *
> + * Keep it as it is for now until we find a common ground.
> + */
> +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.
> + *
> + * TODO: Block scope support
> + */
> +static PnvXive *pnv_xive_get_ic(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 *xive = &chip9->xive;
> +
> +        if (xive->chip->chip_id == blk) {
> +            return xive;
> +        }
> +    }
> +    return NULL;
> +}
> +
> +/*
> + * VST accessors for SBE, EAT, ENDT, NVT
> + *
> + * Indirect VST tables are arrays of VSDs pointing to a page (of same
> + * size). Each page is a direct VST table.
> + */
> +
> +#define XIVE_VSD_SIZE 8
> +
> +/* Indirect page size can be 4K, 64K, 2M, 16M. */
> +static uint64_t pnv_xive_vst_page_size_allowed(uint32_t page_shift)
> +{
> +     return page_shift == 12 || page_shift == 16 ||
> +         page_shift == 21 || page_shift == 24;
> +}
> +
> +static uint64_t pnv_xive_vst_size(uint64_t vsd)
> +{
> +    uint64_t vst_tsize = 1ull << (GETFIELD(VSD_TSIZE, vsd) + 12);
> +
> +    /*
> +     * Read the first descriptor to get the page size of the indirect
> +     * table.
> +     */
> +    if (VSD_INDIRECT & vsd) {
> +        uint32_t nr_pages = vst_tsize / XIVE_VSD_SIZE;
> +        uint32_t page_shift;
> +
> +        vsd = ldq_be_dma(&address_space_memory, vsd & VSD_ADDRESS_MASK);
> +        page_shift = GETFIELD(VSD_TSIZE, vsd) + 12;
> +
> +        if (!pnv_xive_vst_page_size_allowed(page_shift)) {
> +            return 0;
> +        }
> +
> +        return nr_pages * (1ull << page_shift);
> +    }
> +
> +    return vst_tsize;
> +}
> +
> +static uint64_t pnv_xive_vst_addr_direct(PnvXive *xive, uint32_t type,
> +                                         uint64_t vsd, uint32_t idx)
> +{
> +    const XiveVstInfo *info = &vst_infos[type];
> +    uint64_t vst_addr = vsd & VSD_ADDRESS_MASK;
> +
> +    return vst_addr + idx * info->size;
> +}
> +
> +static uint64_t pnv_xive_vst_addr_indirect(PnvXive *xive, uint32_t type,
> +                                           uint64_t vsd, uint32_t idx)
> +{
> +    const XiveVstInfo *info = &vst_infos[type];
> +    uint64_t vsd_addr;
> +    uint32_t vsd_idx;
> +    uint32_t page_shift;
> +    uint32_t vst_per_page;
> +
> +    /* Get the page size of the indirect table. */
> +    vsd_addr = vsd & VSD_ADDRESS_MASK;
> +    vsd = ldq_be_dma(&address_space_memory, vsd_addr);
> +
> +    if (!(vsd & VSD_ADDRESS_MASK)) {
> +        xive_error(xive, "VST: invalid %s entry %x !?", info->name, 0);
> +        return 0;
> +    }
> +
> +    page_shift = GETFIELD(VSD_TSIZE, vsd) + 12;
> +
> +    if (!pnv_xive_vst_page_size_allowed(page_shift)) {
> +        xive_error(xive, "VST: invalid %s page shift %d", info->name,
> +                   page_shift);
> +        return 0;
> +    }
> +
> +    vst_per_page = (1ull << page_shift) / info->size;
> +    vsd_idx = idx / vst_per_page;
> +
> +    /* Load the VSD we are looking for, if not already done */
> +    if (vsd_idx) {
> +        vsd_addr = vsd_addr + vsd_idx * XIVE_VSD_SIZE;
> +        vsd = ldq_be_dma(&address_space_memory, vsd_addr);
> +
> +        if (!(vsd & VSD_ADDRESS_MASK)) {
> +            xive_error(xive, "VST: invalid %s entry %x !?", info->name, 0);
> +            return 0;
> +        }
> +
> +        /*
> +         * Check that the pages have a consistent size across the
> +         * indirect table
> +         */
> +        if (page_shift != GETFIELD(VSD_TSIZE, vsd) + 12) {
> +            xive_error(xive, "VST: %s entry %x indirect page size differ !?",
> +                       info->name, idx);
> +            return 0;
> +        }
> +    }
> +
> +    return pnv_xive_vst_addr_direct(xive, type, vsd, (idx % vst_per_page));
> +}
> +
> +static uint64_t pnv_xive_vst_addr(PnvXive *xive, uint32_t type, uint8_t blk,
> +                                  uint32_t idx)
> +{
> +    const XiveVstInfo *info = &vst_infos[type];
> +    uint64_t vsd;
> +    uint32_t idx_max;
> +
> +    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[type][blk];
> +
> +    /* Remote VST access */
> +    if (GETFIELD(VSD_MODE, vsd) == VSD_MODE_FORWARD) {
> +        xive = pnv_xive_get_ic(blk);
> +
> +        return xive ? pnv_xive_vst_addr(xive, type, blk, idx) : 0;
> +    }
> +
> +    idx_max = pnv_xive_vst_size(vsd) / info->size - 1;
> +    if (idx > idx_max) {
> +#ifdef XIVE_DEBUG
> +        xive_error(xive, "VST: %s entry %x/%x out of range [ 0 .. %x ] !?",
> +                   info->name, blk, idx, idx_max);
> +#endif
> +        return 0;
> +    }
> +
> +    if (VSD_INDIRECT & vsd) {
> +        return pnv_xive_vst_addr_indirect(xive, type, vsd, idx);
> +    }
> +
> +    return pnv_xive_vst_addr_direct(xive, type, vsd, 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, type, blk, idx);
> +
> +    if (!addr) {
> +        return -1;
> +    }
> +
> +    cpu_physical_memory_read(addr, data, info->size);
> +    return 0;
> +}
> +
> +#define XIVE_VST_WORD_ALL -1
> +
> +static int pnv_xive_vst_write(PnvXive *xive, uint32_t type, uint8_t blk,
> +                              uint32_t idx, void *data, uint32_t word_number)
> +{
> +    const XiveVstInfo *info = &vst_infos[type];
> +    uint64_t addr = pnv_xive_vst_addr(xive, type, blk, idx);
> +
> +    if (!addr) {
> +        return -1;
> +    }
> +
> +    if (word_number == XIVE_VST_WORD_ALL) {
> +        cpu_physical_memory_write(addr, data, info->size);
> +    } else {
> +        cpu_physical_memory_write(addr + word_number * 4,
> +                                  data + word_number * 4, 4);
> +    }
> +    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,
> +                              word_number);
> +}
> +
> +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,
> +                              XIVE_VST_WORD_ALL);
> +}
> +
> +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,
> +                              word_number);
> +}
> +
> +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,
> +                              XIVE_VST_WORD_ALL);
> +}
> +
> +static int pnv_xive_get_eas(XiveRouter *xrtr, uint8_t blk, uint32_t idx,
> +                            XiveEAS *eas)
> +{
> +    PnvXive *xive = PNV_XIVE(xrtr);
> +
> +    if (pnv_xive_get_ic(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)
> +{
> +    PowerPCCPU *cpu = POWERPC_CPU(cs);
> +    XiveTCTX *tctx = XIVE_TCTX(pnv_cpu_state(cpu)->intc);
> +    PnvXive *xive = NULL;
> +    CPUPPCState *env = &cpu->env;
> +    int pir = env->spr_cb[SPR_PIR].default_value;
> +
> +    /*
> +     * Perform an extra check on the HW thread 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 PIR.
> +     */
> +    xive = pnv_xive_get_ic((pir >> 8) & 0xf);
> +    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);
> +    uint8_t blk = xive->chip->chip_id;
> +
> +    xive_router_notify(xn, XIVE_SRCNO(blk, 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;
> +}
> +
> +static uint32_t pnv_xive_nr_ipis(PnvXive *xive)
> +{
> +    uint8_t blk = xive->chip->chip_id;
> +
> +    return pnv_xive_vst_size(xive->vsds[VST_TSEL_SBE][blk]) * SBE_PER_BYTE;
> +}
> +
> +static uint32_t pnv_xive_nr_ends(PnvXive *xive)
> +{
> +    uint8_t blk = xive->chip->chip_id;
> +
> +    return pnv_xive_vst_size(xive->vsds[VST_TSEL_EQDT][blk])
> +        / vst_infos[VST_TSEL_EQDT].size;
> +}
> +
> +/*
> + * EDT Table
> + *
> + * 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.
> + */
> +
> +/*
> + * 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;
> +}
> +
> +static void pnv_xive_edt_resize(PnvXive *xive)
> +{
> +    uint64_t ipi_edt_size = pnv_xive_edt_size(xive, CQ_TDR_EDT_IPI);
> +    uint64_t end_edt_size = pnv_xive_edt_size(xive, CQ_TDR_EDT_EQ);
> +
> +    memory_region_set_size(&xive->ipi_edt_mmio, ipi_edt_size);
> +    memory_region_add_subregion(&xive->ipi_mmio, 0, &xive->ipi_edt_mmio);
> +
> +    memory_region_set_size(&xive->end_edt_mmio, end_edt_size);
> +    memory_region_add_subregion(&xive->end_mmio, 0, &xive->end_edt_mmio);
> +}
> +
> +/*
> + * XIVE Table configuration. Only EDT is supported.
> + */
> +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);
> +    }
> +
> +    /*
> +     * EDT configuration is complete. Resize the MMIO windows exposing
> +     * the IPI and the END ESBs in the VC region.
> +     */
> +    if (tsel == CQ_TAR_TSEL_EDT && tsel_index == ARRAY_SIZE(xive->edt)) {
> +        pnv_xive_edt_resize(xive);
> +    }
> +
> +    return 0;
> +}
> +
> +/*
> + * Virtual Structure Tables (VST) configuration
> + */
> +static void pnv_xive_vst_set_exclusive(PnvXive *xive, uint8_t type,
> +                                       uint8_t blk, uint64_t vsd)
> +{
> +    XiveENDSource *end_xsrc = &xive->end_source;
> +    XiveSource *xsrc = &xive->ipi_source;
> +    const XiveVstInfo *info = &vst_infos[type];
> +    uint32_t page_shift = GETFIELD(VSD_TSIZE, vsd) + 12;
> +    uint64_t vst_addr = vsd & VSD_ADDRESS_MASK;
> +
> +    /* Basic checks */
> +
> +    if (VSD_INDIRECT & vsd) {
> +        if (!(xive->regs[VC_GLOBAL_CONFIG >> 3] & VC_GCONF_INDIRECT)) {
> +            xive_error(xive, "VST: %s indirect tables are not enabled",
> +                       info->name);
> +            return;
> +        }
> +
> +        if (!pnv_xive_vst_page_size_allowed(page_shift)) {
> +            xive_error(xive, "VST: invalid %s page shift %d", info->name,
> +                       page_shift);
> +            return;
> +        }
> +    }
> +
> +    if (!QEMU_IS_ALIGNED(vst_addr, 1ull << page_shift)) {
> +        xive_error(xive, "VST: %s table address 0x%"PRIx64" is not aligned 
> with"
> +                   " page shift %d", info->name, vst_addr, page_shift);
> +        return;
> +    }
> +
> +    /* Record the table configuration (in SRAM on HW) */
> +    xive->vsds[type][blk] = vsd;
> +
> +    /* Now tune the models with the configuration provided by the FW */
> +
> +    switch (type) {
> +    case VST_TSEL_IVT:  /* Nothing to be done */
> +        break;
> +
> +    case VST_TSEL_EQDT:
> +        /*
> +         * Backing store pages for the END. Compute the number of ENDs
> +         * provisioned by FW and resize the END ESB window accordingly.
> +         */
> +        memory_region_set_size(&end_xsrc->esb_mmio, pnv_xive_nr_ends(xive) *
> +                               (1ull << (end_xsrc->esb_shift + 1)));
> +        memory_region_add_subregion(&xive->end_edt_mmio, 0,
> +                                    &end_xsrc->esb_mmio);
> +        break;
> +
> +    case VST_TSEL_SBE:
> +        /*
> +         * Backing store pages for the source PQ bits. The model does
> +         * not use these PQ bits backed in RAM because the XiveSource
> +         * model has its own. Compute the number of IRQs provisioned
> +         * by FW and resize the IPI ESB window accordingly.
> +         */
> +        memory_region_set_size(&xsrc->esb_mmio, pnv_xive_nr_ipis(xive) *
> +                               (1ull << xsrc->esb_shift));
> +        memory_region_add_subregion(&xive->ipi_edt_mmio, 0, &xsrc->esb_mmio);
> +        break;
> +
> +    case VST_TSEL_VPDT: /* Not modeled */
> +    case VST_TSEL_IRQ:  /* 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();
> +    }
> +}
> +
> +/*
> + * 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;
> +    bool is_chip0 = xive->chip->chip_id == 0;
> +
> +    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:
> +        /*
> +         * PC_GCONF_CHIPID_OVR
> +         *   Overrides Int command Chip ID with the Chip ID field (DEBUG)
> +         */
> +        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->ipi_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 && is_chip0) {
> +                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) && is_chip0) {
> +                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)
> +{
> +    uint64_t tctxt_indir = xive->regs[PC_TCTXT_INDIR0 >> 3];
> +    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 & 0x3f))) {
> +        xive_error(xive, "IC: CPU %x is not enabled", pir);
> +    }
> +
> +    return XIVE_TCTX(pnv_cpu_state(cpu)->intc);
> +}
> +
> +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));
> +
> +    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));
> +
> +    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);
> +    uint8_t blk = xive->chip->chip_id;
> +    uint32_t srcno0 = XIVE_SRCNO(blk, 0);
> +    uint32_t nr_ipis = pnv_xive_nr_ipis(xive);
> +    uint32_t nr_ends = pnv_xive_nr_ends(xive);
> +    XiveEAS eas;
> +    XiveEND end;
> +    int i;
> +
> +    monitor_printf(mon, "XIVE[%x] Source %08x .. %08x\n", blk, srcno0,
> +                   srcno0 + nr_ipis - 1);
> +    xive_source_pic_print_info(&xive->ipi_source, srcno0, mon);
> +
> +    monitor_printf(mon, "XIVE[%x] EAT %08x .. %08x\n", blk, srcno0,
> +                   srcno0 + nr_ipis - 1);
> +    for (i = 0; i < nr_ipis; i++) {
> +        if (xive_router_get_eas(xrtr, blk, i, &eas)) {
> +            break;
> +        }
> +        if (!xive_eas_is_masked(&eas)) {
> +            xive_eas_pic_print_info(&eas, i, mon);
> +        }
> +    }
> +
> +    monitor_printf(mon, "XIVE[%x] ENDT %08x .. %08x\n", blk, 0, nr_ends - 1);
> +    for (i = 0; i < nr_ends; i++) {
> +        if (xive_router_get_end(xrtr, blk, i, &end)) {
> +            break;
> +        }
> +        xive_end_pic_print_info(&end, i, mon);
> +    }
> +}
> +
> +static void pnv_xive_reset(void *dev)
> +{
> +    PnvXive *xive = PNV_XIVE(dev);
> +    XiveSource *xsrc = &xive->ipi_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->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_child(obj, "ipi_source", &xive->ipi_source,
> +                            sizeof(xive->ipi_source), TYPE_XIVE_SOURCE,
> +                            &error_abort, NULL);
> +    object_initialize_child(obj, "end_source", &xive->end_source,
> +                            sizeof(xive->end_source), TYPE_XIVE_END_SOURCE,
> +                            &error_abort, 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->ipi_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);
> +
> +    /*
> +     * The XiveSource and XiveENDSource objects are realized 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("address@hidden", 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/ppc/pnv.c b/hw/ppc/pnv.c
> index b90d03711a05..a7ec76dbd6c7 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -705,7 +705,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->intc = obj;
>  }
>  
>  /* Allowed core identifiers on a POWER8 Processor Chip :
> @@ -887,11 +903,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_child(obj, "xive", &chip9->xive, sizeof(chip9->xive),
> +                            TYPE_PNV_XIVE, &error_abort, 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);
> @@ -899,6 +923,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)
> 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: signature.asc
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]