diff mbox series

[3/7] tests: Add bbc:microbit / nRF51 test suite

Message ID 20180806100114.21410-4-contrib@steffen-goertz.de
State New
Headers show
Series arm: nRF51 Devices and Microbit Support | expand

Commit Message

Steffen Görtz Aug. 6, 2018, 10:01 a.m. UTC
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 <contrib@steffen-goertz.de>
---
 tests/Makefile.include |   2 +
 tests/microbit-test.c  | 126 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+)
 create mode 100644 tests/microbit-test.c

Comments

Stefan Hajnoczi Aug. 8, 2018, 9:09 a.m. UTC | #1
On Mon, Aug 6, 2018 at 11:01 AM, Steffen Görtz
<contrib@steffen-goertz.de> wrote:
> +#define PAGE_SIZE           1024
> +#define FLASH_SIZE          (256 * PAGE_SIZE)
> +#define FLASH_BASE          0x00000000
> +#define UICR_BASE           0x10001000
> +#define UICR_SIZE           0x100
> +#define NVMC_BASE           0x4001E000UL
> +#define NVMC_READY          0x400
> +#define NVMC_CONFIG         0x504
> +#define NVMC_ERASEPAGE      0x508
> +#define NVMC_ERASEPCR1      0x508
> +#define NVMC_ERASEALL       0x50C
> +#define NVMC_ERASEPCR0      0x510
> +#define NVMC_ERASEUICR      0x514

All these constants could live in include/hw/arm/nrf51.h.  That way
tests do not need to duplicate them.  As more devices are implemented
we can expect this list to grow.

> +static void fill_and_erase(hwaddr base, hwaddr size, uint32_t address_reg)

Why hwaddr?  writel() and friends use uint64_t.
Cameron Esfahani via Aug. 8, 2018, 9:46 a.m. UTC | #2
On 08.08.2018 12:09, Stefan Hajnoczi wrote:
> On Mon, Aug 6, 2018 at 11:01 AM, Steffen Görtz
> <contrib@steffen-goertz.de> wrote:
>> +#define PAGE_SIZE           1024
>> +#define FLASH_SIZE          (256 * PAGE_SIZE)
>> +#define FLASH_BASE          0x00000000
>> +#define UICR_BASE           0x10001000
>> +#define UICR_SIZE           0x100
>> +#define NVMC_BASE           0x4001E000UL
>> +#define NVMC_READY          0x400
>> +#define NVMC_CONFIG         0x504
>> +#define NVMC_ERASEPAGE      0x508
>> +#define NVMC_ERASEPCR1      0x508
>> +#define NVMC_ERASEALL       0x50C
>> +#define NVMC_ERASEPCR0      0x510
>> +#define NVMC_ERASEUICR      0x514
> 
> All these constants could live in include/hw/arm/nrf51.h.  That way
> tests do not need to duplicate them.  As more devices are implemented
> we can expect this list to grow.

Maybe it's better to move them to device headers?
include/hw/arm/nrf51.h has to include them in any case to use device
types.

Best regards, Julia Suvorova.
Stefan Hajnoczi Aug. 9, 2018, 4:16 p.m. UTC | #3
On Wed, Aug 8, 2018 at 10:46 AM, Julia Suvorova <jusual@mail.ru> wrote:
> On 08.08.2018 12:09, Stefan Hajnoczi wrote:
>>
>> On Mon, Aug 6, 2018 at 11:01 AM, Steffen Görtz
>> <contrib@steffen-goertz.de> wrote:
>>>
>>> +#define PAGE_SIZE           1024
>>> +#define FLASH_SIZE          (256 * PAGE_SIZE)
>>> +#define FLASH_BASE          0x00000000
>>> +#define UICR_BASE           0x10001000
>>> +#define UICR_SIZE           0x100
>>> +#define NVMC_BASE           0x4001E000UL
>>> +#define NVMC_READY          0x400
>>> +#define NVMC_CONFIG         0x504
>>> +#define NVMC_ERASEPAGE      0x508
>>> +#define NVMC_ERASEPCR1      0x508
>>> +#define NVMC_ERASEALL       0x50C
>>> +#define NVMC_ERASEPCR0      0x510
>>> +#define NVMC_ERASEUICR      0x514
>>
>>
>> All these constants could live in include/hw/arm/nrf51.h.  That way
>> tests do not need to duplicate them.  As more devices are implemented
>> we can expect this list to grow.
>
>
> Maybe it's better to move them to device headers?
> include/hw/arm/nrf51.h has to include them in any case to use device
> types.

That would be fine.  Each device (uart, rng, etc) would have it's own
include/hw/... header file and test cases can include that file to get
the constants/structs.

Stefan
diff mbox series

Patch

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 760a0f18b6..1f1206e33a 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -378,6 +378,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)
 gcov-files-arm-y += hw/misc/tmp105.c
 check-qtest-arm-y += tests/virtio-blk-test$(EXESUF)
@@ -793,6 +794,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..9f83063cf3
--- /dev/null
+++ b/tests/microbit-test.c
@@ -0,0 +1,126 @@ 
+ /*
+ * 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 <contrib@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"
+
+
+#define PAGE_SIZE           1024
+#define FLASH_SIZE          (256 * PAGE_SIZE)
+#define FLASH_BASE          0x00000000
+#define UICR_BASE           0x10001000
+#define UICR_SIZE           0x100
+#define NVMC_BASE           0x4001E000UL
+#define NVMC_READY          0x400
+#define NVMC_CONFIG         0x504
+#define NVMC_ERASEPAGE      0x508
+#define NVMC_ERASEPCR1      0x508
+#define NVMC_ERASEALL       0x50C
+#define NVMC_ERASEPCR0      0x510
+#define NVMC_ERASEUICR      0x514
+
+
+static void fill_and_erase(hwaddr base, hwaddr size, uint32_t address_reg)
+{
+    /* Fill memory */
+    writel(NVMC_BASE + NVMC_CONFIG, 0x01);
+    for (hwaddr i = 0; i < size; ++i) {
+        writeb(base + i, i);
+        g_assert_cmpuint(readb(base + i), ==, i & 0xFF);
+    }
+    writel(NVMC_BASE + NVMC_CONFIG, 0x00);
+
+    /* Erase Page */
+    writel(NVMC_BASE + NVMC_CONFIG, 0x02);
+    writel(NVMC_BASE + address_reg, base);
+    writel(NVMC_BASE + NVMC_CONFIG, 0x00);
+
+    /* Check memory */
+    for (hwaddr i = 0; i < size; ++i) {
+        g_assert_cmpuint(readb(base + i), ==, 0xFF);
+    }
+}
+
+static void test_nrf51_nvmc(void)
+{
+    uint32_t value;
+    /* Test always ready */
+    value = readl(NVMC_BASE + NVMC_READY);
+    g_assert_cmpuint(value & 0x01, ==, 0x01);
+
+    /* Test write-read config register */
+    writel(NVMC_BASE + NVMC_CONFIG, 0x03);
+    g_assert_cmpuint(readl(NVMC_BASE + NVMC_CONFIG), ==, 0x03);
+    writel(NVMC_BASE + NVMC_CONFIG, 0x00);
+    g_assert_cmpuint(readl(NVMC_BASE + NVMC_CONFIG), ==, 0x00);
+
+    /* Test PCR0 */
+    fill_and_erase(FLASH_BASE, PAGE_SIZE, NVMC_ERASEPCR0);
+    fill_and_erase(FLASH_BASE + PAGE_SIZE, PAGE_SIZE, NVMC_ERASEPCR0);
+
+    /* Test PCR1 */
+    fill_and_erase(FLASH_BASE, PAGE_SIZE, NVMC_ERASEPCR1);
+    fill_and_erase(FLASH_BASE + PAGE_SIZE, PAGE_SIZE, NVMC_ERASEPCR1);
+
+    /* Erase all */
+    writel(NVMC_BASE + NVMC_CONFIG, 0x01);
+    for (hwaddr i = 0; i < FLASH_SIZE / 4; i++) {
+        writel(FLASH_BASE + i * 4, i);
+        g_assert_cmpuint(readl(FLASH_BASE + i * 4), ==, i);
+    }
+    writel(NVMC_BASE + NVMC_CONFIG, 0x00);
+
+    writel(NVMC_BASE + NVMC_CONFIG, 0x02);
+    writel(NVMC_BASE + NVMC_ERASEALL, 0x01);
+    writel(NVMC_BASE + NVMC_CONFIG, 0x00);
+
+    for (hwaddr i = 0; i < FLASH_SIZE / 4; i++) {
+        g_assert_cmpuint(readl(FLASH_BASE + i * 4), ==, 0xFFFFFFFF);
+    }
+
+    /* Erase UICR */
+    writel(NVMC_BASE + NVMC_CONFIG, 0x01);
+    for (hwaddr i = 0; i < UICR_SIZE / 4; i++) {
+        writel(UICR_BASE + i * 4, i);
+        g_assert_cmpuint(readl(UICR_BASE + i * 4), ==, i);
+    }
+    writel(NVMC_BASE + NVMC_CONFIG, 0x00);
+
+    writel(NVMC_BASE + NVMC_CONFIG, 0x02);
+    writel(NVMC_BASE + NVMC_ERASEUICR, 0x01);
+    writel(NVMC_BASE + NVMC_CONFIG, 0x00);
+
+    for (hwaddr i = 0; i < UICR_SIZE / 4; i++) {
+        g_assert_cmpuint(readl(UICR_BASE + i * 4), ==, 0xFFFFFFFF);
+    }
+}
+
+int main(int argc, char **argv)
+{
+    int ret;
+
+    g_test_init(&argc, &argv, NULL);
+
+    global_qtest = qtest_startf("-machine microbit");
+
+    qtest_add_func("/microbit/nrf51/nvmc", test_nrf51_nvmc);
+
+    ret = g_test_run();
+
+    qtest_quit(global_qtest);
+    return ret;
+}