mirror of https://github.com/proxmox/mirror_qemu
ppc patch queue 2016-08-08
This batch has several last minute bug fixes to be merged for qemu-2.7. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXp/E6AAoJEGw4ysog2bOSl/QQAIyuYw4XLy7wRcNhMnc37YQA yDWSYvuYOY8NSr4mFodwEUkTwbv1nnioh3kO4e+umiP+YJrt/KS0IROSnswUvuRW /AuL9ICSvHllYJWTipwxbt+IPtquQ6d7jO330bUy14BUAN4OiTPWdD9b6x5LYJI0 eI0EwrE/R31nRm9g73Dopj3Qhzo4QcZoiqg2UfLLbXzCoPR+ugycYxuNDw8vIHTr WUM9vY1cx8RBDh+CuLqxDStFMOIUe/4vSWMM9ZSuc8rKdwfrmZCUIQMNco+vONeq VjTD2X+GzEQtxCci0zAEoJ5qPr/8vF/CL7Cc8+JvXTLwzKKg7QCouy0uy7l6MX8f 8JHnPm5D4PA2HQ/Cx/GHNBsPzz1OEydVj+fIL85vykvcFBnKF05yJGxYnZS96FVl MbCdwdtTtHaHdrbRTrY+Uo88gtqU/aYZ8AJLPZuwYbiIUhgELmVxpn3WZ5XERdkj J5y/vZOmOD1kqxAdDNG5V0eLwK1U64HYVHqIc+0Vmenmog+3DmbIixlcTH3IJ5c1 OEpPT+R+pAwG/6xyrgT9qd66wpwImbAgrOkzHhsnEtaLISXdWAM4XoFBwmbs6xAT 1yw+Nm4loQlWM7NFn2R6d3k2ABXpVqvdTwIbyeY5EAMfLdEB8pm0qkNWoIgswCMH qy0Hd6BKpvM148aIg4/U =hKMF -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160808' into staging ppc patch queue 2016-08-08 This batch has several last minute bug fixes to be merged for qemu-2.7. # gpg: Signature made Mon 08 Aug 2016 03:40:58 BST # gpg: using RSA key 0x6C38CACA20D9B392 # gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" # gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>" # gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392 * remotes/dgibson/tags/ppc-for-2.7-20160808: spapr: Fix undefined behaviour in spapr_tce_reset() macio: set res_count value to 0 after non-block ATAPI DMA transfers spapr: Correctly set query_hotpluggable_cpus hook based on machine version Signed-off-by: Peter Maydell <peter.maydell@linaro.org>master
commit
cbda16c010
|
@ -273,6 +273,7 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, int ret)
|
||||||
s->io_buffer_size = MIN(s->io_buffer_size, io->len);
|
s->io_buffer_size = MIN(s->io_buffer_size, io->len);
|
||||||
dma_memory_write(&address_space_memory, io->addr, s->io_buffer,
|
dma_memory_write(&address_space_memory, io->addr, s->io_buffer,
|
||||||
s->io_buffer_size);
|
s->io_buffer_size);
|
||||||
|
io->len = 0;
|
||||||
ide_atapi_cmd_ok(s);
|
ide_atapi_cmd_ok(s);
|
||||||
m->dma_active = false;
|
m->dma_active = false;
|
||||||
goto done;
|
goto done;
|
||||||
|
|
|
@ -938,6 +938,7 @@ static void spapr_finalize_fdt(sPAPRMachineState *spapr,
|
||||||
hwaddr rtas_size)
|
hwaddr rtas_size)
|
||||||
{
|
{
|
||||||
MachineState *machine = MACHINE(qdev_get_machine());
|
MachineState *machine = MACHINE(qdev_get_machine());
|
||||||
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
||||||
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(machine);
|
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(machine);
|
||||||
const char *boot_device = machine->boot_order;
|
const char *boot_device = machine->boot_order;
|
||||||
int ret, i;
|
int ret, i;
|
||||||
|
@ -1020,7 +1021,7 @@ static void spapr_finalize_fdt(sPAPRMachineState *spapr,
|
||||||
_FDT(spapr_drc_populate_dt(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_LMB));
|
_FDT(spapr_drc_populate_dt(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_LMB));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (smc->dr_cpu_enabled) {
|
if (mc->query_hotpluggable_cpus) {
|
||||||
int offset = fdt_path_offset(fdt, "/cpus");
|
int offset = fdt_path_offset(fdt, "/cpus");
|
||||||
ret = spapr_drc_populate_dt(fdt, offset, NULL,
|
ret = spapr_drc_populate_dt(fdt, offset, NULL,
|
||||||
SPAPR_DR_CONNECTOR_TYPE_CPU);
|
SPAPR_DR_CONNECTOR_TYPE_CPU);
|
||||||
|
@ -1712,6 +1713,7 @@ static void spapr_validate_node_memory(MachineState *machine, Error **errp)
|
||||||
static void ppc_spapr_init(MachineState *machine)
|
static void ppc_spapr_init(MachineState *machine)
|
||||||
{
|
{
|
||||||
sPAPRMachineState *spapr = SPAPR_MACHINE(machine);
|
sPAPRMachineState *spapr = SPAPR_MACHINE(machine);
|
||||||
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
||||||
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(machine);
|
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(machine);
|
||||||
const char *kernel_filename = machine->kernel_filename;
|
const char *kernel_filename = machine->kernel_filename;
|
||||||
const char *kernel_cmdline = machine->kernel_cmdline;
|
const char *kernel_cmdline = machine->kernel_cmdline;
|
||||||
|
@ -1733,7 +1735,7 @@ static void ppc_spapr_init(MachineState *machine)
|
||||||
int spapr_cores = smp_cpus / smp_threads;
|
int spapr_cores = smp_cpus / smp_threads;
|
||||||
int spapr_max_cores = max_cpus / smp_threads;
|
int spapr_max_cores = max_cpus / smp_threads;
|
||||||
|
|
||||||
if (smc->dr_cpu_enabled) {
|
if (mc->query_hotpluggable_cpus) {
|
||||||
if (smp_cpus % smp_threads) {
|
if (smp_cpus % smp_threads) {
|
||||||
error_report("smp_cpus (%u) must be multiple of threads (%u)",
|
error_report("smp_cpus (%u) must be multiple of threads (%u)",
|
||||||
smp_cpus, smp_threads);
|
smp_cpus, smp_threads);
|
||||||
|
@ -1810,7 +1812,7 @@ static void ppc_spapr_init(MachineState *machine)
|
||||||
machine->cpu_model = kvm_enabled() ? "host" : "POWER7";
|
machine->cpu_model = kvm_enabled() ? "host" : "POWER7";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (smc->dr_cpu_enabled) {
|
if (mc->query_hotpluggable_cpus) {
|
||||||
char *type = spapr_get_cpu_core_type(machine->cpu_model);
|
char *type = spapr_get_cpu_core_type(machine->cpu_model);
|
||||||
|
|
||||||
spapr->cores = g_new0(Object *, spapr_max_cores);
|
spapr->cores = g_new0(Object *, spapr_max_cores);
|
||||||
|
@ -2333,12 +2335,12 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev,
|
||||||
static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev,
|
static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev,
|
||||||
DeviceState *dev, Error **errp)
|
DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(qdev_get_machine());
|
MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());
|
||||||
|
|
||||||
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
|
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
|
||||||
error_setg(errp, "Memory hot unplug not supported by sPAPR");
|
error_setg(errp, "Memory hot unplug not supported by sPAPR");
|
||||||
} else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) {
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) {
|
||||||
if (!smc->dr_cpu_enabled) {
|
if (!mc->query_hotpluggable_cpus) {
|
||||||
error_setg(errp, "CPU hot unplug not supported on this machine");
|
error_setg(errp, "CPU hot unplug not supported on this machine");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -2376,11 +2378,8 @@ static HotpluggableCPUList *spapr_query_hotpluggable_cpus(MachineState *machine)
|
||||||
int i;
|
int i;
|
||||||
HotpluggableCPUList *head = NULL;
|
HotpluggableCPUList *head = NULL;
|
||||||
sPAPRMachineState *spapr = SPAPR_MACHINE(machine);
|
sPAPRMachineState *spapr = SPAPR_MACHINE(machine);
|
||||||
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(machine);
|
|
||||||
int spapr_max_cores = max_cpus / smp_threads;
|
int spapr_max_cores = max_cpus / smp_threads;
|
||||||
|
|
||||||
g_assert(smc->dr_cpu_enabled);
|
|
||||||
|
|
||||||
for (i = 0; i < spapr_max_cores; i++) {
|
for (i = 0; i < spapr_max_cores; i++) {
|
||||||
HotpluggableCPUList *list_item = g_new0(typeof(*list_item), 1);
|
HotpluggableCPUList *list_item = g_new0(typeof(*list_item), 1);
|
||||||
HotpluggableCPU *cpu_item = g_new0(typeof(*cpu_item), 1);
|
HotpluggableCPU *cpu_item = g_new0(typeof(*cpu_item), 1);
|
||||||
|
@ -2435,12 +2434,9 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
|
||||||
hc->plug = spapr_machine_device_plug;
|
hc->plug = spapr_machine_device_plug;
|
||||||
hc->unplug = spapr_machine_device_unplug;
|
hc->unplug = spapr_machine_device_unplug;
|
||||||
mc->cpu_index_to_socket_id = spapr_cpu_index_to_socket_id;
|
mc->cpu_index_to_socket_id = spapr_cpu_index_to_socket_id;
|
||||||
if (smc->dr_cpu_enabled) {
|
|
||||||
mc->query_hotpluggable_cpus = spapr_query_hotpluggable_cpus;
|
|
||||||
}
|
|
||||||
|
|
||||||
smc->dr_lmb_enabled = true;
|
smc->dr_lmb_enabled = true;
|
||||||
smc->dr_cpu_enabled = true;
|
mc->query_hotpluggable_cpus = spapr_query_hotpluggable_cpus;
|
||||||
fwc->get_dev_path = spapr_get_fw_dev_path;
|
fwc->get_dev_path = spapr_get_fw_dev_path;
|
||||||
nc->nmi_monitor_handler = spapr_nmi;
|
nc->nmi_monitor_handler = spapr_nmi;
|
||||||
}
|
}
|
||||||
|
@ -2521,10 +2517,8 @@ static void spapr_machine_2_6_instance_options(MachineState *machine)
|
||||||
|
|
||||||
static void spapr_machine_2_6_class_options(MachineClass *mc)
|
static void spapr_machine_2_6_class_options(MachineClass *mc)
|
||||||
{
|
{
|
||||||
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
|
|
||||||
|
|
||||||
spapr_machine_2_7_class_options(mc);
|
spapr_machine_2_7_class_options(mc);
|
||||||
smc->dr_cpu_enabled = false;
|
mc->query_hotpluggable_cpus = NULL;
|
||||||
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_6);
|
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_6);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -153,7 +153,6 @@ void spapr_core_unplug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||||||
void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(OBJECT(hotplug_dev));
|
|
||||||
sPAPRMachineState *spapr = SPAPR_MACHINE(OBJECT(hotplug_dev));
|
sPAPRMachineState *spapr = SPAPR_MACHINE(OBJECT(hotplug_dev));
|
||||||
sPAPRCPUCore *core = SPAPR_CPU_CORE(OBJECT(dev));
|
sPAPRCPUCore *core = SPAPR_CPU_CORE(OBJECT(dev));
|
||||||
CPUCore *cc = CPU_CORE(dev);
|
CPUCore *cc = CPU_CORE(dev);
|
||||||
|
@ -166,8 +165,6 @@ void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||||||
int index = cc->core_id / smp_threads;
|
int index = cc->core_id / smp_threads;
|
||||||
int smt = kvmppc_smt_threads();
|
int smt = kvmppc_smt_threads();
|
||||||
|
|
||||||
g_assert(smc->dr_cpu_enabled);
|
|
||||||
|
|
||||||
drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, index * smt);
|
drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, index * smt);
|
||||||
spapr->cores[index] = OBJECT(dev);
|
spapr->cores[index] = OBJECT(dev);
|
||||||
|
|
||||||
|
@ -209,7 +206,7 @@ void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
MachineState *machine = MACHINE(OBJECT(hotplug_dev));
|
MachineState *machine = MACHINE(OBJECT(hotplug_dev));
|
||||||
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(OBJECT(hotplug_dev));
|
MachineClass *mc = MACHINE_GET_CLASS(hotplug_dev);
|
||||||
sPAPRMachineState *spapr = SPAPR_MACHINE(OBJECT(hotplug_dev));
|
sPAPRMachineState *spapr = SPAPR_MACHINE(OBJECT(hotplug_dev));
|
||||||
int spapr_max_cores = max_cpus / smp_threads;
|
int spapr_max_cores = max_cpus / smp_threads;
|
||||||
int index;
|
int index;
|
||||||
|
@ -218,7 +215,7 @@ void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||||||
char *base_core_type = spapr_get_cpu_core_type(machine->cpu_model);
|
char *base_core_type = spapr_get_cpu_core_type(machine->cpu_model);
|
||||||
const char *type = object_get_typename(OBJECT(dev));
|
const char *type = object_get_typename(OBJECT(dev));
|
||||||
|
|
||||||
if (!smc->dr_cpu_enabled) {
|
if (!mc->query_hotpluggable_cpus) {
|
||||||
error_setg(&local_err, "CPU hotplug not supported for this machine");
|
error_setg(&local_err, "CPU hotplug not supported for this machine");
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
|
@ -385,7 +385,9 @@ static void spapr_tce_reset(DeviceState *dev)
|
||||||
sPAPRTCETable *tcet = SPAPR_TCE_TABLE(dev);
|
sPAPRTCETable *tcet = SPAPR_TCE_TABLE(dev);
|
||||||
size_t table_size = tcet->nb_table * sizeof(uint64_t);
|
size_t table_size = tcet->nb_table * sizeof(uint64_t);
|
||||||
|
|
||||||
memset(tcet->table, 0, table_size);
|
if (tcet->nb_table) {
|
||||||
|
memset(tcet->table, 0, table_size);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static target_ulong put_tce_emu(sPAPRTCETable *tcet, target_ulong ioba,
|
static target_ulong put_tce_emu(sPAPRTCETable *tcet, target_ulong ioba,
|
||||||
|
|
|
@ -38,7 +38,6 @@ struct sPAPRMachineClass {
|
||||||
|
|
||||||
/*< public >*/
|
/*< public >*/
|
||||||
bool dr_lmb_enabled; /* enable dynamic-reconfig/hotplug of LMBs */
|
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 */
|
bool use_ohci_by_default; /* use USB-OHCI instead of XHCI */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue