diff --git a/.gitignore b/.gitignore index eb8fb8c..fa2b595 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/seabios-1.15.0.tar.gz +SOURCES/seabios-1.16.0.tar.gz diff --git a/.seabios.metadata b/.seabios.metadata index 7e522e1..41a6710 100644 --- a/.seabios.metadata +++ b/.seabios.metadata @@ -1 +1 @@ -1ab1ca5971e59d8d6b5c579b242d586e54a86873 SOURCES/seabios-1.15.0.tar.gz +0cc6b21cfbafa1f9f158c9aca1ab9f5174ebede2 SOURCES/seabios-1.16.0.tar.gz diff --git a/SOURCES/0002-allow-1TB-of-RAM.patch b/SOURCES/0002-allow-1TB-of-RAM.patch index c726ce0..979e2ba 100644 --- a/SOURCES/0002-allow-1TB-of-RAM.patch +++ b/SOURCES/0002-allow-1TB-of-RAM.patch @@ -1,7 +1,10 @@ -From 0dea1df1f9b9a64bd9e71dd1a7b4c6cc9962afa0 Mon Sep 17 00:00:00 2001 +From d659d62b9c094acea66f6f7506877f210a9dd182 Mon Sep 17 00:00:00 2001 From: Andrea Arcangeli Date: Tue, 8 Oct 2013 17:07:23 +0200 Subject: allow >1TB of RAM +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit RH-Author: Andrea Arcangeli Message-id: <1381252043-13480-2-git-send-email-aarcange@redhat.com> @@ -20,15 +23,15 @@ Signed-off-by: Andrea Arcangeli src/post.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) -Signed-off-by: Miroslav Rezanina -(cherry picked from commit 4fee214c41b11b72b3427fda18e9eac1ee647746) +(cherry picked from commit 0dea1df1f9b9a64bd9e71dd1a7b4c6cc9962afa0) +Signed-off-by: Paweł Poławski --- src/fw/paravirt.c | 7 ++++--- src/hw/rtc.h | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/fw/paravirt.c b/src/fw/paravirt.c -index fba4e52..090d655 100644 +index fba4e52d..090d6555 100644 --- a/src/fw/paravirt.c +++ b/src/fw/paravirt.c @@ -516,9 +516,10 @@ qemu_cfg_e820(void) @@ -46,7 +49,7 @@ index fba4e52..090d655 100644 e820_add(0x100000000ull, high, E820_RAM); dprintf(1, "RamSizeOver4G: 0x%016llx [cmos]\n", RamSizeOver4G); diff --git a/src/hw/rtc.h b/src/hw/rtc.h -index 252e73a..c4369f8 100644 +index 252e73a4..c4369f81 100644 --- a/src/hw/rtc.h +++ b/src/hw/rtc.h @@ -41,9 +41,10 @@ @@ -64,5 +67,5 @@ index 252e73a..c4369f8 100644 // RTC register flags -- -2.27.0 +2.31.1 diff --git a/SOURCES/0003-smbios-set-bios-vendor-version-fields-to-Seabios-0.5.patch b/SOURCES/0003-smbios-set-bios-vendor-version-fields-to-Seabios-0.5.patch index 526a1c6..081cd84 100644 --- a/SOURCES/0003-smbios-set-bios-vendor-version-fields-to-Seabios-0.5.patch +++ b/SOURCES/0003-smbios-set-bios-vendor-version-fields-to-Seabios-0.5.patch @@ -1,7 +1,10 @@ -From cc21704fcfbc62af6789e1362eb05a2dc2b56cbf Mon Sep 17 00:00:00 2001 +From daf5bb8573c22dc133b4f7a8a07a174dbb30a2c5 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 28 Jul 2014 12:14:11 +0200 Subject: smbios: set bios vendor/version fields to Seabios/0.5.1 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Message-id: <1406549651-26021-2-git-send-email-kraxel@redhat.com> Patchwork-id: 60264 @@ -20,14 +23,15 @@ fill in the actual version information instead of the bogous 0.5.1 which we are using here for backward compatibility reasons. Signed-off-by: Gerd Hoffmann -Signed-off-by: Miroslav Rezanina -(cherry picked from commit bf361def4623ac1942512f255e5c1450970b5092) + +(cherry picked from commit cc21704fcfbc62af6789e1362eb05a2dc2b56cbf) +Signed-off-by: Paweł Poławski --- src/fw/smbios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fw/smbios.c b/src/fw/smbios.c -index 62a563b..4dc1737 100644 +index 730b6898..cb6fc03f 100644 --- a/src/fw/smbios.c +++ b/src/fw/smbios.c @@ -174,8 +174,8 @@ smbios_init_type_0(void *start) @@ -42,5 +46,5 @@ index 62a563b..4dc1737 100644 p->bios_starting_address_segment = 0xe800; -- -2.27.0 +2.31.1 diff --git a/SOURCES/0004-Workaround-for-a-win8.1-32-S4-resume-bug.patch b/SOURCES/0004-Workaround-for-a-win8.1-32-S4-resume-bug.patch index 9b72496..9651e10 100644 --- a/SOURCES/0004-Workaround-for-a-win8.1-32-S4-resume-bug.patch +++ b/SOURCES/0004-Workaround-for-a-win8.1-32-S4-resume-bug.patch @@ -1,4 +1,4 @@ -From 8629f200084ce1aab31d193280d34b5fb16e543f Mon Sep 17 00:00:00 2001 +From 0182f348c6bc7cb676cb52941cbb0b220639c4e0 Mon Sep 17 00:00:00 2001 From: Radim Krcmar Date: Mon, 10 Mar 2014 15:14:27 +0100 Subject: Workaround for a win8.1-32 S4 resume bug @@ -36,12 +36,15 @@ The reason Windows uses NULL pointer is still unknown, but this bug is blocking WHQL certification, so we have to work around it in 7.0. Signed-off-by: Radim Krčmář + +(cherry picked from commit 8629f200084ce1aab31d193280d34b5fb16e543f) +Signed-off-by: Paweł Poławski --- src/clock.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/clock.c b/src/clock.c -index e44e112..298a722 100644 +index e44e1120..298a7229 100644 --- a/src/clock.c +++ b/src/clock.c @@ -309,7 +309,13 @@ handle_08(void) @@ -60,5 +63,5 @@ index e44e112..298a722 100644 pic_eoi1(); } -- -2.27.0 +2.31.1 diff --git a/SOURCES/0005-pci-let-firmware-reserve-IO-for-pcie-pci-bridge.patch b/SOURCES/0005-pci-let-firmware-reserve-IO-for-pcie-pci-bridge.patch deleted file mode 100644 index 614b1f8..0000000 --- a/SOURCES/0005-pci-let-firmware-reserve-IO-for-pcie-pci-bridge.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 153f5ec6899055276eaef20eae7b6d9fd090a05a Mon Sep 17 00:00:00 2001 -From: Igor Mammedov -Date: Mon, 29 Nov 2021 06:48:12 -0500 -Subject: pci: let firmware reserve IO for pcie-pci-bridge - -RH-Bugzilla: 2001921 - -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: 76327b9f32a ("fw/pci: do not automatically allocate IO region for PCIe bridges") -Signed-off-by: Igor Mammedov imammedo@redhat.com -CC: mapfelba@redhat.com -CC: kraxel@redhat.com -CC: mst@redhat.com -CC: lvivier@redhat.com -CC: jusual@redhat.com -Tested-by: Laurent Vivier -Acked-by: Michael S. Tsirkin -Message-Id: <20211129114812.231849-3-imammedo@redhat.com> -Signed-off-by: Gerd Hoffmann ---- - src/fw/pciinit.c | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/src/fw/pciinit.c b/src/fw/pciinit.c -index d25931b..3c99d51 100644 ---- a/src/fw/pciinit.c -+++ b/src/fw/pciinit.c -@@ -793,7 +793,13 @@ pci_region_create_entry(struct pci_bus *bus, struct pci_device *dev, - return entry; - } - --static int pci_bus_hotplug_support(struct pci_bus *bus, u8 pcie_cap) -+typedef enum hotplug_type_t { -+ HOTPLUG_NO_SUPPORTED = 0, -+ HOTPLUG_PCIE, -+ HOTPLUG_SHPC -+} hotplug_type_t; -+ -+static hotplug_type_t pci_bus_hotplug_support(struct pci_bus *bus, u8 pcie_cap) - { - u8 shpc_cap; - -@@ -815,11 +821,12 @@ static int pci_bus_hotplug_support(struct pci_bus *bus, u8 pcie_cap) - */ - u16 slot_implemented = pcie_flags & PCI_EXP_FLAGS_SLOT; - -- return downstream_port && slot_implemented; -+ return downstream_port && slot_implemented ? -+ HOTPLUG_PCIE : HOTPLUG_NO_SUPPORTED; - } - - shpc_cap = pci_find_capability(bus->bus_dev->bdf, PCI_CAP_ID_SHPC, 0); -- return !!shpc_cap; -+ return !!shpc_cap ? HOTPLUG_SHPC : HOTPLUG_NO_SUPPORTED; - } - - /* Test whether bridge support forwarding of transactions -@@ -904,7 +911,7 @@ static int pci_bios_check_devices(struct pci_bus *busses) - u8 pcie_cap = pci_find_capability(bdf, PCI_CAP_ID_EXP, 0); - u8 qemu_cap = pci_find_resource_reserve_capability(bdf); - -- int hotplug_support = pci_bus_hotplug_support(s, pcie_cap); -+ hotplug_type_t hotplug_support = pci_bus_hotplug_support(s, pcie_cap); - for (type = 0; type < PCI_REGION_TYPE_COUNT; type++) { - u64 align = (type == PCI_REGION_TYPE_IO) ? - PCI_BRIDGE_IO_MIN : PCI_BRIDGE_MEM_MIN; -@@ -948,7 +955,9 @@ static int pci_bios_check_devices(struct pci_bus *busses) - if (pci_region_align(&s->r[type]) > align) - align = pci_region_align(&s->r[type]); - u64 sum = pci_region_sum(&s->r[type]); -- int resource_optional = pcie_cap && (type == PCI_REGION_TYPE_IO); -+ int resource_optional = 0; -+ if (hotplug_support == HOTPLUG_PCIE) -+ resource_optional = pcie_cap && (type == PCI_REGION_TYPE_IO); - if (!sum && hotplug_support && !resource_optional) - sum = align; /* reserve min size for hot-plug */ - if (size > sum) { --- -2.27.0 - diff --git a/SOURCES/0006-pci-reserve-resources-for-pcie-pci-bridge-to-fix-reg.patch b/SOURCES/0006-pci-reserve-resources-for-pcie-pci-bridge-to-fix-reg.patch deleted file mode 100644 index 6e5900c..0000000 --- a/SOURCES/0006-pci-reserve-resources-for-pcie-pci-bridge-to-fix-reg.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 4a31485efad9db7feed56f483e123f0b58c38b2f Mon Sep 17 00:00:00 2001 -From: Igor Mammedov -Date: Mon, 29 Nov 2021 06:48:11 -0500 -Subject: pci: reserve resources for pcie-pci-bridge to fix regressed hotplug - on q35 - -RH-Bugzilla: 2001921 - -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. - -[1] -Fixes: 3aa31d7d637 ("hw/pci: reserve IO and mem for pci express downstream ports with no devices attached") -Signed-off-by: Igor Mammedov imammedo@redhat.com -CC: mapfelba@redhat.com -CC: kraxel@redhat.com -CC: mst@redhat.com -CC: lvivier@redhat.com -CC: jusual@redhat.com -Tested-by: Laurent Vivier -Acked-by: Michael S. Tsirkin -Message-Id: <20211129114812.231849-2-imammedo@redhat.com> -Signed-off-by: Gerd Hoffmann ---- - src/fw/pciinit.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/fw/pciinit.c b/src/fw/pciinit.c -index 3c99d51..badf13d 100644 ---- a/src/fw/pciinit.c -+++ b/src/fw/pciinit.c -@@ -808,6 +808,10 @@ static hotplug_type_t pci_bus_hotplug_support(struct pci_bus *bus, u8 pcie_cap) - pcie_cap + PCI_EXP_FLAGS); - u8 port_type = ((pcie_flags & PCI_EXP_FLAGS_TYPE) >> - (__builtin_ffs(PCI_EXP_FLAGS_TYPE) - 1)); -+ -+ if (port_type == PCI_EXP_TYPE_PCI_BRIDGE) -+ goto check_shpc; -+ - u8 downstream_port = (port_type == PCI_EXP_TYPE_DOWNSTREAM) || - (port_type == PCI_EXP_TYPE_ROOT_PORT); - /* -@@ -825,6 +829,7 @@ static hotplug_type_t pci_bus_hotplug_support(struct pci_bus *bus, u8 pcie_cap) - HOTPLUG_PCIE : HOTPLUG_NO_SUPPORTED; - } - -+check_shpc: - shpc_cap = pci_find_capability(bus->bus_dev->bdf, PCI_CAP_ID_SHPC, 0); - return !!shpc_cap ? HOTPLUG_SHPC : HOTPLUG_NO_SUPPORTED; - } --- -2.27.0 - diff --git a/SPECS/seabios.spec b/SPECS/seabios.spec index 3d152a1..741632c 100644 --- a/SPECS/seabios.spec +++ b/SPECS/seabios.spec @@ -1,5 +1,5 @@ Name: seabios -Version: 1.15.0 +Version: 1.16.0 Release: 1%{?dist} Summary: Open-source legacy BIOS implementation @@ -7,7 +7,7 @@ Group: Applications/Emulators License: LGPLv3 URL: https://www.coreboot.org/SeaBIOS -Source0: https://code.coreboot.org/p/seabios/downloads/get/seabios-1.15.0.tar.gz +Source0: https://code.coreboot.org/p/seabios/downloads/get/seabios-1.16.0.tar.gz Source10: config.vga.cirrus Source11: config.vga.qxl @@ -22,8 +22,6 @@ Source21: config.seabios-256k Patch0002: 0002-allow-1TB-of-RAM.patch Patch0003: 0003-smbios-set-bios-vendor-version-fields-to-Seabios-0.5.patch Patch0004: 0004-Workaround-for-a-win8.1-32-S4-resume-bug.patch -Patch0005: 0005-pci-let-firmware-reserve-IO-for-pcie-pci-bridge.patch -Patch0006: 0006-pci-reserve-resources-for-pcie-pci-bridge-to-fix-reg.patch BuildRequires: python3 iasl ExclusiveArch: x86_64 %{power64} @@ -78,8 +76,6 @@ SeaVGABIOS is an open-source VGABIOS implementation. %patch0002 -p1 %patch0003 -p1 %patch0004 -p1 -%patch0005 -p1 -%patch0006 -p1 %build %ifarch x86_64 @@ -138,6 +134,11 @@ install -m 0644 binaries/vgabios*.bin $RPM_BUILD_ROOT%{_datadir}/seavgabios %changelog +* Tue Apr 26 2022 Paweł Poławski - 1.16.0-1 +- Rebase to upstream 1.16 tag [bz#2066828] +- Resolves: bz#2066828 + (rebase seabios to 1.16 release) + * Thu Dec 16 2021 Jon Maloy - 1.15.0-1.el8 - Rebase to 1.15 (bz#2018392) - Resolves: bz#2018392