Compare commits

..

No commits in common. 'c9-beta' and 'c9' have entirely different histories.
c9-beta ... c9

@ -0,0 +1,59 @@
From 638fdc27d742ea45fc51a9b17fc4799c4edb6b17 Mon Sep 17 00:00:00 2001
From: Daniil Tatianin <d-tatianin@yandex-team.ru>
Date: Thu, 11 Apr 2024 22:51:35 +0300
Subject: [PATCH] pciinit: don't misalign large BARs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
RH-MergeRequest: 13: pciinit: don't misalign large BARs
RH-Jira: RHEL-68955
RH-Acked-by: Luigi Leonardi <None>
RH-Acked-by: Oliver Steffen <osteffen@redhat.com>
RH-Commit: [1/1] 5761e0038bc6e301a59e99af1ada3304623c031b
Previously we would unconditionally lower the alignment for large BARs
in case their alignment was greater than "pci_mem64_top >> 11", this
would make it impossible to use these devices by the kernel:
[ 13.821108] pci 0000:9c:00.0: can't claim BAR 1 [mem 0x66000000000-0x67fffffffff 64bit pref]: no compatible bridge window
[ 13.823492] pci 0000:9d:00.0: can't claim BAR 1 [mem 0x64000000000-0x65fffffffff 64bit pref]: no compatible bridge window
[ 13.824218] pci 0000:9e:00.0: can't claim BAR 1 [mem 0x62000000000-0x63fffffffff 64bit pref]: no compatible bridge window
[ 13.828322] pci 0000:8a:00.0: can't claim BAR 1 [mem 0x6e000000000-0x6ffffffffff 64bit pref]: no compatible bridge window
[ 13.830691] pci 0000:8b:00.0: can't claim BAR 1 [mem 0x6c000000000-0x6dfffffffff 64bit pref]: no compatible bridge window
[ 13.832218] pci 0000:8c:00.0: can't claim BAR 1 [mem 0x6a000000000-0x6bfffffffff 64bit pref]: no compatible bridge window
Fix it by only overwriting the alignment in case it's actually greater
than the desired by the BAR window.
Fixes: 96a8d130a8c ("be less conservative with the 64bit pci io window")
Signed-off-by: Daniil Tatianin <d-tatianin@yandex-team.ru>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
(cherry picked from commit e5f2e4c69643bc3cd385306a9e5d29e11578148c)
Resolves: RHEL-68955
---
src/fw/pciinit.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/fw/pciinit.c b/src/fw/pciinit.c
index 6b13cd5b..bb44dc29 100644
--- a/src/fw/pciinit.c
+++ b/src/fw/pciinit.c
@@ -970,9 +970,11 @@ static int pci_bios_check_devices(struct pci_bus *busses)
int resource_optional = 0;
if (hotplug_support == HOTPLUG_PCIE)
resource_optional = pcie_cap && (type == PCI_REGION_TYPE_IO);
+
+ u64 top_align = pci_mem64_top >> 11;
if (hotplug_support && pci_pad_mem64 && is64
- && (type == PCI_REGION_TYPE_PREFMEM))
- align = pci_mem64_top >> 11;
+ && (type == PCI_REGION_TYPE_PREFMEM) && (top_align > align))
+ align = top_align;
if (align > sum && hotplug_support && !resource_optional)
sum = align; /* reserve min size for hot-plug */
if (size > sum) {
--
2.39.3

@ -1,6 +1,6 @@
Name: seabios Name: seabios
Version: 1.16.3 Version: 1.16.3
Release: 2%{?dist} Release: 2%{?dist}.1
Summary: Open-source legacy BIOS implementation Summary: Open-source legacy BIOS implementation
License: LGPLv3 License: LGPLv3
@ -19,6 +19,8 @@ Source21: config.vga-bochs-display
Patch1: seabios-add-hwerr_printf-function-for-threads.patch Patch1: seabios-add-hwerr_printf-function-for-threads.patch
# For RHEL-7110 - [seabios] Can't boot from a disk with 4K sector size # For RHEL-7110 - [seabios] Can't boot from a disk with 4K sector size
Patch2: seabios-display-error-message-for-blocksizes-512.patch Patch2: seabios-display-error-message-for-blocksizes-512.patch
# For RHEL-68955 - amdgpu failed to initialize when multiple AMD MI210 GPUs assigned and firmware is seabios [rhel-9.5.z]
Patch3: seabios-pciinit-don-t-misalign-large-BARs.patch
BuildRequires: make BuildRequires: make
BuildRequires: gcc BuildRequires: gcc
@ -135,6 +137,11 @@ install -m 0644 binaries/vgabios*.bin $RPM_BUILD_ROOT%{_datadir}/seavgabios
%{_datadir}/seavgabios/vgabios*.bin %{_datadir}/seavgabios/vgabios*.bin
%changelog %changelog
* Thu Nov 28 2024 Miroslav Rezanina <mrezanin@redhat.com> - 1.16.3-2.el9_5.1
- seabios-pciinit-don-t-misalign-large-BARs.patch [RHEL-68955]
- Resolves: RHEL-68955
(amdgpu failed to initialize when multiple AMD MI210 GPUs assigned and firmware is seabios [rhel-9.5.z])
* Wed Jan 10 2024 Miroslav Rezanina <mrezanin@redhat.com> - 1.16.3-2 * Wed Jan 10 2024 Miroslav Rezanina <mrezanin@redhat.com> - 1.16.3-2
- seabios-add-hwerr_printf-function-for-threads.patch [RHEL-7110] - seabios-add-hwerr_printf-function-for-threads.patch [RHEL-7110]
- seabios-display-error-message-for-blocksizes-512.patch [RHEL-7110] - seabios-display-error-message-for-blocksizes-512.patch [RHEL-7110]

Loading…
Cancel
Save