hw/ppc/spapr: Use XHCI as host controller for new spapr machines
PATCH v2 1/1 hw/ppc/spapr: Use XHCI as host controller for new spapr machines
The OHCI has some bugs and performance issues, so for newer machines it's preferable to use XHCI instead.
Signed-off-by Thomas Huth <[email protected]>
---
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(-)
hw/ppc/spapr.c +8 -1
@@ -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);
include/hw/ppc/spapr.h +2 -1
@@ -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 */ };/**
Signature · 1 line
1.8.3.1
Quoted 4 lines · Thomas Huth
The OHCI has some bugs and performance issues, so for newer machines it's preferable to use XHCI instead.
Signed-off-by Thomas Huth <[email protected]>
Sorry, I somehow missed this one for a while. I've now merged into ppc-for-2.6.
Signature · 4 lines
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