RISC-V Add the OpenTitan Machine
cover RISC-V Add the OpenTitan Machine
From: Alistair Francis <[email protected]>
OpenTitan is an open source silicon Root of Trust (RoT) project. This series adds initial support for the OpenTitan machine to QEMU.
This series add the Ibex CPU to the QEMU RISC-V target. It then adds the OpenTitan machine, the Ibex UART and the Ibex PLIC.
The UART has been tested sending data, but not receiving as there is currently no UART receiving support in Tock.
With this series QEMU can boot the OpenTitan ROM, Tock OS and a Tock userspace app.
The Ibex PLIC is similar to the RISC-V PLIC (and is based on the QEMU implementation) with some differences. The hope is that the Ibex PLIC will converge to follow the RISC-V spec. As that happens I want to update the QEMU Ibex PLIC and hopefully eventually replace the current PLIC as the implementation is a little overlay complex.
For more details on OpenTitan, see here: https://docs.opentitan.org/
Alistair Francis (9):
riscv/boot: Add a missing header include target/riscv: Don't overwrite the reset vector target/riscv: Add the lowRISC Ibex CPU
riscv: Initial commit of OpenTitan machine hw/char: Initial commit of Ibex UART hw/intc: Initial commit of lowRISC Ibex PLIC riscv/opentitan: Connect the PLIC device riscv/opentitan: Connect the UART device target/riscv: Use a smaller guess size for no-MMU PMP
MAINTAINERS | 14 + default-configs/riscv32-softmmu.mak | 1 + default-configs/riscv64-softmmu.mak | 11 +- hw/char/Makefile.objs | 1 + hw/char/ibex_uart.c | 487 ++++++++++++++++++++++++++++ hw/intc/Makefile.objs | 1 + hw/intc/ibex_plic.c | 261 +++++++++++++++ hw/riscv/Kconfig | 9 + hw/riscv/Makefile.objs | 1 + hw/riscv/opentitan.c | 204 ++++++++++++ include/hw/char/ibex_uart.h | 110 +++++++ include/hw/intc/ibex_plic.h | 63 ++++ include/hw/riscv/boot.h | 1 + include/hw/riscv/opentitan.h | 79 +++++ target/riscv/cpu.c | 30 +- target/riscv/cpu.h | 1 + target/riscv/pmp.c | 19 +- 17 files changed, 1278 insertions(+), 15 deletions(-) create mode 100644 hw/char/ibex_uart.c create mode 100644 hw/intc/ibex_plic.c create mode 100644 hw/riscv/opentitan.c create mode 100644 include/hw/char/ibex_uart.h create mode 100644 include/hw/intc/ibex_plic.h create mode 100644 include/hw/riscv/opentitan.h
Signature · 1 line
2.26.2
PATCH 1/9 riscv/boot: Add a missing header include
From: Alistair Francis <[email protected]>
--- include/hw/riscv/boot.h | 1 + 1 file changed, 1 insertion(+)
include/hw/riscv/boot.h +1 -0
@@ -21,6 +21,7 @@#define RISCV_BOOT_H #include "exec/cpu-defs.h" +#include "hw/loader.h" void riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware,
Signature · 1 line
2.26.2
PATCH 2/9 target/riscv: Don't overwrite the reset vector
In reply to Alistair FrancisFrom: Alistair Francis <[email protected]>
If the reset vector is set in the init function don't set it again in realise.
--- target/riscv/cpu.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
target/riscv/cpu.c +11 -9
@@ -111,6 +111,14 @@ static void set_feature(CPURISCVState *env, int feature) env->features |= (1ULL << feature); } +static int get_resetvec (CPURISCVState *env) +{ +#ifndef CONFIG_USER_ONLY +return env->resetvec; +#endif +return 0 ; +} +static void set_resetvec (CPURISCVState *env,int resetvec) {#ifndef CONFIG_USER_ONLY
@@ -123,7 +131,6 @@ static void riscv_any_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RVXLEN |RVI |RVM |RVA |RVF |RVD |RVC |RVU );set_priv_version (env,PRIV_VERSION_1_11_0 ); -set_resetvec (env,DEFAULT_RSTVEC ); }#if defined(TARGET_RISCV32 )
@@ -140,7 +147,6 @@ static void rv32gcsu_priv1_09_1_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RV32 |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_09_1 ); -set_resetvec (env,DEFAULT_RSTVEC );set_feature (env,RISCV_FEATURE_MMU );set_feature (env,RISCV_FEATURE_PMP ); }
@@ -150,7 +156,6 @@ static void rv32gcsu_priv1_10_0_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RV32 |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC );set_feature (env,RISCV_FEATURE_MMU );set_feature (env,RISCV_FEATURE_PMP ); }
@@ -160,7 +165,6 @@ static void rv32imacu_nommu_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RV32 |RVI |RVM |RVA |RVC |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC );set_feature (env,RISCV_FEATURE_PMP ); }
@@ -169,7 +173,6 @@ static void rv32imafcu_nommu_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RV32 |RVI |RVM |RVA |RVF |RVC |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC );set_feature (env,RISCV_FEATURE_PMP ); }
@@ -187,7 +190,6 @@ static void rv64gcsu_priv1_09_1_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RV64 |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_09_1 ); -set_resetvec (env,DEFAULT_RSTVEC );set_feature (env,RISCV_FEATURE_MMU );set_feature (env,RISCV_FEATURE_PMP ); }
@@ -197,7 +199,6 @@ static void rv64gcsu_priv1_10_0_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RV64 |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC );set_feature (env,RISCV_FEATURE_MMU );set_feature (env,RISCV_FEATURE_PMP ); }
@@ -207,7 +208,6 @@ static void rv64imacu_nommu_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RV64 |RVI |RVM |RVA |RVC |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC );set_feature (env,RISCV_FEATURE_PMP ); }
@@ -399,7 +399,9 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) }set_priv_version (env, priv_version); -set_resetvec (env,DEFAULT_RSTVEC ); +if (!get_resetvec (env)) { +set_resetvec (env,DEFAULT_RSTVEC ); + }if (cpu->cfg.mmu) {set_feature (env,RISCV_FEATURE_MMU );
Signature · 1 line
2.26.2
PATCH 3/9 target/riscv: Add the lowRISC Ibex CPU
In reply to Alistair FrancisFrom: Alistair Francis <[email protected]>
--- target/riscv/cpu.c | 10 ++++++++++ target/riscv/cpu.h | 1 + 2 files changed, 11 insertions(+)
target/riscv/cpu.c +10 -0
@@ -160,6 +160,15 @@ static void rv32gcsu_priv1_10_0_cpu_init(Object *obj)set_feature (env,RISCV_FEATURE_PMP ); } +static void rv32imcu_nommu_cpu_init (Object *obj) +{ +CPURISCVState *env = &RISCV_CPU (obj)->env; +set_misa (env,RV32 |RVI |RVM |RVC |RVU ); +set_priv_version (env,PRIV_VERSION_1_10_0 ); +set_resetvec (env,0x8088 ); +set_feature (env,RISCV_FEATURE_PMP ); +} +static void rv32imacu_nommu_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;
@@ -620,6 +629,7 @@ static const TypeInfo riscv_cpu_type_infos[] = { DEFINE_CPU(TYPE_RISCV_CPU_ANY, riscv_any_cpu_init),#if defined(TARGET_RISCV32 )DEFINE_CPU (TYPE_RISCV_CPU_BASE32 , riscv_base32_cpu_init), +DEFINE_CPU (TYPE_RISCV_CPU_IBEX , rv32imcu_nommu_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_E31 , rv32imacu_nommu_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_E34 , rv32imafcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rv32gcsu_priv1_10_0_cpu_init),
target/riscv/cpu.h +1 -0
@@ -35,6 +35,7 @@#define TYPE_RISCV_CPU_ANY RISCV_CPU_TYPE_NAME("any")#define TYPE_RISCV_CPU_BASE32 RISCV_CPU_TYPE_NAME("rv32")#define TYPE_RISCV_CPU_BASE64 RISCV_CPU_TYPE_NAME("rv64") +#define TYPE_RISCV_CPU_IBEX RISCV_CPU_TYPE_NAME("lowrisc-ibex")#define TYPE_RISCV_CPU_SIFIVE_E31 RISCV_CPU_TYPE_NAME("sifive-e31")#define TYPE_RISCV_CPU_SIFIVE_E34 RISCV_CPU_TYPE_NAME("sifive-e34")#define TYPE_RISCV_CPU_SIFIVE_E51 RISCV_CPU_TYPE_NAME("sifive-e51")
Signature · 1 line
2.26.2
PATCH 4/9 riscv: Initial commit of OpenTitan machine
In reply to Alistair FrancisFrom: Alistair Francis <[email protected]>
This adds a barebone OpenTitan machine to QEMU.
--- MAINTAINERS | 10 ++ default-configs/riscv32-softmmu.mak | 1 + default-configs/riscv64-softmmu.mak | 11 +- hw/riscv/Kconfig | 5 + hw/riscv/Makefile.objs | 1 + hw/riscv/opentitan.c | 169 ++++++++++++++++++++++++++++ include/hw/riscv/opentitan.h | 63 +++++++++++ 7 files changed, 259 insertions(+), 1 deletion(-) create mode 100644 hw/riscv/opentitan.c create mode 100644 include/hw/riscv/opentitan.h
MAINTAINERS +10 -0
@@ -1225,6 +1225,16 @@ F: pc-bios/canyonlands.dt[sb] F: pc-bios/u-boot-sam460ex-20100605.bin F: roms/u-boot-sam460ex +RISC-V Machines +----------------- +OpenTitan +M: Alistair Francis <[email protected]> +L: [email protected] +S: Supported +F: hw/riscv/opentitan.c +F: include/hw/riscv/opentitan.h + + SH4 Machines ------------ R2D
default-configs/riscv32-softmmu.mak +1 -0
@@ -10,3 +10,4 @@ CONFIG_SPIKE=y CONFIG_SIFIVE_E=y CONFIG_SIFIVE_U=y CONFIG_RISCV_VIRT=y +CONFIG_OPENTITAN=y
default-configs/riscv64-softmmu.mak +10 -1
@@ -1,3 +1,12 @@ # Default configuration for riscv64-softmmu -include riscv32-softmmu.mak +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=n + +# Boards: +# +CONFIG_SPIKE=y +CONFIG_SIFIVE_E=y +CONFIG_SIFIVE_U=y +CONFIG_RISCV_VIRT=y
hw/riscv/Kconfig +5 -0
@@ -27,6 +27,11 @@ config SPIKE select HTIF select SIFIVE +config OPENTITAN + bool + select HART + select UNIMP + config RISCV_VIRT bool imply PCI_DEVICES
hw/riscv/Makefile.objs +1 -0
@@ -1,6 +1,7 @@ obj-y += boot.o obj-$(CONFIG_SPIKE) += riscv_htif.o obj-$(CONFIG_HART) += riscv_hart.o +obj-$(CONFIG_OPENTITAN) += opentitan.o obj-$(CONFIG_SIFIVE_E) += sifive_e.o obj-$(CONFIG_SIFIVE_E) += sifive_e_prci.o obj-$(CONFIG_SIFIVE) += sifive_clint.o
hw/riscv/opentitan.c new file +169 -0
169 lines not on this page · raw message
include/hw/riscv/opentitan.h new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 5/9 hw/char: Initial commit of Ibex UART
In reply to Alistair FrancisFrom: Alistair Francis <[email protected]>
This is the initial commit of the Ibex UART device. Serial TX is working, while RX has been implemeneted but untested.
This is based on the documentation from:
https://docs.opentitan.org/hw/ip/uart/doc/
--- MAINTAINERS | 2 + hw/char/Makefile.objs | 1 + hw/char/ibex_uart.c | 487 ++++++++++++++++++++++++++++++++++++ hw/riscv/Kconfig | 4 + include/hw/char/ibex_uart.h | 110 ++++++++ 5 files changed, 604 insertions(+) create mode 100644 hw/char/ibex_uart.c create mode 100644 include/hw/char/ibex_uart.h
MAINTAINERS +2 -0
@@ -1232,7 +1232,9 @@ M: Alistair Francis <[email protected]> L: [email protected] S: Supported F: hw/riscv/opentitan.c +F: hw/char/ibex_uart.c F: include/hw/riscv/opentitan.h +F: include/hw/char/ibex_uart.h SH4 Machines
hw/char/Makefile.objs +1 -0
@@ -12,6 +12,7 @@ common-obj-$(CONFIG_VIRTIO_SERIAL) += virtio-console.o common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o common-obj-$(CONFIG_XEN) += xen_console.o common-obj-$(CONFIG_CADENCE) += cadence_uart.o +common-obj-$(CONFIG_IBEX) += ibex_uart.o common-obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o common-obj-$(CONFIG_COLDFIRE) += mcf_uart.o
hw/char/ibex_uart.c new file +487 -0
487 lines not on this page · raw message
hw/riscv/Kconfig +4 -0
@@ -4,6 +4,9 @@ config HTIF config HART bool +config IBEX + bool + config SIFIVE bool select MSI_NONBROKEN
@@ -29,6 +32,7 @@ config SPIKE config OPENTITAN bool + select IBEX select HART select UNIMP
include/hw/char/ibex_uart.h new file +110 -0
110 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 6/9 hw/intc: Initial commit of lowRISC Ibex PLIC
In reply to Alistair FrancisFrom: Alistair Francis <[email protected]>
The Ibex core contains a PLIC that although similar to the RISC-V spec is not RISC-V spec compliant.
This patch implements a Ibex PLIC in a somewhat generic way.
As the current RISC-V PLIC needs tidying up, my hope is that as the Ibex PLIC move towards spec compliance this PLIC implementation can be updated until it can replace the current PLIC.
--- MAINTAINERS | 2 + hw/intc/Makefile.objs | 1 + hw/intc/ibex_plic.c | 261 ++++++++++++++++++++++++++++++++++++ include/hw/intc/ibex_plic.h | 63 +++++++++ 4 files changed, 327 insertions(+) create mode 100644 hw/intc/ibex_plic.c create mode 100644 include/hw/intc/ibex_plic.h
MAINTAINERS +2 -0
@@ -1233,8 +1233,10 @@ L: [email protected] S: Supported F: hw/riscv/opentitan.c F: hw/char/ibex_uart.c +F: hw/intc/ibex_plic.c F: include/hw/riscv/opentitan.h F: include/hw/char/ibex_uart.h +F: include/hw/intc/ibex_plic.h SH4 Machines
hw/intc/Makefile.objs +1 -0
@@ -49,3 +49,4 @@ obj-$(CONFIG_ARM_GIC) += arm_gicv3_cpuif.o obj-$(CONFIG_MIPS_CPS) += mips_gic.o obj-$(CONFIG_NIOS2) += nios2_iic.o obj-$(CONFIG_OMPIC) += ompic.o +obj-$(CONFIG_IBEX) += ibex_plic.o
hw/intc/ibex_plic.c new file +261 -0
261 lines not on this page · raw message
include/hw/intc/ibex_plic.h new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 7/9 riscv/opentitan: Connect the PLIC device
In reply to Alistair FrancisFrom: Alistair Francis <[email protected]>
--- hw/riscv/opentitan.c | 19 +++++++++++++++++-- include/hw/riscv/opentitan.h | 3 +++ 2 files changed, 20 insertions(+), 2 deletions(-)
hw/riscv/opentitan.c +17 -2
@@ -25,6 +25,7 @@#include "hw/misc/unimp.h" #include "hw/riscv/boot.h" #include "exec/address-spaces.h" +#include "sysemu/sysemu.h" static const struct MemmapEntry { hwaddr base;
@@ -92,6 +93,9 @@ static void riscv_lowrisc_ibex_soc_init(Object *obj)object_initialize_child (obj,"cpus" , &s->cpus,sizeof (s->cpus),TYPE_RISCV_HART_ARRAY , &error_abort,NULL ); + +sysbus_init_child_obj (obj,"plic" , &s->plic, +sizeof (s->plic),TYPE_IBEX_PLIC ); }static void riscv_lowrisc_ibex_soc_realize (DeviceState *dev_soc,Error **errp)
@@ -100,6 +104,9 @@ static void riscv_lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp)MachineState *ms =MACHINE (qdev_get_machine ());LowRISCIbexSoCState *s =RISCV_IBEX_SOC (dev_soc);MemoryRegion *sys_mem =get_system_memory (); +DeviceState *dev; +SysBusDevice *busdev; +Error *err =NULL ;object_property_set_str (OBJECT (&s->cpus), ms->cpu_type,"cpu-type" , &error_abort);
@@ -120,6 +127,16 @@ static void riscv_lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp)memory_region_add_subregion (sys_mem, memmap[IBEX_FLASH ].base, &s->flash_mem); +/* PLIC */ + dev =DEVICE (&s->plic); +object_property_set_bool (OBJECT (&s->plic), true,"realized" , &err); +if (err !=NULL ) { +error_propagate (errp, err); +return ; + } + busdev =SYS_BUS_DEVICE (dev); +sysbus_mmio_map (busdev,0 , memmap[IBEX_PLIC ].base); +create_unimplemented_device ("riscv.lowrisc.ibex.uart" , memmap[IBEX_UART ].base, memmap[IBEX_UART ].size); create_unimplemented_device("riscv.lowrisc.ibex.gpio",
@@ -134,8 +151,6 @@ static void riscv_lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp) memmap[IBEX_AES].base, memmap[IBEX_AES].size);create_unimplemented_device ("riscv.lowrisc.ibex.hmac" , memmap[IBEX_HMAC ].base, memmap[IBEX_HMAC ].size); -create_unimplemented_device ("riscv.lowrisc.ibex.plic" , - memmap[IBEX_PLIC ].base, memmap[IBEX_PLIC ].size);create_unimplemented_device ("riscv.lowrisc.ibex.pinmux" , memmap[IBEX_PINMUX ].base, memmap[IBEX_PINMUX ].size); create_unimplemented_device("riscv.lowrisc.ibex.alert_handler",
include/hw/riscv/opentitan.h +3 -0
@@ -20,6 +20,7 @@#define HW_OPENTITAN_H #include "hw/riscv/riscv_hart.h" +#include "hw/intc/ibex_plic.h" #define TYPE_RISCV_IBEX_SOC "riscv.lowrisc.ibex.soc"#define RISCV_IBEX_SOC (obj) \
@@ -31,6 +32,8 @@ typedef struct LowRISCIbexSoCState {/*< public >*/ RISCVHartArrayState cpus; +IbexPlicState plic; +MemoryRegion flash_mem;MemoryRegion rom; } LowRISCIbexSoCState;
Signature · 1 line
2.26.2
PATCH 8/9 riscv/opentitan: Connect the UART device
In reply to Alistair FrancisFrom: Alistair Francis <[email protected]>
--- hw/riscv/opentitan.c | 24 ++++++++++++++++++++++-- include/hw/riscv/opentitan.h | 13 +++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-)
hw/riscv/opentitan.c +22 -2
@@ -96,6 +96,9 @@ static void riscv_lowrisc_ibex_soc_init(Object *obj)sysbus_init_child_obj (obj,"plic" , &s->plic,sizeof (s->plic),TYPE_IBEX_PLIC ); + +sysbus_init_child_obj (obj,"uart" , &s->uart, +sizeof (s->uart),TYPE_IBEX_UART ); }static void riscv_lowrisc_ibex_soc_realize (DeviceState *dev_soc,Error **errp)
@@ -137,8 +140,25 @@ static void riscv_lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp) busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 , memmap[IBEX_PLIC ].base); -create_unimplemented_device ("riscv.lowrisc.ibex.uart" , - memmap[IBEX_UART ].base, memmap[IBEX_UART ].size); +/* UART */ + dev =DEVICE (&(s->uart)); +qdev_prop_set_chr (dev,"chardev" ,serial_hd (0 )); +object_property_set_bool (OBJECT (&s->uart), true,"realized" , &err); +if (err !=NULL ) { +error_propagate (errp, err); +return ; + } + busdev =SYS_BUS_DEVICE (dev); +sysbus_mmio_map (busdev,0 , memmap[IBEX_UART ].base); +sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (DEVICE (&s->plic), +IBEX_UART_TX_WATERMARK_IRQ )); +sysbus_connect_irq (busdev,1 ,qdev_get_gpio_in (DEVICE (&s->plic), +IBEX_UART_RX_WATERMARK_IRQ )); +sysbus_connect_irq (busdev,2 ,qdev_get_gpio_in (DEVICE (&s->plic), +IBEX_UART_TX_EMPTY_IRQ )); +sysbus_connect_irq (busdev,3 ,qdev_get_gpio_in (DEVICE (&s->plic), +IBEX_UART_RX_OVERFLOW_IRQ )); +create_unimplemented_device ("riscv.lowrisc.ibex.gpio" , memmap[IBEX_GPIO ].base, memmap[IBEX_GPIO ].size); create_unimplemented_device("riscv.lowrisc.ibex.spi",
include/hw/riscv/opentitan.h +13 -0
@@ -21,6 +21,7 @@#include "hw/riscv/riscv_hart.h" #include "hw/intc/ibex_plic.h" +#include "hw/char/ibex_uart.h" #define TYPE_RISCV_IBEX_SOC "riscv.lowrisc.ibex.soc"#define RISCV_IBEX_SOC (obj) \
@@ -33,6 +34,7 @@ typedef struct LowRISCIbexSoCState {/*< public >*/ RISCVHartArrayState cpus;IbexPlicState plic; +IbexUartState uart;MemoryRegion flash_mem;MemoryRegion rom;
@@ -63,4 +65,15 @@ enum { IBEX_USBDEV, }; +enum { +IBEX_UART_RX_PARITY_ERR_IRQ =0x28 , +IBEX_UART_RX_TIMEOUT_IRQ =0x27 , +IBEX_UART_RX_BREAK_ERR_IRQ =0x26 , +IBEX_UART_RX_FRAME_ERR_IRQ =0x25 , +IBEX_UART_RX_OVERFLOW_IRQ =0x24 , +IBEX_UART_TX_EMPTY_IRQ =0x23 , +IBEX_UART_RX_WATERMARK_IRQ =0x22 , +IBEX_UART_TX_WATERMARK_IRQ =0x21 +}; +#endif
Signature · 1 line
2.26.2
PATCH 9/9 target/riscv: Use a smaller guess size for no-MMU PMP
In reply to Alistair FrancisFrom: Alistair Francis <[email protected]>
--- target/riscv/pmp.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
target/riscv/pmp.c +14 -5
@@ -233,12 +233,21 @@ bool pmp_hart_has_privs(CPURISCVState *env, target_ulong addr,return true; } -/* -* if size is unknown (0), assume that all bytes -* from addr to the end of the page will be accessed. -*/ if (size ==0 ) { - pmp_size = -(addr |TARGET_PAGE_MASK ); +if (!riscv_feature (env,RISCV_FEATURE_MMU )) { +/* +* if size is unknown (0), assume that all bytes +* from addr to the end of the page will be accessed. +*/ + pmp_size = -(addr |TARGET_PAGE_MASK ); + }else { +/* +* If size is unknown (0) and we don't have an MMU, +* just guess the size as the xlen as we don't want to +* access an entire page worth. +*/ + pmp_size =sizeof (target_ulong); + } }else { pmp_size = size; }
Signature · 1 line
2.26.2