Message ID | 20220627185234.1911337-3-irischenlj@fb.com |
---|---|
State | New |
Headers | show |
Series | Add Block Protect (BP) and Top Bottom (TB) bits for write protect | expand |
On 6/27/22 20:52, Iris Chen wrote: > Signed-off-by: Iris Chen <irischenlj@fb.com> Palmettos are getting old (2014). We might want to change the machine model to an ast2600 one. Anyhow, these are very good tests for both m25p80 and aspeed-smc models. Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > tests/qtest/aspeed_smc-test.c | 111 ++++++++++++++++++++++++++++++++++ > 1 file changed, 111 insertions(+) > > diff --git a/tests/qtest/aspeed_smc-test.c b/tests/qtest/aspeed_smc-test.c > index 1258687eac..05ce941566 100644 > --- a/tests/qtest/aspeed_smc-test.c > +++ b/tests/qtest/aspeed_smc-test.c > @@ -192,6 +192,24 @@ static void read_page_mem(uint32_t addr, uint32_t *page) > } > } > > +static void write_page_mem(uint32_t addr, uint32_t write_value) > +{ > + spi_ctrl_setmode(CTRL_WRITEMODE, PP); > + > + for (int i = 0; i < FLASH_PAGE_SIZE / 4; i++) { > + writel(ASPEED_FLASH_BASE + addr + i * 4, write_value); > + } > +} > + > +static void assert_page_mem(uint32_t addr, uint32_t expected_value) > +{ > + uint32_t page[FLASH_PAGE_SIZE / 4]; > + read_page_mem(addr, page); > + for (int i = 0; i < FLASH_PAGE_SIZE / 4; i++) { > + g_assert_cmphex(page[i], ==, expected_value); > + } > +} > + > static void test_erase_sector(void) > { > uint32_t some_page_addr = 0x600 * FLASH_PAGE_SIZE; > @@ -501,6 +519,95 @@ static void test_status_reg_write_protection(void) > flash_reset(); > } > > +static void test_write_block_protect(void) > +{ > + uint32_t sector_size = 65536; > + uint32_t n_sectors = 512; > + > + spi_ce_ctrl(1 << CRTL_EXTENDED0); > + spi_conf(CONF_ENABLE_W0); > + > + uint32_t bp_bits = 0b0; > + > + for (int i = 0; i < 16; i++) { > + bp_bits = ((i & 0b1000) << 3) | ((i & 0b0111) << 2); > + > + spi_ctrl_start_user(); > + writeb(ASPEED_FLASH_BASE, WREN); > + writeb(ASPEED_FLASH_BASE, BULK_ERASE); > + writeb(ASPEED_FLASH_BASE, WREN); > + writeb(ASPEED_FLASH_BASE, WRSR); > + writeb(ASPEED_FLASH_BASE, bp_bits); > + writeb(ASPEED_FLASH_BASE, EN_4BYTE_ADDR); > + writeb(ASPEED_FLASH_BASE, WREN); > + spi_ctrl_stop_user(); > + > + 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(addr, 0xffffffff); > + write_page_mem(addr, make_be32(0xabcdef12)); > + > + uint32_t expected_value = protection_start <= sector > + && sector < protection_end > + ? 0xffffffff : 0xabcdef12; > + > + assert_page_mem(addr, expected_value); > + } > + } > + > + flash_reset(); > +} > + > +static void test_write_block_protect_bottom_bit(void) > +{ > + uint32_t sector_size = 65536; > + uint32_t n_sectors = 512; > + > + spi_ce_ctrl(1 << CRTL_EXTENDED0); > + spi_conf(CONF_ENABLE_W0); > + > + /* 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(); > + writeb(ASPEED_FLASH_BASE, WREN); > + writeb(ASPEED_FLASH_BASE, BULK_ERASE); > + writeb(ASPEED_FLASH_BASE, WREN); > + writeb(ASPEED_FLASH_BASE, WRSR); > + writeb(ASPEED_FLASH_BASE, bp_bits); > + writeb(ASPEED_FLASH_BASE, EN_4BYTE_ADDR); > + writeb(ASPEED_FLASH_BASE, WREN); > + spi_ctrl_stop_user(); > + > + 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(addr, 0xffffffff); > + write_page_mem(addr, make_be32(0xabcdef12)); > + > + uint32_t expected_value = protection_start <= sector > + && sector < protection_end > + ? 0xffffffff : 0xabcdef12; > + > + assert_page_mem(addr, expected_value); > + } > + } > + > + flash_reset(); > +} > + > static char tmp_path[] = "/tmp/qtest.m25p80.XXXXXX"; > > int main(int argc, char **argv) > @@ -529,6 +636,10 @@ int main(int argc, char **argv) > qtest_add_func("/ast2400/smc/read_status_reg", test_read_status_reg); > qtest_add_func("/ast2400/smc/status_reg_write_protection", > test_status_reg_write_protection); > + qtest_add_func("/ast2400/smc/write_block_protect", > + test_write_block_protect); > + qtest_add_func("/ast2400/smc/write_block_protect_bottom_bit", > + test_write_block_protect_bottom_bit); > > flash_reset(); > ret = g_test_run();
diff --git a/tests/qtest/aspeed_smc-test.c b/tests/qtest/aspeed_smc-test.c index 1258687eac..05ce941566 100644 --- a/tests/qtest/aspeed_smc-test.c +++ b/tests/qtest/aspeed_smc-test.c @@ -192,6 +192,24 @@ static void read_page_mem(uint32_t addr, uint32_t *page) } } +static void write_page_mem(uint32_t addr, uint32_t write_value) +{ + spi_ctrl_setmode(CTRL_WRITEMODE, PP); + + for (int i = 0; i < FLASH_PAGE_SIZE / 4; i++) { + writel(ASPEED_FLASH_BASE + addr + i * 4, write_value); + } +} + +static void assert_page_mem(uint32_t addr, uint32_t expected_value) +{ + uint32_t page[FLASH_PAGE_SIZE / 4]; + read_page_mem(addr, page); + for (int i = 0; i < FLASH_PAGE_SIZE / 4; i++) { + g_assert_cmphex(page[i], ==, expected_value); + } +} + static void test_erase_sector(void) { uint32_t some_page_addr = 0x600 * FLASH_PAGE_SIZE; @@ -501,6 +519,95 @@ static void test_status_reg_write_protection(void) flash_reset(); } +static void test_write_block_protect(void) +{ + uint32_t sector_size = 65536; + uint32_t n_sectors = 512; + + spi_ce_ctrl(1 << CRTL_EXTENDED0); + spi_conf(CONF_ENABLE_W0); + + uint32_t bp_bits = 0b0; + + for (int i = 0; i < 16; i++) { + bp_bits = ((i & 0b1000) << 3) | ((i & 0b0111) << 2); + + spi_ctrl_start_user(); + writeb(ASPEED_FLASH_BASE, WREN); + writeb(ASPEED_FLASH_BASE, BULK_ERASE); + writeb(ASPEED_FLASH_BASE, WREN); + writeb(ASPEED_FLASH_BASE, WRSR); + writeb(ASPEED_FLASH_BASE, bp_bits); + writeb(ASPEED_FLASH_BASE, EN_4BYTE_ADDR); + writeb(ASPEED_FLASH_BASE, WREN); + spi_ctrl_stop_user(); + + 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(addr, 0xffffffff); + write_page_mem(addr, make_be32(0xabcdef12)); + + uint32_t expected_value = protection_start <= sector + && sector < protection_end + ? 0xffffffff : 0xabcdef12; + + assert_page_mem(addr, expected_value); + } + } + + flash_reset(); +} + +static void test_write_block_protect_bottom_bit(void) +{ + uint32_t sector_size = 65536; + uint32_t n_sectors = 512; + + spi_ce_ctrl(1 << CRTL_EXTENDED0); + spi_conf(CONF_ENABLE_W0); + + /* 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(); + writeb(ASPEED_FLASH_BASE, WREN); + writeb(ASPEED_FLASH_BASE, BULK_ERASE); + writeb(ASPEED_FLASH_BASE, WREN); + writeb(ASPEED_FLASH_BASE, WRSR); + writeb(ASPEED_FLASH_BASE, bp_bits); + writeb(ASPEED_FLASH_BASE, EN_4BYTE_ADDR); + writeb(ASPEED_FLASH_BASE, WREN); + spi_ctrl_stop_user(); + + 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(addr, 0xffffffff); + write_page_mem(addr, make_be32(0xabcdef12)); + + uint32_t expected_value = protection_start <= sector + && sector < protection_end + ? 0xffffffff : 0xabcdef12; + + assert_page_mem(addr, expected_value); + } + } + + flash_reset(); +} + static char tmp_path[] = "/tmp/qtest.m25p80.XXXXXX"; int main(int argc, char **argv) @@ -529,6 +636,10 @@ int main(int argc, char **argv) qtest_add_func("/ast2400/smc/read_status_reg", test_read_status_reg); qtest_add_func("/ast2400/smc/status_reg_write_protection", test_status_reg_write_protection); + qtest_add_func("/ast2400/smc/write_block_protect", + test_write_block_protect); + qtest_add_func("/ast2400/smc/write_block_protect_bottom_bit", + test_write_block_protect_bottom_bit); flash_reset(); ret = g_test_run();
Signed-off-by: Iris Chen <irischenlj@fb.com> --- tests/qtest/aspeed_smc-test.c | 111 ++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+)