From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7325025390560280576 X-Received: by 2002:a92:c050:0:b0:35f:d3aa:584b with SMTP id o16-20020a92c050000000b0035fd3aa584bmr10080097ilf.3.1705490378657; Wed, 17 Jan 2024 03:19:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:348c:b0:360:69b:4399 with SMTP id bp12-20020a056e02348c00b00360069b4399ls790622ilb.1.-pod-prod-04-us; Wed, 17 Jan 2024 03:19:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IGaXUNZLN/cBrrpsfIe9n5mMuntxDlQkv8n25mxw1BsS1ZpVSim/Bfg5Xm8jA6O2gYjceEg X-Received: by 2002:a05:6602:d:b0:7be:e639:29b7 with SMTP id b13-20020a056602000d00b007bee63929b7mr10656856ioa.32.1705490377907; Wed, 17 Jan 2024 03:19:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705490377; cv=none; d=google.com; s=arc-20160816; b=dpWlNATEvNplAmPj5jns2Qp+Z0zPfxVonGEsuwdzDEJAOCpLF48VwQnLJsOinkNYPX DMgd6Ej81nqFEMQyXRn3e0b8WsxXCz3AQfivRmqgM4ff2eQaQGW4WuFfsyBj0YMWeIAo kYr1BrSTnXwmlK2/Dsv6vEqJuCejnYhv2KsuNKqPWTrZDsJkd/uM07S4xxtCIVMftb5G 3jRBhLtv+zfedENCBI5ywnqnOwfo9oVXQHj9nzUe5uYWR6fODAvRZ1bJkAKtIkIS0fAT 4Gz/128lb3a3b68lvGwaRl5yVLWXZcO32VJgSz9f9hfayQf0V9mHusYs+XKnOTVrzEX8 1atg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=iBcqknNNMptfmzV19keHMACrRKVjAsCk/JVo/isdE7Y=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=eQ0T2J0t2Gjn3dpmLgS1wM6Puxm5LUIuQ7Dk1yWjUpy2jnJX6u461mmeB7U+J90G/0 o12Qc9xRGciK2m/gqLNH5zQoSKbKkQuEftWHPPlRBWFJ6JEi3e2vPx79lK92vceeoNA3 2WADCmQjRLXrmupsiUoXp9dZstxrwYHDE+t8p9jGSSh8VZVTqwbKP5M1S0DwBo0iUgdS 69UCNi0qYZ/6H4uS9BuRyu61x9y0x7tZ7KNH31GFQW/2rhdTqUKfcM24Ed/vK015d3j1 HxlKoSg7M5bNDMDzmySL61A3hFImF1VJXU1GUdWGQjGPpmMvgjed1OBMpqzrCV3FMyLK VyAA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=HVzcdmyl; spf=pass (google.com: domain of fm-294854-20240117111935ef35dbb6b3d6c7375e-g9mi2d@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-294854-20240117111935ef35dbb6b3d6c7375e-g9mi2d@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net. [185.136.65.228]) by gmr-mx.google.com with ESMTPS id y15-20020a02bb0f000000b0046d52ddd758si105531jan.1.2024.01.17.03.19.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2024 03:19:37 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240117111935ef35dbb6b3d6c7375e-g9mi2d@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) client-ip=185.136.65.228; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=HVzcdmyl; spf=pass (google.com: domain of fm-294854-20240117111935ef35dbb6b3d6c7375e-g9mi2d@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-294854-20240117111935ef35dbb6b3d6c7375e-g9mi2d@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 20240117111935ef35dbb6b3d6c7375e for ; Wed, 17 Jan 2024 12:19:36 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=iBcqknNNMptfmzV19keHMACrRKVjAsCk/JVo/isdE7Y=; b=HVzcdmylb9ELuFpWtVKOiOo2AQt0M+pRxx7cOr7wr717B0DfKkKxZYlQBAdrae+rlT8Zps s0k5PrVflRG1fhid/7MXu+byD9c3tfkLaVUc5MGqepy/WbZOkS05QtqwB2QJj2Y8olgcv/Mi l7diFKoza/zoPzAmSup3hgmmiJvDc=; From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v3 8/8] linux-starfive: Update to 6.6 upstream queue Date: Wed, 17 Jan 2024 12:19:33 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: xdXihpjw32ad From: Jan Kiszka This is compatible with Debian sid, maintains all enabled board features, and fixes the out-of-tree module build. We currently need one extra patch (that is also pending upstream) to fix breakages in the EFI stub with latest binutils coming via sid. Signed-off-by: Jan Kiszka --- .../conf/machine/starfive-visionfive2.conf | 2 +- ...sure-GP-relative-addressing-is-not-u.patch | 32 +++++++++++++++++++ .../linux/files/starfive2_extra.cfg | 6 ++-- .../linux/linux-starfive_5.15-visionfive2.bb | 19 ----------- .../linux/linux-starfive_6.6-visionfive2.bb | 21 ++++++++++++ 5 files changed, 58 insertions(+), 22 deletions(-) create mode 100644 meta-isar/recipes-kernel/linux/files/0001-riscv-efistub-Ensure-GP-relative-addressing-is-not-u.patch delete mode 100644 meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb create mode 100644 meta-isar/recipes-kernel/linux/linux-starfive_6.6-visionfive2.bb diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf index c7f72bb3..ed2828f1 100644 --- a/meta-isar/conf/machine/starfive-visionfive2.conf +++ b/meta-isar/conf/machine/starfive-visionfive2.conf @@ -15,5 +15,5 @@ IMAGER_INSTALL:wic += " \ IMAGER_BUILD_DEPS += "u-boot-starfive-visionfive2" # DTB file for booting -DTB_VISIONFIVE2 = "jh7110-visionfive-v2.dtb" +DTB_VISIONFIVE2 = "jh7110-starfive-visionfive-2-v1.3b.dtb" DTB_FILES = "starfive/${DTB_VISIONFIVE2}" 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 new file mode 100644 index 00000000..7db1c70f --- /dev/null +++ b/meta-isar/recipes-kernel/linux/files/0001-riscv-efistub-Ensure-GP-relative-addressing-is-not-u.patch @@ -0,0 +1,32 @@ +From 80a71d31e35ac5f90e85b0b52cd080a974b91e8d Mon Sep 17 00:00:00 2001 +From: Jan Kiszka +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 +--- + 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/files/starfive2_extra.cfg b/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg index d11c28de..9649ec87 100644 --- a/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg +++ b/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg @@ -1,3 +1,5 @@ # additional configuration to support stock debian userlands -CONFIG_BINFMT_MISC=y -CONFIG_SQUASHFS=m +CONFIG_NLS_ISO8859_1=m + +# only complicates the build +# CONFIG_MODULE_COMPRESS_ZSTD is not set diff --git a/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb b/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb deleted file mode 100644 index e9e0bf4a..00000000 --- a/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) Siemens AG, 2023 -# -# SPDX-License-Identifier: MIT - -require recipes-kernel/linux/linux-custom.inc - -SRC_URI += " \ - git://github.com/starfive-tech/linux.git;protocol=https;branch=JH7110_VisionFive2_devel;destsuffix=linux-visionfive-${PV} \ - file://starfive2_extra.cfg" -SRCREV = "a87c6861c6d96621026ee53b94f081a1a00a4cc7" - -S = "${WORKDIR}/linux-visionfive-${PV}" - -KERNEL_DEFCONFIG = "starfive_visionfive2_defconfig" - -LINUX_VERSION_EXTENSION = "-isar" - -COMPATIBLE_MACHINE = "starfive-visionfive2" diff --git a/meta-isar/recipes-kernel/linux/linux-starfive_6.6-visionfive2.bb b/meta-isar/recipes-kernel/linux/linux-starfive_6.6-visionfive2.bb new file mode 100644 index 00000000..f4dd5c9a --- /dev/null +++ b/meta-isar/recipes-kernel/linux/linux-starfive_6.6-visionfive2.bb @@ -0,0 +1,21 @@ +# +# Copyright (c) Siemens AG, 2023-2024 +# +# SPDX-License-Identifier: MIT + +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://starfive2_extra.cfg" +SRCREV = "9fe004eaf1aa5b23bd5d03b4cfe9c3858bd884c4" +SRC_URI[sha256sum] = "9eaf7659aa57e2c5b399b7b33076f1376ec43ef343680e0a57e0a2a9bef6c0ae" + +S = "${WORKDIR}/linux-${SRCREV}" + +KERNEL_DEFCONFIG = "starfive_visionfive2_defconfig" + +LINUX_VERSION_EXTENSION = "-isar" + +COMPATIBLE_MACHINE = "starfive-visionfive2" -- 2.35.3