On 09/12/14 21:59, Gabriel L. Somlo wrote: > On Fri, Sep 12, 2014 at 08:26:01PM +0200, Paolo Bonzini wrote: >> So it could be an OVMF bug related to multifunction devices. >> >> Well, you could try moving devices around in different functions. >> You could try moving ehci1 to 0 and the UHCIs to 1/2/7. >> >> Or drop uhci2/uhci3 and move the two remaining devices around. Once you >> have three combinations that work (e.g. 0/4, 0/6, 0/7) you could use it >> to add three UHCI controllers (in the above examples, it would be 0/1/2/7). >> >> Remember that one of the two must be xx.0, the other can be anything >> from xx.1 to xx.7. > > I moved things around as you suggested (from hw/usb/hcd-ehci-pci.c and > the ich9_1d[] array). > > No matter which PCI function gets assigned to which device, and no > matter which order the uhci1/2/3 devices are listed in ich9_1d[], > it's *always* uhci3 (dev.id. 2936) and ehci being shown, and uhci1&2 > end up missing. > > System Information looks like this (high-speed kbd/mouse patch is > applied, so I'm looking for whether uhci2/3 show up in the list or > not, but wanted to always have mouse and keyboard available on ehci): > > USB Device Tree: > > --->USB Bus<--- > v USB Hi-Speed Bus > QEMU USB Keyboard > QEMU USB Mouse > > > USB Bus: > > Host Controller Location: Expansion Slot > Host Controller Driver: AppleUSBUHCI > PCI Device ID: 0x2936 > PCI Revision ID: 0x0003 > PCI Vendor ID: 0x8086 > Bus Number: 0x5d > > The bus number varies (depending on which function I hard-coded for > uhci3, e.g. 3d when I had it at 00:1d.1, 5d for the default 00:1d.2, > etc.) but it's always uhci3... > > > Interestingly, if I comment out uhci3, it's only ehci that shows up, > not uhci1 or uhci2 (even though one of them is 00:1d.0). > > > Feels like there's some thing "magical" about the uhci3 name or device > ID. Maybe at this point I should go fishing in the edk2 source :)
Right, a bit earlier I thought of devids being special maybe and grepped edk2 for "2936" -- no luck. There are hits but they all seem unrelated. Laszlo
