diff mbox series

[1/4] hw/m68k/virt: Add a XHCI controller

Message ID 20240527-m68k-bios-v1-1-6de26552fa77@flygoat.com (mailing list archive)
State New, archived
Headers show
Series hw/m68k/virt: Add some devices | expand

Commit Message

Jiaxun Yang May 27, 2024, 5:15 p.m. UTC 
VirtIO is somewhat limited on the diversity of devices.
We lack proper audio, webcam and so on support on m68k virt machine.

This can be improved by providing a XHCI controller, which enables
provision of many different discoverable devices.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 hw/m68k/Kconfig                                   |  1 +
 hw/m68k/virt.c                                    | 22 +++++++++++++++++++++-
 include/standard-headers/asm-m68k/bootinfo-virt.h |  2 ++
 3 files changed, 24 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig
index 0092cda4e9c8..66e63cd60b57 100644
--- a/hw/m68k/Kconfig
+++ b/hw/m68k/Kconfig
@@ -44,4 +44,5 @@  config M68K_VIRT
     select GOLDFISH_PIC
     select GOLDFISH_TTY
     select GOLDFISH_RTC
+    select USB_XHCI_SYSBUS
     select VIRTIO_MMIO
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 09bc9bdfefb2..7b3917dcbd2b 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -33,13 +33,16 @@ 
 #include "hw/char/goldfish_tty.h"
 #include "hw/rtc/goldfish_rtc.h"
 #include "hw/intc/goldfish_pic.h"
+#include "hw/usb/hcd-xhci-sysbus.h"
 #include "hw/virtio/virtio-mmio.h"
 #include "hw/virtio/virtio-blk.h"
 
 /*
  * 6 goldfish-pic for CPU IRQ #1 to IRQ #6
  * CPU IRQ #1 -> PIC #1
- *               IRQ #1 to IRQ #31 -> unused
+ *               IRQ #1 -> virt-ctrl
+ *               IRQ #2 -> xhci
+ *               IRQ #3 to IRQ #31 -> unused
  *               IRQ #32 -> goldfish-tty
  * CPU IRQ #2 -> PIC #2
  *               IRQ #1 to IRQ #32 -> virtio-mmio from 1 to 32
@@ -86,6 +89,9 @@ 
 #define VIRT_VIRTIO_MMIO_BASE 0xff010000     /* MMIO: 0xff010000 - 0xff01ffff */
 #define VIRT_VIRTIO_IRQ_BASE  PIC_IRQ(2, 1)  /* PIC: 2, 3, 4, 5, IRQ: ALL */
 
+#define VIRT_XHCI_MMIO_BASE 0xff020000    /* MMIO: 0xff020000 - 0xff023fff */
+#define VIRT_XHCI_IRQ_BASE  PIC_IRQ(1, 2) /* PIC: #1, IRQ: #2 */
+
 typedef struct {
     M68kCPU *cpu;
     hwaddr initial_pc;
@@ -216,6 +222,16 @@  static void virt_init(MachineState *machine)
         io_base += 0x200;
     }
 
+    /* xhci */
+    if (machine_usb(machine)) {
+        dev = qdev_new(TYPE_XHCI_SYSBUS);
+        qdev_prop_set_uint32(dev, "intrs", 1);
+        sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
+        sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, VIRT_XHCI_MMIO_BASE);
+        sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
+                        PIC_GPIO(VIRT_XHCI_IRQ_BASE));
+    }
+
     if (kernel_filename) {
         CPUState *cs = CPU(cpu);
         uint64_t high;
@@ -268,6 +284,10 @@  static void virt_init(MachineState *machine)
                   VIRT_CTRL_MMIO_BASE, VIRT_CTRL_IRQ_BASE);
         BOOTINFO2(param_ptr, BI_VIRT_VIRTIO_BASE,
                   VIRT_VIRTIO_MMIO_BASE, VIRT_VIRTIO_IRQ_BASE);
+        if (machine_usb(machine)) {
+            BOOTINFO2(param_ptr, BI_VIRT_XHCI_BASE,
+                    VIRT_XHCI_MMIO_BASE, VIRT_XHCI_IRQ_BASE);
+        }
 
         if (kernel_cmdline) {
             BOOTINFOSTR(param_ptr, BI_COMMAND_LINE,
diff --git a/include/standard-headers/asm-m68k/bootinfo-virt.h b/include/standard-headers/asm-m68k/bootinfo-virt.h
index 75ac6bbd7d73..1700c3ada765 100644
--- a/include/standard-headers/asm-m68k/bootinfo-virt.h
+++ b/include/standard-headers/asm-m68k/bootinfo-virt.h
@@ -16,6 +16,8 @@ 
 /* No longer used -- replaced with BI_RNG_SEED -- but don't reuse this index:
  * #define BI_VIRT_RNG_SEED	0x8006 */
 
+#define BI_VIRT_XHCI_BASE	0x8007
+
 #define VIRT_BOOTI_VERSION	MK_BI_VERSION(2, 0)
 
 #endif /* _UAPI_ASM_M68K_BOOTINFO_MAC_H */