Add read_page_mem_dor (CTRL_FREADMODE with DOR command and dual data
IO mode) and write_page_dor (user-mode DOR) tests.
Reviewed-by: Bin Meng <bin.meng@processmission.com>
Link: https://lore.kernel.org/qemu-devel/20260708111544.1440761-4-clg@redhat.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
tests/qtest/aspeed-smc-utils.h | 4 +++
tests/qtest/aspeed-smc-utils.c | 45 ++++++++++++++++++++++++++++++++++
tests/qtest/aspeed_smc-test.c | 16 ++++++++++++
tests/qtest/ast2700-smc-test.c | 4 +++
4 files changed, 69 insertions(+)
diff --git a/tests/qtest/aspeed-smc-utils.h b/tests/qtest/aspeed-smc-utils.h
index 7504f5a525b4..04d3c7db5f7b 100644
--- a/tests/qtest/aspeed-smc-utils.h
+++ b/tests/qtest/aspeed-smc-utils.h
@@ -28,6 +28,7 @@
#define CTRL_FREADMODE 0x1
#define CTRL_WRITEMODE 0x2
#define CTRL_USERMODE 0x3
+#define CTRL_IO_DUAL_DATA BIT(29)
#define CTRL_DUMMY_LOW_SHIFT 6
#define CTRL_DUMMY_HIGH_SHIFT 14
#define SR_WEL BIT(1)
@@ -42,6 +43,7 @@ enum {
BULK_ERASE = 0xc7,
READ = 0x03,
FAST_READ = 0x0b,
+ DOR = 0x3b,
PP = 0x02,
WRSR = 0x1,
WREN = 0x6,
@@ -79,5 +81,7 @@ void aspeed_smc_test_write_block_protect_bottom_bit(const void *data);
void aspeed_smc_test_write_page_qpi(const void *data);
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);
#endif /* TESTS_ASPEED_SMC_UTILS_H */
diff --git a/tests/qtest/aspeed-smc-utils.c b/tests/qtest/aspeed-smc-utils.c
index 07e65e0173d9..454224ec28b4 100644
--- a/tests/qtest/aspeed-smc-utils.c
+++ b/tests/qtest/aspeed-smc-utils.c
@@ -98,6 +98,10 @@ static void spi_ctrl_set_fast_read(const AspeedSMCTestData *data, uint8_t cmd)
uint32_t ctrl = spi_readl(data, ctrl_reg);
uint32_t iomode = 0;
+ if (cmd == DOR) {
+ iomode = CTRL_IO_DUAL_DATA;
+ }
+
ctrl &= ~(CTRL_USERMODE | (0xff << 16) |
(0x3 << CTRL_DUMMY_LOW_SHIFT) |
(0x1 << CTRL_DUMMY_HIGH_SHIFT) |
@@ -738,3 +742,44 @@ void aspeed_smc_test_write_page_fast_read(const void *data)
{
test_write_page(data, read_page_fast_read);
}
+
+static void read_page_mem_dor(const AspeedSMCTestData *data,
+ uint32_t addr, uint32_t *page)
+{
+ int i;
+
+ spi_ctrl_set_fast_read(data, DOR);
+
+ 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_dor(const void *data)
+{
+ test_read_page_mem(data, read_page_mem_dor);
+}
+
+static void read_page_dor(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, DOR);
+ flash_writel(data, 0, make_be32(addr));
+ /* 1 dummy byte for standard SPI DOR */
+ 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_dor(const void *data)
+{
+ test_write_page(data, read_page_dor);
+}
diff --git a/tests/qtest/aspeed_smc-test.c b/tests/qtest/aspeed_smc-test.c
index 4697c493a813..a67cc5a999ca 100644
--- a/tests/qtest/aspeed_smc-test.c
+++ b/tests/qtest/aspeed_smc-test.c
@@ -56,6 +56,10 @@ static void test_palmetto_bmc(AspeedSMCTestData *data)
data, aspeed_smc_test_read_page_mem_fast_read);
qtest_add_data_func("/ast2400/smc/write_page_fast_read",
data, aspeed_smc_test_write_page_fast_read);
+ qtest_add_data_func("/ast2400/smc/read_page_mem_dor",
+ data, aspeed_smc_test_read_page_mem_dor);
+ qtest_add_data_func("/ast2400/smc/write_page_dor",
+ data, aspeed_smc_test_write_page_dor);
/*
* Block protect tests must be run last because the block protect
* state is not cleared by reset_memory() and silently prevents
@@ -112,6 +116,10 @@ static void test_ast2500_evb(AspeedSMCTestData *data)
data, aspeed_smc_test_read_page_mem_fast_read);
qtest_add_data_func("/ast2500/smc/write_page_fast_read",
data, aspeed_smc_test_write_page_fast_read);
+ qtest_add_data_func("/ast2500/smc/read_page_mem_dor",
+ data, aspeed_smc_test_read_page_mem_dor);
+ qtest_add_data_func("/ast2500/smc/write_page_dor",
+ data, aspeed_smc_test_write_page_dor);
}
static void test_ast2600_evb(AspeedSMCTestData *data)
@@ -159,6 +167,10 @@ static void test_ast2600_evb(AspeedSMCTestData *data)
data, aspeed_smc_test_read_page_mem_fast_read);
qtest_add_data_func("/ast2600/smc/write_page_fast_read",
data, aspeed_smc_test_write_page_fast_read);
+ qtest_add_data_func("/ast2600/smc/read_page_mem_dor",
+ data, aspeed_smc_test_read_page_mem_dor);
+ qtest_add_data_func("/ast2600/smc/write_page_dor",
+ data, aspeed_smc_test_write_page_dor);
}
static void test_ast1030_evb(AspeedSMCTestData *data)
@@ -206,6 +218,10 @@ static void test_ast1030_evb(AspeedSMCTestData *data)
data, aspeed_smc_test_read_page_mem_fast_read);
qtest_add_data_func("/ast1030/smc/write_page_fast_read",
data, aspeed_smc_test_write_page_fast_read);
+ qtest_add_data_func("/ast1030/smc/read_page_mem_dor",
+ data, aspeed_smc_test_read_page_mem_dor);
+ qtest_add_data_func("/ast1030/smc/write_page_dor",
+ data, aspeed_smc_test_write_page_dor);
}
int main(int argc, char **argv)
diff --git a/tests/qtest/ast2700-smc-test.c b/tests/qtest/ast2700-smc-test.c
index 9ad04b574c0d..bd9d3f7905b3 100644
--- a/tests/qtest/ast2700-smc-test.c
+++ b/tests/qtest/ast2700-smc-test.c
@@ -56,6 +56,10 @@ static void test_ast2700_evb(AspeedSMCTestData *data)
data, aspeed_smc_test_read_page_mem_fast_read);
qtest_add_data_func("/ast2700/smc/write_page_fast_read",
data, aspeed_smc_test_write_page_fast_read);
+ qtest_add_data_func("/ast2700/smc/read_page_mem_dor",
+ data, aspeed_smc_test_read_page_mem_dor);
+ qtest_add_data_func("/ast2700/smc/write_page_dor",
+ data, aspeed_smc_test_write_page_dor);
}
int main(int argc, char **argv)
--
2.54.0