From: Palmer Dabbelt <palmer@rivosinc.com>
To: lizhengyu3@huawei.com
Cc: Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
aou@eecs.berkeley.edu, robh+dt@kernel.org,
frowand.list@gmail.com, zohar@linux.ibm.com,
dmitry.kasatkin@gmail.com, jmorris@namei.org, serge@hallyn.com,
liaochang1@huawei.com, linux-riscv@lists.infradead.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-integrity@vger.kernel.org,
linux-security-module@vger.kernel.org, linux@rivosinc.com,
Palmer Dabbelt <palmer@rivosinc.com>
Subject: [PATCH v1 4/5] RISC-V: purgatory: Use XLEN-length loads to support rv32
Date: Fri, 20 May 2022 08:44:30 -0700 [thread overview]
Message-ID: <20220520154430.18593-5-palmer@rivosinc.com> (raw)
In-Reply-To: <20220520154430.18593-1-palmer@rivosinc.com>
From: Palmer Dabbelt <palmer@rivosinc.com>
This uses an explicit "ld" to load up target address, which dosn't work
on rv32. Convert it to a REG_L macro, like everywhere else.
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
---
arch/riscv/purgatory/entry.S | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/riscv/purgatory/entry.S b/arch/riscv/purgatory/entry.S
index 0194f4554130..71c50fef051c 100644
--- a/arch/riscv/purgatory/entry.S
+++ b/arch/riscv/purgatory/entry.S
@@ -8,6 +8,8 @@
*
*/
+#include <asm/asm.h>
+
.macro size, sym:req
.size \sym, . - \sym
.endm
@@ -26,7 +28,7 @@ purgatory_start:
/* Start new image. */
mv a0, s0
mv a1, s1
- ld a2, riscv_kernel_entry
+ REG_L a2, riscv_kernel_entry
jr a2
size purgatory_start
@@ -41,7 +43,7 @@ size purgatory_start
.globl riscv_kernel_entry
riscv_kernel_entry:
- .quad 0
+ REG_ASM 0
size riscv_kernel_entry
.end
--
2.34.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2022-05-20 15:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-20 15:44 [PATCH v1 0/5] Support kexec_file on 32-bit RISC-V Palmer Dabbelt
2022-05-20 15:44 ` [PATCH v1 1/5] drivers: of: kexec ima: Support 32-bit platforms Palmer Dabbelt
2022-05-20 22:42 ` Rob Herring
2022-05-20 15:44 ` [PATCH v1 2/5] ima: Fix a build issue on " Palmer Dabbelt
2022-05-20 15:44 ` [PATCH v1 3/5] RISC-V: kexec: Use Elf64 on 64-bit targets Palmer Dabbelt
2022-05-20 15:44 ` Palmer Dabbelt [this message]
2022-05-20 15:44 ` [PATCH v1 5/5] RISC-V: Allow kexec_file() on 32-bit platforms Palmer Dabbelt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220520154430.18593-5-palmer@rivosinc.com \
--to=palmer@rivosinc.com \
--cc=aou@eecs.berkeley.edu \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.kasatkin@gmail.com \
--cc=frowand.list@gmail.com \
--cc=jmorris@namei.org \
--cc=liaochang1@huawei.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-security-module@vger.kernel.org \
--cc=linux@rivosinc.com \
--cc=lizhengyu3@huawei.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=robh+dt@kernel.org \
--cc=serge@hallyn.com \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox