On 2018-11-12 22:42, Steffen Görtz wrote: > The microbit-test includes tests for the nRF51 NVMC > peripheral and will host future nRF51 peripheral tests > and board-level bbc:microbit tests. > > Signed-off-by: Steffen Görtz <cont...@steffen-goertz.de> > Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com> > --- > tests/Makefile.include | 2 + > tests/microbit-test.c | 133 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 135 insertions(+) > create mode 100644 tests/microbit-test.c > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index f77a495109..602346eeed 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -274,6 +274,7 @@ check-qtest-sparc64-y += tests/boot-serial-test$(EXESUF) > check-qtest-arm-y += tests/tmp105-test$(EXESUF) > check-qtest-arm-y += tests/pca9552-test$(EXESUF) > check-qtest-arm-y += tests/ds1338-test$(EXESUF) > +check-qtest-arm-y += tests/microbit-test$(EXESUF) > check-qtest-arm-y += tests/m25p80-test$(EXESUF) > check-qtest-arm-y += tests/virtio-blk-test$(EXESUF) > check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF) > @@ -695,6 +696,7 @@ tests/pxe-test$(EXESUF): tests/pxe-test.o > tests/boot-sector.o $(libqos-obj-y) > tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y) > tests/pca9552-test$(EXESUF): tests/pca9552-test.o $(libqos-omap-obj-y) > tests/ds1338-test$(EXESUF): tests/ds1338-test.o $(libqos-imx-obj-y) > +tests/microbit-test$(EXESUF): tests/microbit-test.o > tests/m25p80-test$(EXESUF): tests/m25p80-test.o > tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y) > tests/q35-test$(EXESUF): tests/q35-test.o $(libqos-pc-obj-y) > diff --git a/tests/microbit-test.c b/tests/microbit-test.c > new file mode 100644 > index 0000000000..40b8b4bc64 > --- /dev/null > +++ b/tests/microbit-test.c > @@ -0,0 +1,133 @@ > + /* > + * QTest testcase for Microbit board using the Nordic Semiconductor nRF51 > SoC. > + * > + * nRF51: > + * Reference Manual: http://infocenter.nordicsemi.com/pdf/nRF51_RM_v3.0.pdf > + * Product Spec: http://infocenter.nordicsemi.com/pdf/nRF51822_PS_v3.1.pdf > + * > + * Microbit Board: http://microbit.org/ > + * > + * Copyright 2018 Steffen Görtz <cont...@steffen-goertz.de> > + * > + * This code is licensed under the GPL version 2 or later. See > + * the COPYING file in the top-level directory. > + */ > + > + > +#include "qemu/osdep.h" > +#include "exec/hwaddr.h" > +#include "libqtest.h" > + > +#include "hw/arm/nrf51.h" > +#include "hw/nvram/nrf51_nvm.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); > + } > +} > + > +int main(int argc, char **argv) > +{ > + int ret; > + > + g_test_init(&argc, &argv, NULL); > + > + global_qtest = qtest_initf("-machine microbit"); > + > + qtest_add_func("/microbit/nrf51/nvmc", test_nrf51_nvmc); > + > + ret = g_test_run(); > + > + qtest_quit(global_qtest); > + return ret; > +}
If you could do me a big favour, then please try to write new qtests without the global_qtest variable. I.e. move the qtest_initf into the test_nrf51_nvmc function and pass around the local test state variable there to qtest_writel() and friends. I just started yet another clean up attempt for some other files, e.g. see here: https://lists.gnu.org/archive/html/qemu-devel/2018-11/msg02196.html (but if this is too much cumbersome right now for you, I also won't object this patch in the current shape - we can still clean this up later) Thomas
