arm: microbit Non-Volatile Memory Controller
v3 cover arm: microbit Non-Volatile Memory Controller
v3:
* Fix endianness of s->storage[], tested by Joel Stanley <[email protected]> on big-endian ppc [Peter]
* Fix off-by-one that prevented clearing the last page of flash
* Add missing memory_region_flush_rom_device() call to flash_write()
v2:
* Add Patch 2 to call memory_region_flush_rom_device() from pflash devices [Peter]
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]
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/hw/arm/nrf51_soc.h | 2 + include/hw/nvram/nrf51_nvm.h | 64 ++++++ hw/arm/nrf51_soc.c | 41 ++-- hw/nvram/nrf51_nvm.c | 388 +++++++++++++++++++++++++++++++++++ tests/microbit-test.c | 108 ++++++++++ 6 files changed, 592 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 v3 1/3 hw/nvram/nrf51_nvm: Add nRF51 non-volatile memories
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 ]---
v3:
* Fix endianness of s->storage[] [Peter]
* Fix off-by-one that prevented clearing the last page of flash
* Add missing memory_region_flush_rom_device() call to flash_write()
v2:
* 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 | 388 +++++++++++++++++++++++++++++++++++ 3 files changed, 453 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 +388 -0
388 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v3 1/3] hw/nvram/nrf51_nvm: Add nRF51 non-volatile memories
hw/nvram/nrf51_nvm.c line 282
Quoted 9 lines · Stefan Hajnoczi
hw/nvram/nrf51_nvm.c new file +9
-0+static void flash_write (void *opaque,hwaddr offset,uint64_t value, +unsigned int size) +{ +NRF51NVMState *s =NRF51_NVM (opaque); + +if (s->config &NRF51_NVMC_CONFIG_WEN ) { +uint32_t oldval; + +assert (offset < s->flash_size);
This would be better as "offset + 4 < s->flash_size", since we're going to be reading 4 bytes, not just 1. (Or "offset + size", though our MemoryRegionOps fields guarantee that size == 4.)
hw/nvram/nrf51_nvm.c line 295
Quoted 13 lines
hw/nvram/nrf51_nvm.c new file +13
-0+ +/* NOR Flash only allows bits to be flipped from 1's to 0's on write */ + oldval =ldl_le_p (s->storage + offset); + oldval &= value; +stl_le_p (s->storage + offset, oldval); + +memory_region_flush_rom_device (&s->flash, offset, size); + }else { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Flash write 0x%" HWADDR_PRIx" while flash not writable.\n" , + __func__, offset); + } +}
otherwise
thanks
-- PMM
PATCH v3 2/3 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 v3 3/3 tests/microbit-test: Add tests for nRF51 NVMC
In reply to Stefan HajnocziFrom: Steffen Görtz <[email protected]>
--- tests/microbit-test.c | 108 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+)
tests/microbit-test.c +108 -0
@@ -21,6 +21,7 @@#include "hw/arm/nrf51.h" #include "hw/char/nrf51_uart.h" #include "hw/gpio/nrf51_gpio.h" +#include "hw/nvram/nrf51_nvm.h" #include "hw/timer/nrf51_timer.h" #include "hw/i2c/microbit_i2c.h"
@@ -156,6 +157,112 @@ static void test_microbit_i2c(void)qtest_quit (qts); } +#define FLASH_SIZE (256 * NRF51_PAGE_SIZE) + +static void fill_and_erase (QTestState *qts,hwaddr base,hwaddr size, +uint32_t address_reg) +{ +hwaddr i; + +/* Erase Page */ +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x02 ); +qtest_writel (qts,NRF51_NVMC_BASE + address_reg, base); +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +/* Check memory */ +for (i =0 ; i < size /4 ; i++) { + g_assert_cmpuint(qtest_readl(qts, base + i * 4), ==, 0xFFFFFFFF); + } + +/* Fill memory */ +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x01 ); +for (i =0 ; i < size /4 ; i++) { +qtest_writel (qts, base + i *4 , i); + g_assert_cmpuint(qtest_readl(qts, base + i * 4), ==, i); + } +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); +} + +static void test_nrf51_nvmc (void ) +{ +uint32_t value; +hwaddr i; +QTestState *qts =qtest_init ("-M microbit" ); + +/* Test always ready */ + value =qtest_readl (qts,NRF51_NVMC_BASE +NRF51_NVMC_READY ); + g_assert_cmpuint(value & 0x01, ==, 0x01); + +/* Test write-read config register */ +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x03 ); +g_assert_cmpuint (qtest_readl (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ), + ==, 0x03); +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); +g_assert_cmpuint (qtest_readl (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ), + ==, 0x00); + +/* Test PCR0 */ +fill_and_erase (qts,NRF51_FLASH_BASE ,NRF51_PAGE_SIZE , +NRF51_NVMC_ERASEPCR0 ); +fill_and_erase (qts,NRF51_FLASH_BASE +NRF51_PAGE_SIZE , +NRF51_PAGE_SIZE ,NRF51_NVMC_ERASEPCR0 ); + +/* Test PCR1 */ +fill_and_erase (qts,NRF51_FLASH_BASE ,NRF51_PAGE_SIZE , +NRF51_NVMC_ERASEPCR1 ); +fill_and_erase (qts,NRF51_FLASH_BASE +NRF51_PAGE_SIZE , +NRF51_PAGE_SIZE ,NRF51_NVMC_ERASEPCR1 ); + +/* Erase all */ +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x02 ); +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_ERASEALL ,0x01 ); +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x01 ); +for (i =0 ; i <FLASH_SIZE /4 ; i++) { +qtest_writel (qts,NRF51_FLASH_BASE + i *4 , i); + g_assert_cmpuint(qtest_readl(qts, NRF51_FLASH_BASE + i * 4), ==, i); + } +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x02 ); +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_ERASEALL ,0x01 ); +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +for (i =0 ; i <FLASH_SIZE /4 ; i++) { +g_assert_cmpuint (qtest_readl (qts,NRF51_FLASH_BASE + i *4 ), + ==, 0xFFFFFFFF); + } + +/* Erase UICR */ +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x02 ); +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_ERASEUICR ,0x01 ); +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +for (i =0 ; i <NRF51_UICR_SIZE /4 ; i++) { +g_assert_cmpuint (qtest_readl (qts,NRF51_UICR_BASE + i *4 ), + ==, 0xFFFFFFFF); + } + +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x01 ); +for (i =0 ; i <NRF51_UICR_SIZE /4 ; i++) { +qtest_writel (qts,NRF51_UICR_BASE + i *4 , i); + g_assert_cmpuint(qtest_readl(qts, NRF51_UICR_BASE + i * 4), ==, i); + } +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x02 ); +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_ERASEUICR ,0x01 ); +qtest_writel (qts,NRF51_NVMC_BASE +NRF51_NVMC_CONFIG ,0x00 ); + +for (i =0 ; i <NRF51_UICR_SIZE /4 ; i++) { +g_assert_cmpuint (qtest_readl (qts,NRF51_UICR_BASE + i *4 ), + ==, 0xFFFFFFFF); + } + +qtest_quit (qts); +} +static void test_nrf51_gpio (void ) {size_t i;
@@ -392,6 +499,7 @@ int main(int argc, char **argv)qtest_add_func ("/microbit/nrf51/uart" , test_nrf51_uart);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);qtest_add_func ("/microbit/microbit/i2c" , test_microbit_i2c);
Signature · 1 line
2.20.1
Re: [Qemu-arm] [PATCH v3 3/3] tests/microbit-test: Add tests for nRF51 NVMC
Quoted 7 lines · Stefan Hajnoczi
From: Steffen Görtz <[email protected]>
Signed-off-by Steffen Görtz <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>Acked-by Thomas Huth <[email protected]>---
thanks
-- PMM