Re: [PATCH] linux-starfive: Update to latest downstream 6.6 version

[Uladzimir Bely <ubely@ilbers.de>]

On Thu, 2024-10-10 at 07:18 +0200, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Allows to drop at least one patch and brings fixes, e.g. for the USB
> gadget mode of this board.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  ...sure-GP-relative-addressing-is-not-u.patch | 32 -----------------
> --
>  ...b => linux-starfive_6.6.20-visionfive2.bb} |  5 ++-
>  2 files changed, 2 insertions(+), 35 deletions(-)
>  delete mode 100644 meta-isar/recipes-kernel/linux/files/0001-riscv-
> efistub-Ensure-GP-relative-addressing-is-not-u.patch
>  rename meta-isar/recipes-kernel/linux/{linux-starfive_6.6-
> visionfive2.bb => linux-starfive_6.6.20-visionfive2.bb} (70%)
> 
> diff --git a/meta-isar/recipes-kernel/linux/files/0001-riscv-efistub-
> Ensure-GP-relative-addressing-is-not-u.patch b/meta-isar/recipes-
> kernel/linux/files/0001-riscv-efistub-Ensure-GP-relative-addressing-
> is-not-u.patch
> deleted file mode 100644
> index 7db1c70f..00000000
> --- a/meta-isar/recipes-kernel/linux/files/0001-riscv-efistub-Ensure-
> GP-relative-addressing-is-not-u.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From 80a71d31e35ac5f90e85b0b52cd080a974b91e8d Mon Sep 17 00:00:00
> 2001
> -From: Jan Kiszka <jan.kiszka@siemens.com>
> -Date: Fri, 12 Jan 2024 17:17:27 +0100
> -Subject: [PATCH] riscv/efistub: Ensure GP-relative addressing is not
> used
> -
> -The cflags for the RISC-V efistub were missing -mno-relax, thus were
> -under the risk that the compiler could use GP-relative addressing.
> That
> -happened for _edata with binutils-2.41 and kernel 6.1, causing the
> -relocation to fail due to an invalid kernel_size in
> handle_kernel_image.
> -It was not yet observed with newer versions, but that may just be
> luck.
> -
> -Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ----
> - drivers/firmware/efi/libstub/Makefile | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/drivers/firmware/efi/libstub/Makefile
> b/drivers/firmware/efi/libstub/Makefile
> -index a1157c2a7170..f54715672d52 100644
> ---- a/drivers/firmware/efi/libstub/Makefile
> -+++ b/drivers/firmware/efi/libstub/Makefile
> -@@ -28,7 +28,7 @@ cflags-$(CONFIG_ARM)		+= -DEFI_HAVE_STRLEN
> -DEFI_HAVE_STRNLEN \
> - 				   -DEFI_HAVE_MEMCHR -
> DEFI_HAVE_STRRCHR \
> - 				   -DEFI_HAVE_STRCMP -fno-builtin -
> fpic \
> - 				   $(call cc-option,-mno-single-pic-
> base)
> --cflags-$(CONFIG_RISCV)		+= -fpic
> -+cflags-$(CONFIG_RISCV)		+= -fpic -mno-relax
> - cflags-$(CONFIG_LOONGARCH)	+= -fpie
> - 
> - cflags-$(CONFIG_EFI_PARAMS_FROM_FDT)	+= -
> I$(srctree)/scripts/dtc/libfdt
> --- 
> -2.35.3
> -
> diff --git a/meta-isar/recipes-kernel/linux/linux-starfive_6.6-
> visionfive2.bb b/meta-isar/recipes-kernel/linux/linux-
> starfive_6.6.20-visionfive2.bb
> similarity index 70%
> rename from meta-isar/recipes-kernel/linux/linux-starfive_6.6-
> visionfive2.bb
> rename to meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-
> visionfive2.bb
> index a267241f..80c2d3ff 100644
> --- a/meta-isar/recipes-kernel/linux/linux-starfive_6.6-
> visionfive2.bb
> +++ b/meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-
> visionfive2.bb
> @@ -7,11 +7,10 @@ require recipes-kernel/linux/linux-custom.inc
>  
>  SRC_URI += " \
>     
> https://github.com/starfive-tech/linux/archive/${SRCREV}.tar.gz;downloadfilename=linux-starfive-${SRCREV}.tar.gz
>  \
> -   
> file://0001-riscv-efistub-Ensure-GP-relative-addressing-is-not-u.patch
>  \
>     
> file://0001-btrfs-fix-kvcalloc-arguments-order-in-btrfs_ioctl_se.patch
>  \
>      file://starfive2_extra.cfg"
> -SRCREV = "9fe004eaf1aa5b23bd5d03b4cfe9c3858bd884c4"
> -SRC_URI[sha256sum] =
> "9eaf7659aa57e2c5b399b7b33076f1376ec43ef343680e0a57e0a2a9bef6c0ae"
> +SRCREV = "d0e7c0486d768a294f4f2b390d00dab8bee5d726"
> +SRC_URI[sha256sum] =
> "86f1bb78a84222d4a3d22779e335023a228cd865df866fd08af6a7816eca3add"
>  
>  S = "${WORKDIR}/linux-${SRCREV}"
>  
> -- 
> 2.43.0
> 

Applied to next, thanks.

-- 
Best regards,
Uladzimir.



-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/3d380be1952dfa3d87edee3f52c0a078ef3fbc0d.camel%40ilbers.de.