Commit ee3d2713 authored by Greg Kurz's avatar Greg Kurz Committed by David Gibson
Browse files

ppc/pnv: Link "psi" property to PnvOCC::psi pointer 



The OCC object has both a pointer and a "psi" property pointing to the
PSI object. Confusing bugs could arise if these ever go out of sync.

Change the property definition so that it explicitely sets the pointer.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Message-Id: <157383334894.165747.7617090757862105199.stgit@bahia.lan>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent b63f3893

hw/ppc/pnv.c

+4 −4
Original line number Diff line number Diff line
@@ -904,8 +904,6 @@ static void pnv_chip_power8_instance_init(Object *obj) 


    object_initialize_child(obj, "occ",  &chip8->occ, sizeof(chip8->occ),

                            TYPE_PNV8_OCC, &error_abort, NULL);

    object_property_add_const_link(OBJECT(&chip8->occ), "psi",

                                   OBJECT(&chip8->psi), &error_abort);



    object_initialize_child(obj, "homer",  &chip8->homer, sizeof(chip8->homer),

                            TYPE_PNV8_HOMER, &error_abort, NULL);
@@ -1000,6 +998,8 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp) 
    }



    /* Create the simplified OCC model */

    object_property_set_link(OBJECT(&chip8->occ), OBJECT(&chip8->psi), "psi",

                             &error_abort);

    object_property_set_bool(OBJECT(&chip8->occ), true, "realized", &local_err);

    if (local_err) {

        error_propagate(errp, local_err);
@@ -1102,8 +1102,6 @@ static void pnv_chip_power9_instance_init(Object *obj) 


    object_initialize_child(obj, "occ",  &chip9->occ, sizeof(chip9->occ),

                            TYPE_PNV9_OCC, &error_abort, NULL);

    object_property_add_const_link(OBJECT(&chip9->occ), "psi",

                                   OBJECT(&chip9->psi), &error_abort);



    object_initialize_child(obj, "homer",  &chip9->homer, sizeof(chip9->homer),

                            TYPE_PNV9_HOMER, &error_abort, NULL);
@@ -1211,6 +1209,8 @@ static void pnv_chip_power9_realize(DeviceState *dev, Error **errp) 
                                            (uint64_t) PNV9_LPCM_BASE(chip));



    /* Create the simplified OCC model */

    object_property_set_link(OBJECT(&chip9->occ), OBJECT(&chip9->psi), "psi",

                             &error_abort);

    object_property_set_bool(OBJECT(&chip9->occ), true, "realized", &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

hw/ppc/pnv_occ.c

+9 −11
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include "qapi/error.h"

#include "qemu/log.h"

#include "qemu/module.h"



#include "hw/qdev-properties.h"

#include "hw/ppc/pnv.h"

#include "hw/ppc/pnv_xscom.h"

#include "hw/ppc/pnv_occ.h"
@@ -257,18 +257,10 @@ static void pnv_occ_realize(DeviceState *dev, Error **errp) 
{

    PnvOCC *occ = PNV_OCC(dev);

    PnvOCCClass *poc = PNV_OCC_GET_CLASS(occ);

    Object *obj;

    Error *local_err = NULL;



    occ->occmisc = 0;

    assert(occ->psi);



    obj = object_property_get_link(OBJECT(dev), "psi", &local_err);

    if (!obj) {

        error_propagate(errp, local_err);

        error_prepend(errp, "required link 'psi' not found: ");

        return;

    }

    occ->psi = PNV_PSI(obj);

    occ->occmisc = 0;



    /* XScom region for OCC registers */

    pnv_xscom_region_init(&occ->xscom_regs, OBJECT(dev), poc->xscom_ops,
@@ -279,12 +271,18 @@ static void pnv_occ_realize(DeviceState *dev, Error **errp) 
                          occ, "occ-common-area", poc->sram_size);

}



static Property pnv_occ_properties[] = {

    DEFINE_PROP_LINK("psi", PnvOCC, psi, TYPE_PNV_PSI, PnvPsi *),

    DEFINE_PROP_END_OF_LIST(),

};



static void pnv_occ_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->realize = pnv_occ_realize;

    dc->desc = "PowerNV OCC Controller";

    dc->props = pnv_occ_properties;

}



static const TypeInfo pnv_occ_type_info = {