| Message ID | 1452236119-24452-10-git-send-email-bharata@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Jan 08, 2016 at 12:25:17PM +0530, Bharata B Rao wrote: > Start supporting CPU hotplug from pseries-2.6 onwards. Add CPU > DRC (Dynamic Resource Connector) device tree entries. > > Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/ppc/spapr.c | 23 +++++++++++++++++++++++ > include/hw/ppc/spapr.h | 1 + > 2 files changed, 24 insertions(+) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index a330169..a3ce1db 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -977,6 +977,16 @@ static void spapr_finalize_fdt(sPAPRMachineState *spapr, > _FDT(spapr_drc_populate_dt(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_LMB)); > } > > + if (smc->dr_cpu_enabled) { > + int offset = fdt_path_offset(fdt, "/cpus"); > + ret = spapr_drc_populate_dt(fdt, offset, NULL, > + SPAPR_DR_CONNECTOR_TYPE_CPU); > + if (ret < 0) { > + fprintf(stderr, "Couldn't set up CPU DR device tree properties\n"); > + exit(1); > + } > + } > + > _FDT((fdt_pack(fdt))); > > if (fdt_totalsize(fdt) > FDT_MAX_SIZE) { > @@ -1731,6 +1741,8 @@ static void ppc_spapr_init(MachineState *machine) > long load_limit, fw_size; > bool kernel_le = false; > char *filename; > + int smt = kvmppc_smt_threads(); > + int smp_max_cores = max_cpus/smp_threads; > > msi_supported = true; > > @@ -1797,6 +1809,15 @@ static void ppc_spapr_init(MachineState *machine) > spapr_validate_node_memory(machine); > } > > + if (smc->dr_cpu_enabled) { > + for (i = 0; i < smp_max_cores; i++) { > + sPAPRDRConnector *drc = > + spapr_dr_connector_new(OBJECT(spapr), > + SPAPR_DR_CONNECTOR_TYPE_CPU, i * smt); > + qemu_register_reset(spapr_drc_reset, drc); > + } > + } > + > /* init CPUs */ > if (machine->cpu_model == NULL) { > machine->cpu_model = kvm_enabled() ? "host" : "POWER7"; > @@ -2299,6 +2320,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) > mc->cpu_index_to_socket_id = spapr_cpu_index_to_socket_id; > > smc->dr_lmb_enabled = true; > + smc->dr_cpu_enabled = true; > fwc->get_dev_path = spapr_get_fw_dev_path; > nc->nmi_monitor_handler = spapr_nmi; > } > @@ -2384,6 +2406,7 @@ static void spapr_machine_2_5_class_options(MachineClass *mc) > > spapr_machine_2_6_class_options(mc); > smc->use_ohci_by_default = true; > + smc->dr_cpu_enabled = false; > SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_5); > mc->validate_smp_config = spapr_validate_smp_config_default; > } > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 53af76a..739f9ba 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -36,6 +36,7 @@ struct sPAPRMachineClass { > > /*< public >*/ > bool dr_lmb_enabled; /* enable dynamic-reconfig/hotplug of LMBs */ > + bool dr_cpu_enabled; /* enable dynamic-reconfig/hotplug of CPUs */ > bool use_ohci_by_default; /* use USB-OHCI instead of XHCI */ > }; >
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index a330169..a3ce1db 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -977,6 +977,16 @@ static void spapr_finalize_fdt(sPAPRMachineState *spapr, _FDT(spapr_drc_populate_dt(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_LMB)); } + if (smc->dr_cpu_enabled) { + int offset = fdt_path_offset(fdt, "/cpus"); + ret = spapr_drc_populate_dt(fdt, offset, NULL, + SPAPR_DR_CONNECTOR_TYPE_CPU); + if (ret < 0) { + fprintf(stderr, "Couldn't set up CPU DR device tree properties\n"); + exit(1); + } + } + _FDT((fdt_pack(fdt))); if (fdt_totalsize(fdt) > FDT_MAX_SIZE) { @@ -1731,6 +1741,8 @@ static void ppc_spapr_init(MachineState *machine) long load_limit, fw_size; bool kernel_le = false; char *filename; + int smt = kvmppc_smt_threads(); + int smp_max_cores = max_cpus/smp_threads; msi_supported = true; @@ -1797,6 +1809,15 @@ static void ppc_spapr_init(MachineState *machine) spapr_validate_node_memory(machine); } + if (smc->dr_cpu_enabled) { + for (i = 0; i < smp_max_cores; i++) { + sPAPRDRConnector *drc = + spapr_dr_connector_new(OBJECT(spapr), + SPAPR_DR_CONNECTOR_TYPE_CPU, i * smt); + qemu_register_reset(spapr_drc_reset, drc); + } + } + /* init CPUs */ if (machine->cpu_model == NULL) { machine->cpu_model = kvm_enabled() ? "host" : "POWER7"; @@ -2299,6 +2320,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) mc->cpu_index_to_socket_id = spapr_cpu_index_to_socket_id; smc->dr_lmb_enabled = true; + smc->dr_cpu_enabled = true; fwc->get_dev_path = spapr_get_fw_dev_path; nc->nmi_monitor_handler = spapr_nmi; } @@ -2384,6 +2406,7 @@ static void spapr_machine_2_5_class_options(MachineClass *mc) spapr_machine_2_6_class_options(mc); smc->use_ohci_by_default = true; + smc->dr_cpu_enabled = false; SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_5); mc->validate_smp_config = spapr_validate_smp_config_default; } diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 53af76a..739f9ba 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -36,6 +36,7 @@ struct sPAPRMachineClass { /*< public >*/ bool dr_lmb_enabled; /* enable dynamic-reconfig/hotplug of LMBs */ + bool dr_cpu_enabled; /* enable dynamic-reconfig/hotplug of CPUs */ bool use_ohci_by_default; /* use USB-OHCI instead of XHCI */ };
Start supporting CPU hotplug from pseries-2.6 onwards. Add CPU DRC (Dynamic Resource Connector) device tree entries. Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> --- hw/ppc/spapr.c | 23 +++++++++++++++++++++++ include/hw/ppc/spapr.h | 1 + 2 files changed, 24 insertions(+)