Commit 57040d45 authored by Thomas Huth's avatar Thomas Huth Committed by David Gibson
Browse files

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: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 4b23699c

hw/ppc/spapr.c

+8 −1
Original line number Diff line number Diff line
@@ -1917,7 +1917,11 @@ static void ppc_spapr_init(MachineState *machine) 
    }



    if (machine->usb) {

        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);
@@ -2362,7 +2366,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;

    SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_5);

}

include/hw/ppc/spapr.h

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ struct sPAPRMachineClass { 


    /*< public >*/

    bool dr_lmb_enabled;       /* enable dynamic-reconfig/hotplug of LMBs */

    bool use_ohci_by_default;  /* use USB-OHCI instead of XHCI */

};



/**