[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 25/26] q35: fill in usb pci slots with -usb
From: |
Jason Baron |
Subject: |
[Qemu-devel] [PATCH v3 25/26] q35: fill in usb pci slots with -usb |
Date: |
Fri, 19 Oct 2012 16:43:41 -0400 |
From: Jason Baron <address@hidden>
This fills out the usb slots on q35, when -usb is passed.
We now have (lspci output):
00:1d.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI
Controller #1 (rev 03)
00:1d.1 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI
Controller #2 (rev 03)
00:1d.2 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI
Controller #3 (rev 03)
00:1d.7 USB Controller: Intel Corporation 82801I (ICH9 Family) USB2 EHCI
Controller #1 (rev 03)
Signed-off-by: Jason Baron <address@hidden>
---
hw/ich9.h | 5 ++++-
hw/pc_q35.c | 11 ++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/hw/ich9.h b/hw/ich9.h
index de49135..9e19266 100644
--- a/hw/ich9.h
+++ b/hw/ich9.h
@@ -87,8 +87,11 @@ typedef struct ICH9LPCState {
/* D29:F0 USB UHCI Controller #1 */
-#define ICH9_USB_UHCI1_DEV 29
+#define ICH9_USB_DEV 29
#define ICH9_USB_UHCI1_FUNC 0
+#define ICH9_USB_UHCI2_FUNC 1
+#define ICH9_USB_UHCI3_FUNC 2
+#define ICH9_USB_EHCI1_FUNC 7
/* D30:F0 DMI-to-PCI brdige */
#define ICH9_D2P_BRIDGE "ICH9 D2P BRIDGE"
diff --git a/hw/pc_q35.c b/hw/pc_q35.c
index ca30b65..bde3749 100644
--- a/hw/pc_q35.c
+++ b/hw/pc_q35.c
@@ -185,8 +185,17 @@ static void pc_q35_init_late(BusState **idebus, ISADevice
*rtc_state,
if (usb_enabled) {
/* Should we create 6 UHCI according to ich9 spec? */
pci_create_simple_multifunction(
- host_bus, PCI_DEVFN(ICH9_USB_UHCI1_DEV, ICH9_USB_UHCI1_FUNC),
+ host_bus, PCI_DEVFN(ICH9_USB_DEV, ICH9_USB_UHCI1_FUNC),
true, "ich9-usb-uhci1");
+ pci_create_simple_multifunction(
+ host_bus, PCI_DEVFN(ICH9_USB_DEV, ICH9_USB_UHCI2_FUNC),
+ true, "ich9-usb-uhci2");
+ pci_create_simple_multifunction(
+ host_bus, PCI_DEVFN(ICH9_USB_DEV, ICH9_USB_UHCI3_FUNC),
+ true, "ich9-usb-uhci3");
+ pci_create_simple_multifunction(
+ host_bus, PCI_DEVFN(ICH9_USB_DEV, ICH9_USB_EHCI1_FUNC),
+ true, "ich9-usb-ehci1");
/* XXX: EHCI */
}
--
1.7.1
- Re: [Qemu-devel] [PATCH v3 13/26] ich9: Add the lpc chip, (continued)
- [Qemu-devel] [PATCH v3 18/26] q35: Suppress SMM BIOS initialization under KVM, Jason Baron, 2012/10/19
- [Qemu-devel] [PATCH v3 16/26] ich9: Add i82801b11 dmi-to-pci bridge, Jason Baron, 2012/10/19
- [Qemu-devel] [PATCH v3 14/26] ich9: Add smbus, Jason Baron, 2012/10/19
- [Qemu-devel] [PATCH v3 22/26] Add a fallback bios file search, if -L fails., Jason Baron, 2012/10/19
- [Qemu-devel] [PATCH v3 23/26] q35: automatically load the q35 dsdt table, Jason Baron, 2012/10/19
- [Qemu-devel] [PATCH v3 25/26] q35: fill in usb pci slots with -usb,
Jason Baron <=
- [Qemu-devel] [PATCH v3 15/26] q35: Introduce q35 pc based chipset emulator, Jason Baron, 2012/10/19
- [Qemu-devel] [PATCH v3 21/26] q35: Add kvmclock support, Jason Baron, 2012/10/19
- [Qemu-devel] [PATCH v3 26/26] ich9: add support pci assignment, Jason Baron, 2012/10/19
- [Qemu-devel] [PATCH v3 20/26] q35: smbus: Remove PCI_STATUS_SIG_SYSTEM_ERROR and PCI_STATUS_DETECTED_PARITY from w1cmask, Jason Baron, 2012/10/19
- [Qemu-devel] [PATCH v3 17/26] Add i21154 bridge chip., Jason Baron, 2012/10/19