| Message ID | 20240605114100.315918-6-bjorn@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6e6c5e21b8cbe94b89d2e848afad4e6fe2a7abd8 |
| Headers | show |
| Series | riscv: Memory Hot(Un)Plug support | expand |
(resending as gmail client turned to html) On Wed, Jun 5, 2024 at 1:41 PM Björn Töpel <bjorn@kernel.org> wrote: > > From: Björn Töpel <bjorn@rivosinc.com> > > The pfn_to_kaddr() function is used by KASAN's memory hotplugging > path. Add the missing function to the RISC-V port, so that it can be > built with MHP and CONFIG_KASAN. > > Signed-off-by: Björn Töpel <bjorn@rivosinc.com> > --- > arch/riscv/include/asm/page.h | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h > index 115ac98b8d72..235fd45d998d 100644 > --- a/arch/riscv/include/asm/page.h > +++ b/arch/riscv/include/asm/page.h > @@ -188,6 +188,11 @@ extern phys_addr_t __phys_addr_symbol(unsigned long x); > > unsigned long kaslr_offset(void); > > +static __always_inline void *pfn_to_kaddr(unsigned long pfn) > +{ > + return __va(pfn << PAGE_SHIFT); > +} > + > #endif /* __ASSEMBLY__ */ > > #define virt_addr_valid(vaddr) ({ \ > -- > 2.43.0 > Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com> Thanks, Alex
diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h index 115ac98b8d72..235fd45d998d 100644 --- a/arch/riscv/include/asm/page.h +++ b/arch/riscv/include/asm/page.h @@ -188,6 +188,11 @@ extern phys_addr_t __phys_addr_symbol(unsigned long x); unsigned long kaslr_offset(void); +static __always_inline void *pfn_to_kaddr(unsigned long pfn) +{ + return __va(pfn << PAGE_SHIFT); +} + #endif /* __ASSEMBLY__ */ #define virt_addr_valid(vaddr) ({ \