| Message ID | 20190523052918.1129-4-david@gibson.dropbear.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/8] spapr: Clean up device node name generation for PCI devices | expand |
On Thu, 23 May 2019 15:29:14 +1000 David Gibson <david@gibson.dropbear.id.au> wrote: > This makes some minor cleanups to spapr_drc_populate_dt(), renaming it to > the shorter and more idiomatic spapr_dt_drc() along the way. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > hw/ppc/spapr.c | 7 +++---- > hw/ppc/spapr_drc.c | 13 ++++++------- > hw/ppc/spapr_pci.c | 3 +-- > include/hw/ppc/spapr_drc.h | 3 +-- > 4 files changed, 11 insertions(+), 15 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 44573adce7..507fd50dd5 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1320,13 +1320,12 @@ static void *spapr_build_fdt(SpaprMachineState *spapr) > spapr_populate_cpus_dt_node(fdt, spapr); > > if (smc->dr_lmb_enabled) { > - _FDT(spapr_drc_populate_dt(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_LMB)); > + _FDT(spapr_dt_drc(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_LMB)); > } > > if (mc->has_hotpluggable_cpus) { > int offset = fdt_path_offset(fdt, "/cpus"); > - ret = spapr_drc_populate_dt(fdt, offset, NULL, > - SPAPR_DR_CONNECTOR_TYPE_CPU); > + ret = spapr_dt_drc(fdt, offset, NULL, SPAPR_DR_CONNECTOR_TYPE_CPU); > if (ret < 0) { > error_report("Couldn't set up CPU DR device tree properties"); > exit(1); > @@ -1363,7 +1362,7 @@ static void *spapr_build_fdt(SpaprMachineState *spapr) > } > > if (smc->dr_phb_enabled) { > - ret = spapr_drc_populate_dt(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_PHB); > + ret = spapr_dt_drc(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_PHB); > if (ret < 0) { > error_report("Couldn't set up PHB DR device tree properties"); > exit(1); > diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c > index 597f236b9c..bacadfcac5 100644 > --- a/hw/ppc/spapr_drc.c > +++ b/hw/ppc/spapr_drc.c > @@ -781,7 +781,7 @@ SpaprDrc *spapr_drc_by_id(const char *type, uint32_t id) > } > > /** > - * spapr_drc_populate_dt > + * spapr_dt_drc > * > * @fdt: libfdt device tree > * @path: path in the DT to generate properties > @@ -794,8 +794,7 @@ SpaprDrc *spapr_drc_by_id(const char *type, uint32_t id) > * > * as documented in PAPR+ v2.1, 13.5.2 > */ > -int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, > - uint32_t drc_type_mask) > +int spapr_dt_drc(void *fdt, int offset, Object *owner, uint32_t drc_type_mask) > { > Object *root_container; > ObjectProperty *prop; > @@ -873,7 +872,7 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, > *(uint32_t *)drc_names->str = cpu_to_be32(drc_count); > *(uint32_t *)drc_types->str = cpu_to_be32(drc_count); > > - ret = fdt_setprop(fdt, fdt_offset, "ibm,drc-indexes", > + ret = fdt_setprop(fdt, offset, "ibm,drc-indexes", > drc_indexes->data, > drc_indexes->len * sizeof(uint32_t)); > if (ret) { > @@ -881,7 +880,7 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, > goto out; > } > > - ret = fdt_setprop(fdt, fdt_offset, "ibm,drc-power-domains", > + ret = fdt_setprop(fdt, offset, "ibm,drc-power-domains", > drc_power_domains->data, > drc_power_domains->len * sizeof(uint32_t)); > if (ret) { > @@ -889,14 +888,14 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, > goto out; > } > > - ret = fdt_setprop(fdt, fdt_offset, "ibm,drc-names", > + ret = fdt_setprop(fdt, offset, "ibm,drc-names", > drc_names->str, drc_names->len); > if (ret) { > error_report("Couldn't finalize ibm,drc-names property"); > goto out; > } > > - ret = fdt_setprop(fdt, fdt_offset, "ibm,drc-types", > + ret = fdt_setprop(fdt, offset, "ibm,drc-types", > drc_types->str, drc_types->len); > if (ret) { > error_report("Couldn't finalize ibm,drc-types property"); > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index c166df4145..04855d3125 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -2282,8 +2282,7 @@ int spapr_dt_phb(SpaprPhbState *phb, uint32_t intc_phandle, void *fdt, > return ret; > } > > - ret = spapr_drc_populate_dt(fdt, bus_off, OBJECT(phb), > - SPAPR_DR_CONNECTOR_TYPE_PCI); > + ret = spapr_dt_drc(fdt, bus_off, OBJECT(phb), SPAPR_DR_CONNECTOR_TYPE_PCI); > if (ret) { > return ret; > } > diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h > index fad0a887f9..c2c543a591 100644 > --- a/include/hw/ppc/spapr_drc.h > +++ b/include/hw/ppc/spapr_drc.h > @@ -266,8 +266,7 @@ SpaprDrc *spapr_dr_connector_new(Object *owner, const char *type, > uint32_t id); > SpaprDrc *spapr_drc_by_index(uint32_t index); > SpaprDrc *spapr_drc_by_id(const char *type, uint32_t id); > -int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, > - uint32_t drc_type_mask); > +int spapr_dt_drc(void *fdt, int offset, Object *owner, uint32_t drc_type_mask); > > void spapr_drc_attach(SpaprDrc *drc, DeviceState *d, Error **errp); > void spapr_drc_detach(SpaprDrc *drc);
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 44573adce7..507fd50dd5 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1320,13 +1320,12 @@ static void *spapr_build_fdt(SpaprMachineState *spapr) spapr_populate_cpus_dt_node(fdt, spapr); if (smc->dr_lmb_enabled) { - _FDT(spapr_drc_populate_dt(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_LMB)); + _FDT(spapr_dt_drc(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_LMB)); } if (mc->has_hotpluggable_cpus) { int offset = fdt_path_offset(fdt, "/cpus"); - ret = spapr_drc_populate_dt(fdt, offset, NULL, - SPAPR_DR_CONNECTOR_TYPE_CPU); + ret = spapr_dt_drc(fdt, offset, NULL, SPAPR_DR_CONNECTOR_TYPE_CPU); if (ret < 0) { error_report("Couldn't set up CPU DR device tree properties"); exit(1); @@ -1363,7 +1362,7 @@ static void *spapr_build_fdt(SpaprMachineState *spapr) } if (smc->dr_phb_enabled) { - ret = spapr_drc_populate_dt(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_PHB); + ret = spapr_dt_drc(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_PHB); if (ret < 0) { error_report("Couldn't set up PHB DR device tree properties"); exit(1); diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 597f236b9c..bacadfcac5 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -781,7 +781,7 @@ SpaprDrc *spapr_drc_by_id(const char *type, uint32_t id) } /** - * spapr_drc_populate_dt + * spapr_dt_drc * * @fdt: libfdt device tree * @path: path in the DT to generate properties @@ -794,8 +794,7 @@ SpaprDrc *spapr_drc_by_id(const char *type, uint32_t id) * * as documented in PAPR+ v2.1, 13.5.2 */ -int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, - uint32_t drc_type_mask) +int spapr_dt_drc(void *fdt, int offset, Object *owner, uint32_t drc_type_mask) { Object *root_container; ObjectProperty *prop; @@ -873,7 +872,7 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, *(uint32_t *)drc_names->str = cpu_to_be32(drc_count); *(uint32_t *)drc_types->str = cpu_to_be32(drc_count); - ret = fdt_setprop(fdt, fdt_offset, "ibm,drc-indexes", + ret = fdt_setprop(fdt, offset, "ibm,drc-indexes", drc_indexes->data, drc_indexes->len * sizeof(uint32_t)); if (ret) { @@ -881,7 +880,7 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, goto out; } - ret = fdt_setprop(fdt, fdt_offset, "ibm,drc-power-domains", + ret = fdt_setprop(fdt, offset, "ibm,drc-power-domains", drc_power_domains->data, drc_power_domains->len * sizeof(uint32_t)); if (ret) { @@ -889,14 +888,14 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, goto out; } - ret = fdt_setprop(fdt, fdt_offset, "ibm,drc-names", + ret = fdt_setprop(fdt, offset, "ibm,drc-names", drc_names->str, drc_names->len); if (ret) { error_report("Couldn't finalize ibm,drc-names property"); goto out; } - ret = fdt_setprop(fdt, fdt_offset, "ibm,drc-types", + ret = fdt_setprop(fdt, offset, "ibm,drc-types", drc_types->str, drc_types->len); if (ret) { error_report("Couldn't finalize ibm,drc-types property"); diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index c166df4145..04855d3125 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -2282,8 +2282,7 @@ int spapr_dt_phb(SpaprPhbState *phb, uint32_t intc_phandle, void *fdt, return ret; } - ret = spapr_drc_populate_dt(fdt, bus_off, OBJECT(phb), - SPAPR_DR_CONNECTOR_TYPE_PCI); + ret = spapr_dt_drc(fdt, bus_off, OBJECT(phb), SPAPR_DR_CONNECTOR_TYPE_PCI); if (ret) { return ret; } diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index fad0a887f9..c2c543a591 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -266,8 +266,7 @@ SpaprDrc *spapr_dr_connector_new(Object *owner, const char *type, uint32_t id); SpaprDrc *spapr_drc_by_index(uint32_t index); SpaprDrc *spapr_drc_by_id(const char *type, uint32_t id); -int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, - uint32_t drc_type_mask); +int spapr_dt_drc(void *fdt, int offset, Object *owner, uint32_t drc_type_mask); void spapr_drc_attach(SpaprDrc *drc, DeviceState *d, Error **errp); void spapr_drc_detach(SpaprDrc *drc);
This makes some minor cleanups to spapr_drc_populate_dt(), renaming it to the shorter and more idiomatic spapr_dt_drc() along the way. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- hw/ppc/spapr.c | 7 +++---- hw/ppc/spapr_drc.c | 13 ++++++------- hw/ppc/spapr_pci.c | 3 +-- include/hw/ppc/spapr_drc.h | 3 +-- 4 files changed, 11 insertions(+), 15 deletions(-)