On Fri, Mar 13, 2020 at 12:54:37PM +0100, Greg Kurz wrote: > On Fri, 13 Mar 2020 15:05:38 +1100 > David Gibson <da...@gibson.dropbear.id.au> wrote: > > > In the spapr code we've been gradually moving towards a convention that > > functions which create pieces of the device tree are called spapr_dt_*(). > > This patch speeds that along by renaming most of the things that don't yet > > match that so that they do. > > > > For now we leave the *_dt_populate() functions which are actual methods > > used in the DRCClass::dt_populate method. > > > > While we're there we remove a few comments that don't really say anything > > useful. > > > > Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> > > --- > > $ git grep _populate hw/ppc/spapr* | grep -v drc > hw/ppc/spapr_ovec.c: trace_spapr_ovec_populate_dt(i, vec_len, > vec[i]); > > This one needs fixing since spapr_ovec_populate_dt() is renamed. > > hw/ppc/spapr_pci.c: spapr_phb_nvgpu_populate_pcidev_dt(dev, fdt, offset, > sphb); > hw/ppc/spapr_pci.c: spapr_phb_nvgpu_populate_dt(phb, fdt, bus_off, &err); > hw/ppc/spapr_pci.c: spapr_phb_nvgpu_ram_populate_dt(phb, fdt); > hw/ppc/spapr_pci_nvlink2.c:void spapr_phb_nvgpu_populate_dt(SpaprPhbState > *sphb, void *fdt, int bus_off, > hw/ppc/spapr_pci_nvlink2.c:void spapr_phb_nvgpu_ram_populate_dt(SpaprPhbState > *sphb, void *fdt) > hw/ppc/spapr_pci_nvlink2.c:void spapr_phb_nvgpu_populate_pcidev_dt(PCIDevice > *dev, void *fdt, int offset, > > These look like good candidates since they are not DRC methods.
Eh, true. I don't really want to go through another review and test
cycle before my PR, so I think I'll merge as is and we can fix those
ones up later.
>
> > hw/ppc/spapr.c | 62 +++++++++++++++++--------------------
> > hw/ppc/spapr_ovec.c | 4 +--
> > include/hw/ppc/spapr_ovec.h | 4 +--
> > 3 files changed, 33 insertions(+), 37 deletions(-)
> >
> > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> > index fc28d9df25..6c32ec3c0a 100644
> > --- a/hw/ppc/spapr.c
> > +++ b/hw/ppc/spapr.c
> > @@ -217,10 +217,9 @@ static int spapr_fixup_cpu_numa_dt(void *fdt, int
> > offset, PowerPCCPU *cpu)
> > sizeof(associativity));
> > }
> >
> > -/* Populate the "ibm,pa-features" property */
> > -static void spapr_populate_pa_features(SpaprMachineState *spapr,
> > - PowerPCCPU *cpu,
> > - void *fdt, int offset)
> > +static void spapr_dt_pa_features(SpaprMachineState *spapr,
> > + PowerPCCPU *cpu,
> > + void *fdt, int offset)
> > {
> > uint8_t pa_features_206[] = { 6, 0,
> > 0xf6, 0x1f, 0xc7, 0x00, 0x80, 0xc0 };
> > @@ -315,8 +314,8 @@ static void add_str(GString *s, const gchar *s1)
> > g_string_append_len(s, s1, strlen(s1) + 1);
> > }
> >
> > -static int spapr_populate_memory_node(void *fdt, int nodeid, hwaddr start,
> > - hwaddr size)
> > +static int spapr_dt_memory_node(void *fdt, int nodeid, hwaddr start,
> > + hwaddr size)
> > {
> > uint32_t associativity[] = {
> > cpu_to_be32(0x4), /* length */
> > @@ -391,9 +390,8 @@ spapr_get_drconf_cell(uint32_t seq_lmbs, uint64_t
> > base_addr,
> > return elem;
> > }
> >
> > -/* ibm,dynamic-memory-v2 */
> > -static int spapr_populate_drmem_v2(SpaprMachineState *spapr, void *fdt,
> > - int offset, MemoryDeviceInfoList *dimms)
> > +static int spapr_dt_dynamic_memory_v2(SpaprMachineState *spapr, void *fdt,
> > + int offset, MemoryDeviceInfoList
> > *dimms)
> > {
> > MachineState *machine = MACHINE(spapr);
> > uint8_t *int_buf, *cur_index;
> > @@ -484,8 +482,7 @@ static int spapr_populate_drmem_v2(SpaprMachineState
> > *spapr, void *fdt,
> > return 0;
> > }
> >
> > -/* ibm,dynamic-memory */
> > -static int spapr_populate_drmem_v1(SpaprMachineState *spapr, void *fdt,
> > +static int spapr_dt_dynamic_memory(SpaprMachineState *spapr, void *fdt,
> > int offset, MemoryDeviceInfoList *dimms)
> > {
> > MachineState *machine = MACHINE(spapr);
> > @@ -554,7 +551,8 @@ static int spapr_populate_drmem_v1(SpaprMachineState
> > *spapr, void *fdt,
> > * Refer to docs/specs/ppc-spapr-hotplug.txt for the documentation
> > * of this device tree node.
> > */
> > -static int spapr_populate_drconf_memory(SpaprMachineState *spapr, void
> > *fdt)
> > +static int spapr_dt_dynamic_reconfiguration_memory(SpaprMachineState
> > *spapr,
> > + void *fdt)
> > {
> > MachineState *machine = MACHINE(spapr);
> > int nb_numa_nodes = machine->numa_state->num_nodes;
> > @@ -593,9 +591,9 @@ static int
> > spapr_populate_drconf_memory(SpaprMachineState *spapr, void *fdt)
> > /* ibm,dynamic-memory or ibm,dynamic-memory-v2 */
> > dimms = qmp_memory_device_list();
> > if (spapr_ovec_test(spapr->ov5_cas, OV5_DRMEM_V2)) {
> > - ret = spapr_populate_drmem_v2(spapr, fdt, offset, dimms);
> > + ret = spapr_dt_dynamic_memory_v2(spapr, fdt, offset, dimms);
> > } else {
> > - ret = spapr_populate_drmem_v1(spapr, fdt, offset, dimms);
> > + ret = spapr_dt_dynamic_memory(spapr, fdt, offset, dimms);
> > }
> > qapi_free_MemoryDeviceInfoList(dimms);
> >
> > @@ -626,7 +624,7 @@ static int
> > spapr_populate_drconf_memory(SpaprMachineState *spapr, void *fdt)
> > return ret;
> > }
> >
> > -static int spapr_populate_memory(SpaprMachineState *spapr, void *fdt)
> > +static int spapr_dt_memory(SpaprMachineState *spapr, void *fdt)
> > {
> > MachineState *machine = MACHINE(spapr);
> > SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
> > @@ -649,7 +647,7 @@ static int spapr_populate_memory(SpaprMachineState
> > *spapr, void *fdt)
> > if (!mem_start) {
> > /* spapr_machine_init() checks for rma_size <= node0_size
> > * already */
> > - spapr_populate_memory_node(fdt, i, 0, spapr->rma_size);
> > + spapr_dt_memory_node(fdt, i, 0, spapr->rma_size);
> > mem_start += spapr->rma_size;
> > node_size -= spapr->rma_size;
> > }
> > @@ -661,7 +659,7 @@ static int spapr_populate_memory(SpaprMachineState
> > *spapr, void *fdt)
> > sizetmp = 1ULL << ctzl(mem_start);
> > }
> >
> > - spapr_populate_memory_node(fdt, i, mem_start, sizetmp);
> > + spapr_dt_memory_node(fdt, i, mem_start, sizetmp);
> > node_size -= sizetmp;
> > mem_start += sizetmp;
> > }
> > @@ -672,7 +670,7 @@ static int spapr_populate_memory(SpaprMachineState
> > *spapr, void *fdt)
> > int ret;
> >
> > g_assert(smc->dr_lmb_enabled);
> > - ret = spapr_populate_drconf_memory(spapr, fdt);
> > + ret = spapr_dt_dynamic_reconfiguration_memory(spapr, fdt);
> > if (ret) {
> > return ret;
> > }
> > @@ -681,8 +679,8 @@ static int spapr_populate_memory(SpaprMachineState
> > *spapr, void *fdt)
> > return 0;
> > }
> >
> > -static void spapr_populate_cpu_dt(CPUState *cs, void *fdt, int offset,
> > - SpaprMachineState *spapr)
> > +static void spapr_dt_cpu(CPUState *cs, void *fdt, int offset,
> > + SpaprMachineState *spapr)
> > {
> > MachineState *ms = MACHINE(spapr);
> > PowerPCCPU *cpu = POWERPC_CPU(cs);
> > @@ -782,7 +780,7 @@ static void spapr_populate_cpu_dt(CPUState *cs, void
> > *fdt, int offset,
> > page_sizes_prop, page_sizes_prop_size)));
> > }
> >
> > - spapr_populate_pa_features(spapr, cpu, fdt, offset);
> > + spapr_dt_pa_features(spapr, cpu, fdt, offset);
> >
> > _FDT((fdt_setprop_cell(fdt, offset, "ibm,chip-id",
> > cs->cpu_index / vcpus_per_socket)));
> > @@ -816,7 +814,7 @@ static void spapr_populate_cpu_dt(CPUState *cs, void
> > *fdt, int offset,
> > pcc->lrg_decr_bits)));
> > }
> >
> > -static void spapr_populate_cpus_dt_node(void *fdt, SpaprMachineState
> > *spapr)
> > +static void spapr_dt_cpus(void *fdt, SpaprMachineState *spapr)
> > {
> > CPUState **rev;
> > CPUState *cs;
> > @@ -860,13 +858,13 @@ static void spapr_populate_cpus_dt_node(void *fdt,
> > SpaprMachineState *spapr)
> > offset = fdt_add_subnode(fdt, cpus_offset, nodename);
> > g_free(nodename);
> > _FDT(offset);
> > - spapr_populate_cpu_dt(cs, fdt, offset, spapr);
> > + spapr_dt_cpu(cs, fdt, offset, spapr);
> > }
> >
> > g_free(rev);
> > }
> >
> > -static int spapr_rng_populate_dt(void *fdt)
> > +static int spapr_dt_rng(void *fdt)
> > {
> > int node;
> > int ret;
> > @@ -1099,8 +1097,7 @@ static void spapr_dt_chosen(SpaprMachineState *spapr,
> > void *fdt)
> >
> > spapr_dt_ov5_platform_support(spapr, fdt, chosen);
> >
> > - _FDT(spapr_ovec_populate_dt(fdt, offset, spapr->ov5_cas,
> > - "ibm,architecture-vec-5"));
> > + _FDT(spapr_dt_ovec(fdt, chosen, spapr->ov5_cas,
> > "ibm,architecture-vec-5"));
> >
> > g_free(stdout_path);
> > g_free(bootlist);
> > @@ -1181,7 +1178,7 @@ void *spapr_build_fdt(SpaprMachineState *spapr, bool
> > reset, size_t space)
> > /* /interrupt controller */
> > spapr_irq_dt(spapr, spapr_max_server_number(spapr), fdt, PHANDLE_INTC);
> >
> > - ret = spapr_populate_memory(spapr, fdt);
> > + ret = spapr_dt_memory(spapr, fdt);
> > if (ret < 0) {
> > error_report("couldn't setup memory nodes in fdt");
> > exit(1);
> > @@ -1191,7 +1188,7 @@ void *spapr_build_fdt(SpaprMachineState *spapr, bool
> > reset, size_t space)
> > spapr_dt_vdevice(spapr->vio_bus, fdt);
> >
> > if (object_resolve_path_type("", TYPE_SPAPR_RNG, NULL)) {
> > - ret = spapr_rng_populate_dt(fdt);
> > + ret = spapr_dt_rng(fdt);
> > if (ret < 0) {
> > error_report("could not set up rng device in the fdt");
> > exit(1);
> > @@ -1206,8 +1203,7 @@ void *spapr_build_fdt(SpaprMachineState *spapr, bool
> > reset, size_t space)
> > }
> > }
> >
> > - /* cpus */
> > - spapr_populate_cpus_dt_node(fdt, spapr);
> > + spapr_dt_cpus(fdt, spapr);
> >
> > if (smc->dr_lmb_enabled) {
> > _FDT(spapr_dt_drc(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_LMB));
> > @@ -3400,8 +3396,8 @@ int spapr_lmb_dt_populate(SpaprDrc *drc,
> > SpaprMachineState *spapr,
> > addr = spapr_drc_index(drc) * SPAPR_MEMORY_BLOCK_SIZE;
> > node = object_property_get_uint(OBJECT(drc->dev), PC_DIMM_NODE_PROP,
> > &error_abort);
> > - *fdt_start_offset = spapr_populate_memory_node(fdt, node, addr,
> > -
> > SPAPR_MEMORY_BLOCK_SIZE);
> > + *fdt_start_offset = spapr_dt_memory_node(fdt, node, addr,
> > + SPAPR_MEMORY_BLOCK_SIZE);
> > return 0;
> > }
> >
> > @@ -3802,7 +3798,7 @@ int spapr_core_dt_populate(SpaprDrc *drc,
> > SpaprMachineState *spapr,
> > offset = fdt_add_subnode(fdt, 0, nodename);
> > g_free(nodename);
> >
> > - spapr_populate_cpu_dt(cs, fdt, offset, spapr);
> > + spapr_dt_cpu(cs, fdt, offset, spapr);
> >
> > *fdt_start_offset = offset;
> > return 0;
> > diff --git a/hw/ppc/spapr_ovec.c b/hw/ppc/spapr_ovec.c
> > index 0ff6d1aeae..dd003f1763 100644
> > --- a/hw/ppc/spapr_ovec.c
> > +++ b/hw/ppc/spapr_ovec.c
> > @@ -200,8 +200,8 @@ SpaprOptionVector *spapr_ovec_parse_vector(target_ulong
> > table_addr, int vector)
> > return ov;
> > }
> >
> > -int spapr_ovec_populate_dt(void *fdt, int fdt_offset,
> > - SpaprOptionVector *ov, const char *name)
> > +int spapr_dt_ovec(void *fdt, int fdt_offset,
> > + SpaprOptionVector *ov, const char *name)
> > {
> > uint8_t vec[OV_MAXBYTES + 1];
> > uint16_t vec_len;
> > diff --git a/include/hw/ppc/spapr_ovec.h b/include/hw/ppc/spapr_ovec.h
> > index 2bed517a2b..d4dee9e06a 100644
> > --- a/include/hw/ppc/spapr_ovec.h
> > +++ b/include/hw/ppc/spapr_ovec.h
> > @@ -72,8 +72,8 @@ void spapr_ovec_set(SpaprOptionVector *ov, long bitnr);
> > void spapr_ovec_clear(SpaprOptionVector *ov, long bitnr);
> > bool spapr_ovec_test(SpaprOptionVector *ov, long bitnr);
> > SpaprOptionVector *spapr_ovec_parse_vector(target_ulong table_addr, int
> > vector);
> > -int spapr_ovec_populate_dt(void *fdt, int fdt_offset,
> > - SpaprOptionVector *ov, const char *name);
> > +int spapr_dt_ovec(void *fdt, int fdt_offset,
> > + SpaprOptionVector *ov, const char *name);
> >
> > /* migration */
> > extern const VMStateDescription vmstate_spapr_ovec;
>
--
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
signature.asc
Description: PGP signature
