Re: [PATCH v4 9/9] tests/qtest/ast2700-smc-test: Add Data FIFO mode test

On 7/17/26 10:46, Jamin Lin wrote:
> Add two qtest cases exercising the new AST2700 Data FIFO-based flash
> access path (R_DATA_FIFO at spi_base + 0x200).
> 
> Write_page_datafifo sends the page-program command and data through
> the FIFO port, then verifies the result via the regular read path.
> Read_page_datafifo writes a page the regular way, then reads it back
> through the FIFO port, so both directions are checked independently.
> 
> Signed-off-by: Jamin Lin <[email protected]>
> ---
>   tests/qtest/aspeed-smc-utils.h |   4 ++
>   tests/qtest/aspeed-smc-utils.c | 102 +++++++++++++++++++++++++++++++++
>   tests/qtest/ast2700-smc-test.c |   4 ++
>   3 files changed, 110 insertions(+)
> 
> diff --git a/tests/qtest/aspeed-smc-utils.h b/tests/qtest/aspeed-smc-utils.h
> index 19c557b822..e4f538e579 100644
> --- a/tests/qtest/aspeed-smc-utils.h
> +++ b/tests/qtest/aspeed-smc-utils.h
> @@ -33,6 +33,8 @@
>   #define   CTRL_DUMMY_LOW_SHIFT   6
>   #define   CTRL_DUMMY_HIGH_SHIFT  14
>   #define SR_WEL BIT(1)
> +/* Data fifo */
> +#define R_DATA_FIFO 0x200
>   
>   /*
>    * Flash commands
> @@ -87,5 +89,7 @@ void aspeed_smc_test_read_page_mem_dor(const void *data);
>   void aspeed_smc_test_write_page_dor(const void *data);
>   void aspeed_smc_test_read_page_mem_qor(const void *data);
>   void aspeed_smc_test_write_page_qor(const void *data);
> +void aspeed_smc_test_write_page_datafifo(const void *data);
> +void aspeed_smc_test_read_page_datafifo(const void *data);
>   
>   #endif /* TESTS_ASPEED_SMC_UTILS_H */
> diff --git a/tests/qtest/aspeed-smc-utils.c b/tests/qtest/aspeed-smc-utils.c
> index 6d75a95578..146332240d 100644
> --- a/tests/qtest/aspeed-smc-utils.c
> +++ b/tests/qtest/aspeed-smc-utils.c
> @@ -57,6 +57,28 @@ static inline uint32_t flash_readl(const AspeedSMCTestData *data,
>       return qtest_readl(data->s, data->flash_base + offset);
>   }
>   
> +/*
> + * Data FIFO port, in spi_base's register bank (not flash_base). Accesses
> + * through the FIFO require the complete user-mode transaction (opcode,
> + * address, and data). Assumes CS0, whose FIFO slot is at R_DATA_FIFO.
> + */
> +static inline void datafifo_writeb(const AspeedSMCTestData *data,
> +                                   uint8_t value)
> +{
> +    qtest_writeb(data->s, data->spi_base + R_DATA_FIFO, value);
> +}
> +
> +static inline void datafifo_writel(const AspeedSMCTestData *data,
> +                                   uint32_t value)
> +{
> +    spi_writel(data, R_DATA_FIFO, value);
> +}
> +
> +static inline uint32_t datafifo_readl(const AspeedSMCTestData *data)
> +{
> +    return spi_readl(data, R_DATA_FIFO);
> +}
> +
>   static void spi_conf(const AspeedSMCTestData *data, uint32_t value)
>   {
>       uint32_t conf = spi_readl(data, R_CONF);
> @@ -826,3 +848,83 @@ void aspeed_smc_test_write_page_qor(const void *data)
>   {
>       test_write_page(data, read_page_qor);
>   }
> +
> +void aspeed_smc_test_write_page_datafifo(const void *data)
> +{
> +    const AspeedSMCTestData *test_data = (const AspeedSMCTestData *)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));
> +
> +    /*
> +     * Send the complete user-mode transaction (opcode, address, data)
> +     * through the Data FIFO port.
> +     */
> +    spi_ctrl_start_user(test_data);
> +    datafifo_writeb(test_data, EN_4BYTE_ADDR);
> +    datafifo_writeb(test_data, WREN);
> +    datafifo_writeb(test_data, PP);
> +    datafifo_writel(test_data, make_be32(my_page_addr));
> +
> +    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> +        datafifo_writel(test_data, make_be32(my_page_addr + i * 4));
> +    }
> +    spi_ctrl_stop_user(test_data);
> +
> +    /* Check what was written, using the regular read path */
> +    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);
> +}
> +
> +void aspeed_smc_test_read_page_datafifo(const void *data)
> +{
> +    const AspeedSMCTestData *test_data = (const AspeedSMCTestData *)data;
> +    uint32_t my_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));
> +
> +    /* Write the page the regular way */
> +    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));
> +    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);
> +
> +    /*
> +     * Read it back through the data FIFO port, again sending the whole
> +     * transaction (opcode, address, data) through it.
> +     */
> +    spi_ctrl_start_user(test_data);
> +    datafifo_writeb(test_data, EN_4BYTE_ADDR);
> +    datafifo_writeb(test_data, READ);
> +    datafifo_writel(test_data, make_be32(my_page_addr));
> +    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> +        page[i] = make_be32(datafifo_readl(test_data));
> +    }
> +    spi_ctrl_stop_user(test_data);
> +
> +    for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> +        g_assert_cmphex(page[i], ==, my_page_addr + i * 4);
> +    }
> +
> +    flash_reset(test_data);
> +}
> diff --git a/tests/qtest/ast2700-smc-test.c b/tests/qtest/ast2700-smc-test.c
> index f85077e04f..925dbcfaaf 100644
> --- a/tests/qtest/ast2700-smc-test.c
> +++ b/tests/qtest/ast2700-smc-test.c
> @@ -64,6 +64,10 @@ static void test_ast2700_evb(AspeedSMCTestData *data)
>                           data, aspeed_smc_test_read_page_mem_qor);
>       qtest_add_data_func("/ast2700/smc/write_page_qor",
>                           data, aspeed_smc_test_write_page_qor);
> +    qtest_add_data_func("/ast2700/smc/write_page_datafifo",
> +                        data, aspeed_smc_test_write_page_datafifo);
> +    qtest_add_data_func("/ast2700/smc/read_page_datafifo",
> +                        data, aspeed_smc_test_read_page_datafifo);
>   }
>   
>   int main(int argc, char **argv)

Reviewed-by: Cédric Le Goater <[email protected]>

Thanks,

C.