From: Jamin Lin via <qemu-devel@nongnu.org>
To: "Cédric Le Goater" <clg@kaod.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Steven Lee" <steven_lee@aspeedtech.com>,
"Troy Lee" <leetroy@gmail.com>,
"Andrew Jeffery" <andrew@codeconstruct.com.au>,
"Joel Stanley" <joel@jms.id.au>,
"Alistair Francis" <alistair@alistair23.me>,
"Kevin Wolf" <kwolf@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"open list:ASPEED BMCs" <qemu-arm@nongnu.org>,
"open list:All patches CC here" <qemu-devel@nongnu.org>,
"open list:Block layer core" <qemu-block@nongnu.org>
Cc: <jamin_lin@aspeedtech.com>, <troy_lee@aspeedtech.com>,
<yunlin.tang@aspeedtech.com>
Subject: [PATCH v1 10/16] test/qtest/aspeed_smc-test: Support to test all CE pins
Date: Fri, 18 Oct 2024 13:31:06 +0800 [thread overview]
Message-ID: <20241018053112.1886173-11-jamin_lin@aspeedtech.com> (raw)
In-Reply-To: <20241018053112.1886173-1-jamin_lin@aspeedtech.com>
Currently, these test cases only support to test CE0. To test all CE pins,
introduces new ce and node members in TestData structure. The ce member is used
for saving the ce index and node member is used for saving the node path,
respectively.
Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
tests/qtest/aspeed_smc-test.c | 77 ++++++++++++++++++-----------------
1 file changed, 40 insertions(+), 37 deletions(-)
diff --git a/tests/qtest/aspeed_smc-test.c b/tests/qtest/aspeed_smc-test.c
index 4c62009605..b8ab20b43d 100644
--- a/tests/qtest/aspeed_smc-test.c
+++ b/tests/qtest/aspeed_smc-test.c
@@ -32,11 +32,11 @@
* ASPEED SPI Controller registers
*/
#define R_CONF 0x00
-#define CONF_ENABLE_W0 (1 << 16)
+#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_CE_STOP_ACTIVE (1 << 2)
+#define CTRL_CE_STOP_ACTIVE BIT(2)
#define CTRL_READMODE 0x0
#define CTRL_FREADMODE 0x1
#define CTRL_WRITEMODE 0x2
@@ -70,6 +70,8 @@ typedef struct TestData {
uint64_t flash_base;
uint32_t jedec_id;
char *tmp_path;
+ uint8_t cs;
+ const char *node;
} TestData;
/*
@@ -140,34 +142,37 @@ static void spi_ce_ctrl(const TestData *data, uint32_t value)
static void spi_ctrl_setmode(const TestData *data, uint8_t mode, uint8_t cmd)
{
- uint32_t ctrl = spi_readl(data, R_CTRL0);
+ 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, R_CTRL0, ctrl);
+ spi_writel(data, ctrl_reg, ctrl);
}
static void spi_ctrl_start_user(const TestData *data)
{
- uint32_t ctrl = spi_readl(data, R_CTRL0);
+ 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, R_CTRL0, ctrl);
+ spi_writel(data, ctrl_reg, ctrl);
ctrl &= ~CTRL_CE_STOP_ACTIVE;
- spi_writel(data, R_CTRL0, ctrl);
+ spi_writel(data, ctrl_reg, ctrl);
}
static void spi_ctrl_stop_user(const TestData *data)
{
- uint32_t ctrl = spi_readl(data, R_CTRL0);
+ 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, R_CTRL0, ctrl);
+ spi_writel(data, ctrl_reg, ctrl);
}
static void flash_reset(const TestData *data)
{
- spi_conf(data, CONF_ENABLE_W0);
+ spi_conf(data, 1 << (CONF_ENABLE_W0 + data->cs));
spi_ctrl_start_user(data);
flash_writeb(data, 0, RESET_ENABLE);
@@ -177,7 +182,7 @@ static void flash_reset(const TestData *data)
flash_writeb(data, 0, WRDI);
spi_ctrl_stop_user(data);
- spi_conf_remove(data, CONF_ENABLE_W0);
+ spi_conf_remove(data, 1 << (CONF_ENABLE_W0 + data->cs));
}
static void test_read_jedec(const void *data)
@@ -185,7 +190,7 @@ static void test_read_jedec(const void *data)
const TestData *test_data = (const TestData *)data;
uint32_t jedec = 0x0;
- spi_conf(test_data, CONF_ENABLE_W0);
+ spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
spi_ctrl_start_user(test_data);
flash_writeb(test_data, 0, JEDEC_READ);
@@ -255,7 +260,7 @@ static void test_erase_sector(const void *data)
uint32_t page[FLASH_PAGE_SIZE / 4];
int i;
- spi_conf(test_data, CONF_ENABLE_W0);
+ spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
/*
* Previous page should be full of 0xffs after backend is
@@ -307,7 +312,7 @@ static void test_erase_all(const void *data)
uint32_t page[FLASH_PAGE_SIZE / 4];
int i;
- spi_conf(test_data, CONF_ENABLE_W0);
+ spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
/*
* Previous page should be full of 0xffs after backend is
@@ -358,7 +363,7 @@ static void test_write_page(const void *data)
uint32_t page[FLASH_PAGE_SIZE / 4];
int i;
- spi_conf(test_data, CONF_ENABLE_W0);
+ 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);
@@ -396,13 +401,12 @@ static void test_read_page_mem(const void *data)
int i;
/*
- * Enable 4BYTE mode for controller. This is should be strapped by
- * HW for CE0 anyhow.
+ * Enable 4BYTE mode for controller.
*/
- spi_ce_ctrl(test_data, 1 << CRTL_EXTENDED0);
+ spi_ce_ctrl(test_data, 1 << (CRTL_EXTENDED0 + test_data->cs));
/* Enable 4BYTE mode for flash. */
- spi_conf(test_data, CONF_ENABLE_W0);
+ 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);
@@ -414,7 +418,7 @@ static void test_read_page_mem(const void *data)
flash_writel(test_data, 0, make_be32(my_page_addr + i * 4));
}
spi_ctrl_stop_user(test_data);
- spi_conf_remove(test_data, CONF_ENABLE_W0);
+ 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);
@@ -439,13 +443,12 @@ static void test_write_page_mem(const void *data)
int i;
/*
- * Enable 4BYTE mode for controller. This is should be strapped by
- * HW for CE0 anyhow.
+ * Enable 4BYTE mode for controller.
*/
- spi_ce_ctrl(test_data, 1 << CRTL_EXTENDED0);
+ spi_ce_ctrl(test_data, 1 << (CRTL_EXTENDED0 + test_data->cs));
/* Enable 4BYTE mode for flash. */
- spi_conf(test_data, CONF_ENABLE_W0);
+ 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);
@@ -473,7 +476,7 @@ static void test_read_status_reg(const void *data)
const TestData *test_data = (const TestData *)data;
uint8_t r;
- spi_conf(test_data, CONF_ENABLE_W0);
+ spi_conf(test_data, 1 << (CONF_ENABLE_W0 + test_data->cs));
spi_ctrl_start_user(test_data);
flash_writeb(test_data, 0, RDSR);
@@ -482,7 +485,7 @@ static void test_read_status_reg(const void *data)
g_assert_cmphex(r & SR_WEL, ==, 0);
g_assert(!qtest_qom_get_bool
- (test_data->s, "/machine/soc/fmc/ssi.0/child[0]", "write-enable"));
+ (test_data->s, test_data->node, "write-enable"));
spi_ctrl_start_user(test_data);
flash_writeb(test_data, 0, WREN);
@@ -492,7 +495,7 @@ static void test_read_status_reg(const void *data)
g_assert_cmphex(r & SR_WEL, ==, SR_WEL);
g_assert(qtest_qom_get_bool
- (test_data->s, "/machine/soc/fmc/ssi.0/child[0]", "write-enable"));
+ (test_data->s, test_data->node, "write-enable"));
spi_ctrl_start_user(test_data);
flash_writeb(test_data, 0, WRDI);
@@ -502,7 +505,7 @@ static void test_read_status_reg(const void *data)
g_assert_cmphex(r & SR_WEL, ==, 0);
g_assert(!qtest_qom_get_bool
- (test_data->s, "/machine/soc/fmc/ssi.0/child[0]", "write-enable"));
+ (test_data->s, test_data->node, "write-enable"));
flash_reset(test_data);
}
@@ -512,7 +515,7 @@ static void test_status_reg_write_protection(const void *data)
const TestData *test_data = (const TestData *)data;
uint8_t r;
- spi_conf(test_data, CONF_ENABLE_W0);
+ 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);
@@ -537,8 +540,7 @@ static void test_status_reg_write_protection(const void *data)
g_assert_cmphex(r & SRWD, ==, 0);
/* WP# low and SRWD low -> status register writable */
- qtest_set_irq_in(test_data->s,
- "/machine/soc/fmc/ssi.0/child[0]", "WP#", 0, 0);
+ 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 */
@@ -561,8 +563,7 @@ static void test_status_reg_write_protection(const void *data)
/* write is not successful */
g_assert_cmphex(r & SRWD, ==, SRWD);
- qtest_set_irq_in(test_data->s,
- "/machine/soc/fmc/ssi.0/child[0]", "WP#", 0, 1);
+ qtest_set_irq_in(test_data->s, test_data->node, "WP#", 0, 1);
flash_reset(test_data);
}
@@ -572,8 +573,8 @@ static void test_write_block_protect(const void *data)
uint32_t sector_size = 65536;
uint32_t n_sectors = 512;
- spi_ce_ctrl(test_data, 1 << CRTL_EXTENDED0);
- spi_conf(test_data, CONF_ENABLE_W0);
+ 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;
@@ -617,8 +618,8 @@ static void test_write_block_protect_bottom_bit(const void *data)
uint32_t sector_size = 65536;
uint32_t n_sectors = 512;
- spi_ce_ctrl(test_data, 1 << CRTL_EXTENDED0);
- spi_conf(test_data, CONF_ENABLE_W0);
+ 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;
@@ -676,6 +677,8 @@ static void test_palmetto_bmc(TestData *data)
data->flash_base = 0x20000000;
data->spi_base = 0x1E620000;
data->jedec_id = 0x20ba19;
+ data->cs = 0;
+ data->node = "/machine/soc/fmc/ssi.0/child[0]";
qtest_add_data_func("/ast2400/smc/read_jedec", data, test_read_jedec);
qtest_add_data_func("/ast2400/smc/erase_sector", data, test_erase_sector);
--
2.34.1
next prev parent reply other threads:[~2024-10-18 5:34 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-18 5:30 [PATCH v1 00/16] Fix write incorrect data into flash in user mode Jamin Lin via
2024-10-18 5:30 ` [PATCH v1 01/16] aspeed/smc: " Jamin Lin via
2024-10-22 5:51 ` [SPAM] " Cédric Le Goater
2024-10-22 9:29 ` Jamin Lin
2024-10-18 5:30 ` [PATCH v1 02/16] hw/block:m25p80: Fix coding style Jamin Lin via
2024-10-18 13:31 ` [SPAM] " Cédric Le Goater
2024-10-18 5:30 ` [PATCH v1 03/16] hw/block:m25p80: Support write status register 2 command (0x31) for w25q01jvq Jamin Lin via
2024-10-21 8:53 ` [SPAM] " Cédric Le Goater
2024-10-18 5:31 ` [PATCH v1 04/16] hw/block/m25p80: Add SFDP table for w25q80bl flash Jamin Lin via
2024-10-21 9:05 ` [SPAM] " Cédric Le Goater
2024-10-18 5:31 ` [PATCH v1 05/16] hw/arm/aspeed: Correct spi_model w25q256 for ast1030-a1 EVB Jamin Lin via
2024-10-21 9:06 ` [SPAM] " Cédric Le Goater
2024-10-18 5:31 ` [PATCH v1 06/16] hw/arm/aspeed: Correct fmc_model w25q80bl " Jamin Lin via
2024-10-21 9:07 ` [SPAM] " Cédric Le Goater
2024-10-18 5:31 ` [PATCH v1 07/16] test/qtest/aspeed_smc-test: Fix coding style Jamin Lin via
2024-10-18 8:25 ` Thomas Huth
2024-10-21 12:02 ` [SPAM] " Cédric Le Goater
2024-10-18 5:31 ` [PATCH v1 08/16] test/qtest/aspeed_smc-test: Move testcases to test_palmetto_bmc function Jamin Lin via
2024-10-21 12:02 ` [SPAM] " Cédric Le Goater
2024-10-18 5:31 ` [PATCH v1 09/16] test/qtest/aspeed_smc-test: Introduce a new TestData to test different BMC SOCs Jamin Lin via
2024-10-21 12:13 ` [SPAM] " Cédric Le Goater
2024-10-22 1:38 ` Jamin Lin
2024-10-22 5:54 ` Cédric Le Goater
2024-10-18 5:31 ` Jamin Lin via [this message]
2024-10-21 12:33 ` [SPAM] [PATCH v1 10/16] test/qtest/aspeed_smc-test: Support to test all CE pins Cédric Le Goater
2024-10-18 5:31 ` [PATCH v1 11/16] test/qtest/aspeed_smc-test: Support to test all flash models Jamin Lin via
2024-10-21 12:39 ` [SPAM] " Cédric Le Goater
2024-10-21 23:34 ` Andrew Jeffery
2024-10-22 1:45 ` Jamin Lin
2024-10-22 1:40 ` Jamin Lin
2024-10-18 5:31 ` [PATCH v1 12/16] test/qtest/aspeed_smc-test: Support to test AST2500 Jamin Lin via
2024-10-21 12:47 ` [SPAM] " Cédric Le Goater
2024-10-18 5:31 ` [PATCH v1 13/16] test/qtest/aspeed_smc-test: Support to test AST2600 Jamin Lin via
2024-10-21 12:47 ` [SPAM] " Cédric Le Goater
2024-10-18 5:31 ` [PATCH v1 14/16] test/qtest/aspeed_smc-test: Support to test AST1030 Jamin Lin via
2024-10-21 12:47 ` [SPAM] " Cédric Le Goater
2024-10-18 5:31 ` [PATCH v1 15/16] test/qtest/aspeed_smc-test: Support write page command with QPI mode Jamin Lin via
2024-10-21 12:53 ` [SPAM] " Cédric Le Goater
2024-10-18 5:31 ` [PATCH v1 16/16] test/qtest/ast2700-smc-test: Support to test AST2700 Jamin Lin via
2024-10-21 12:58 ` [SPAM] " Cédric Le Goater
2024-10-22 1:53 ` Jamin Lin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241018053112.1886173-11-jamin_lin@aspeedtech.com \
--to=qemu-devel@nongnu.org \
--cc=alistair@alistair23.me \
--cc=andrew@codeconstruct.com.au \
--cc=clg@kaod.org \
--cc=hreitz@redhat.com \
--cc=jamin_lin@aspeedtech.com \
--cc=joel@jms.id.au \
--cc=kwolf@redhat.com \
--cc=leetroy@gmail.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=steven_lee@aspeedtech.com \
--cc=thuth@redhat.com \
--cc=troy_lee@aspeedtech.com \
--cc=yunlin.tang@aspeedtech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).