Skip to contentSkip to conversation

hw/mips: Improve the default USB settings in the loongson3-virt machine

PATCH Superseded Thomas Huth 2 participants 4 messages May 25, 2023 – Jun 21, 2023

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/mips: Improve the default USB settings in the loongson3-virt machine

It's possible to compile QEMU without the USB devices (e.g. when using "--without-default-devices" as option for the "configure" script). To be still able to run the loongson3-virt machine in default mode with such a QEMU binary, we have to check here for the availability of the devices first before instantiating them.

---
The alternative would be to use a "#ifdef CONFIG_USB_OHCI_PCI" etc. ... not sure what is nicer ... what do you think?

 hw/mips/loongson3_virt.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
hw/mips/loongson3_virt.c +7 -3
index 216812f660..a0afb17030 100644
@@ -447,10 +447,14 @@ static inline void loongson3_virt_devices_init(MachineState *machine,
 
     pci_vga_init(pci_bus);
 
-    if (defaults_enabled()) {
+    if (defaults_enabled() && module_object_class_by_name("pci-ohci")) {
         pci_create_simple(pci_bus, -1, "pci-ohci");
-        usb_create_simple(usb_bus_find(-1), "usb-kbd");
-        usb_create_simple(usb_bus_find(-1), "usb-tablet");
+        if (module_object_class_by_name("usb-kbd")) {
+            usb_create_simple(usb_bus_find(-1), "usb-kbd");
+        }
+        if (module_object_class_by_name("usb-tablet")) {
+            usb_create_simple(usb_bus_find(-1), "usb-tablet");
+        }
     }
 
     for (i = 0; i < nb_nics; i++) {
Signature · 1 line
2.31.1
#1 lore raw
Quoted 26 lines · Thomas Huth

It's possible to compile QEMU without the USB devices (e.g. when using "--without-default-devices" as option for the "configure" script). To be still able to run the loongson3-virt machine in default mode with such a QEMU binary, we have to check here for the availability of the devices first before instantiating them.

---
The alternative would be to use a "#ifdef CONFIG_USB_OHCI_PCI" etc. ... not sure what is nicer ... what do you think?

  hw/mips/loongson3_virt.c | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
hw/mips/loongson3_virt.c +1 -2
index 216812f660..a0afb17030 100644
@@ -447,10 +447,14 @@ static inline void loongson3_virt_devices_init(MachineState *machine,
 
      pci_vga_init(pci_bus);
 
-    if (defaults_enabled()) {
+    if (defaults_enabled() && module_object_class_by_name("pci-ohci")) {
          pci_create_simple(pci_bus, -1, "pci-ohci");
-        usb_create_simple(usb_bus_find(-1), "usb-kbd");

hw/mips/loongson3_virt.c static inline void loongson3_virt_devices_init(MachineState *machine, · line 460

Quoted 10 lines
hw/mips/loongson3_virt.c +6 -1
-        usb_create_simple(usb_bus_find(-1), "usb-tablet");
+        if (module_object_class_by_name("usb-kbd")) {
+            usb_create_simple(usb_bus_find(-1), "usb-kbd");
+        }
+        if (module_object_class_by_name("usb-tablet")) {
+            usb_create_simple(usb_bus_find(-1), "usb-tablet");
+        }
      }
 
      for (i = 0; i < nb_nics; i++) {

Friendly ping!

Thomas

#2 lore raw
Quoted 24 lines · Thomas Huth
Quoted 23 lines · Thomas Huth

It's possible to compile QEMU without the USB devices (e.g. when using "--without-default-devices" as option for the "configure" script). To be still able to run the loongson3-virt machine in default mode with such a QEMU binary, we have to check here for the availability of the devices first before instantiating them.

---
  The alternative would be to use a "#ifdef CONFIG_USB_OHCI_PCI" etc. ... not sure what is nicer ... what do you think?

  hw/mips/loongson3_virt.c | 10 +++++++---

  1 file changed, 7 insertions(+), 3 deletions(-)
hw/mips/loongson3_virt.c +1 -1
index 216812f660..a0afb17030 100644
@@ -447,10 +447,14 @@ static inline void loongson3_virt_devices_init(MachineState *machine,
       pci_vga_init(pci_bus);
-    if (defaults_enabled()) {
+    if (defaults_enabled() && module_object_class_by_name("pci-ohci")) {
           pci_create_simple(pci_bus, -1, "pci-ohci");
Quoted 8 lines

hw/mips/loongson3_virt.c static inline void loongson3_virt_devices_init(MachineState *machine, · line 457

Quoted 8 lines
hw/mips/loongson3_virt.c +6 -2
-        usb_create_simple(usb_bus_find(-1), "usb-kbd");
-        usb_create_simple(usb_bus_find(-1), "usb-tablet");
+        if (module_object_class_by_name("usb-kbd")) {
+            usb_create_simple(usb_bus_find(-1), "usb-kbd");
+        }
+        if (module_object_class_by_name("usb-tablet")) {
+            usb_create_simple(usb_bus_find(-1), "usb-tablet");
+        }

It looks like kbd/tablet don't need to have an if around, because hw/usb/usb-hid.c is always compiled when CONFIG_USB is enabled, and enabling CONFIG_USB_OHCI automatically selects CONFIG_USB.

I guess this whole code can be guarded by #if CONFIG_USB_OHCI..#endif, instead of using runtime checking of device availability.

Notes:

Other places don't check if ohci or other usb controllers are available.

We have TYPE_PCI_OHCI #define which isn't used in places where pci-ohci is requested, - probably need to move it to a common header (it is defined in hw/usb/hcd-ohci-pci.c now).

roms/config.seabios-128k turns USB_OHCI off.

/mjt

#3 lore raw
Quoted 30 lines · Michael Tokarev
Quoted 29 lines · Thomas Huth
Quoted 28 lines · Thomas Huth

It's possible to compile QEMU without the USB devices (e.g. when using "--without-default-devices" as option for the "configure" script). To be still able to run the loongson3-virt machine in default mode with such a QEMU binary, we have to check here for the availability of the devices first before instantiating them.

---
  The alternative would be to use a "#ifdef CONFIG_USB_OHCI_PCI" etc. ... not sure what is nicer ... what do you think?

  hw/mips/loongson3_virt.c | 10 +++++++---

  1 file changed, 7 insertions(+), 3 deletions(-)
hw/mips/loongson3_virt.c +3 -3
index 216812f660..a0afb17030 100644
@@ -447,10 +447,14 @@ static inline void 
 loongson3_virt_devices_init(MachineState *machine,
       pci_vga_init(pci_bus);
-    if (defaults_enabled()) {
+    if (defaults_enabled() && module_object_class_by_name("pci-ohci")) {
           pci_create_simple(pci_bus, -1, "pci-ohci");
-        usb_create_simple(usb_bus_find(-1), "usb-kbd");
-        usb_create_simple(usb_bus_find(-1), "usb-tablet");
+        if (module_object_class_by_name("usb-kbd")) {
+            usb_create_simple(usb_bus_find(-1), "usb-kbd");
Quoted 8 lines
Quoted 4 lines

hw/mips/loongson3_virt.c static inline void loongson3_virt_devices_init(MachineState *machine, · line 457

Quoted 4 lines
hw/mips/loongson3_virt.c +4 -0
+        }
+        if (module_object_class_by_name("usb-tablet")) {
+            usb_create_simple(usb_bus_find(-1), "usb-tablet");
+        }

It looks like kbd/tablet don't need to have an if around, because hw/usb/usb-hid.c is always compiled when CONFIG_USB is enabled, and enabling CONFIG_USB_OHCI automatically selects CONFIG_USB.

Oh, right! So this can be simplified, indeed.

Quoted 2 lines

I guess this whole code can be guarded by #if CONFIG_USB_OHCI..#endif, instead of using runtime checking of device availability.

Yes, that's the alternative ... I'll respin the patch with that to see how it looks like.

Quoted 3 lines

Notes:

Other places don't check if ohci or other usb controllers are available.

Those likely use "select" instead of "imply" in their Kconfig, so the OHCI controller is always included.

Quoted 3 lines

We have TYPE_PCI_OHCI #define which isn't used in places where pci-ohci is requested, - probably need to move it to a common header (it is defined in hw/usb/hcd-ohci-pci.c now).

Yes, sounds like a cleanup that could be done in an additional patch.

Quoted 1 line

roms/config.seabios-128k turns USB_OHCI off.

That's the config of the seabios ROM - not (directly) related to the config of the QEMU binaries.

Thomas