On 2019-01-24 15:11, Stefan Hajnoczi wrote:
> From: Steffen Görtz <cont...@steffen-goertz.de>
>
> Signed-off-by: Steffen Görtz <cont...@steffen-goertz.de>
> Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com>
> ---
> This resolves the conflict with Julia's UART test series due to
> global_qtest removal.
>
> tests/microbit-test.c | 108 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 108 insertions(+)
>
> diff --git a/tests/microbit-test.c b/tests/microbit-test.c
> index 3bad947b6c..04e199ec33 100644
> --- a/tests/microbit-test.c
> +++ b/tests/microbit-test.c
> @@ -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);
Thank you for getting rid of global_qtest stuff also here!
Acked-by: Thomas Huth <th...@redhat.com>
