qemu-block
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: [PATCH v2 17/18] test/qtest: Introduce a new aspeed-smc-utils.c to p


From: Jamin Lin
Subject: RE: [PATCH v2 17/18] test/qtest: Introduce a new aspeed-smc-utils.c to place common testcases
Date: Tue, 26 Nov 2024 03:07:30 +0000

Hi Cedric, 

> Subject: Re: [PATCH v2 17/18] test/qtest: Introduce a new aspeed-smc-utils.c 
> to
> > +
> > +typedef struct TestData {
> > +    QTestState *s;
> > +    uint64_t spi_base;> +    uint64_t flash_base;
> > +    uint32_t jedec_id;
> > +    char *tmp_path;
> > +    uint8_t cs;
> > +    const char *node;
> > +    uint32_t page_addr;
> > +} TestData;
> 
> Please replace the type name with AspeedSMCTestData.
> 
> > +
> > +void test_read_jedec(const void *data);
> 
> The above routine needs an 'aspeed_smc' prefix. I think
> 
>       aspeed_smc_test_read_jedec
> 
> should be fine.
> 
> > +void test_erase_sector(const void *data);
> > +void test_erase_all(const void *data);
> > +void test_write_page(const void *data);
> > +void test_read_page_mem(const void *data);
> > +void test_write_page_mem(const void *data);
> > +void test_read_status_reg(const void *data);
> > +void test_status_reg_write_protection(const void *data);
> > +void test_write_block_protect(const void *data);
> > +void test_write_block_protect_bottom_bit(const void *data);
> > +void test_write_page_qpi(const void *data);
> 
> same for these above.
> 
Thanks for review.
Will fix them

Jamin

> Thanks,
> 
> C.
> 
> 
> > +#endif /* TESTS_ASPEED_SMC_UTILS_H */
> > diff --git a/tests/qtest/aspeed_smc-test.c b/tests/qtest/aspeed_smc-test.c
> > index 59f3876cdc..ef3fdc516e 100644
> > --- a/tests/qtest/aspeed_smc-test.c
> > +++ b/tests/qtest/aspeed_smc-test.c
> > @@ -27,705 +27,7 @@
> >   #include "qemu/bswap.h"
> >   #include "libqtest-single.h"
> >   #include "qemu/bitops.h"
> > -
> > -/*
> > - * ASPEED SPI Controller registers
> > - */
> > -#define R_CONF              0x00
> > -#define   CONF_ENABLE_W0       16
> > -#define R_CE_CTRL           0x04
> > -#define   CRTL_EXTENDED0       0  /* 32 bit addressing for SPI */
> > -#define R_CTRL0             0x10
> > -#define   CTRL_IO_QUAD_IO      BIT(31)
> > -#define   CTRL_CE_STOP_ACTIVE  BIT(2)
> > -#define   CTRL_READMODE        0x0
> > -#define   CTRL_FREADMODE       0x1
> > -#define   CTRL_WRITEMODE       0x2
> > -#define   CTRL_USERMODE        0x3
> > -#define SR_WEL BIT(1)
> > -
> > -/*
> > - * Flash commands
> > - */
> > -enum {
> > -    JEDEC_READ = 0x9f,
> > -    RDSR = 0x5,
> > -    WRDI = 0x4,
> > -    BULK_ERASE = 0xc7,
> > -    READ = 0x03,
> > -    PP = 0x02,
> > -    WRSR = 0x1,
> > -    WREN = 0x6,
> > -    SRWD = 0x80,
> > -    RESET_ENABLE = 0x66,
> > -    RESET_MEMORY = 0x99,
> > -    EN_4BYTE_ADDR = 0xB7,
> > -    ERASE_SECTOR = 0xd8,
> > -};
> > -
> > -#define CTRL_IO_MODE_MASK  (BIT(31) | BIT(30) | BIT(29) | BIT(28))
> > -#define FLASH_PAGE_SIZE           256
> > -
> > -typedef struct TestData {
> > -    QTestState *s;
> > -    uint64_t spi_base;
> > -    uint64_t flash_base;
> > -    uint32_t jedec_id;
> > -    char *tmp_path;
> > -    uint8_t cs;
> > -    const char *node;
> > -    uint32_t page_addr;
> > -} TestData;
> > -
> > -/*
> > - * Use an explicit bswap for the values read/wrote to the flash region
> > - * as they are BE and the Aspeed CPU is LE.
> > - */
> > -static inline uint32_t make_be32(uint32_t data)
> > -{
> > -    return bswap32(data);
> > -}
> > -
> > -static inline void spi_writel(const TestData *data, uint64_t offset,
> > -                              uint32_t value)
> > -{
> > -    qtest_writel(data->s, data->spi_base + offset, value);
> > -}
> > -
> > -static inline uint32_t spi_readl(const TestData *data, uint64_t offset)
> > -{
> > -    return qtest_readl(data->s, data->spi_base + offset);
> > -}
> > -
> > -static inline void flash_writeb(const TestData *data, uint64_t offset,
> > -                                uint8_t value)
> > -{
> > -    qtest_writeb(data->s, data->flash_base + offset, value);
> > -}
> > -
> > -static inline void flash_writel(const TestData *data, uint64_t offset,
> > -                                uint32_t value)
> > -{
> > -    qtest_writel(data->s, data->flash_base + offset, value);
> > -}
> > -
> > -static inline uint8_t flash_readb(const TestData *data, uint64_t offset)
> > -{
> > -    return qtest_readb(data->s, data->flash_base + offset);
> > -}
> > -
> > -static inline uint32_t flash_readl(const TestData *data, uint64_t offset)
> > -{
> > -    return qtest_readl(data->s, data->flash_base + offset);
> > -}
> > -
> > -static void spi_conf(const TestData *data, uint32_t value)
> > -{
> > -    uint32_t conf = spi_readl(data, R_CONF);
> > -
> > -    conf |= value;
> > -    spi_writel(data, R_CONF, conf);
> > -}
> > -
> > -static void spi_conf_remove(const TestData *data, uint32_t value)
> > -{
> > -    uint32_t conf = spi_readl(data, R_CONF);
> > -
> > -    conf &= ~value;
> > -    spi_writel(data, R_CONF, conf);
> > -}
> > -
> > -static void spi_ce_ctrl(const TestData *data, uint32_t value)
> > -{
> > -    uint32_t conf = spi_readl(data, R_CE_CTRL);
> > -
> > -    conf |= value;
> > -    spi_writel(data, R_CE_CTRL, conf);
> > -}
> > -
> > -static void spi_ctrl_setmode(const TestData *data, uint8_t mode, uint8_t
> cmd)
> > -{
> > -    uint32_t ctrl_reg = R_CTRL0 + data->cs * 4;
> > -    uint32_t ctrl = spi_readl(data, ctrl_reg);
> > -    ctrl &= ~(CTRL_USERMODE | 0xff << 16);
> > -    ctrl |= mode | (cmd << 16);
> > -    spi_writel(data, ctrl_reg, ctrl);
> > -}
> > -
> > -static void spi_ctrl_start_user(const TestData *data)
> > -{
> > -    uint32_t ctrl_reg = R_CTRL0 + data->cs * 4;
> > -    uint32_t ctrl = spi_readl(data, ctrl_reg);
> > -
> > -    ctrl |= CTRL_USERMODE | CTRL_CE_STOP_ACTIVE;
> > -    spi_writel(data, ctrl_reg, ctrl);
> > -
> > -    ctrl &= ~CTRL_CE_STOP_ACTIVE;
> > -    spi_writel(data, ctrl_reg, ctrl);
> > -}
> > -
> > -static void spi_ctrl_stop_user(const TestData *data)
> > -{
> > -    uint32_t ctrl_reg = R_CTRL0 + data->cs * 4;
> > -    uint32_t ctrl = spi_readl(data, ctrl_reg);
> > -
> > -    ctrl |= CTRL_USERMODE | CTRL_CE_STOP_ACTIVE;
> > -    spi_writel(data, ctrl_reg, ctrl);
> > -}
> > -
> > -static void spi_ctrl_set_io_mode(const TestData *data, uint32_t value)
> > -{
> > -    uint32_t ctrl_reg = R_CTRL0 + data->cs * 4;
> > -    uint32_t ctrl = spi_readl(data, ctrl_reg);
> > -    uint32_t mode;
> > -
> > -    mode = value & CTRL_IO_MODE_MASK;
> > -    ctrl &= ~CTRL_IO_MODE_MASK;
> > -    ctrl |= mode;
> > -    spi_writel(data, ctrl_reg, ctrl);
> > -}
> > -
> > -static void flash_reset(const TestData *data)
> > -{
> > -    spi_conf(data, 1 << (CONF_ENABLE_W0 + data->cs));
> > -
> > -    spi_ctrl_start_user(data);
> > -    flash_writeb(data, 0, RESET_ENABLE);
> > -    flash_writeb(data, 0, RESET_MEMORY);
> > -    flash_writeb(data, 0, WREN);
> > -    flash_writeb(data, 0, BULK_ERASE);
> > -    flash_writeb(data, 0, WRDI);
> > -    spi_ctrl_stop_user(data);
> > -
> > -    spi_conf_remove(data, 1 << (CONF_ENABLE_W0 + data->cs));
> > -}
> > -
> > -static void test_read_jedec(const void *data)
> > -{
> > -    const TestData *test_data = (const TestData *)data;
> > -    uint32_t jedec = 0x0;
> > -
> > -    spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
> > -
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, JEDEC_READ);
> > -    jedec |= flash_readb(test_data, 0) << 16;
> > -    jedec |= flash_readb(test_data, 0) << 8;
> > -    jedec |= flash_readb(test_data, 0);
> > -    spi_ctrl_stop_user(test_data);
> > -
> > -    flash_reset(test_data);
> > -
> > -    g_assert_cmphex(jedec, ==, test_data->jedec_id);
> > -}
> > -
> > -static void read_page(const TestData *data, uint32_t addr, uint32_t *page)
> > -{
> > -    int i;
> > -
> > -    spi_ctrl_start_user(data);
> > -
> > -    flash_writeb(data, 0, EN_4BYTE_ADDR);
> > -    flash_writeb(data, 0, READ);
> > -    flash_writel(data, 0, make_be32(addr));
> > -
> > -    /* Continuous read are supported */
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        page[i] = make_be32(flash_readl(data, 0));
> > -    }
> > -    spi_ctrl_stop_user(data);
> > -}
> > -
> > -static void read_page_mem(const TestData *data, uint32_t addr, uint32_t
> *page)
> > -{
> > -    int i;
> > -
> > -    /* move out USER mode to use direct reads from the AHB bus */
> > -    spi_ctrl_setmode(data, CTRL_READMODE, READ);
> > -
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        page[i] = make_be32(flash_readl(data, addr + i * 4));
> > -    }
> > -}
> > -
> > -static void write_page_mem(const TestData *data, uint32_t addr,
> > -                           uint32_t write_value)
> > -{
> > -    spi_ctrl_setmode(data, CTRL_WRITEMODE, PP);
> > -
> > -    for (int i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        flash_writel(data, addr + i * 4, write_value);
> > -    }
> > -}
> > -
> > -static void assert_page_mem(const TestData *data, uint32_t addr,
> > -                            uint32_t expected_value)
> > -{
> > -    uint32_t page[FLASH_PAGE_SIZE / 4];
> > -    read_page_mem(data, addr, page);
> > -    for (int i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, expected_value);
> > -    }
> > -}
> > -
> > -static void test_erase_sector(const void *data)
> > -{
> > -    const TestData *test_data = (const TestData *)data;
> > -    uint32_t some_page_addr = test_data->page_addr;
> > -    uint32_t page[FLASH_PAGE_SIZE / 4];
> > -    int i;
> > -
> > -    spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
> > -
> > -    /*
> > -     * Previous page should be full of 0xffs after backend is
> > -     * initialized
> > -     */
> > -    read_page(test_data, some_page_addr - FLASH_PAGE_SIZE, page);
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, 0xffffffff);
> > -    }
> > -
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, EN_4BYTE_ADDR);
> > -    flash_writeb(test_data, 0, WREN);
> > -    flash_writeb(test_data, 0, PP);
> > -    flash_writel(test_data, 0, make_be32(some_page_addr));
> > -
> > -    /* Fill the page with its own addresses */
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        flash_writel(test_data, 0, make_be32(some_page_addr + i * 4));
> > -    }
> > -    spi_ctrl_stop_user(test_data);
> > -
> > -    /* Check the page is correctly written */
> > -    read_page(test_data, some_page_addr, page);
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, some_page_addr + i * 4);
> > -    }
> > -
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, WREN);
> > -    flash_writeb(test_data, 0, EN_4BYTE_ADDR);
> > -    flash_writeb(test_data, 0, ERASE_SECTOR);
> > -    flash_writel(test_data, 0, make_be32(some_page_addr));
> > -    spi_ctrl_stop_user(test_data);
> > -
> > -    /* Check the page is erased */
> > -    read_page(test_data, some_page_addr, page);
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, 0xffffffff);
> > -    }
> > -
> > -    flash_reset(test_data);
> > -}
> > -
> > -static void test_erase_all(const void *data)
> > -{
> > -    const TestData *test_data = (const TestData *)data;
> > -    uint32_t some_page_addr = test_data->page_addr;
> > -    uint32_t page[FLASH_PAGE_SIZE / 4];
> > -    int i;
> > -
> > -    spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
> > -
> > -    /*
> > -     * Previous page should be full of 0xffs after backend is
> > -     * initialized
> > -     */
> > -    read_page(test_data, some_page_addr - FLASH_PAGE_SIZE, page);
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, 0xffffffff);
> > -    }
> > -
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, EN_4BYTE_ADDR);
> > -    flash_writeb(test_data, 0, WREN);
> > -    flash_writeb(test_data, 0, PP);
> > -    flash_writel(test_data, 0, make_be32(some_page_addr));
> > -
> > -    /* Fill the page with its own addresses */
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        flash_writel(test_data, 0, make_be32(some_page_addr + i * 4));
> > -    }
> > -    spi_ctrl_stop_user(test_data);
> > -
> > -    /* Check the page is correctly written */
> > -    read_page(test_data, some_page_addr, page);
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, some_page_addr + i * 4);
> > -    }
> > -
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, WREN);
> > -    flash_writeb(test_data, 0, BULK_ERASE);
> > -    spi_ctrl_stop_user(test_data);
> > -
> > -    /* Check the page is erased */
> > -    read_page(test_data, some_page_addr, page);
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, 0xffffffff);
> > -    }
> > -
> > -    flash_reset(test_data);
> > -}
> > -
> > -static void test_write_page(const void *data)
> > -{
> > -    const TestData *test_data = (const TestData *)data;
> > -    uint32_t my_page_addr = test_data->page_addr;
> > -    uint32_t some_page_addr = my_page_addr + FLASH_PAGE_SIZE;
> > -    uint32_t page[FLASH_PAGE_SIZE / 4];
> > -    int i;
> > -
> > -    spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
> > -
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, EN_4BYTE_ADDR);
> > -    flash_writeb(test_data, 0, WREN);
> > -    flash_writeb(test_data, 0, PP);
> > -    flash_writel(test_data, 0, make_be32(my_page_addr));
> > -
> > -    /* Fill the page with its own addresses */
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        flash_writel(test_data, 0, make_be32(my_page_addr + i * 4));
> > -    }
> > -    spi_ctrl_stop_user(test_data);
> > -
> > -    /* Check what was written */
> > -    read_page(test_data, my_page_addr, page);
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, my_page_addr + i * 4);
> > -    }
> > -
> > -    /* Check some other page. It should be full of 0xff */
> > -    read_page(test_data, some_page_addr, page);
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, 0xffffffff);
> > -    }
> > -
> > -    flash_reset(test_data);
> > -}
> > -
> > -static void test_read_page_mem(const void *data)
> > -{
> > -    const TestData *test_data = (const TestData *)data;
> > -    uint32_t my_page_addr = test_data->page_addr;
> > -    uint32_t some_page_addr = my_page_addr + FLASH_PAGE_SIZE;
> > -    uint32_t page[FLASH_PAGE_SIZE / 4];
> > -    int i;
> > -
> > -    /*
> > -     * Enable 4BYTE mode for controller.
> > -     */
> > -    spi_ce_ctrl(test_data, 1 << (CRTL_EXTENDED0 + test_data->cs));
> > -
> > -    /* Enable 4BYTE mode for flash. */
> > -    spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, EN_4BYTE_ADDR);
> > -    flash_writeb(test_data, 0, WREN);
> > -    flash_writeb(test_data, 0, PP);
> > -    flash_writel(test_data, 0, make_be32(my_page_addr));
> > -
> > -    /* Fill the page with its own addresses */
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        flash_writel(test_data, 0, make_be32(my_page_addr + i * 4));
> > -    }
> > -    spi_ctrl_stop_user(test_data);
> > -    spi_conf_remove(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
> > -
> > -    /* Check what was written */
> > -    read_page_mem(test_data, my_page_addr, page);
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, my_page_addr + i * 4);
> > -    }
> > -
> > -    /* Check some other page. It should be full of 0xff */
> > -    read_page_mem(test_data, some_page_addr, page);
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, 0xffffffff);
> > -    }
> > -
> > -    flash_reset(test_data);
> > -}
> > -
> > -static void test_write_page_mem(const void *data)
> > -{
> > -    const TestData *test_data = (const TestData *)data;
> > -    uint32_t my_page_addr = test_data->page_addr;
> > -    uint32_t page[FLASH_PAGE_SIZE / 4];
> > -    int i;
> > -
> > -    /*
> > -     * Enable 4BYTE mode for controller.
> > -     */
> > -    spi_ce_ctrl(test_data, 1 << (CRTL_EXTENDED0 + test_data->cs));
> > -
> > -    /* Enable 4BYTE mode for flash. */
> > -    spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, EN_4BYTE_ADDR);
> > -    flash_writeb(test_data, 0, WREN);
> > -    spi_ctrl_stop_user(test_data);
> > -
> > -    /* move out USER mode to use direct writes to the AHB bus */
> > -    spi_ctrl_setmode(test_data, CTRL_WRITEMODE, PP);
> > -
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        flash_writel(test_data, my_page_addr + i * 4,
> > -               make_be32(my_page_addr + i * 4));
> > -    }
> > -
> > -    /* Check what was written */
> > -    read_page_mem(test_data, my_page_addr, page);
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, my_page_addr + i * 4);
> > -    }
> > -
> > -    flash_reset(test_data);
> > -}
> > -
> > -static void test_read_status_reg(const void *data)
> > -{
> > -    const TestData *test_data = (const TestData *)data;
> > -    uint8_t r;
> > -
> > -    spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
> > -
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, RDSR);
> > -    r = flash_readb(test_data, 0);
> > -    spi_ctrl_stop_user(test_data);
> > -
> > -    g_assert_cmphex(r & SR_WEL, ==, 0);
> > -    g_assert(!qtest_qom_get_bool
> > -            (test_data->s, test_data->node, "write-enable"));
> > -
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, WREN);
> > -    flash_writeb(test_data, 0, RDSR);
> > -    r = flash_readb(test_data, 0);
> > -    spi_ctrl_stop_user(test_data);
> > -
> > -    g_assert_cmphex(r & SR_WEL, ==, SR_WEL);
> > -    g_assert(qtest_qom_get_bool
> > -            (test_data->s, test_data->node, "write-enable"));
> > -
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, WRDI);
> > -    flash_writeb(test_data, 0, RDSR);
> > -    r = flash_readb(test_data, 0);
> > -    spi_ctrl_stop_user(test_data);
> > -
> > -    g_assert_cmphex(r & SR_WEL, ==, 0);
> > -    g_assert(!qtest_qom_get_bool
> > -            (test_data->s, test_data->node, "write-enable"));
> > -
> > -    flash_reset(test_data);
> > -}
> > -
> > -static void test_status_reg_write_protection(const void *data)
> > -{
> > -    const TestData *test_data = (const TestData *)data;
> > -    uint8_t r;
> > -
> > -    spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
> > -
> > -    /* default case: WP# is high and SRWD is low -> status register
> writable */
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, WREN);
> > -    /* test ability to write SRWD */
> > -    flash_writeb(test_data, 0, WRSR);
> > -    flash_writeb(test_data, 0, SRWD);
> > -    flash_writeb(test_data, 0, RDSR);
> > -    r = flash_readb(test_data, 0);
> > -    spi_ctrl_stop_user(test_data);
> > -    g_assert_cmphex(r & SRWD, ==, SRWD);
> > -
> > -    /* WP# high and SRWD high -> status register writable */
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, WREN);
> > -    /* test ability to write SRWD */
> > -    flash_writeb(test_data, 0, WRSR);
> > -    flash_writeb(test_data, 0, 0);
> > -    flash_writeb(test_data, 0, RDSR);
> > -    r = flash_readb(test_data, 0);
> > -    spi_ctrl_stop_user(test_data);
> > -    g_assert_cmphex(r & SRWD, ==, 0);
> > -
> > -    /* WP# low and SRWD low -> status register writable */
> > -    qtest_set_irq_in(test_data->s, test_data->node, "WP#", 0, 0);
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, WREN);
> > -    /* test ability to write SRWD */
> > -    flash_writeb(test_data, 0, WRSR);
> > -    flash_writeb(test_data, 0, SRWD);
> > -    flash_writeb(test_data, 0, RDSR);
> > -    r = flash_readb(test_data, 0);
> > -    spi_ctrl_stop_user(test_data);
> > -    g_assert_cmphex(r & SRWD, ==, SRWD);
> > -
> > -    /* WP# low and SRWD high -> status register NOT writable */
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0 , WREN);
> > -    /* test ability to write SRWD */
> > -    flash_writeb(test_data, 0, WRSR);
> > -    flash_writeb(test_data, 0, 0);
> > -    flash_writeb(test_data, 0, RDSR);
> > -    r = flash_readb(test_data, 0);
> > -    spi_ctrl_stop_user(test_data);
> > -    /* write is not successful */
> > -    g_assert_cmphex(r & SRWD, ==, SRWD);
> > -
> > -    qtest_set_irq_in(test_data->s, test_data->node, "WP#", 0, 1);
> > -    flash_reset(test_data);
> > -}
> > -
> > -static void test_write_block_protect(const void *data)
> > -{
> > -    const TestData *test_data = (const TestData *)data;
> > -    uint32_t sector_size = 65536;
> > -    uint32_t n_sectors = 512;
> > -
> > -    spi_ce_ctrl(test_data, 1 << (CRTL_EXTENDED0 + test_data->cs));
> > -    spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
> > -
> > -    uint32_t bp_bits = 0b0;
> > -
> > -    for (int i = 0; i < 16; i++) {
> > -        bp_bits = ((i & 0b1000) << 3) | ((i & 0b0111) << 2);
> > -
> > -        spi_ctrl_start_user(test_data);
> > -        flash_writeb(test_data, 0, WREN);
> > -        flash_writeb(test_data, 0, BULK_ERASE);
> > -        flash_writeb(test_data, 0, WREN);
> > -        flash_writeb(test_data, 0, WRSR);
> > -        flash_writeb(test_data, 0, bp_bits);
> > -        flash_writeb(test_data, 0, EN_4BYTE_ADDR);
> > -        flash_writeb(test_data, 0, WREN);
> > -        spi_ctrl_stop_user(test_data);
> > -
> > -        uint32_t num_protected_sectors = i ? MIN(1 << (i - 1), n_sectors) :
> 0;
> > -        uint32_t protection_start = n_sectors - num_protected_sectors;
> > -        uint32_t protection_end = n_sectors;
> > -
> > -        for (int sector = 0; sector < n_sectors; sector++) {
> > -            uint32_t addr = sector * sector_size;
> > -
> > -            assert_page_mem(test_data, addr, 0xffffffff);
> > -            write_page_mem(test_data, addr, make_be32(0xabcdef12));
> > -
> > -            uint32_t expected_value = protection_start <= sector
> > -                                      && sector < protection_end
> > -                                      ? 0xffffffff : 0xabcdef12;
> > -
> > -            assert_page_mem(test_data, addr, expected_value);
> > -        }
> > -    }
> > -
> > -    flash_reset(test_data);
> > -}
> > -
> > -static void test_write_block_protect_bottom_bit(const void *data)
> > -{
> > -    const TestData *test_data = (const TestData *)data;
> > -    uint32_t sector_size = 65536;
> > -    uint32_t n_sectors = 512;
> > -
> > -    spi_ce_ctrl(test_data, 1 << (CRTL_EXTENDED0 + test_data->cs));
> > -    spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
> > -
> > -    /* top bottom bit is enabled */
> > -    uint32_t bp_bits = 0b00100 << 3;
> > -
> > -    for (int i = 0; i < 16; i++) {
> > -        bp_bits = (((i & 0b1000) | 0b0100) << 3) | ((i & 0b0111) << 2);
> > -
> > -        spi_ctrl_start_user(test_data);
> > -        flash_writeb(test_data, 0, WREN);
> > -        flash_writeb(test_data, 0, BULK_ERASE);
> > -        flash_writeb(test_data, 0, WREN);
> > -        flash_writeb(test_data, 0, WRSR);
> > -        flash_writeb(test_data, 0, bp_bits);
> > -        flash_writeb(test_data, 0, EN_4BYTE_ADDR);
> > -        flash_writeb(test_data, 0, WREN);
> > -        spi_ctrl_stop_user(test_data);
> > -
> > -        uint32_t num_protected_sectors = i ? MIN(1 << (i - 1), n_sectors) :
> 0;
> > -        uint32_t protection_start = 0;
> > -        uint32_t protection_end = num_protected_sectors;
> > -
> > -        for (int sector = 0; sector < n_sectors; sector++) {
> > -            uint32_t addr = sector * sector_size;
> > -
> > -            assert_page_mem(test_data, addr, 0xffffffff);
> > -            write_page_mem(test_data, addr, make_be32(0xabcdef12));
> > -
> > -            uint32_t expected_value = protection_start <= sector
> > -                                      && sector < protection_end
> > -                                      ? 0xffffffff : 0xabcdef12;
> > -
> > -            assert_page_mem(test_data, addr, expected_value);
> > -        }
> > -    }
> > -
> > -    flash_reset(test_data);
> > -}
> > -
> > -static void test_write_page_qpi(const void *data)
> > -{
> > -    const TestData *test_data = (const TestData *)data;
> > -    uint32_t my_page_addr = test_data->page_addr;
> > -    uint32_t some_page_addr = my_page_addr + FLASH_PAGE_SIZE;
> > -    uint32_t page[FLASH_PAGE_SIZE / 4];
> > -    uint32_t page_pattern[] = {
> > -        0xebd8c134, 0x5da196bc, 0xae15e729, 0x5085ccdf
> > -    };
> > -    int i;
> > -
> > -    spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
> > -
> > -    spi_ctrl_start_user(test_data);
> > -    flash_writeb(test_data, 0, EN_4BYTE_ADDR);
> > -    flash_writeb(test_data, 0, WREN);
> > -    flash_writeb(test_data, 0, PP);
> > -    flash_writel(test_data, 0, make_be32(my_page_addr));
> > -
> > -    /* Set QPI mode */
> > -    spi_ctrl_set_io_mode(test_data, CTRL_IO_QUAD_IO);
> > -
> > -    /* Fill the page pattern */
> > -    for (i = 0; i < ARRAY_SIZE(page_pattern); i++) {
> > -        flash_writel(test_data, 0, make_be32(page_pattern[i]));
> > -    }
> > -
> > -    /* Fill the page with its own addresses */
> > -    for (; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        flash_writel(test_data, 0, make_be32(my_page_addr + i * 4));
> > -    }
> > -
> > -    /* Restore io mode */
> > -    spi_ctrl_set_io_mode(test_data, 0);
> > -    spi_ctrl_stop_user(test_data);
> > -
> > -    /* Check what was written */
> > -    read_page(test_data, my_page_addr, page);
> > -    for (i = 0; i < ARRAY_SIZE(page_pattern); i++) {
> > -        g_assert_cmphex(page[i], ==, page_pattern[i]);
> > -    }
> > -    for (; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, my_page_addr + i * 4);
> > -    }
> > -
> > -    /* Check some other page. It should be full of 0xff */
> > -    read_page(test_data, some_page_addr, page);
> > -    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> > -        g_assert_cmphex(page[i], ==, 0xffffffff);
> > -    }
> > -
> > -    flash_reset(test_data);
> > -}
> > +#include "aspeed-smc-utils.h"
> >
> >   static void test_palmetto_bmc(TestData *data)
> >   {
> > diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> > index 41f3678cee..fde4de902b 100644
> > --- a/tests/qtest/meson.build
> > +++ b/tests/qtest/meson.build
> > @@ -353,6 +353,7 @@ qtests = {
> >     'virtio-net-failover': files('migration-helpers.c'),
> >     'vmgenid-test': files('boot-sector.c', 'acpi-utils.c'),
> >     'netdev-socket': files('netdev-socket.c', '../unit/socket-helpers.c'),
> > +  'aspeed_smc-test': files('aspeed-smc-utils.c', 'aspeed_smc-test.c'),
> >   }
> >
> >   if vnc.found()


reply via email to

[Prev in Thread] Current Thread [Next in Thread]