[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/17] usb: Fix bootindex for portnr > 9
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 01/17] usb: Fix bootindex for portnr > 9 |
Date: |
Fri, 29 Aug 2014 14:03:36 +0200 |
From: Markus Armbruster <address@hidden>
We identify devices by their Open Firmware device paths. The encoding
of the host controller and hub port numbers is incorrect:
usb_get_fw_dev_path() formats them in decimal, while SeaBIOS uses
hexadecimal. When some port number > 9, SeaBIOS will miss the
bootindex (lucky case), or apply it to another device (unlucky case).
The relevant spec[*] agrees with SeaBIOS (and OVMF, for that matter).
Change %d to %x.
Bug can bite only with host controllers or hubs sporting more than ten
ports. I'm not aware of any.
[*] Open Firmware Recommended Practice: Universal Serial Bus,
Version 1, Section 3.2.1 Device Node Address Representation
http://www.openfirmware.org/1275/bindings/usb/usb-1_0.ps
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Note: xhci can be configured with up to 15 ports (default is 4 ports).
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/bus.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 927a47b..516fb52 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -589,11 +589,11 @@ static char *usb_get_fw_dev_path(DeviceState *qdev)
nr = strtol(in, &in, 10);
if (in[0] == '.') {
/* some hub between root port and device */
- pos += snprintf(fw_path + pos, fw_len - pos, "address@hidden/",
nr);
+ pos += snprintf(fw_path + pos, fw_len - pos, "address@hidden/",
nr);
in++;
} else {
/* the device itself */
- pos += snprintf(fw_path + pos, fw_len - pos, "address@hidden",
+ pos += snprintf(fw_path + pos, fw_len - pos, "address@hidden",
qdev_fw_name(qdev), nr);
break;
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/17] usb patch queue, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 04/17] xhci: use (1u << i), Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 01/17] usb: Fix bootindex for portnr > 9,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 05/17] Revert "xhci: Fix number of streams allocated when using streams", Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 08/17] usb-ohci: add exit function, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 02/17] xhci: fix debug print compiling error, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 11/17] usb-ehci: add ehci unrealize funciton, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 10/17] usb-ehci: add vmstate properity for EHCIState, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 12/17] usb-ehci: add ehci-pci device exit function, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 06/17] usb: add usb_bus_release function, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 13/17] usb-xhci: add exit function, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 15/17] tests: add OHCI qtest, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 03/17] Fix OHCI ISO TD state never being written back., Gerd Hoffmann, 2014/08/29