mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Greentime Hu <greentime.hu@sifive.com>,
	Palmer Dabbelt <palmerdabbelt@google.com>,
	Sasha Levin <sashal@kernel.org>,
	linux-riscv@lists.infradead.org
Subject: [PATCH AUTOSEL 5.5 18/67] riscv: set pmp configuration if kernel is running in M-mode
Date: Thu,  5 Mar 2020 12:12:19 -0500	[thread overview]
Message-ID: <20200305171309.29118-18-sashal@kernel.org> (raw)
In-Reply-To: <20200305171309.29118-1-sashal@kernel.org>

From: Greentime Hu <greentime.hu@sifive.com>

[ Upstream commit c68a9032299e837b56d356de9250c93094f7e0e3 ]

When the kernel is running in S-mode, the expectation is that the
bootloader or SBI layer will configure the PMP to allow the kernel to
access physical memory.  But, when the kernel is running in M-mode and is
started with the ELF "loader", there's probably no bootloader or SBI layer
involved to configure the PMP.  Thus, we need to configure the PMP
ourselves to enable the kernel to access all regions.

Signed-off-by: Greentime Hu <greentime.hu@sifive.com>
Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 arch/riscv/include/asm/csr.h | 12 ++++++++++++
 arch/riscv/kernel/head.S     |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h
index 435b65532e294..8e18d2c64399d 100644
--- a/arch/riscv/include/asm/csr.h
+++ b/arch/riscv/include/asm/csr.h
@@ -72,6 +72,16 @@
 #define EXC_LOAD_PAGE_FAULT	13
 #define EXC_STORE_PAGE_FAULT	15
 
+/* PMP configuration */
+#define PMP_R			0x01
+#define PMP_W			0x02
+#define PMP_X			0x04
+#define PMP_A			0x18
+#define PMP_A_TOR		0x08
+#define PMP_A_NA4		0x10
+#define PMP_A_NAPOT		0x18
+#define PMP_L			0x80
+
 /* symbolic CSR names: */
 #define CSR_CYCLE		0xc00
 #define CSR_TIME		0xc01
@@ -100,6 +110,8 @@
 #define CSR_MCAUSE		0x342
 #define CSR_MTVAL		0x343
 #define CSR_MIP			0x344
+#define CSR_PMPCFG0		0x3a0
+#define CSR_PMPADDR0		0x3b0
 #define CSR_MHARTID		0xf14
 
 #ifdef CONFIG_RISCV_M_MODE
diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S
index a4242be66966b..e4d9baf973232 100644
--- a/arch/riscv/kernel/head.S
+++ b/arch/riscv/kernel/head.S
@@ -58,6 +58,12 @@ _start_kernel:
 	/* Reset all registers except ra, a0, a1 */
 	call reset_regs
 
+	/* Setup a PMP to permit access to all of memory. */
+	li a0, -1
+	csrw CSR_PMPADDR0, a0
+	li a0, (PMP_A_NAPOT | PMP_R | PMP_W | PMP_X)
+	csrw CSR_PMPCFG0, a0
+
 	/*
 	 * The hartid in a0 is expected later on, and we have no firmware
 	 * to hand it to us.
-- 
2.20.1


  parent reply	other threads:[~2020-03-05 17:23 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-05 17:12 [PATCH AUTOSEL 5.5 01/67] ACPI: watchdog: Allow disabling WDAT at boot Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 02/67] HID: apple: Add support for recent firmware on Magic Keyboards Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 03/67] HID: core: fix off-by-one memset in hid_report_raw_event() Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 04/67] HID: core: increase HID report buffer size to 8KiB Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 05/67] HID: hiddev: Fix race in in hiddev_disconnect() Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 06/67] HID: alps: Fix an error handling path in 'alps_input_configured()' Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 07/67] i2c: altera: Fix potential integer overflow Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 08/67] ACPI: watchdog: Set default timeout in probe Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 09/67] HID: i2c-hid: add Trekstor Surfbook E11B to descriptor override Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 10/67] mips: vdso: fix 'jalr t9' crash in vdso code Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 11/67] MIPS: Disable VDSO time functionality on microMIPS Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 12/67] mips: vdso: add build time check that no 'jalr t9' calls left Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 13/67] MIPS: cavium_octeon: Fix syncw generation Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 14/67] MIPS: VPE: Fix a double free and a memory leak in 'release_vpe()' Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 15/67] HID: hid-bigbenff: fix general protection fault caused by double kfree Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 16/67] HID: hid-bigbenff: call hid_hw_stop() in case of error Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 17/67] HID: hid-bigbenff: fix race condition for scheduled work during removal Sasha Levin
2020-03-05 17:12 ` Sasha Levin [this message]
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 19/67] RISC-V: Don't enable all interrupts in trap_init() Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 20/67] MIPS: vdso: Wrap -mexplicit-relocs in cc-option Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 21/67] kunit: run kunit_tool from any directory Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 22/67] selftests/rseq: Fix out-of-tree compilation Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 23/67] tracing: Fix number printing bug in print_synth_event() Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 24/67] nl80211: fix potential leak in AP start Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 25/67] cfg80211: check reg_rule for NULL in handle_channel_custom() Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 26/67] mac80211: Remove a redundant mutex unlock Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 27/67] scsi: libfc: free response frame from GPN_ID Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 28/67] netfilter: ipset: Fix "INFO: rcu detected stall in hash_xxx" reports Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 29/67] netfilter: ipset: Fix forceadd evaluation path Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 30/67] vhost: Check docket sk_family instead of call getname Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 31/67] net: usb: qmi_wwan: restore mtu min/max values after raw_ip switch Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 32/67] hv_netvsc: Fix unwanted wakeup in netvsc_attach() Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 33/67] net: ks8851-ml: Fix IRQ handling and locking Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 34/67] mac80211: rx: avoid RCU list traversal under mutex Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 35/67] net: ll_temac: Fix race condition causing TX hang Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 36/67] net: ll_temac: Add more error handling of dma_map_single() calls Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 37/67] net: ll_temac: Fix RX buffer descriptor handling on GFP_ATOMIC pressure Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 38/67] net: ll_temac: Handle DMA halt condition caused by buffer underrun Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 39/67] blk-mq: insert passthrough request into hctx->dispatch directly Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 40/67] io_uring: fix poll_list race for SETUP_IOPOLL|SETUP_SQPOLL Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 41/67] drm/amdgpu: fix memory leak during TDR test(v2) Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 42/67] io_uring: pick up link work on submit reference drop Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 43/67] kbuild: fix DT binding schema rule to detect command line changes Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 44/67] kbuild: add dtbs_check to PHONY Sasha Levin
2020-03-05 17:12 ` [PATCH AUTOSEL 5.5 45/67] kbuild: add dt_binding_check to PHONY in a correct place Sasha Levin

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=20200305171309.29118-18-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=greentime.hu@sifive.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=palmerdabbelt@google.com \
    --cc=stable@vger.kernel.org \
    /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

all inboxes | Powered by JetHome®