diff options
| author | Alexander Richardson <Alexander.Richardson@cl.cam.ac.uk> | 2020-07-31 22:15:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 14:15:12 -0700 |
| commit | 7d8b7c0dab72108e3ea7bb7744d3f6cc907c7ef4 (patch) | |
| tree | 624935c30601796d647ae9d6351f1d305d3abe1a /machine | |
| parent | 6584364eaebfbad80ae91f232e7155c3c275b098 (diff) | |
| download | riscv-pk-7d8b7c0dab72108e3ea7bb7744d3f6cc907c7ef4.zip riscv-pk-7d8b7c0dab72108e3ea7bb7744d3f6cc907c7ef4.tar.gz riscv-pk-7d8b7c0dab72108e3ea7bb7744d3f6cc907c7ef4.tar.bz2 | |
Don't perform 64-bit accesses to the PLIC (#205)
Recent QEMU will fault for 8-byte accesses. Use a uint32_t instead of
uintptr_t to avoid those problems.
Diffstat (limited to 'machine')
| -rw-r--r-- | machine/fdt.c | 4 | ||||
| -rw-r--r-- | machine/minit.c | 6 | ||||
| -rw-r--r-- | machine/mtrap.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/machine/fdt.c b/machine/fdt.c index fee3ae9..07b574f 100644 --- a/machine/fdt.c +++ b/machine/fdt.c @@ -439,10 +439,10 @@ static void plic_done(const struct fdt_scan_node *node, void *extra) if (hart < MAX_HARTS) { hls_t *hls = OTHER_HLS(hart); if (cpu_int == IRQ_M_EXT) { - hls->plic_m_ie = (uintptr_t*)((uintptr_t)scan->reg + ENABLE_BASE + ENABLE_SIZE * index); + hls->plic_m_ie = (uint32_t*)((uintptr_t)scan->reg + ENABLE_BASE + ENABLE_SIZE * index); hls->plic_m_thresh = (uint32_t*) ((uintptr_t)scan->reg + HART_BASE + HART_SIZE * index); } else if (cpu_int == IRQ_S_EXT) { - hls->plic_s_ie = (uintptr_t*)((uintptr_t)scan->reg + ENABLE_BASE + ENABLE_SIZE * index); + hls->plic_s_ie = (uint32_t*)((uintptr_t)scan->reg + ENABLE_BASE + ENABLE_SIZE * index); hls->plic_s_thresh = (uint32_t*) ((uintptr_t)scan->reg + HART_BASE + HART_SIZE * index); } else { printm("PLIC wired hart %d to wrong interrupt %d", hart, cpu_int); diff --git a/machine/minit.c b/machine/minit.c index a1befd1..f0587cc 100644 --- a/machine/minit.c +++ b/machine/minit.c @@ -146,12 +146,12 @@ static void hart_plic_init() if (!plic_ndevs) return; - size_t ie_words = (plic_ndevs + 8 * sizeof(uintptr_t) - 1) / - (8 * sizeof(uintptr_t)); + size_t ie_words = (plic_ndevs + 8 * sizeof(*HLS()->plic_s_ie) - 1) / + (8 * sizeof(*HLS()->plic_s_ie)); for (size_t i = 0; i < ie_words; i++) { if (HLS()->plic_s_ie) { // Supervisor not always present - HLS()->plic_s_ie[i] = ULONG_MAX; + HLS()->plic_s_ie[i] = __UINT32_MAX__; } } *HLS()->plic_m_thresh = 1; diff --git a/machine/mtrap.h b/machine/mtrap.h index 74520c5..a8dbeff 100644 --- a/machine/mtrap.h +++ b/machine/mtrap.h @@ -43,9 +43,9 @@ typedef struct { volatile uint64_t* timecmp; volatile uint32_t* plic_m_thresh; - volatile uintptr_t* plic_m_ie; + volatile uint32_t* plic_m_ie; volatile uint32_t* plic_s_thresh; - volatile uintptr_t* plic_s_ie; + volatile uint32_t* plic_s_ie; } hls_t; #define MACHINE_STACK_TOP() ({ \ |