From: Atish Patra <atish.patra@wdc.com>
To: linux-kernel@vger.kernel.org
Cc: Atish Patra <atish.patra@wdc.com>,
Ard Biesheuvel <ardb@kernel.org>,
linux-efi@vger.kernel.org, linux-riscv@lists.infradead.org,
Masahiro Yamada <masahiroy@kernel.org>,
Palmer Dabbelt <palmer@dabbelt.com>,
Heinrich Schuchardt <xypron.glpk@gmx.de>,
linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 03/11] RISC-V: Setup exception vector early
Date: Thu, 25 Jun 2020 16:45:08 -0700 [thread overview]
Message-ID: <20200625234516.31406-4-atish.patra@wdc.com> (raw)
In-Reply-To: <20200625234516.31406-1-atish.patra@wdc.com>
The trap vector is set only in trap_init which may be too late in some
cases. Early ioremap/efi spits many warning messages which may be useful.
Setup the trap vector early so that any warning/bug can be handled before
generic code invokes trap_init.
Signed-off-by: Atish Patra <atish.patra@wdc.com>
---
arch/riscv/kernel/head.S | 10 ++++++++--
arch/riscv/kernel/smpboot.c | 1 -
arch/riscv/kernel/traps.c | 8 +-------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S
index c5b529234ad8..eb123eda3663 100644
--- a/arch/riscv/kernel/head.S
+++ b/arch/riscv/kernel/head.S
@@ -77,10 +77,16 @@ relocate:
csrw CSR_SATP, a0
.align 2
1:
- /* Set trap vector to spin forever to help debug */
- la a0, .Lsecondary_park
+ /* Set trap vector to exception handler */
+ la a0, handle_exception
csrw CSR_TVEC, a0
+ /*
+ * Set sup0 scratch register to 0, indicating to exception vector that
+ * we are presently executing in kernel.
+ */
+ csrw CSR_SCRATCH, zero
+
/* Reload the global pointer */
.option push
.option norelax
diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c
index 4e9922790f6e..5a9c127a380e 100644
--- a/arch/riscv/kernel/smpboot.c
+++ b/arch/riscv/kernel/smpboot.c
@@ -154,7 +154,6 @@ asmlinkage __visible void smp_callin(void)
mmgrab(mm);
current->active_mm = mm;
- trap_init();
notify_cpu_starting(smp_processor_id());
update_siblings_masks(smp_processor_id());
set_cpu_online(smp_processor_id(), 1);
diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c
index ecec1778e3a4..fbedf6c018a3 100644
--- a/arch/riscv/kernel/traps.c
+++ b/arch/riscv/kernel/traps.c
@@ -174,13 +174,7 @@ int is_valid_bugaddr(unsigned long pc)
}
#endif /* CONFIG_GENERIC_BUG */
+/* stvec & scratch is already set from head.S */
void trap_init(void)
{
- /*
- * Set sup0 scratch register to 0, indicating to exception vector
- * that we are presently executing in the kernel
- */
- csr_write(CSR_SCRATCH, 0);
- /* Set the exception vector address */
- csr_write(CSR_TVEC, &handle_exception);
}
--
2.24.0
next prev parent reply other threads:[~2020-06-25 23:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-25 23:45 [RFC PATCH 00/11] Add UEFI support for RISC-V Atish Patra
2020-06-25 23:45 ` [RFC PATCH 01/11] efi: Fix gcc error around __umoddi3 for 32 bit builds Atish Patra
2020-06-26 2:42 ` Heinrich Schuchardt
2020-06-26 21:56 ` Atish Patra
2020-06-26 22:03 ` Ard Biesheuvel
2020-06-27 9:22 ` Ard Biesheuvel
2020-06-29 20:09 ` Atish Patra
2020-07-22 22:48 ` [tip: efi/urgent] efi/libstub: " tip-bot2 for Atish Patra
2020-06-25 23:45 ` [RFC PATCH 02/11] RISC-V: Move DT mapping outof fixmap Atish Patra
2020-06-25 23:45 ` Atish Patra [this message]
2020-06-25 23:45 ` [RFC PATCH 04/11] RISC-V: Add early ioremap support Atish Patra
2020-06-25 23:45 ` [RFC PATCH 05/11] RISC-V: Set maximum number of mapped pages correctly Atish Patra
2020-06-25 23:45 ` [RFC PATCH 06/11] riscv: Parse all memory blocks to remove unusable memory Atish Patra
2020-06-25 23:45 ` [RFC PATCH 07/11] include: pe.h: Add RISC-V related PE definition Atish Patra
2020-06-25 23:45 ` [RFC PATCH 08/11] RISC-V: Add PE/COFF header for EFI stub Atish Patra
2020-06-25 23:45 ` [RFC PATCH 09/11] RISC-V: Add EFI stub support Atish Patra
2020-06-25 23:45 ` [RFC PATCH 10/11] efi: Rename arm-init to efi-init common for all arch Atish Patra
2020-06-26 3:00 ` Heinrich Schuchardt
2020-06-26 21:57 ` Atish Patra
2020-06-25 23:45 ` [RFC PATCH 11/11] RISC-V: Add EFI runtime services Atish Patra
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=20200625234516.31406-4-atish.patra@wdc.com \
--to=atish.patra@wdc.com \
--cc=ardb@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=masahiroy@kernel.org \
--cc=palmer@dabbelt.com \
--cc=xypron.glpk@gmx.de \
/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;
as well as URLs for NNTP newsgroup(s).