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

ppc/pnv: remove xscom_base field from PnvChip 



It has now became useless with the previous patch.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Message-Id: <20190612174345.9799-3-clg@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 709044fd

hw/ppc/pnv.c

+0 −10
Original line number Diff line number Diff line
@@ -924,7 +924,6 @@ static void pnv_chip_power8e_class_init(ObjectClass *klass, void *data) 
    k->isa_create = pnv_chip_power8_isa_create;

    k->dt_populate = pnv_chip_power8_dt_populate;

    k->pic_print_info = pnv_chip_power8_pic_print_info;

    k->xscom_base = 0x003fc0000000000ull;

    dc->desc = "PowerNV Chip POWER8E";



    device_class_set_parent_realize(dc, pnv_chip_power8_realize,
@@ -944,7 +943,6 @@ static void pnv_chip_power8_class_init(ObjectClass *klass, void *data) 
    k->isa_create = pnv_chip_power8_isa_create;

    k->dt_populate = pnv_chip_power8_dt_populate;

    k->pic_print_info = pnv_chip_power8_pic_print_info;

    k->xscom_base = 0x003fc0000000000ull;

    dc->desc = "PowerNV Chip POWER8";



    device_class_set_parent_realize(dc, pnv_chip_power8_realize,
@@ -964,7 +962,6 @@ static void pnv_chip_power8nvl_class_init(ObjectClass *klass, void *data) 
    k->isa_create = pnv_chip_power8nvl_isa_create;

    k->dt_populate = pnv_chip_power8_dt_populate;

    k->pic_print_info = pnv_chip_power8_pic_print_info;

    k->xscom_base = 0x003fc0000000000ull;

    dc->desc = "PowerNV Chip POWER8NVL";



    device_class_set_parent_realize(dc, pnv_chip_power8_realize,
@@ -1115,7 +1112,6 @@ static void pnv_chip_power9_class_init(ObjectClass *klass, void *data) 
    k->isa_create = pnv_chip_power9_isa_create;

    k->dt_populate = pnv_chip_power9_dt_populate;

    k->pic_print_info = pnv_chip_power9_pic_print_info;

    k->xscom_base = 0x00603fc00000000ull;

    dc->desc = "PowerNV Chip POWER9";



    device_class_set_parent_realize(dc, pnv_chip_power9_realize,
@@ -1152,11 +1148,6 @@ static void pnv_chip_core_sanitize(PnvChip *chip, Error **errp) 
    }

}



static void pnv_chip_instance_init(Object *obj)

{

    PNV_CHIP(obj)->xscom_base = PNV_CHIP_GET_CLASS(obj)->xscom_base;

}



static void pnv_chip_core_realize(PnvChip *chip, Error **errp)

{

    Error *error = NULL;
@@ -1406,7 +1397,6 @@ static const TypeInfo types[] = { 
        .name          = TYPE_PNV_CHIP,

        .parent        = TYPE_SYS_BUS_DEVICE,

        .class_init    = pnv_chip_class_init,

        .instance_init = pnv_chip_instance_init,

        .instance_size = sizeof(PnvChip),

        .class_size    = sizeof(PnvChipClass),

        .abstract      = true,

include/hw/ppc/pnv.h

+1 −4
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ typedef struct PnvChip { 
    uint64_t     cores_mask;

    void         *cores;



    hwaddr       xscom_base;

    MemoryRegion xscom_mmio;

    MemoryRegion xscom;

    AddressSpace xscom_as;
@@ -105,8 +104,6 @@ typedef struct PnvChipClass { 
    uint64_t     chip_cfam_id;

    uint64_t     cores_mask;



    hwaddr       xscom_base;



    DeviceRealize parent_realize;



    uint32_t (*core_pir)(PnvChip *chip, uint32_t core_id);
@@ -199,7 +196,7 @@ void pnv_bmc_powerdown(IPMIBmc *bmc); 
 */

#define PNV_XSCOM_SIZE        0x800000000ull

#define PNV_XSCOM_BASE(chip)                                            \

    (chip->xscom_base + ((uint64_t)(chip)->chip_id) * PNV_XSCOM_SIZE)

    (0x0003fc0000000000ull + ((uint64_t)(chip)->chip_id) * PNV_XSCOM_SIZE)



/*

 * XSCOM 0x20109CA defines the ICP BAR: