target/riscv: Ignore reserved bits in PTE for RV64
PATCH v4 1/1 target/riscv: Ignore reserved bits in PTE for RV64
From: Guo Ren <[email protected]>
Highest 10 bits of PTE are reserved in riscv-privileged, ref: [1], so we need to ignore them. They cannot be a part of ppn.
1: The RISC-V Instruction Set Manual, Volume II: Privileged Architecture
4.4 Sv39: Page-Based 39-bit Virtual-Memory System
4.5 Sv48: Page-Based 48-bit Virtual-Memory System
--- target/riscv/cpu_bits.h | 7 +++++++ target/riscv/cpu_helper.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
Changelog V4:
- Change title to Ignore not Bugfix
- Use PTE_PPN_MASK for RV32 and RV64
Changelog V3:
- Use UUL define for PTE_RESERVED
- Keep ppn >> PTE_PPN_SHIFT
Changelog V2:
- Bugfix pte destroyed cause boot fail
- Change to AND with a mask instead of shifting both directions
target/riscv/cpu_bits.h +7 -0
@@ -473,6 +473,13 @@/* Page table PPN shift amount */ #define PTE_PPN_SHIFT 10 +/* Page table PPN mask */ +#if defined(TARGET_RISCV32 ) +#define PTE_PPN_MASK 0xffffffffUL +#elif defined(TARGET_RISCV64 ) +#define PTE_PPN_MASK 0x3fffffffffffffULL +#endif +/* Leaf page shift amount */ #define PGSHIFT 12
target/riscv/cpu_helper.c +1 -1
@@ -261,7 +261,7 @@ restart:#elif defined(TARGET_RISCV64 )target_ulong pte =ldq_phys (cs->as, pte_addr);#endif -hwaddr ppn = pte >>PTE_PPN_SHIFT ; +hwaddr ppn = (pte &PTE_PPN_MASK ) >>PTE_PPN_SHIFT ;if (!(pte &PTE_V )) {/* Invalid PTE */
Signature · 1 line
2.7.4
Quoted 21 lines · On Wed, Sep 25, 2019 at 5:21 PM <[email protected]> wrote:
From: Guo Ren <[email protected]>
Highest 10 bits of PTE are reserved in riscv-privileged, ref: [1], so we need to ignore them. They cannot be a part of ppn.
1: The RISC-V Instruction Set Manual, Volume II: Privileged Architecture
4.4 Sv39: Page-Based 39-bit Virtual-Memory System
4.5 Sv48: Page-Based 48-bit Virtual-Memory SystemSigned-off-by Guo Ren <[email protected]>Reviewed-by Liu Zhiwei <[email protected]>--- target/riscv/cpu_bits.h | 7 +++++++ target/riscv/cpu_helper.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)Changelog V4:
- Change title to Ignore not Bugfix
- UsePTE_PPN_MASKfor RV32 and RV64
Quoted 8 lines
Changelog V3:
- Use UUL define forPTE_RESERVED
- Keep ppn >>PTE_PPN_SHIFTChangelog V2:
- Bugfix pte destroyed cause boot fail
- Change to AND with a mask instead of shifting both directions
Thx
Quoted 34 lines · Bin Meng
Quoted 21 lines · On Wed, Sep 25, 2019 at 5:21 PM <[email protected]> wrote:
From: Guo Ren <[email protected]>
Highest 10 bits of PTE are reserved in riscv-privileged, ref: [1], so we need to ignore them. They cannot be a part of ppn.
1: The RISC-V Instruction Set Manual, Volume II: Privileged Architecture
4.4 Sv39: Page-Based 39-bit Virtual-Memory System
4.5 Sv48: Page-Based 48-bit Virtual-Memory SystemSigned-off-by Guo Ren <[email protected]>Reviewed-by Liu Zhiwei <[email protected]>--- target/riscv/cpu_bits.h | 7 +++++++ target/riscv/cpu_helper.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)Changelog V4:
- Change title to Ignore not Bugfix
- UsePTE_PPN_MASKfor RV32 and RV64Quoted 8 lines
Changelog V3:
- Use UUL define forPTE_RESERVED
- Keep ppn >>PTE_PPN_SHIFTChangelog V2:
- Bugfix pte destroyed cause boot fail
- Change to AND with a mask instead of shifting both directionsReviewed-by Bin Meng <[email protected]>Tested-by Bin Meng <[email protected]>
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/