Otherwise SeaBIOS can't access virtio's modern BAR.
Signed-off-by: Marcel Apfelbaum <marcel(a)redhat.com>
---
Hi,
If there is no room to map all MMIO BARs into the 32-bit PCI window,
SeaBIOS will re-allocate all 64-bit MMIO BARs into over-4G space.
Virtio 1.0 block devices (virtio-blk/virtio-scsi) use a 64-bit BAR
unusable by SeaBIOS if mapped over 4G space, preventing the system
to boot.
The simplest solution is to follow the xhci model and simply
skip migrating the virtio 1.0 modern bar into over-4G space.
In order to reproduce the problem use:
-device virtio-blk-pci, ...\
-object memory-backend-file,id=mem,size=4G,mem-path=/dev/hugepages,share=on \
-device ivshmem-plain,memdev=mem \
Thanks,
Marcel
src/fw/pciinit.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/fw/pciinit.c b/src/fw/pciinit.c
index 35d9902..3b76e66 100644
--- a/src/fw/pciinit.c
+++ b/src/fw/pciinit.c
@@ -655,6 +655,13 @@ static void pci_region_migrate_64bit_entries(struct pci_region *from,
continue;
if (entry->dev->class == PCI_CLASS_SERIAL_USB)
continue;
+ if (entry->dev->vendor == PCI_VENDOR_ID_REDHAT_QUMRANET &&
+ (entry->dev->device == PCI_DEVICE_ID_VIRTIO_BLK_09 ||
+ entry->dev->device == PCI_DEVICE_ID_VIRTIO_BLK_10 ||
+ entry->dev->device == PCI_DEVICE_ID_VIRTIO_SCSI_09 ||
+ entry->dev->device == PCI_DEVICE_ID_VIRTIO_SCSI_10))
+ continue;
+
// Move from source list to destination list.
hlist_del(&entry->node);
hlist_add(&entry->node, last);
--
2.5.5
There were several keys not mapped in the keyboard scancode to
"keycode" mapping functions. This series adds in a number of
additional keyboard mappings. I used the Phoenix "System BIOS for IBM
PC/XT/AT Computers and Compatibles" book as a reference for the
mappings.
Albert - can you test if this series fixes your issue with the SysReq
key?
I've also uploaded the series to:
https://github.com/KevinOConnor/seabios/tree/testing
FYI, I've found on my Linux/X-Windows setup that QEMU doesn't always
pass the correct keycodes for SysReq and Break to the guest. But,
I've tested on real hardware to confirm that the keyboard mappings are
correct.
-Kevin
Kevin O'Connor (10):
kbd: Implement 101-key keyboard keycode mapping
kbd: Implement extended keycode mappings for keypad-enter and keypad-/
kbd: Suppress keys without mappings
kbd: Merge bda->kbd_flag0 and bda->kbd_flag1
kbd: Extract out shift flag setting into new function
kbd: Move checking for special keys in __process_keys() into switch
kbd: Ignore fake shift keys
usb-hid: Generate Ctrl+Break and Alt+SysReq keys
kbd: Generate interrupt events for SysReq, PrtScr, and Break
post: Map int 0x05 to entry point
src/hw/usb-hid.c | 50 +++++---
src/kbd.c | 383 ++++++++++++++++++++++++++++++-------------------------
src/post.c | 1 +
src/romlayout.S | 2 +
src/std/bda.h | 26 +++-
5 files changed, 268 insertions(+), 194 deletions(-)
--
2.5.5
