From patchwork Sun Oct 8 07:27:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 7269 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4S3S0m0FsWz3wtN for ; Sun, 8 Oct 2023 16:14:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4S3S0g64yHzkM; Sun, 8 Oct 2023 16:14:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4S3S0f6869z303Q; Sun, 8 Oct 2023 16:14:26 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4S3DJq3qJhz308B for ; Sun, 8 Oct 2023 07:27:39 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4S3DJq0nBXzZ6; Sun, 8 Oct 2023 07:27:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1696750059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5c/aZI1AQyiCYZwY/GC7b6+BHLQ04x5Y7JhHtbtyjbI=; b=ChzlX1TKRn4UqGpJedHf8Z1dzDyFR+WNA7SaK2I0EKRr/kb6O/K/nUkv3Lk+YIeKSGEVM0 3zEMxSFePkRvVvrPZ5lRASGvlWQVUPXdCOjMGoOjE9A0RKwKnh8GgiaArwmA81JaeO7uZ8 scqBDsHD3IPcr6u7OYil+otEAvRqUwkxnkFDmUx66vT5KSW582o739AoMm8By9HL0QMlPb EXlVAFyGeXEBBVACp2JfRrZ/N4ZY/BqeAwle46oKfUBAkvRaTM4bHTaf3Wo8GgXbWL0bXM GGiSVMLzKmX+sEy+USrUgtklZQ4bP8NHifXcSx0OGE/eFmu1E/7y1vZBh6EpNA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1696750059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5c/aZI1AQyiCYZwY/GC7b6+BHLQ04x5Y7JhHtbtyjbI=; b=KDrcAFJ9xDDDxihpFMpeT6qs+XNECPeFjsunXiXyylX3CJyYu+ZxUmqXSaRC6CxJNCDrfz 3+OjJi9fOusv+tBQ== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH 2/3] grub: fix mkimage on riscv64 and fix cdrom Date: Sun, 8 Oct 2023 09:27:21 +0200 Message-Id: <20231008072722.3900296-2-arne_f@ipfire.org> In-Reply-To: <20231008072722.3900296-1-arne_f@ipfire.org> References: <20231008072722.3900296-1-arne_f@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: HIKIFPFFPWXA4VWTY7WT3PDOZEUXLUZS X-Message-ID-Hash: HIKIFPFFPWXA4VWTY7WT3PDOZEUXLUZS X-MailFrom: arne_f@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Arne Fitzenreiter X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: the riscv64 image needs more than 1.44MB Signed-off-by: Arne Fitzenreiter --- lfs/cdrom | 2 +- lfs/grub | 1 + .../grub-Handle-R_RISCV_CALL_PLT-reloc.patch | 48 +++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/patches/grub/grub-Handle-R_RISCV_CALL_PLT-reloc.patch diff --git a/lfs/cdrom b/lfs/cdrom index 261df2663..fed69f171 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -220,7 +220,7 @@ ifeq "$(EFI)" "1" < $(DIR_SRC)/config/cdrom/grub.cfg > $(DIR_TMP)/cdrom/EFI/BOOT/grub.cfg # Create the EFI Eltorito image - dd if=/dev/zero of=$(DIR_TMP)/cdrom/boot/isolinux/efiboot.img bs=1k count=1440 + dd if=/dev/zero of=$(DIR_TMP)/cdrom/boot/isolinux/efiboot.img bs=1k count=2880 mkdosfs -F 12 -n "IPFIRE_EFI" $(DIR_TMP)/cdrom/boot/isolinux/efiboot.img # Mount the EFI image diff --git a/lfs/grub b/lfs/grub index c32edb2ef..e4cd35d78 100644 --- a/lfs/grub +++ b/lfs/grub @@ -96,6 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.06-remove_os_prober_disabled_warning.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.02_disable_vga_fallback.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-Use-zifencei-on-riscv.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-Handle-R_RISCV_CALL_PLT-reloc.patch cd $(DIR_APP) && autoreconf -vfi # Install unifont diff --git a/src/patches/grub/grub-Handle-R_RISCV_CALL_PLT-reloc.patch b/src/patches/grub/grub-Handle-R_RISCV_CALL_PLT-reloc.patch new file mode 100644 index 000000000..f3f12b6f0 --- /dev/null +++ b/src/patches/grub/grub-Handle-R_RISCV_CALL_PLT-reloc.patch @@ -0,0 +1,48 @@ +From 64be669638e198bc0c7c1a344547265dfacd2470 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 23 Jan 2023 15:29:02 -0800 +Subject: [PATCH] risc-v: Handle R_RISCV_CALL_PLT reloc + +GNU assembler starting 2.40 release always generates R_RISCV_CALL_PLT +reloc for call in assembler [1], similarly llvm does not make +distinction between R_RISCV_CALL_PLT and R_RISCV_CALL [2] + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/grub-devel/2023-02/msg00143.html] + +[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=70f35d72ef04cd23771875c1661c9975044a749c +[2] https://reviews.llvm.org/D132530 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + grub-core/kern/riscv/dl.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/grub-core/kern/riscv/dl.c ++++ b/grub-core/kern/riscv/dl.c +@@ -188,6 +188,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t + break; + + case R_RISCV_CALL: ++ case R_RISCV_CALL_PLT: + { + grub_uint32_t *abs_place = place; + grub_ssize_t off = sym_addr - (grub_addr_t) place; +--- a/util/grub-mkimagexx.c ++++ b/util/grub-mkimagexx.c +@@ -1294,6 +1294,7 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, st + } + break; + case R_RISCV_CALL: ++ case R_RISCV_CALL_PLT: + { + grub_uint32_t hi20, lo12; + +@@ -1725,6 +1726,7 @@ translate_relocation_pe (struct translat + case R_RISCV_BRANCH: + case R_RISCV_JAL: + case R_RISCV_CALL: ++ case R_RISCV_CALL_PLT: + case R_RISCV_PCREL_HI20: + case R_RISCV_PCREL_LO12_I: + case R_RISCV_PCREL_LO12_S: