On Wed, Jul 8, 2026 at 7:17 PM Cédric Le Goater <[email protected]> wrote:
>
> Add read_page_mem_qor (CTRL_FREADMODE with QOR command and quad data
> IO mode) and write_page_qor (user-mode QOR) tests.
>
> Signed-off-by: Cédric Le Goater <[email protected]>
> ---
> tests/qtest/aspeed-smc-utils.h | 4 +++
> tests/qtest/aspeed-smc-utils.c | 50 ++++++++++++++++++++++++++++++++++
> tests/qtest/aspeed_smc-test.c | 16 +++++++++++
> tests/qtest/ast2700-smc-test.c | 4 +++
> 4 files changed, 74 insertions(+)
>
> diff --git a/tests/qtest/aspeed-smc-utils.h b/tests/qtest/aspeed-smc-utils.h
> index fbfb94e831d8..f5720f1becc1 100644
> --- a/tests/qtest/aspeed-smc-utils.h
> +++ b/tests/qtest/aspeed-smc-utils.h
> @@ -44,6 +44,7 @@
> #define CTRL_FREADMODE 0x1
> #define CTRL_WRITEMODE 0x2
> #define CTRL_USERMODE 0x3
> +#define CTRL_IO_QUAD_DATA BIT(30)
Already defined in line 42.
> #define CTRL_IO_DUAL_DATA BIT(29)
> #define CTRL_DUMMY_LOW_SHIFT 6
> #define CTRL_DUMMY_HIGH_SHIFT 14
> @@ -60,6 +61,7 @@ enum {
> READ = 0x03,
> FAST_READ = 0x0b,
> DOR = 0x3b,
> + QOR = 0x6b,
> PP = 0x02,
> WRSR = 0x1,
> WREN = 0x6,
> @@ -99,5 +101,7 @@ void aspeed_smc_test_read_page_mem_fast_read(const void
> *data);
> void aspeed_smc_test_write_page_fast_read(const void *data);
> 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);
>
> #endif /* TESTS_ASPEED_SMC_UTILS_H */
> diff --git a/tests/qtest/aspeed-smc-utils.c b/tests/qtest/aspeed-smc-utils.c
> index 25e3d28ec646..bc64a3eb9477 100644
> --- a/tests/qtest/aspeed-smc-utils.c
> +++ b/tests/qtest/aspeed-smc-utils.c
> @@ -796,3 +796,53 @@ void aspeed_smc_test_write_page_dor(const void *data)
> {
> test_write_page(data, read_page_dor);
> }
> +
> +static void read_page_mem_qor(const AspeedSMCTestData *data,
> + uint32_t addr, uint32_t *page)
> +{
> + uint32_t ctrl_reg = R_CTRL0 + data->cs * 4;
> + uint32_t ctrl = spi_readl(data, ctrl_reg);
> + int i;
> +
> + ctrl &= ~(CTRL_USERMODE | (0xff << 16) |
> + (0x3 << CTRL_DUMMY_LOW_SHIFT) |
> + (0x1 << CTRL_DUMMY_HIGH_SHIFT) |
> + CTRL_IO_MODE_MASK);
> + ctrl |= CTRL_FREADMODE | (QOR << 16) |
> + (1 << CTRL_DUMMY_LOW_SHIFT) |
> + CTRL_IO_QUAD_DATA;
> + spi_writel(data, ctrl_reg, ctrl);
Just call spi_ctrl_set_fast_read()?
> +
> + for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> + page[i] = make_be32(flash_readl(data, addr + i * 4));
> + }
> +}
> +
> +void aspeed_smc_test_read_page_mem_qor(const void *data)
> +{
> + test_read_page_mem(data, read_page_mem_qor);
> +}
> +
> +static void read_page_qor(const AspeedSMCTestData *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, QOR);
> + flash_writel(data, 0, make_be32(addr));
> + /* 1 dummy byte for standard SPI QOR */
> + flash_writeb(data, 0, 0x00);
> +
> + for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
> + page[i] = make_be32(flash_readl(data, 0));
> + }
> + spi_ctrl_stop_user(data);
> +}
> +
> +void aspeed_smc_test_write_page_qor(const void *data)
> +{
> + test_write_page(data, read_page_qor);
> +}
> diff --git a/tests/qtest/aspeed_smc-test.c b/tests/qtest/aspeed_smc-test.c
> index 6d48444fd71b..004951380e9e 100644
> --- a/tests/qtest/aspeed_smc-test.c
> +++ b/tests/qtest/aspeed_smc-test.c
> @@ -76,6 +76,10 @@ static void test_palmetto_bmc(AspeedSMCTestData *data)
> data, aspeed_smc_test_read_page_mem_dor);
> qtest_add_data_func("/ast2400/smc/write_page_dor",
> data, aspeed_smc_test_write_page_dor);
> + qtest_add_data_func("/ast2400/smc/read_page_mem_qor",
> + data, aspeed_smc_test_read_page_mem_qor);
> + qtest_add_data_func("/ast2400/smc/write_page_qor",
> + data, aspeed_smc_test_write_page_qor);
> /*
> * Block protect tests must be run last because the block protect
> * state is not cleared by reset_memory() and silently prevents
> @@ -136,6 +140,10 @@ static void test_ast2500_evb(AspeedSMCTestData *data)
> data, aspeed_smc_test_read_page_mem_dor);
> qtest_add_data_func("/ast2500/smc/write_page_dor",
> data, aspeed_smc_test_write_page_dor);
> + qtest_add_data_func("/ast2500/smc/read_page_mem_qor",
> + data, aspeed_smc_test_read_page_mem_qor);
> + qtest_add_data_func("/ast2500/smc/write_page_qor",
> + data, aspeed_smc_test_write_page_qor);
> }
>
> static void test_ast2600_evb(AspeedSMCTestData *data)
> @@ -187,6 +195,10 @@ static void test_ast2600_evb(AspeedSMCTestData *data)
> data, aspeed_smc_test_read_page_mem_dor);
> qtest_add_data_func("/ast2600/smc/write_page_dor",
> data, aspeed_smc_test_write_page_dor);
> + qtest_add_data_func("/ast2600/smc/read_page_mem_qor",
> + data, aspeed_smc_test_read_page_mem_qor);
> + qtest_add_data_func("/ast2600/smc/write_page_qor",
> + data, aspeed_smc_test_write_page_qor);
> }
>
> static void test_ast1030_evb(AspeedSMCTestData *data)
> @@ -238,6 +250,10 @@ static void test_ast1030_evb(AspeedSMCTestData *data)
> data, aspeed_smc_test_read_page_mem_dor);
> qtest_add_data_func("/ast1030/smc/write_page_dor",
> data, aspeed_smc_test_write_page_dor);
> + qtest_add_data_func("/ast1030/smc/read_page_mem_qor",
> + data, aspeed_smc_test_read_page_mem_qor);
> + qtest_add_data_func("/ast1030/smc/write_page_qor",
> + data, aspeed_smc_test_write_page_qor);
> }
>
> int main(int argc, char **argv)
> diff --git a/tests/qtest/ast2700-smc-test.c b/tests/qtest/ast2700-smc-test.c
> index bd9d3f7905b3..f85077e04ff4 100644
> --- a/tests/qtest/ast2700-smc-test.c
> +++ b/tests/qtest/ast2700-smc-test.c
> @@ -60,6 +60,10 @@ static void test_ast2700_evb(AspeedSMCTestData *data)
> data, aspeed_smc_test_read_page_mem_dor);
> qtest_add_data_func("/ast2700/smc/write_page_dor",
> data, aspeed_smc_test_write_page_dor);
> + qtest_add_data_func("/ast2700/smc/read_page_mem_qor",
> + data, aspeed_smc_test_read_page_mem_qor);
> + qtest_add_data_func("/ast2700/smc/write_page_qor",
> + data, aspeed_smc_test_write_page_qor);
> }
>
> int main(int argc, char **argv)
> --
Regards,
Bin
