From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6dwp-0008CO-Ax for qemu-devel@nongnu.org; Wed, 09 Dec 2015 07:34:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6dwn-00080E-7W for qemu-devel@nongnu.org; Wed, 09 Dec 2015 07:34:19 -0500 From: Thomas Huth Date: Wed, 9 Dec 2015 13:34:13 +0100 Message-Id: <1449664453-32603-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH v2 for-2.6] hw/ppc/spapr: Use XHCI as host controller for new spapr machines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org, David Gibson Cc: qemu-devel@nongnu.org, Alexander Graf The OHCI has some bugs and performance issues, so for newer machines it's preferable to use XHCI instead. Signed-off-by: Thomas Huth --- v2: rebased this patch to David's latest ppc-for-2.6 branch (which already contains the pseries-2.6 machine definition) hw/ppc/spapr.c | 9 ++++++++- include/hw/ppc/spapr.h | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 2d57ab0..ee42f1b 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1917,7 +1917,11 @@ static void ppc_spapr_init(MachineState *machine) } if (machine->usb) { - pci_create_simple(phb->bus, -1, "pci-ohci"); + if (smc->use_ohci_by_default) { + pci_create_simple(phb->bus, -1, "pci-ohci"); + } else { + pci_create_simple(phb->bus, -1, "nec-usb-xhci"); + } if (spapr->has_graphics) { USBBus *usb_bus = usb_bus_find(-1); @@ -2359,7 +2363,10 @@ static void spapr_machine_2_5_instance_options(MachineState *machine) static void spapr_machine_2_5_class_options(MachineClass *mc) { + sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); + spapr_machine_2_6_class_options(mc); + smc->use_ohci_by_default = true; } DEFINE_SPAPR_MACHINE(2_5, "2.5", false); diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 5baa906..53af76a 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -35,7 +35,8 @@ struct sPAPRMachineClass { MachineClass parent_class; /*< public >*/ - bool dr_lmb_enabled; /* enable dynamic-reconfig/hotplug of LMBs */ + bool dr_lmb_enabled; /* enable dynamic-reconfig/hotplug of LMBs */ + bool use_ohci_by_default; /* use USB-OHCI instead of XHCI */ }; /** -- 1.8.3.1