From 114b84ba527e4308724d1a40a3c3733f7324ab86 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Wed, 5 May 2021 11:35:39 -0700
Subject: replace `spbtr` with `satp` (#241)

The LLVM IAS currently does not support the older spelling for the CSR.
Update the references to the modern name.
---
 machine/minit.c | 2 +-
 pk/mmap.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/machine/minit.c b/machine/minit.c
index cf80a98..c519926 100644
--- a/machine/minit.c
+++ b/machine/minit.c
@@ -46,7 +46,7 @@ static void mstatus_init()
 
   // Disable paging
   if (supports_extension('S'))
-    write_csr(sptbr, 0);
+    write_csr(satp, 0);
 }
 
 // send S-mode interrupts and most exceptions straight to S-mode
diff --git a/pk/mmap.c b/pk/mmap.c
index 179318a..3bcfbbe 100644
--- a/pk/mmap.c
+++ b/pk/mmap.c
@@ -560,7 +560,7 @@ uintptr_t pk_vm_init()
   __map_kernel_range(KVA_START, MEM_START, mem_size, PROT_READ|PROT_WRITE|PROT_EXEC);
 
   flush_tlb();
-  write_csr(sptbr, ((uintptr_t)root_page_table >> RISCV_PGSHIFT) | SATP_MODE_CHOICE);
+  write_csr(satp, ((uintptr_t)root_page_table >> RISCV_PGSHIFT) | SATP_MODE_CHOICE);
 
   uintptr_t kernel_stack_top = __page_alloc_assert() + RISCV_PGSIZE;
 
-- 
cgit v1.1