Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2023-02-21 15:35:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new.22824 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot" Tue Feb 21 15:35:31 2023 rev:170 rq:1066736 version:2023.01 Changes: -------- --- /work/SRC/openSUSE:Factory/u-boot/u-boot.changes 2023-01-28 20:10:03.930671576 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new.22824/u-boot.changes 2023-02-21 15:35:32.656115359 +0100 @@ -1,0 +2,11 @@ +Mon Feb 20 07:54:47 UTC 2023 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2023.01 +Use new upstream solution to fix boo#1207562 +* Patches dropped: + 0017-Backport-https-patchwork.ozlabs.org.patch +* Patches added: + 0017-Bump-LMB_MAX_REGIONS-default-to-16.patch + 0018-lmb-Treat-a-region-which-is-a-subse.patch + +------------------------------------------------------------------- Old: ---- 0017-Backport-https-patchwork.ozlabs.org.patch New: ---- 0017-Bump-LMB_MAX_REGIONS-default-to-16.patch 0018-lmb-Treat-a-region-which-is-a-subse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot.spec ++++++ --- /var/tmp/diff_new_pack.FlwvrR/_old 2023-02-21 15:35:33.516120301 +0100 +++ /var/tmp/diff_new_pack.FlwvrR/_new 2023-02-21 15:35:33.520120324 +0100 @@ -238,7 +238,8 @@ Patch0014: 0014-Enable-EFI-and-ISO-partitions-suppo.patch Patch0015: 0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch Patch0016: 0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch -Patch0017: 0017-Backport-https-patchwork.ozlabs.org.patch +Patch0017: 0017-Bump-LMB_MAX_REGIONS-default-to-16.patch +Patch0018: 0018-lmb-Treat-a-region-which-is-a-subse.patch # Patches: end BuildRequires: bc BuildRequires: bison ++++++ 0017-Bump-LMB_MAX_REGIONS-default-to-16.patch ++++++ >From 1760447d478bd16aceebe67b8e03d7e2d9e87fbc Mon Sep 17 00:00:00 2001 From: Sjoerd Simons <sjo...@collabora.com> Date: Thu, 19 Jan 2023 09:38:17 +0100 Subject: [PATCH] Bump LMB_MAX_REGIONS default to 16 Since commit 06d514d77c37 ("lmb: consider EFI memory map") the EFI regions are also pushed into the lmb if EFI_LOADER is enabled (which is by default on most system). Which can cause the number of entries to go over the maximum as it's default is only 8. Specifically i ran into this case on an TI am62 which has an fdt with 4 reserved regions (in practice 3 lmb entries due to adjecent ranges). As this is likely to impact more devices bump the default max regions to 16 so there is a bit more slack. Fixes: 06d514d77c ("lmb: consider EFI memory map") Link: https://bugzilla.opensuse.org/show_bug.cgi?id=1207562 Reviewed-by: Francesco Dolcini <francesco.dolc...@toradex.com> Signed-off-by: Sjoerd Simons <sjo...@collabora.com> Signed-off-by: Michal Suchanek <msucha...@suse.de> [trini: collect tags from the other equivalent patch] --- lib/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Kconfig b/lib/Kconfig index 3c5a4ab386..7d1b88656d 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -1002,7 +1002,7 @@ config LMB_USE_MAX_REGIONS config LMB_MAX_REGIONS int "Number of memory and reserved regions in lmb lib" depends on LMB && LMB_USE_MAX_REGIONS - default 8 + default 16 help Define the number of supported regions, memory and reserved, in the library logical memory blocks. ++++++ 0018-lmb-Treat-a-region-which-is-a-subse.patch ++++++ >From 8a5a3aa5d3ee1a06f654fad4f648aa9c550f889e Mon Sep 17 00:00:00 2001 From: Sjoerd Simons <sjo...@collabora.com> Date: Sun, 12 Feb 2023 16:07:05 +0100 Subject: [PATCH] lmb: Treat a region which is a subset as equal In various cases logical memory blocks are coalesced; As a result doing a strict check whether memory blocks are the same doesn't necessarily work as a previous addition of a given block might have been merged into a bigger block. Fix this by considering a block is already registered if it's a pure subset of one of the existing blocks. Signed-off-by: Sjoerd Simons <sjo...@collabora.com> --- lib/lmb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/lmb.c b/lib/lmb.c index ec790760db..866b0699d5 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -244,8 +244,10 @@ static long lmb_add_region_flags(struct lmb_region *rgn, phys_addr_t base, phys_addr_t rgnbase = rgn->region[i].base; phys_size_t rgnsize = rgn->region[i].size; phys_size_t rgnflags = rgn->region[i].flags; + phys_addr_t end = base + size - 1; + phys_addr_t rgnend = rgnbase + rgnsize - 1; - if (rgnbase == base && rgnsize == size) { + if (rgnbase <= base && end <= rgnend) { if (flags == rgnflags) /* Already have this region, so we're done */ return 0;
