[PATCH qemu 16/38] aspeed/smc: add tests for Command mode

[Cédric Le Goater]

On 11/21/2016 08:25 AM, Joel Stanley wrote:
> On Sat, Nov 19, 2016 at 12:51 AM, Cédric Le Goater <clg at kaod.org> wrote:
>> 0005 tests add a read_page_mem test
> 
> This looks like something went wrong

Euh, yeah I need to write a commit log for this patch ! 

C. 
>>
>> Signed-off-by: Cédric Le Goater <clg at kaod.org>
>> ---
>>  tests/m25p80-test.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 86 insertions(+)
>>
>> diff --git a/tests/m25p80-test.c b/tests/m25p80-test.c
>> index cb7ec81f1a6d..3d449bd194a9 100644
>> --- a/tests/m25p80-test.c
>> +++ b/tests/m25p80-test.c
>> @@ -36,6 +36,9 @@
>>  #define   CRTL_EXTENDED0       0  /* 32 bit addressing for SPI */
>>  #define R_CTRL0             0x10
>>  #define   CTRL_CE_STOP_ACTIVE  (1 << 2)
>> +#define   CTRL_READMODE        0x0
>> +#define   CTRL_FREADMODE       0x1
>> +#define   CTRL_WRITEMODE       0x2
>>  #define   CTRL_USERMODE        0x3
>>
>>  #define ASPEED_FMC_BASE    0x1E620000
>> @@ -76,6 +79,22 @@ static void spi_conf(uint32_t value)
>>      writel(ASPEED_FMC_BASE + R_CONF, conf);
>>  }
>>
>> +static void spi_ce_ctrl(uint32_t value)
>> +{
>> +    uint32_t conf = readl(ASPEED_FMC_BASE + R_CE_CTRL);
>> +
>> +    conf |= value;
>> +    writel(ASPEED_FMC_BASE + R_CE_CTRL, conf);
>> +}
>> +
>> +static void spi_ctrl_setmode(uint8_t mode, uint8_t cmd)
>> +{
>> +    uint32_t ctrl = readl(ASPEED_FMC_BASE + R_CTRL0);
>> +    ctrl &= ~(CTRL_USERMODE | 0xff << 16);
>> +    ctrl |= mode | (cmd << 16);
>> +    writel(ASPEED_FMC_BASE + R_CTRL0, ctrl);
>> +}
>> +
>>  static void spi_ctrl_start_user(void)
>>  {
>>      uint32_t ctrl = readl(ASPEED_FMC_BASE + R_CTRL0);
>> @@ -128,6 +147,18 @@ static void read_page(uint32_t addr, uint32_t *page)
>>      spi_ctrl_stop_user();
>>  }
>>
>> +static void read_page_mem(uint32_t addr, uint32_t *page)
>> +{
>> +    int i;
>> +
>> +    /* move out USER mode to use direct reads from the AHB bus */
>> +    spi_ctrl_setmode(CTRL_READMODE, READ);
>> +
>> +    for (i = 0; i < PAGE_SIZE / 4; i++) {
>> +        page[i] = make_be32(readl(ASPEED_FLASH_BASE + addr + i * 4));
>> +    }
>> +}
>> +
>>  static void test_erase_sector(void)
>>  {
>>      uint32_t some_page_addr = 0x600 * PAGE_SIZE;
>> @@ -195,6 +226,7 @@ static void test_write_page(void)
>>
>>      spi_ctrl_start_user();
>>      writeb(ASPEED_FLASH_BASE, EN_4BYTE_ADDR);
>> +    writeb(ASPEED_FLASH_BASE, WREN);
>>      writeb(ASPEED_FLASH_BASE, PP);
>>      writel(ASPEED_FLASH_BASE, make_be32(my_page_addr));
>>
>> @@ -217,6 +249,58 @@ static void test_write_page(void)
>>      }
>>  }
>>
>> +static void test_read_page_mem(void)
>> +{
>> +    uint32_t my_page_addr = 0x14000 * PAGE_SIZE; /* beyond 16MB */
>> +    uint32_t some_page_addr = 0x15000 * PAGE_SIZE;
>> +    uint32_t page[PAGE_SIZE / 4];
>> +    int i;
>> +
>> +    /* Enable 4BYTE mode for flash. This is should be strapped by HW
>> +     * for CE0 anyhow.
>> +     */
>> +    spi_ce_ctrl(1 << CRTL_EXTENDED0);
>> +
>> +    /* Check what was written */
>> +    read_page_mem(my_page_addr, page);
>> +    for (i = 0; i < 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_mem(some_page_addr, page);
>> +    for (i = 0; i < PAGE_SIZE / 4; i++) {
>> +        g_assert_cmphex(page[i], ==, 0xffffffff);
>> +    }
>> +}
>> +
>> +static void test_write_page_mem(void)
>> +{
>> +    uint32_t my_page_addr = 0x15000 * PAGE_SIZE;
>> +    uint32_t page[PAGE_SIZE / 4];
>> +    int i;
>> +
>> +    /* Enable 4BYTE mode for flash. This is should be strapped by HW
>> +     * for CE0 anyhow.
>> +     */
>> +    spi_ce_ctrl(1 << CRTL_EXTENDED0);
>> +
>> +    /* move out USER mode to use direct writes to the AHB bus */
>> +    spi_ctrl_setmode(CTRL_WRITEMODE, PP);
>> +
>> +    for (i = 0; i < PAGE_SIZE / 4; i++) {
>> +        writel(ASPEED_FLASH_BASE + my_page_addr + i * 4,
>> +               make_be32(my_page_addr + i * 4));
>> +    }
>> +
>> +    /* Check what was written */
>> +    read_page_mem(my_page_addr, page);
>> +    for (i = 0; i < PAGE_SIZE / 4; i++) {
>> +        g_assert_cmphex(page[i], ==, my_page_addr + i * 4);
>> +    }
>> +}
>> +
>> +
>>  static char tmp_path[] = "/tmp/qtest.m25p80.XXXXXX";
>>
>>  int main(int argc, char **argv)
>> @@ -242,6 +326,8 @@ int main(int argc, char **argv)
>>      qtest_add_func("/m25p80/erase_sector", test_erase_sector);
>>      qtest_add_func("/m25p80/erase_all",  test_erase_all);
>>      qtest_add_func("/m25p80/write_page", test_write_page);
>> +    qtest_add_func("/m25p80/read_page_mem", test_read_page_mem);
>> +    qtest_add_func("/m25p80/write_page_mem", test_write_page_mem);
>>
>>      ret = g_test_run();
>>
>> --
>> 2.7.4
>>
>> _______________________________________________
>> openbmc mailing list
>> openbmc at lists.ozlabs.org
>> https://lists.ozlabs.org/listinfo/openbmc