From: Palmer Dabbelt <palmer@dabbelt.com>
To: linux-riscv@lists.infradead.org
Cc: Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
aou@eecs.berkeley.edu, akpm@linux-foundation.org,
Atish Patra <Atish.Patra@wdc.com>,
Anup Patel <Anup.Patel@wdc.com>,
wangkefeng.wang@huawei.com, rppt@kernel.org,
vitaly.wool@konsulko.com, alex@ghiti.fr, greentime.hu@sifive.com,
0x7f454c46@gmail.com, chenhuang5@huawei.com,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
kernel-team@android.com,
Palmer Dabbelt <palmerdabbelt@google.com>,
Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH] RISC-V: Always define XIP_FIXUP
Date: Tue, 27 Apr 2021 20:34:15 -0700 [thread overview]
Message-ID: <20210428033415.107756-1-palmer@dabbelt.com> (raw)
From: Palmer Dabbelt <palmerdabbelt@google.com>
XIP depends on MMU, but XIP_FIXUP is defined throughout the kernel in
order to avoid excessive ifdefs. This just makes sure to always define
XIP_FIXIP, which will fix MMU=n builds.
Fixes: 44c922572952 ("RISC-V: enable XIP")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
---
arch/riscv/include/asm/pgtable.h | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 2f1384e14e31..fd749351f432 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -73,18 +73,6 @@
#endif
#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
-#ifdef CONFIG_XIP_KERNEL
-#define XIP_OFFSET SZ_8M
-#define XIP_FIXUP(addr) ({ \
- uintptr_t __a = (uintptr_t)(addr); \
- (__a >= CONFIG_XIP_PHYS_ADDR && __a < CONFIG_XIP_PHYS_ADDR + SZ_16M) ? \
- __a - CONFIG_XIP_PHYS_ADDR + CONFIG_PHYS_RAM_BASE - XIP_OFFSET :\
- __a; \
- })
-#else
-#define XIP_FIXUP(addr) (addr)
-#endif /* CONFIG_XIP_KERNEL */
-
#endif
#ifndef __ASSEMBLY__
@@ -101,6 +89,18 @@
#include <asm/pgtable-32.h>
#endif /* CONFIG_64BIT */
+#ifdef CONFIG_XIP_KERNEL
+#define XIP_OFFSET SZ_8M
+#define XIP_FIXUP(addr) ({ \
+ uintptr_t __a = (uintptr_t)(addr); \
+ (__a >= CONFIG_XIP_PHYS_ADDR && __a < CONFIG_XIP_PHYS_ADDR + SZ_16M) ? \
+ __a - CONFIG_XIP_PHYS_ADDR + CONFIG_PHYS_RAM_BASE - XIP_OFFSET :\
+ __a; \
+ })
+#else
+#define XIP_FIXUP(addr) (addr)
+#endif /* CONFIG_XIP_KERNEL */
+
#ifdef CONFIG_MMU
/* Number of entries in the page global directory */
#define PTRS_PER_PGD (PAGE_SIZE / sizeof(pgd_t))
--
2.31.1.498.g6c1eba8ee3d-goog
next reply other threads:[~2021-04-28 3:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-28 3:34 Palmer Dabbelt [this message]
2021-04-28 3:40 ` [PATCH] RISC-V: Always define XIP_FIXUP Anup Patel
2021-04-28 8:25 ` Alex Ghiti
2021-04-29 4:43 ` Palmer Dabbelt
2021-04-29 13:31 ` Alex Ghiti
2021-05-02 8:14 ` Alex Ghiti
2021-04-28 4:16 Guenter Roeck
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=20210428033415.107756-1-palmer@dabbelt.com \
--to=palmer@dabbelt.com \
--cc=0x7f454c46@gmail.com \
--cc=Anup.Patel@wdc.com \
--cc=Atish.Patra@wdc.com \
--cc=akpm@linux-foundation.org \
--cc=alex@ghiti.fr \
--cc=aou@eecs.berkeley.edu \
--cc=chenhuang5@huawei.com \
--cc=greentime.hu@sifive.com \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux@roeck-us.net \
--cc=palmerdabbelt@google.com \
--cc=paul.walmsley@sifive.com \
--cc=rppt@kernel.org \
--cc=vitaly.wool@konsulko.com \
--cc=wangkefeng.wang@huawei.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;
as well as URLs for NNTP newsgroup(s).