Commit 64d011d5 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by David Gibson
Browse files

ppc/pnv: add a 'dt_isa_nodename' to the chip 



The ISA bus has a different DT nodename on POWER9. Compute the name
when the PnvChip is realized, that is before it is used by the machine
to populate the device tree with the ISA devices.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Message-Id: <20190307223548.20516-6-clg@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 82514be2

hw/ppc/pnv.c

+5 −13
Original line number Diff line number Diff line
@@ -417,24 +417,12 @@ static int pnv_dt_isa_device(DeviceState *dev, void *opaque) 
    return 0;

}



static int pnv_chip_isa_offset(PnvChip *chip, void *fdt)

{

    char *name;

    int offset;



    name = g_strdup_printf("/xscom@%" PRIx64 "/isa@%x",

                           (uint64_t) PNV_XSCOM_BASE(chip), PNV_XSCOM_LPC_BASE);

    offset = fdt_path_offset(fdt, name);

    g_free(name);

    return offset;

}



/* The default LPC bus of a multichip system is on chip 0. It's

 * recognized by the firmware (skiboot) using a "primary" property.

 */

static void pnv_dt_isa(PnvMachineState *pnv, void *fdt)

{

    int isa_offset = pnv_chip_isa_offset(pnv->chips[0], fdt);

    int isa_offset = fdt_path_offset(fdt, pnv->chips[0]->dt_isa_nodename);

    ForeachPopulateArgs args = {

        .fdt = fdt,

        .offset = isa_offset,
@@ -866,6 +854,10 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp) 
                             &error_fatal);

    pnv_xscom_add_subregion(chip, PNV_XSCOM_LPC_BASE, &chip8->lpc.xscom_regs);



    chip->dt_isa_nodename = g_strdup_printf("/xscom@%" PRIx64 "/isa@%x",

                                            (uint64_t) PNV_XSCOM_BASE(chip),

                                            PNV_XSCOM_LPC_BASE);



    /* Interrupt Management Area. This is the memory region holding

     * all the Interrupt Control Presenter (ICP) registers */

    pnv_chip_icp_realize(chip8, &local_err);

include/hw/ppc/pnv.h

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ typedef struct PnvChip { 
    MemoryRegion xscom_mmio;

    MemoryRegion xscom;

    AddressSpace xscom_as;



    gchar        *dt_isa_nodename;

} PnvChip;



#define TYPE_PNV8_CHIP "pnv8-chip"