NuKVM/memtest86plus
3
0
Fork 0
mirror of https://github.com/memtest86plus/memtest86plus.git synced 2025-02-25 18:55:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Check for correct address space in probe_usb_controller() (issue #36).

Browse Source 
We expect UHCI controllers to be mapped into I/O space and the other
controller types to be mapped into Memory space. Print a diagnostic
message and abort if this is not the case. Only call map_region()
for controllers mapped into Memory space.
This commit is contained in:
Martin Whitaker 2022-04-06 20:46:08 +01:00
parent f14d1fed52
commit 2c33aa3e85
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
system/usbhcd.c
View File

@ -599,8 +599,9 @@ static void probe_usb_controller(int bus, int dev, int func, hci_type_t controll
pci_config_write32(bus, dev, func, bar, 0xffffffff); pci_config_write32(bus, dev, func, bar, 0xffffffff);
uintptr_t mmio_size = pci_config_read32(bus, dev, func, bar); uintptr_t mmio_size = pci_config_read32(bus, dev, func, bar);
pci_config_write32(bus, dev, func, bar, base_addr); pci_config_write32(bus, dev, func, bar, base_addr);
bool in_io_space = base_addr & 0x1;
#ifdef __x86_64__ #ifdef __x86_64__
if (base_addr & 0x4) { if (!in_io_space && (base_addr & 0x4)) {
base_addr += (uintptr_t)pci_config_read32(bus, dev, func, bar + 4) << 32; base_addr += (uintptr_t)pci_config_read32(bus, dev, func, bar + 4) << 32;
pci_config_write32(bus, dev, func, bar + 4, 0xffffffff); pci_config_write32(bus, dev, func, bar + 4, 0xffffffff);
mmio_size += (uintptr_t)pci_config_read32(bus, dev, func, bar + 4) << 32; mmio_size += (uintptr_t)pci_config_read32(bus, dev, func, bar + 4) << 32;
@ -613,14 +614,25 @@ static void probe_usb_controller(int bus, int dev, int func, hci_type_t controll
mmio_size &= ~(uintptr_t)0xf; mmio_size &= ~(uintptr_t)0xf;
mmio_size = ~mmio_size + 1; mmio_size = ~mmio_size + 1;
print_usb_info("Found %s controller %04x:%04x at %08x size %08x", hci_name[controller_type], print_usb_info("Found %s controller %04x:%04x at %08x size %08x in %s space", hci_name[controller_type],
(uintptr_t)vendor_id, (uintptr_t)device_id, base_addr, mmio_size); (uintptr_t)vendor_id, (uintptr_t)device_id, base_addr, mmio_size, in_io_space ? "I/O" : "Mem");
if (in_io_space) {
if (controller_type != UHCI) {
print_usb_info(" Unsupported address mapping for this controller type");
return;
}
} else {
if (controller_type == UHCI) {
print_usb_info(" Unsupported address mapping for this controller type");
return;
}
base_addr = map_region(base_addr, mmio_size, false); base_addr = map_region(base_addr, mmio_size, false);
if (base_addr == 0) { if (base_addr == 0) {
print_usb_info(" Failed to map device into virtual memory"); print_usb_info(" Failed to map device into virtual memory");
return; return;
} }
}
// Search for power management capability. // Search for power management capability.
//uint8_t pm_cap_ptr; //uint8_t pm_cap_ptr;