Commit Graph

2638 Commits

Author SHA1 Message Date
Kevin O'Connor 6a62e0cb0d scripts: Remove python23compat.py
It's simpler to use b"" designations around binary strings than to use
the as_bytes() function.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
2021-12-19 09:45:04 -05:00
Kevin O'Connor 9ad4399b0e readserial: Improve Python3 compatibility
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
2021-12-19 09:44:30 -05:00
Kevin O'Connor 98dd53b994 memmap: Fix gcc out-of-bounds warning
Use a different definition for the linker script symbol to avoid a gcc
warning.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
2021-12-18 12:08:53 -05:00
Kevin O'Connor 0a1e7675f7 vgasrc: Don't use VAR16 in header files to fix gcc warning
Some versions of gcc complain when VAR16 is used in both the header
and C files - use only in the C file to fix the warning.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
2021-12-18 12:00:16 -05:00
Gerd Hoffmann f9af71744a svgamodes: add standard 4k modes
Add all three 4k modes.  Computer monitors typically use
the first one (3840x2160).

Add 16 and 32 bpp variants.  24bpp is dead these days, and
software which is so old that still uses those modes most
likely doesn't even know what 4k is.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2021-12-18 11:54:52 -05:00
Andy Pei a05af290ba virtio-blk: split large IO according to size_max
if driver reads data larger than VIRTIO_BLK_F_SIZE_MAX,
it will cause some issue to the DMA engine.

So when upper software wants to read data larger than
VIRTIO_BLK_F_SIZE_MAX, virtio-blk driver split one large
request into multiple smaller ones.

Signed-off-by: Andy Pei <andy.pei@intel.com>
Signed-off-by: Ding Limin <dinglimin@cmss.chinamobile.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
2021-12-18 11:52:43 -05:00
Andy Pei 815d749865 virtio-blk: abstract a function named virtio_blk_op_one_segment to handle r/w request
abstract virtio-blk queue operation to form a function named virtio_blk_op_one_segment

Signed-off-by: Andy Pei <andy.pei@intel.com>
Signed-off-by: Ding Limin <dinglimin@cmss.chinamobile.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
2021-12-18 11:52:36 -05:00
Andy Pei 27b573d4f5 virtio-blk: add feature VIRTIO_BLK_F_SIZE_MAX and VIRTIO_BLK_F_SEG_MAX
according to virtio spec, add feature VIRTIO_BLK_F_SIZE_MAX
and VIRTIO_BLK_F_SEG_MAX parse to virtio blk driver.

Signed-off-by: Andy Pei <andy.pei@intel.com>
Signed-off-by: Ding Limin <dinglimin@cmss.chinamobile.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
2021-12-18 11:52:22 -05:00
Igor Mammedov b06d956d75 pci: let firmware reserve IO for pcie-pci-bridge
With [1] patch hotplug of rtl8139 succeeds, with caveat that it
fails to initialize IO bar, which is caused by [2] that makes
firmware skip IO reservation for any PCIe device, which isn't
correct in case of pcie-pci-bridge.
Fix it by exposing hotplug type and making IO resource optional
only if PCIe hotplug is in use.

[1]
 "pci: reserve resources for pcie-pci-bridge to fix regressed hotplug on q35"
[2]
Fixes: 76327b9f32 ("fw/pci: do not automatically allocate IO region for PCIe bridges")
Signed-off-by: Igor Mammedov imammedo@redhat.com
Tested-by: Laurent Vivier <lvivier@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
CC: mapfelba@redhat.com
CC: kraxel@redhat.com
CC: mst@redhat.com
CC: lvivier@redhat.com
CC: jusual@redhat.com
2021-12-18 11:49:22 -05:00
Igor Mammedov bba24ef84b pci: reserve resources for pcie-pci-bridge to fix regressed hotplug on q35
If QEMU is started with unpopulated pcie-pci-bridge with ACPI PCI
hotplug enabled (default since QEMU-6.1), hotplugging a PCI device
into one of the bridge slots fails due to lack of resources.

once linux guest is booted (test used Fedora 34), hotplug NIC from
QEMU monitor:
  (qemu) device_add rtl8139,bus=pcie-pci-bridge-0,addr=0x2

guest fails hotplug with:
  pci 0000:01:02.0: [10ec:8139] type 00 class 0x020000
  pci 0000:01:02.0: reg 0x10: [io  0x0000-0x00ff]
  pci 0000:01:02.0: reg 0x14: [mem 0x00000000-0x000000ff]
  pci 0000:01:02.0: reg 0x30: [mem 0x00000000-0x0003ffff pref]
  pci 0000:01:02.0: BAR 6: no space for [mem size 0x00040000 pref]
  pci 0000:01:02.0: BAR 6: failed to assign [mem size 0x00040000 pref]
  pci 0000:01:02.0: BAR 0: no space for [io  size 0x0100]
  pci 0000:01:02.0: BAR 0: failed to assign [io  size 0x0100]
  pci 0000:01:02.0: BAR 1: no space for [mem size 0x00000100]
  pci 0000:01:02.0: BAR 1: failed to assign [mem size 0x00000100]
  8139cp: 8139cp: 10/100 PCI Ethernet driver v1.3 (Mar 22, 2004)
  PCI Interrupt Link [GSIG] enabled at IRQ 22
  8139cp 0000:01:02.0: no MMIO resource
  8139cp: probe of 0000:01:02.0 failed with error -5

Reason for this is that commit [1] didn't take into account
pcie-pci-bridge, marking bridge as non hotpluggable instead of
handling it as possibly SHPC capable bridge.
Fix issue by checking if pcie-pci-bridge is SHPC capable and
if it is mark it as hotpluggable.

Fixes regression in QEMU-6.1 and later, since it was switched
to ACPI based PCI hotplug on Q35 by default at that time.

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=2001732
[1]
Fixes: 3aa31d7d63 ("hw/pci: reserve IO and mem for pci express downstream ports with no devices attached")
Signed-off-by: Igor Mammedov imammedo@redhat.com
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Laurent Vivier <lvivier@redhat.com>
CC: mapfelba@redhat.com
CC: kraxel@redhat.com
CC: mst@redhat.com
CC: lvivier@redhat.com
CC: jusual@redhat.com
2021-12-18 11:48:35 -05:00
Eduardo Habkost fa69276802 smbios: Support SMBIOS 3.0 entry point at smbios_romfile_setup()
Support SMBIOS 3.0 entry points if exposed by QEMU in fw_cfg.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:13 -05:00
Eduardo Habkost 401d3132fd smbios: Support SMBIOS 3.0 entry point at copy_table()
This will make coreboot code (scan_tables()) and xen code
(xen_biostable_setup()) copy SMBIOS 3.0 entry points if
found.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:13 -05:00
Eduardo Habkost eafea937e4 smbios: copy_smbios_30() function
Add new copy_smbios_30() function, that will be used to support
SMBIOS 3.0 entry points.

The SMBIOS 3.0 entry point will be tracked in a separate
SMBios30Addr variable, because both 2.1 and 3.0 entry points may
exist at the same time.

Adjust the smbios_get_tables(), smbios_major_version(), and
smbios_minor_version() helpers to use the SMBIOS 3.0 entry point
if available.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:13 -05:00
Eduardo Habkost ddd0f7b877 smbios: Make smbios_build_tables() ready for 64-bit tables
Make smbios_build_tables() get u64 address and u32 length
arguments, making it usable for SMBIOS 3.0.  Adapt
smbios_21_setup_entry_point() to use intermediate variables when
calling smbios_build_tables().

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:13 -05:00
Eduardo Habkost 6290dcede4 smbios: Make some smbios_build_tables() arguments optional
Make max_structure_size and number_of_structures optional,
as we don't have those fields in SMBIOS 3.0 entry points.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:13 -05:00
Eduardo Habkost 1daafc8ba8 smbios: smbios_21_setup_entry_point() function
Extract the code specific for building the SMBIOS 2.1 entry point
from smbios_romfile_setup() to a new
smbios_21_setup_entry_point() function.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:13 -05:00
Eduardo Habkost 4e99229e32 smbios: Make smbios_build_tables() more generic
Instead of taking a SMBIOS 2.1 entry point as argument, make
smbios_build_tables() take pointers to the fields it actually
changes.  This will allow us to reuse the function for SMBIOS 3.0
later.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:13 -05:00
Eduardo Habkost 31eac039b2 smbios: Extract SMBIOS table building code to separate function
Move the code that builds the SMBIOS tables to a separate
smbios_build_tables() function, to keep it isolated from the code
that initializes the SMBIOS entry point.

Thew new function will still take a smbios_21_entry_point
argument to make code review easier, but this will be changed by
the next commits.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:13 -05:00
Eduardo Habkost 34c3fce6e7 smbios: Use smbios_next() at smbios_romfile_setup()
Use smbios_next() instead of smbios_21_next(), to make the code
more generic and reusable for SMBIOS 3.0 support.

Note that `qtables_len` is initialized to `ftables->size` instead
of `ep.structure_table_length` now, but both fields are
guaranteed to have exactly the same value.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:13 -05:00
Eduardo Habkost 33fa7082b8 smbios: Make SMBios21Addr variable static
The variable is now only used inside biostables.c, there's no
need to make it global.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:13 -05:00
Eduardo Habkost 107391619a csm: Don't check SMBios21Addr before calling copy_smbios_21()
copy_smbios_21() already checks if SMBios21Addr is NULL, there's
no need to check it before calling the function.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:13 -05:00
Eduardo Habkost 4912bae2d1 tpm: Use smbios_get_tables()
Instead of using the SMBios21Addr global variable, use the
smbios_get_tables() helper.  This doesn't change any behavior
yet, but it will be useful when we start supporting SMBIOS 3.0
entry points.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:13 -05:00
Eduardo Habkost 831f1463aa smbios: smbios_major_version()/smbios_minor_version() helpers
They new helpers will be useful when we start supporting SMBIOS
3.0 entry points.  Use the new helpers at display_uuid().

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:13 -05:00
Eduardo Habkost dd54ccda8e smbios: Use smbios_get_tables()/smbios_next() at display_uuid()
Make the code more generic, and not specific for SMBIOS 2.1 entry
points.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:12 -05:00
Eduardo Habkost b251b21b2b smbios: smbios_get_tables() function
The new function will be useful for code that just needs the
address and length of SMBIOS tables.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:12 -05:00
Eduardo Habkost cfd1ef3ab9 smbios: Generic smbios_next() function
Extract generic code from smbios_21_next(), so it can be reused
for SMBIOS 3.0 support.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:12 -05:00
Eduardo Habkost 97f6c5b024 smbios: Rename code specific for SMBIOS 2.1 entry points
Rename copy_smbios(), smbios_next(), SMBIOS_SIGNATURE,
smbios_entry_point, and SMBiosAddr, to indicate they refer to
SMBIOS 2.1 entry points.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:12 -05:00
Eduardo Habkost 7b02616560 util.h: Delete unused get_smbios_entry_point() prototype
The get_smbios_entry_point() function doesn't exist, delete
unused prototype.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:12 -05:00
Eduardo Habkost 72f917ea37 biostables: copy_fseg_table() function
Replace the common malloc_fseg() + memcpy() code pattern
with a helper function.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2021-12-18 11:39:12 -05:00
Kevin O'Connor 2dd4b9b3f8 docs: Note v1.15.0 release
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
2021-12-02 20:43:20 -05:00
Stefan Berger 64f37cc530 tcgbios: Disable platform hierarchy in case of failure
In the rare case of a TPM 2 failure, disable the platform hierarchy after
disabling the endorsement and owner hierarchies.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2021-09-23 22:47:57 -04:00
Alex Martens via SeaBIOS 54082c81d9 nvme: fix missing newline on sq full print
Signed-off-by: Alex Martens <alexmgit@protonmail.com>
2021-06-30 17:00:17 -04:00
Stefan Berger 1be65c56c6 tcgbios: Use The proper sha function for each PCR bank
Instead of just using sha1 for all PCR banks (and truncating
the value or zero-padding it) use the proper hash function for
each one of the banks. For unimplemented hashes, fill the buffer
with 0xff.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2021-06-30 16:58:48 -04:00
Stefan Berger 4e57a54703 Add implementations for sha256, sha384, and sha512
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2021-06-30 16:58:48 -04:00
Stefan Berger ba949f5522 tcgbios: Fix details in log entries
Fix two details of the logs:

- Set the field 'SpecErrata' to 2 as required by specs.
- Write the separator into the log entry's event field.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2021-06-30 16:58:48 -04:00
Volker Rümelin e3c3079582 stacks: call check_irqs() after switch_next()
In function run_thread() the function check_irqs() gets called
after the thread switch for atomic handoff reasons. In yield()
it's the other way round.

If check_irqs() is called after run_thread() and check_irqs()
is called before switch_next() in yield(), it can happen in a
constructed case that a background thread runs twice without
a check_irqs() call in between. Call check_irqs() after
switch_next() in yield() to prevent this.

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
2021-06-09 11:05:19 -04:00
Volker Rümelin f501bcbeef stacks: call check_irqs() in run_thread()
The comment above the yield() function suggests that yield()
allows interrupts for a short time. But yield() only briefly
enables interrupts if seabios was built without CONFIG_THREADS
or if yield() is called from the main thread. In order to
guarantee that the interrupts were enabled once before yield()
returns in a background thread, the main thread must call
check_irqs() before or after every thread switch. The function
run_thread() also switches threads, but the call to check_irqs()
was forgotten. Add the missing check_irqs() call.

This fixes PS/2 keyboard initialization failures.

The code in src/hw/ps2port.c relies on yield() to briefly enable
interrupts. There is a comment above the yield() function in
__ps2_command(), where the author left a remark why the call to
yield() is actually needed.

Here is one of the call sequences leading to a PS/2 keyboard
initialization failure.

ps2_keyboard_setup()
  |
  ret = i8042_command(I8042_CMD_CTL_TEST, param);
  # This command will register an interrupt if the PS/2 device
  # controller raises interrupts for replies to a controller
  # command.
  |
  ret = ps2_kbd_command(ATKBD_CMD_RESET_BAT, param);
    |
    ps2_command(0, command, param);
      |
      ret = __ps2_command(aux, command, param);
        |
        // Flush any interrupts already pending.
        yield();
        # yield() doesn't flush interrupts if the main thread
        # hasn't reached wait_threads().
        |
        ret = ps2_sendbyte(aux, command, 1000);
        # Reset the PS/2 keyboard controller and wait for
        # PS2_RET_ACK.
        |
        ret = ps2_recvbyte(aux, 0, 4000);
          |
          for (;;) {
            |
            status = inb(PORT_PS2_STATUS);
            # I8042_STR_OBF isn't set because the keyboard self
            # test reply is still on wire.
            |
            yield();
            # After a few yield()s the keyboard interrupt fires
            # and clears the I8042_STR_OBF status bit. If the
            # keyboard self test reply arrives before the
            # interrupt fires the keyboard reply is lost and
            # ps2_recvbyte() returns after the timeout.
          }

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
2021-06-09 11:05:18 -04:00
Gerd Hoffmann 7292e4a0a8 Increase BUILD_MIN_BIOSTABLE for large roms
BUILD_MIN_BIOSTABLE reserves space in the f-segment.  Some data
structures -- for example disk drives known to seabios -- must be
stored there, so the space available here limits the number of
devices seabios is able to manage.

This patch sets BUILD_MIN_BIOSTABLE to 8k for bios images being 256k or
larger in size.  32bit code is moved off in that case, so we have more
room in the f-segment then.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2021-06-04 08:05:08 +02:00
Gerd Hoffmann 81433aa8a1 nvme: drive desc should not include the newline
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2021-05-31 07:34:34 +02:00
Gerd Hoffmann 9bb1203b35 nvme: improve namespace allocation
Instead of allocating a big array upfront go probe the namespaces and
only allocate an nvme_namespace struct for those namespaces which are
actually active.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2021-05-31 07:34:34 +02:00
Sergei Trofimovich 6eff808598 vgasrc: ignore .node.gnu.property (binutils-2.36 support)
Modern binutils unconditionally tracks x86_64 ISA levels in intermediate
files in .note.gnu.property. Custom liker script does not handle the
section and complains about it:

    ld --gc-sections -T out/vgasrc/vgalayout.lds out/vgaccode16.o \
        out/vgaentry.o out/vgaversion.o -o out/vgarom.o
    ld: section .note.gnu.property LMA [0000000000000000,0000000000000027] \
        overlaps section .text LMA [0000000000000000,00000000000098af]

The change ignores .note* sections.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
2021-05-26 10:07:01 -04:00
Stefan Ott via SeaBIOS b0d61ecef6 usb-hid: Increase MAX_KBD_EVENT
Some USB keyboards use max packet sizes beyond the current maximum
supported by SeaBIOS.

This increases the available size to support keyboards such as the
Matias Ergo Pro.

Signed-off-by: Stefan Ott <stefan@ott.net>
2021-03-10 10:22:17 -05:00
Mike Banon ef88eeaf05 Support booting USB drives with a write protect switch enabled
At least some USB drives with a write protect switch (e.g. Netac U335)
could report "MEDIUM NOT PRESENT" for a while if a write protection is
enabled. Instead of stopping the initialization attempts immediately,
stop only after getting this report for 3 times, to ensure the
successful initialization of such a "broken hardware".

Signed-off-by: Mike Banon <mikebdp2@gmail.com>
2020-12-21 10:59:39 -05:00
David Woodhouse 748d619be3 nvme: Clean up nvme_cmd_readwrite()
This ended up with an odd mix of recursion (albeit *mostly*
tail-recursion) and interation that could have been prettier. In
addition, while recursing it potentially adjusted op->count which is
used by callers to see the amount of I/O actually performed.

Fix it by bringing nvme_build_prpl() into the normal loop using 'i'
as the offset in the op.

Fixes: 94f0510dc ("nvme: Split requests by maximum allowed size")
Reviewed-by: Alexander Graf <graf@amazon.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
2020-11-16 10:22:19 -05:00
Alexander Graf 94f0510dc7 nvme: Split requests by maximum allowed size
Some NVMe controllers only support small maximum request sizes, such as
the AWS EBS NVMe implementation which only supports NVMe requests of up
to 32 pages (256kb) at once.

BIOS callers can exceed those request sizes by defining sector counts
above this threshold. Currently we fall back to the bounce buffer
implementation for those. This is slow.

This patch introduces splitting logic to the NVMe I/O request code so
that every NVMe I/O request gets handled in a chunk size that is
consumable by the NVMe adapter, while maintaining the fast path PRPL
logic we just introduced.

Signed-off-by: Alexander Graf <graf@amazon.com>
2020-10-28 15:18:29 -04:00
Alexander Graf 01f2736cc9 nvme: Pass large I/O requests as PRP lists
Today, we split every I/O request into at most 4kb chunks and wait for these
requests to finish. We encountered issues where the backing storage is network
based, so every I/O request needs to go over the network with associated
latency cost. A few ms of latency when loading 100MB initrd in 4kb chunks
does add up.

NVMe implements a feature to allow I/O requests spanning multiple pages,
called PRP lists. This patch takes larger I/O operations and checks if
they can be directly passed to the NVMe backing device as PRP list.
At least for grub, read operations can always be mapped directly into
PRP list items.

This reduces the number of I/O operations required during a typical boot
path by roughly a factor of 5.

Signed-off-by: Alexander Graf <graf@amazon.com>
2020-10-28 15:18:29 -04:00
Alexander Graf 23258d39ff nvme: Allow to set PRP2
When creating a PRP based I/O request, we pass in the pointer to operate
on. Going forward, we will want to be able to pass additional pointers
though for mappings above 4k.

This patch adds a parameter to nvme_get_next_sqe() to pass in the PRP2
value of an NVMe I/O request, paving the way for a future patch to
implement PRP lists.

Signed-off-by: Alexander Graf <graf@amazon.com>
Reviewed-by: Filippo Sironi <sironi@amazon.de>
2020-10-28 15:18:29 -04:00
Alexander Graf b68f313c91 nvme: Record maximum allowed request size
NVMe has a limit on how many sectors it can handle at most within a single
request. Remember that number, so that in a follow-up patch, we can verify
that we don't exceed it.

Signed-off-by: Alexander Graf <graf@amazon.com>
2020-10-28 15:18:29 -04:00
Gerd Hoffmann 58a44be024 usb boot: add xhci mmio example
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20201013091019.22029-1-kraxel@redhat.com
2020-10-15 11:16:26 +02:00
Gerd Hoffmann c685fe3ff2 usb/xhci: add support for mmio host adapters (via acpi).
Add xhci_controller_setup_acpi() function to initialize usb host
adapters declared in the DSDT table.  Search the acpi devices list
for xhci controllers.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200930111433.21533-4-kraxel@redhat.com
2020-10-13 11:04:03 +02:00