EHCI USB Controllers Support

Makefile

@@ -25,6 +25,7 @@ debug ?= none
 net ?= none
 merge_sections ?= yes
 bootloader ?= grub
+usb_hid ?= no
 
 ## aarch64 only supports booting via UEFI
 ifeq ($(ARCH),aarch64)
@@ -773,6 +774,12 @@ help:
 	@echo -e "\t Configure which bootloader to pack into the final \".iso\" file."
 	@echo -e "\t    'grub':    Use the GRUB bootloader. Default value."
 	@echo -e "\t    'limine':  Use the Limine bootloader. See setup instructions in the README."
+
+	@echo -e "\nThe following key-value options are available to emulate USB devices:"
+	@echo -e "   usb_hid=yes|no"
+	@echo -e "\t Enables or disables the emulation of USB HID devices."
+	@echo -e "\t    'no':  No USB HID device; enables PS/2 input on x86. Default value."
+	@echo -e "\t    'yes': Creates a virtual USB controller with keyboard and mouse plugged in."
 
 	@echo -e "\nThe following key-value options are available to customize the build process:"
 	@echo -e "   merge_sections=yes|no"
@@ -949,13 +956,18 @@ else ifeq ($(ARCH),aarch64)
 	QEMU_FLAGS += -machine virt,gic-version=3
 	QEMU_FLAGS += -device ramfb
 	QEMU_FLAGS += -cpu cortex-a72
-	QEMU_FLAGS += -usb
-	QEMU_FLAGS += -device usb-ehci,id=ehci
-	QEMU_FLAGS += -device usb-kbd
 else
 	QEMU_FLAGS += -cpu Broadwell
 endif
 
+## USB devices
+ifeq ($(usb_hid),yes)
+	QEMU_FLAGS += -usb
+	QEMU_FLAGS += -device usb-ehci,id=ehci
+	QEMU_FLAGS += -device usb-kbd,bus=ehci.0
+	QEMU_FLAGS += -device usb-mouse,bus=ehci.0
+endif
+
 ## Currently, kvm by itself can cause problems, but it works with the "host" option (above).
 ifeq ($(kvm),yes)
 $(error Error: the 'kvm=yes' option is currently broken. Use 'host=yes' instead")

kernel/device_manager/Cargo.toml

@@ -13,6 +13,7 @@ serial_port = { path = "../serial_port" }
 console = { path = "../console" }
 logger = { path = "../logger" }
 pci = { path = "../pci" }
+usb = { path = "../usb" }
 derive_more = "0.99.0"
 mpmc = "0.1.6"
 log = "0.4.8"

kernel/device_manager/src/lib.rs

@@ -119,19 +119,35 @@ pub fn init(
             }
         }
 
+        if dev.class == 0x0C {
+            // Serial Bus Controller
+            if dev.subclass == 0x03 {
+                // USB controller
+                // Note: only aarch64 is supported due to use of legacy PCI interrupts
+                // #[cfg(target_arch = "aarch64")]
+                if dev.prog_if == 0x20 {
+                    // EHCI
+                    usb::init_pci(dev, usb::ControllerType::Ehci)?;
+                    continue;
+                }
+            }
+        }
+
         // If this is a network device, initialize it as such.
         // Look for networking controllers, specifically ethernet cards
         // No NIC support on aarch64 at the moment
         #[cfg(target_arch = "x86_64")]
         if dev.class == 0x02 && dev.subclass == 0x00 {
-            if dev.vendor_id == e1000::INTEL_VEND && dev.device_id == e1000::E1000_DEV {
-                info!("e1000 PCI device found at: {:?}", dev.location);
-                let nic = e1000::E1000Nic::init(dev)?;
-                let interface = net::register_device(nic);
-                nic.lock().init_interrupts(interface)?;
+            // The e1000 driver clashes with the USB driver
+            // if dev.vendor_id == e1000::INTEL_VEND && dev.device_id == e1000::E1000_DEV {
+            //     info!("e1000 PCI device found at: {:?}", dev.location);
+            //     let nic = e1000::E1000Nic::init(dev)?;
+            //     let interface = net::register_device(nic);
+            //     nic.lock().init_interrupts(interface)?;
+            //
+            //     continue;
+            // }
 
-                continue;
-            }
             if dev.vendor_id == ixgbe::INTEL_VEND && dev.device_id == ixgbe::INTEL_82599 {
                 info!("ixgbe PCI device found at: {:?}", dev.location);
 

kernel/usb/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+authors = ["Nathan Royer <[email protected]>"]
+name = "usb"
+description = "USB controllers and classes support"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+log = "0.4.8"
+zerocopy = "0.5.0"
+volatile = "0.2.7"
+bilge = "0.2.0"
+
+sync_irq = { path = "../../libs/sync_irq" }
+memory = { path = "../memory" }
+waker = { path = "../waker" }
+spawn = { path = "../spawn" }
+sleep = { path = "../sleep" }
+pci = { path = "../pci" }