arm: microbit Non-Volatile Memory Controller
cover arm: microbit Non-Volatile Memory Controller
This series adds the Non-Volatile Memory Controller, which controls access to the User Information Control Registers (UICR), Factory Information Control Registers (FICR), and flash memory.
This is the last piece of microbit work needed to make basic programs like Micropython "Hello world" work under QEMU.
Originally sent as part of Steffen's longer microbit device emulation series, I extracted this and deferred it until later because cleanups were necessary:
* Use memory_region_flush_rom_device() to dirty/invalidate memory [Peter] ^--- Paolo: I CCed you on this new memory API
* Fix device-introspect-test segfault due to missing owner when initializing FICR and UICR memory regions [Peter]
* Fix off-by-one assertion checks [Peter]
* Fix missing whitespace at end of comment [Peter]
* Clear UICR on reset - we'd need a block device for true non-volatility [Peter]
Stefan Hajnoczi (1):
memory: add memory_region_flush_rom_device()
Steffen Görtz (3):
hw/nvram/nrf51_nvm: Add nRF51 non-volatile memories
arm: Instantiate NRF51 special NVM's and NVMC tests/microbit-test: Add tests for nRF51 NVMC
hw/nvram/Makefile.objs | 1 + include/exec/memory.h | 18 ++ include/hw/arm/nrf51_soc.h | 2 + include/hw/nvram/nrf51_nvm.h | 64 ++++++ exec.c | 12 ++ hw/arm/nrf51_soc.c | 41 ++-- hw/nvram/nrf51_nvm.c | 381 +++++++++++++++++++++++++++++++++++ tests/microbit-test.c | 97 +++++++++ 8 files changed, 604 insertions(+), 12 deletions(-) create mode 100644 include/hw/nvram/nrf51_nvm.h create mode 100644 hw/nvram/nrf51_nvm.c
Signature · 1 line
2.20.1
PATCH 1/4 memory: add memory_region_flush_rom_device()
ROM devices go via MemoryRegionOps->write() callbacks for write operations and do not dirty/invalidate that memory. Device emulation must be able to mark memory ranges that have been modified internally (e.g. using memory_region_get_ram_ptr()).
Introduce the memory_region_flush_rom_device() API for this purpose.
--- include/exec/memory.h | 18 ++++++++++++++++++ exec.c | 12 ++++++++++++ 2 files changed, 30 insertions(+)
include/exec/memory.h +18 -0
@@ -1344,6 +1344,24 @@ bool memory_region_snapshot_get_dirty(MemoryRegion *mr,void memory_region_reset_dirty (MemoryRegion *mr,hwaddr addr,hwaddr size,unsigned client); +/** +* memory_region_flush_rom_device: Mark a range of pages dirty and invalidate +* TBs (for self-modifying code). +* +* The MemoryRegionOps->write() callback of a ROM device must use this function +* to mark byte ranges that have been modified internally, such as by directly +* accessing the memory returned by memory_region_get_ram_ptr(). +* +* This function marks the range dirty and invalidates TBs so that TCG can +* detect self-modifying code. +* +* @mr: the region being flushed. +* @addr: the start, relative to the start of the region, of the range being +* flushed. +* @size: the size, in bytes, of the range being flushed. +*/ +void memory_region_flush_rom_device (MemoryRegion *mr,hwaddr addr,hwaddr size); +/** * memory_region_set_readonly: Turn a memory region read-only (or read-write) *
exec.c +12 -0
@@ -3162,6 +3162,18 @@ static void invalidate_and_set_dirty(MemoryRegion *mr, hwaddr addr,cpu_physical_memory_set_dirty_range (addr, length, dirty_log_mask); } +void memory_region_flush_rom_device (MemoryRegion *mr,hwaddr addr,hwaddr size) +{ +/* In principle this function would work on other memory region types too, +* but the ROM device use case is the only one where this operation is +* necessary. Other memory regions should use the +* address_space_read/write() APIs. +*/ +assert (memory_region_is_romd (mr)); + +invalidate_and_set_dirty (mr, addr, size); +} +static int memory_access_size (MemoryRegion *mr,unsigned l,hwaddr addr) {unsigned access_size_max = mr->ops->valid.max_access_size;
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH 1/4] memory: add memory_region_flush_rom_device()
Quoted 56 lines · Stefan Hajnoczi
ROM devices go via
MemoryRegionOps->write()callbacks for write operations and do not dirty/invalidate that memory. Device emulation must be able to mark memory ranges that have been modified internally (e.g. usingmemory_region_get_ram_ptr()).Introduce the
memory_region_flush_rom_device()API for this purpose.Signed-off-by Stefan Hajnoczi <[email protected]>--- include/exec/memory.h | 18 ++++++++++++++++++ exec.c | 12 ++++++++++++ 2 files changed, 30 insertions(+)include/exec/memory.h +18
-0@@ -1344,6 +1344,24 @@ bool memory_region_snapshot_get_dirty(MemoryRegion *mr,void memory_region_reset_dirty (MemoryRegion *mr,hwaddr addr,hwaddr size,unsigned client); +/** +* memory_region_flush_rom_device: Mark a range of pages dirty and invalidate +* TBs (for self-modifying code). +* +* The MemoryRegionOps->write() callback of a ROM device must use this function +* to mark byte ranges that have been modified internally, such as by directly +* accessing the memory returned by memory_region_get_ram_ptr(). +* +* This function marks the range dirty and invalidates TBs so that TCG can +* detect self-modifying code. +* +* @mr: the region being flushed. +* @addr: the start, relative to the start of the region, of the range being +* flushed. +* @size: the size, in bytes, of the range being flushed. +*/ +void memory_region_flush_rom_device (MemoryRegion *mr,hwaddr addr,hwaddr size); +/** * memory_region_set_readonly: Turn a memory region read-only (or read-write) * exec.c +5
-0@@ -3162,6 +3162,18 @@ static void invalidate_and_set_dirty(MemoryRegion *mr, hwaddr addr,cpu_physical_memory_set_dirty_range (addr, length, dirty_log_mask); } +void memory_region_flush_rom_device (MemoryRegion *mr,hwaddr addr,hwaddr size) +{ +/* In principle this function would work on other memory region types too, +* but the ROM device use case is the only one where this operation is +* necessary. Other memory regions should use the
exec.c static void invalidate_and_set_dirty(MemoryRegion *mr, hwaddr addr, · line 3179
Quoted 10 lines
exec.c +7
-0+* address_space_read/write() APIs. +*/ +assert (memory_region_is_romd (mr)); + +invalidate_and_set_dirty (mr, addr, size); +} +static int memory_access_size (MemoryRegion *mr,unsigned l,hwaddr addr) {unsigned access_size_max = mr->ops->valid.max_access_size;
API and implementation make sense to me, but better that Paolo reviews this I think. I guess we should add calls to this to the pflash device models too...
thanks
-- PMM
Re: [Qemu-devel] [PATCH 1/4] memory: add memory_region_flush_rom_device()
Quoted 10 lines · Peter Maydell
Quoted 10 lines
exec.c +10
-0+void memory_region_flush_rom_device (MemoryRegion *mr,hwaddr addr,hwaddr size) +{ +/* In principle this function would work on other memory region types too, +* but the ROM device use case is the only one where this operation is +* necessary. Other memory regions should use the +* address_space_read/write() APIs. +*/ +assert (memory_region_is_romd (mr)); + +invalidate_and_set_dirty (mr, addr, size);
Quoted 8 lines
exec.c static void invalidate_and_set_dirty(MemoryRegion *mr, hwaddr addr, · line 3179
Quoted 5 lines
exec.c +2
-0+} +static int memory_access_size (MemoryRegion *mr,unsigned l,hwaddr addr) {unsigned access_size_max = mr->ops->valid.max_access_size;API and implementation make sense to me, but better that Paolo reviews this I think. I guess we should add calls to this to the pflash device models too...
Yes, I agree. The implementation makes sense, though maybe we could
just rename invalidate_and_set_dirty to memory_region_invalidate_and_set_dirty. Whatever you guys prefer.
Paolo
Re: [Qemu-arm] [Qemu-devel] [PATCH 1/4] memory: add memory_region_flush_rom_device()
In reply to Peter MaydellQuoted 63 lines · Peter Maydell
Quoted 62 lines · Stefan Hajnoczi
ROM devices go via
MemoryRegionOps->write()callbacks for write operations and do not dirty/invalidate that memory. Device emulation must be able to mark memory ranges that have been modified internally (e.g. usingmemory_region_get_ram_ptr()).Introduce the
memory_region_flush_rom_device()API for this purpose.Signed-off-by Stefan Hajnoczi <[email protected]>--- include/exec/memory.h | 18 ++++++++++++++++++ exec.c | 12 ++++++++++++ 2 files changed, 30 insertions(+)include/exec/memory.h +18
-0@@ -1344,6 +1344,24 @@ bool memory_region_snapshot_get_dirty(MemoryRegion *mr,void memory_region_reset_dirty (MemoryRegion *mr,hwaddr addr,hwaddr size,unsigned client); +/** +* memory_region_flush_rom_device: Mark a range of pages dirty and invalidate +* TBs (for self-modifying code). +* +* The MemoryRegionOps->write() callback of a ROM device must use this function +* to mark byte ranges that have been modified internally, such as by directly +* accessing the memory returned by memory_region_get_ram_ptr(). +* +* This function marks the range dirty and invalidates TBs so that TCG can +* detect self-modifying code. +* +* @mr: the region being flushed. +* @addr: the start, relative to the start of the region, of the range being +* flushed. +* @size: the size, in bytes, of the range being flushed. +*/ +void memory_region_flush_rom_device (MemoryRegion *mr,hwaddr addr,hwaddr size); +/** * memory_region_set_readonly: Turn a memory region read-only (or read-write) * exec.c +11
-0@@ -3162,6 +3162,18 @@ static void invalidate_and_set_dirty(MemoryRegion *mr, hwaddr addr,cpu_physical_memory_set_dirty_range (addr, length, dirty_log_mask); } +void memory_region_flush_rom_device (MemoryRegion *mr,hwaddr addr,hwaddr size) +{ +/* In principle this function would work on other memory region types too, +* but the ROM device use case is the only one where this operation is +* necessary. Other memory regions should use the +* address_space_read/write() APIs. +*/ +assert (memory_region_is_romd (mr)); + +invalidate_and_set_dirty (mr, addr, size); +}
Quoted 8 lines
exec.c static void invalidate_and_set_dirty(MemoryRegion *mr, hwaddr addr, · line 3179
Quoted 4 lines
exec.c +1
-0+static int memory_access_size (MemoryRegion *mr,unsigned l,hwaddr addr) {unsigned access_size_max = mr->ops->valid.max_access_size;API and implementation make sense to me, but better that Paolo reviews this I think. I guess we should add calls to this to the pflash device models too...
Okay, will cover pflash in the next revision.
Stefan
Re: [Qemu-devel] [PATCH 1/4] memory: add memory_region_flush_rom_device()
Quoted 7 lines · Stefan Hajnoczi
Quoted 3 lines · Peter Maydell
API and implementation make sense to me, but better that Paolo reviews this I think. I guess we should add calls to this to the pflash device models too...
Okay, will cover pflash in the next revision.
We can do that as a separate patch, since it's not related to the microbit work. For this lot we just need to make a decision about whether to do this this way or have as Paolo suggested "memory_region_invalidate_and_set_dirty()". I don't have a strong opinion, and it sounded like Paolo didn't either, so let's go with the code you have here.
I can take this patchset via target-arm.next.
thanks
-- PMM
PATCH 2/4 hw/nvram/nrf51_nvm: Add nRF51 non-volatile memories
In reply to Stefan HajnocziFrom: Steffen Görtz <[email protected]>
The nRF51 contains three regions of non-volatile memory (NVM):
- CODE (R/W): contains code
- FICR (R): Factory information like code size, chip id etc.
- UICR (R/W): Changeable configuration data. Lock bits, Code protection configuration, Bootloader address, Nordic SoftRadio configuration, Firmware configuration.
Read and write access to the memories is managed by the Non-volatile memory controller.
Memory schema:
[ CPU ] -+- [ NVM, either FICR, UICR or CODE ]
| |
\- [ NVMC ]---
* Fix device-introspect-test segfault due to missing owner when initializing FICR and UICR memory regions [Peter]
* Fix off-by-one assertion checks [Peter]
* Fix missing whitespace at end of comment [Peter]
* Clear UICR on reset - we'd need a block device for true non-volatility [Peter]
* Use memory_region_flush_rom_device() to dirty/invalidate memory [Peter]
--- hw/nvram/Makefile.objs | 1 + include/hw/nvram/nrf51_nvm.h | 64 ++++++ hw/nvram/nrf51_nvm.c | 381 +++++++++++++++++++++++++++++++++++ 3 files changed, 446 insertions(+) create mode 100644 include/hw/nvram/nrf51_nvm.h create mode 100644 hw/nvram/nrf51_nvm.c
hw/nvram/Makefile.objs +1 -0
@@ -5,3 +5,4 @@ common-obj-y += fw_cfg.o common-obj-y += chrp_nvram.o common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o obj-$(CONFIG_PSERIES) += spapr_nvram.o +obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o
include/hw/nvram/nrf51_nvm.h new file +64 -0
64 lines not on this page · raw message
hw/nvram/nrf51_nvm.c new file +381 -0
381 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH 2/4] hw/nvram/nrf51_nvm: Add nRF51 non-volatile memories
Quoted 20 lines · Stefan Hajnoczi
From: Steffen Görtz <[email protected]>
The nRF51 contains three regions of non-volatile memory (NVM):
- CODE (R/W): contains code
- FICR (R): Factory information like code size, chip id etc.
- UICR (R/W): Changeable configuration data. Lock bits, Code protection configuration, Bootloader address, Nordic SoftRadio configuration, Firmware configuration.Read and write access to the memories is managed by the Non-volatile memory controller.
Memory schema:
[ CPU ] -+- [ NVM, either FICR, UICR or CODE ]| | \- [ NVMC ]Signed-off-by Steffen Görtz <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>
Quoted 10 lines
---
* Fix device-introspect-test segfault due to missing owner when initializing FICR and UICR memory regions [Peter]
* Fix off-by-one assertion checks [Peter]
* Fix missing whitespace at end of comment [Peter]
* Clear UICR on reset - we'd need a block device for true non-volatility [Peter]
* Usememory_region_flush_rom_device()to dirty/invalidate memory [Peter]
---
thanks
-- PMM
PATCH 3/4 arm: Instantiate NRF51 special NVM's and NVMC
In reply to Stefan HajnocziFrom: Steffen Görtz <[email protected]>
Instantiates UICR, FICR, FLASH and NVMC in nRF51 SOC.
--- include/hw/arm/nrf51_soc.h | 2 ++ hw/arm/nrf51_soc.c | 41 +++++++++++++++++++++++++++----------- 2 files changed, 31 insertions(+), 12 deletions(-)
include/hw/arm/nrf51_soc.h +2 -0
@@ -15,6 +15,7 @@#include "hw/char/nrf51_uart.h" #include "hw/misc/nrf51_rng.h" #include "hw/gpio/nrf51_gpio.h" +#include "hw/nvram/nrf51_nvm.h" #include "hw/timer/nrf51_timer.h" #define TYPE_NRF51_SOC "nrf51-soc"
@@ -32,6 +33,7 @@ typedef struct NRF51State {NRF51UARTState uart;NRF51RNGState rng; +NRF51NVMState nvm;NRF51GPIOState gpio;NRF51TimerState timer[NRF51_NUM_TIMERS ];
hw/arm/nrf51_soc.c +29 -12
71 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 4/4 tests/microbit-test: Add tests for nRF51 NVMC
In reply to Stefan HajnocziFrom: Steffen Görtz <[email protected]>
--- tests/microbit-test.c | 97 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+)
tests/microbit-test.c +97 -0
@@ -20,8 +20,104 @@#include "hw/arm/nrf51.h" #include "hw/gpio/nrf51_gpio.h" +#include "hw/nvram/nrf51_nvm.h" #include "hw/timer/nrf51_timer.h" +#define FLASH_SIZE (256 * NRF51_PAGE_SIZE) + +static void fill_and_erase (hwaddr base,hwaddr size,uint32_t address_reg) +{ +hwaddr i; + +/* Erase Page */ +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x02 ); +writel (NRF51_NVMC_BASE + address_reg, base); +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +/* Check memory */ +for (i =0 ; i < size /4 ; i++) { + g_assert_cmpuint(readl(base + i * 4), ==, 0xFFFFFFFF); + } + +/* Fill memory */ +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x01 ); +for (i =0 ; i < size /4 ; i++) { +writel (base + i *4 , i); + g_assert_cmpuint(readl(base + i * 4), ==, i); + } +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); +} + +static void test_nrf51_nvmc (void ) +{ +uint32_t value; +hwaddr i; + +/* Test always ready */ + value =readl (NRF51_NVMC_BASE +NRF51_NVMC_READY ); + g_assert_cmpuint(value & 0x01, ==, 0x01); + +/* Test write-read config register */ +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x03 ); + g_assert_cmpuint(readl(NRF51_NVMC_BASE + NRF51_NVMC_CONFIG), ==, 0x03); +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + g_assert_cmpuint(readl(NRF51_NVMC_BASE + NRF51_NVMC_CONFIG), ==, 0x00); + +/* Test PCR0 */ +fill_and_erase (NRF51_FLASH_BASE ,NRF51_PAGE_SIZE ,NRF51_NVMC_ERASEPCR0 ); +fill_and_erase (NRF51_FLASH_BASE +NRF51_PAGE_SIZE , +NRF51_PAGE_SIZE ,NRF51_NVMC_ERASEPCR0 ); + +/* Test PCR1 */ +fill_and_erase (NRF51_FLASH_BASE ,NRF51_PAGE_SIZE ,NRF51_NVMC_ERASEPCR1 ); +fill_and_erase (NRF51_FLASH_BASE +NRF51_PAGE_SIZE , +NRF51_PAGE_SIZE ,NRF51_NVMC_ERASEPCR1 ); + +/* Erase all */ +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x02 ); +writel (NRF51_NVMC_BASE +NRF51_NVMC_ERASEALL ,0x01 ); +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x01 ); +for (i =0 ; i <FLASH_SIZE /4 ; i++) { +writel (NRF51_FLASH_BASE + i *4 , i); + g_assert_cmpuint(readl(NRF51_FLASH_BASE + i * 4), ==, i); + } +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x02 ); +writel (NRF51_NVMC_BASE +NRF51_NVMC_ERASEALL ,0x01 ); +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +for (i =0 ; i <FLASH_SIZE /4 ; i++) { + g_assert_cmpuint(readl(NRF51_FLASH_BASE + i * 4), ==, 0xFFFFFFFF); + } + +/* Erase UICR */ +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x02 ); +writel (NRF51_NVMC_BASE +NRF51_NVMC_ERASEUICR ,0x01 ); +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +for (i =0 ; i <NRF51_UICR_SIZE /4 ; i++) { + g_assert_cmpuint(readl(NRF51_UICR_BASE + i * 4), ==, 0xFFFFFFFF); + } + +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x01 ); +for (i =0 ; i <NRF51_UICR_SIZE /4 ; i++) { +writel (NRF51_UICR_BASE + i *4 , i); + g_assert_cmpuint(readl(NRF51_UICR_BASE + i * 4), ==, i); + } +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x02 ); +writel (NRF51_NVMC_BASE +NRF51_NVMC_ERASEUICR ,0x01 ); +writel (NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +for (i =0 ; i <NRF51_UICR_SIZE /4 ; i++) { + g_assert_cmpuint(readl(NRF51_UICR_BASE + i * 4), ==, 0xFFFFFFFF); + } +} +static void test_nrf51_gpio (void ) {size_t i;
@@ -246,6 +342,7 @@ int main(int argc, char **argv) global_qtest =qtest_initf ("-machine microbit" );qtest_add_func ("/microbit/nrf51/gpio" , test_nrf51_gpio); +qtest_add_func ("/microbit/nrf51/nvmc" , test_nrf51_nvmc);qtest_add_func ("/microbit/nrf51/timer" , test_nrf51_timer); ret =g_test_run ();
Signature · 1 line
2.20.1
Re: [Qemu-arm] [PATCH 4/4] tests/microbit-test: Add tests for nRF51 NVMC
Quoted 5 lines · Stefan Hajnoczi
From: Steffen Görtz <[email protected]>
Signed-off-by Steffen Görtz <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>
thanks
-- PMM