* [PATCH] tests/qtest: add qtests for npcm7xx sdhci
@ 2022-01-07 22:25 Patrick Venture
2022-01-10 16:39 ` Patrick Venture
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Patrick Venture @ 2022-01-07 22:25 UTC (permalink / raw)
To: thuth, lvivier, pbonzini
Cc: hskinnemoen, kfting, qemu-devel, qemu-arm, Shengtan Mao, Hao Wu,
Chris Rauer
From: Shengtan Mao <stmao@google.com>
Reviewed-by: Hao Wu <wuhaotsh@google.com>
Reviewed-by: Chris Rauer <crauer@google.com>
Signed-off-by: Shengtan Mao <stmao@google.com>
---
tests/qtest/meson.build | 1 +
tests/qtest/npcm7xx_sdhci-test.c | 201 +++++++++++++++++++++++++++++++
2 files changed, 202 insertions(+)
create mode 100644 tests/qtest/npcm7xx_sdhci-test.c
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 37e1eaa449..b406eba8f6 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -189,6 +189,7 @@ qtests_npcm7xx = \
'npcm7xx_gpio-test',
'npcm7xx_pwm-test',
'npcm7xx_rng-test',
+ 'npcm7xx_sdhci-test',
'npcm7xx_smbus-test',
'npcm7xx_timer-test',
'npcm7xx_watchdog_timer-test'] + \
diff --git a/tests/qtest/npcm7xx_sdhci-test.c b/tests/qtest/npcm7xx_sdhci-test.c
new file mode 100644
index 0000000000..feb09b921a
--- /dev/null
+++ b/tests/qtest/npcm7xx_sdhci-test.c
@@ -0,0 +1,201 @@
+/*
+ * QTests for NPCM7xx SD-3.0 / MMC-4.51 Host Controller
+ *
+ * Copyright (c) 2021 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/sd/npcm7xx_sdhci.h"
+
+#include "libqos/libqtest.h"
+#include "libqtest-single.h"
+#include "libqos/sdhci-cmd.h"
+
+#define NPCM7XX_MMC_BA 0xF0842000
+#define NPCM7XX_BLK_SIZE 512
+#define NPCM7XX_TEST_IMAGE_SIZE (1 << 30)
+
+char *sd_path;
+
+static QTestState *setup_sd_card(void)
+{
+ QTestState *qts = qtest_initf(
+ "-machine kudo-bmc "
+ "-device sd-card,drive=drive0 "
+ "-drive id=drive0,if=none,file=%s,format=raw,auto-read-only=off",
+ sd_path);
+
+ qtest_writew(qts, NPCM7XX_MMC_BA + SDHC_SWRST, SDHC_RESET_ALL);
+ qtest_writew(qts, NPCM7XX_MMC_BA + SDHC_CLKCON,
+ SDHC_CLOCK_SDCLK_EN | SDHC_CLOCK_INT_STABLE |
+ SDHC_CLOCK_INT_EN);
+ sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0, 0, SDHC_APP_CMD);
+ sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0x41200000, 0, (41 << 8));
+ sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0, 0, SDHC_ALL_SEND_CID);
+ sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0, 0, SDHC_SEND_RELATIVE_ADDR);
+ sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0x45670000, 0,
+ SDHC_SELECT_DESELECT_CARD);
+
+ return qts;
+}
+
+static void write_sdread(QTestState *qts, const char *msg)
+{
+ size_t len = strlen(msg);
+ char *rmsg = g_malloc(len);
+
+ /* write message to sd */
+ int fd = open(sd_path, O_WRONLY);
+ int ret = write(fd, msg, len);
+ close(fd);
+ g_assert(ret == len);
+
+ /* read message using sdhci */
+ ret = sdhci_read_cmd(qts, NPCM7XX_MMC_BA, rmsg, len);
+ g_assert(ret == len);
+ g_assert(!strcmp(rmsg, msg));
+
+ free(rmsg);
+}
+
+/* Check MMC can read values from sd */
+static void test_read_sd(void)
+{
+ QTestState *qts = setup_sd_card();
+
+ write_sdread(qts, "hello world");
+ write_sdread(qts, "goodbye");
+
+ qtest_quit(qts);
+}
+
+static void sdwrite_read(QTestState *qts, const char *msg)
+{
+ size_t len = strlen(msg);
+ char *rmsg = g_malloc(len);
+
+ /* write message using sdhci */
+ sdhci_write_cmd(qts, NPCM7XX_MMC_BA, msg, len, NPCM7XX_BLK_SIZE);
+
+ /* read message from sd */
+ int fd = open(sd_path, O_RDONLY);
+ int ret = read(fd, rmsg, len);
+ close(fd);
+ g_assert(ret == len);
+
+ g_assert(!strcmp(rmsg, msg));
+
+ free(rmsg);
+}
+
+/* Check MMC can write values to sd */
+static void test_write_sd(void)
+{
+ QTestState *qts = setup_sd_card();
+
+ sdwrite_read(qts, "hello world");
+ sdwrite_read(qts, "goodbye");
+
+ qtest_quit(qts);
+}
+
+/* Check SDHCI has correct default values. */
+static void test_reset(void)
+{
+ QTestState *qts = qtest_init("-machine kudo-bmc");
+
+ uint64_t addr = NPCM7XX_MMC_BA;
+ uint64_t end_addr = addr + NPCM7XX_REG_SIZE;
+ uint16_t prstvals_resets[] = {NPCM7XX_PRSTVALS_0_RESET,
+ NPCM7XX_PRSTVALS_1_RESET,
+ 0,
+ NPCM7XX_PRSTVALS_3_RESET,
+ 0,
+ 0};
+ int i;
+ uint32_t mask;
+ while (addr < end_addr) {
+ switch (addr - NPCM7XX_MMC_BA) {
+ case SDHC_PRNSTS:
+ /* ignores bits 20 to 24: they are changed when reading registers */
+ mask = 0x1f00000;
+ g_assert_cmphex(qtest_readl(qts, addr) | mask, ==,
+ NPCM7XX_PRSNTS_RESET | mask);
+ addr += 4;
+ break;
+ case SDHC_BLKGAP:
+ g_assert_cmphex(qtest_readb(qts, addr), ==, NPCM7XX_BLKGAP_RESET);
+ addr += 1;
+ break;
+ case SDHC_CAPAB:
+ g_assert_cmphex(qtest_readq(qts, addr), ==, NPCM7XX_CAPAB_RESET);
+ addr += 8;
+ break;
+ case SDHC_MAXCURR:
+ g_assert_cmphex(qtest_readq(qts, addr), ==, NPCM7XX_MAXCURR_RESET);
+ addr += 8;
+ break;
+ case SDHC_HCVER:
+ g_assert_cmphex(qtest_readw(qts, addr), ==, NPCM7XX_HCVER_RESET);
+ addr += 2;
+ break;
+ case NPCM7XX_PRSTVALS:
+ for (i = 0; i < NPCM7XX_PRSTVALS_SIZE; ++i) {
+ g_assert_cmphex(qtest_readw(qts, addr + 2 * i), ==,
+ prstvals_resets[i]);
+ }
+ addr += NPCM7XX_PRSTVALS_SIZE * 2;
+ break;
+ default:
+ g_assert_cmphex(qtest_readb(qts, addr), ==, 0);
+ addr += 1;
+ }
+ }
+
+ qtest_quit(qts);
+}
+
+static void drive_destroy(void)
+{
+ unlink(sd_path);
+ g_free(sd_path);
+}
+
+static void drive_create(void)
+{
+ int fd, ret;
+ sd_path = g_strdup("/tmp/qtest.XXXXXX");
+
+ /* Create a temporary raw image */
+ fd = mkstemp(sd_path);
+ g_assert_cmpint(fd, >=, 0);
+ ret = ftruncate(fd, NPCM7XX_TEST_IMAGE_SIZE);
+ g_assert_cmpint(ret, ==, 0);
+ g_message("%s", sd_path);
+ close(fd);
+}
+
+int main(int argc, char **argv)
+{
+ drive_create();
+
+ g_test_init(&argc, &argv, NULL);
+
+ qtest_add_func("npcm7xx_sdhci/reset", test_reset);
+ qtest_add_func("npcm7xx_sdhci/write_sd", test_write_sd);
+ qtest_add_func("npcm7xx_sdhci/read_sd", test_read_sd);
+
+ int ret = g_test_run();
+ drive_destroy();
+ return ret;
+}
--
2.34.1.575.g55b058a8bb-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] tests/qtest: add qtests for npcm7xx sdhci
2022-01-07 22:25 [PATCH] tests/qtest: add qtests for npcm7xx sdhci Patrick Venture
@ 2022-01-10 16:39 ` Patrick Venture
2022-01-13 11:43 ` Peter Maydell
2022-01-13 14:15 ` Thomas Huth
2 siblings, 0 replies; 4+ messages in thread
From: Patrick Venture @ 2022-01-10 16:39 UTC (permalink / raw)
To: Thomas Huth, lvivier, Paolo Bonzini, Peter Maydell
Cc: Havard Skinnemoen, CS20 KFTing, QEMU Developers, qemu-arm,
Shengtan Mao, Hao Wu, Chris Rauer
[-- Attachment #1: Type: text/plain, Size: 7513 bytes --]
On Fri, Jan 7, 2022 at 2:26 PM Patrick Venture <venture@google.com> wrote:
> From: Shengtan Mao <stmao@google.com>
>
> Reviewed-by: Hao Wu <wuhaotsh@google.com>
> Reviewed-by: Chris Rauer <crauer@google.com>
> Signed-off-by: Shengtan Mao <stmao@google.com>
> ---
> tests/qtest/meson.build | 1 +
> tests/qtest/npcm7xx_sdhci-test.c | 201 +++++++++++++++++++++++++++++++
> 2 files changed, 202 insertions(+)
> create mode 100644 tests/qtest/npcm7xx_sdhci-test.c
>
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index 37e1eaa449..b406eba8f6 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -189,6 +189,7 @@ qtests_npcm7xx = \
> 'npcm7xx_gpio-test',
> 'npcm7xx_pwm-test',
> 'npcm7xx_rng-test',
> + 'npcm7xx_sdhci-test',
> 'npcm7xx_smbus-test',
> 'npcm7xx_timer-test',
> 'npcm7xx_watchdog_timer-test'] + \
> diff --git a/tests/qtest/npcm7xx_sdhci-test.c
> b/tests/qtest/npcm7xx_sdhci-test.c
> new file mode 100644
> index 0000000000..feb09b921a
> --- /dev/null
> +++ b/tests/qtest/npcm7xx_sdhci-test.c
> @@ -0,0 +1,201 @@
> +/*
> + * QTests for NPCM7xx SD-3.0 / MMC-4.51 Host Controller
> + *
> + * Copyright (c) 2021 Google LLC
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the
> + * Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful, but
> WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> + * for more details.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "hw/sd/npcm7xx_sdhci.h"
> +
> +#include "libqos/libqtest.h"
> +#include "libqtest-single.h"
> +#include "libqos/sdhci-cmd.h"
> +
> +#define NPCM7XX_MMC_BA 0xF0842000
> +#define NPCM7XX_BLK_SIZE 512
> +#define NPCM7XX_TEST_IMAGE_SIZE (1 << 30)
> +
> +char *sd_path;
> +
> +static QTestState *setup_sd_card(void)
> +{
> + QTestState *qts = qtest_initf(
> + "-machine kudo-bmc "
> + "-device sd-card,drive=drive0 "
> + "-drive id=drive0,if=none,file=%s,format=raw,auto-read-only=off",
> + sd_path);
> +
> + qtest_writew(qts, NPCM7XX_MMC_BA + SDHC_SWRST, SDHC_RESET_ALL);
> + qtest_writew(qts, NPCM7XX_MMC_BA + SDHC_CLKCON,
> + SDHC_CLOCK_SDCLK_EN | SDHC_CLOCK_INT_STABLE |
> + SDHC_CLOCK_INT_EN);
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0, 0, SDHC_APP_CMD);
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0x41200000, 0, (41 << 8));
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0, 0, SDHC_ALL_SEND_CID);
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0, 0,
> SDHC_SEND_RELATIVE_ADDR);
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0x45670000, 0,
> + SDHC_SELECT_DESELECT_CARD);
> +
> + return qts;
> +}
> +
> +static void write_sdread(QTestState *qts, const char *msg)
> +{
> + size_t len = strlen(msg);
> + char *rmsg = g_malloc(len);
> +
> + /* write message to sd */
> + int fd = open(sd_path, O_WRONLY);
> + int ret = write(fd, msg, len);
> + close(fd);
> + g_assert(ret == len);
> +
> + /* read message using sdhci */
> + ret = sdhci_read_cmd(qts, NPCM7XX_MMC_BA, rmsg, len);
> + g_assert(ret == len);
> + g_assert(!strcmp(rmsg, msg));
> +
> + free(rmsg);
> +}
> +
> +/* Check MMC can read values from sd */
> +static void test_read_sd(void)
> +{
> + QTestState *qts = setup_sd_card();
> +
> + write_sdread(qts, "hello world");
> + write_sdread(qts, "goodbye");
> +
> + qtest_quit(qts);
> +}
> +
> +static void sdwrite_read(QTestState *qts, const char *msg)
> +{
> + size_t len = strlen(msg);
> + char *rmsg = g_malloc(len);
> +
> + /* write message using sdhci */
> + sdhci_write_cmd(qts, NPCM7XX_MMC_BA, msg, len, NPCM7XX_BLK_SIZE);
> +
> + /* read message from sd */
> + int fd = open(sd_path, O_RDONLY);
> + int ret = read(fd, rmsg, len);
> + close(fd);
> + g_assert(ret == len);
> +
> + g_assert(!strcmp(rmsg, msg));
> +
> + free(rmsg);
> +}
> +
> +/* Check MMC can write values to sd */
> +static void test_write_sd(void)
> +{
> + QTestState *qts = setup_sd_card();
> +
> + sdwrite_read(qts, "hello world");
> + sdwrite_read(qts, "goodbye");
> +
> + qtest_quit(qts);
> +}
> +
> +/* Check SDHCI has correct default values. */
> +static void test_reset(void)
> +{
> + QTestState *qts = qtest_init("-machine kudo-bmc");
> +
> + uint64_t addr = NPCM7XX_MMC_BA;
> + uint64_t end_addr = addr + NPCM7XX_REG_SIZE;
> + uint16_t prstvals_resets[] = {NPCM7XX_PRSTVALS_0_RESET,
> + NPCM7XX_PRSTVALS_1_RESET,
> + 0,
> + NPCM7XX_PRSTVALS_3_RESET,
> + 0,
> + 0};
> + int i;
> + uint32_t mask;
> + while (addr < end_addr) {
> + switch (addr - NPCM7XX_MMC_BA) {
> + case SDHC_PRNSTS:
> + /* ignores bits 20 to 24: they are changed when reading
> registers */
> + mask = 0x1f00000;
> + g_assert_cmphex(qtest_readl(qts, addr) | mask, ==,
> + NPCM7XX_PRSNTS_RESET | mask);
> + addr += 4;
> + break;
> + case SDHC_BLKGAP:
> + g_assert_cmphex(qtest_readb(qts, addr), ==,
> NPCM7XX_BLKGAP_RESET);
> + addr += 1;
> + break;
> + case SDHC_CAPAB:
> + g_assert_cmphex(qtest_readq(qts, addr), ==,
> NPCM7XX_CAPAB_RESET);
> + addr += 8;
> + break;
> + case SDHC_MAXCURR:
> + g_assert_cmphex(qtest_readq(qts, addr), ==,
> NPCM7XX_MAXCURR_RESET);
> + addr += 8;
> + break;
> + case SDHC_HCVER:
> + g_assert_cmphex(qtest_readw(qts, addr), ==,
> NPCM7XX_HCVER_RESET);
> + addr += 2;
> + break;
> + case NPCM7XX_PRSTVALS:
> + for (i = 0; i < NPCM7XX_PRSTVALS_SIZE; ++i) {
> + g_assert_cmphex(qtest_readw(qts, addr + 2 * i), ==,
> + prstvals_resets[i]);
> + }
> + addr += NPCM7XX_PRSTVALS_SIZE * 2;
> + break;
> + default:
> + g_assert_cmphex(qtest_readb(qts, addr), ==, 0);
> + addr += 1;
> + }
> + }
> +
> + qtest_quit(qts);
> +}
> +
> +static void drive_destroy(void)
> +{
> + unlink(sd_path);
> + g_free(sd_path);
> +}
> +
> +static void drive_create(void)
> +{
> + int fd, ret;
> + sd_path = g_strdup("/tmp/qtest.XXXXXX");
> +
> + /* Create a temporary raw image */
> + fd = mkstemp(sd_path);
> + g_assert_cmpint(fd, >=, 0);
> + ret = ftruncate(fd, NPCM7XX_TEST_IMAGE_SIZE);
> + g_assert_cmpint(ret, ==, 0);
> + g_message("%s", sd_path);
> + close(fd);
> +}
> +
> +int main(int argc, char **argv)
> +{
> + drive_create();
> +
> + g_test_init(&argc, &argv, NULL);
> +
> + qtest_add_func("npcm7xx_sdhci/reset", test_reset);
> + qtest_add_func("npcm7xx_sdhci/write_sd", test_write_sd);
> + qtest_add_func("npcm7xx_sdhci/read_sd", test_read_sd);
> +
> + int ret = g_test_run();
> + drive_destroy();
> + return ret;
> +}
>
+ Peter for ARM maintainers list.
> --
> 2.34.1.575.g55b058a8bb-goog
>
>
[-- Attachment #2: Type: text/html, Size: 9687 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tests/qtest: add qtests for npcm7xx sdhci
2022-01-07 22:25 [PATCH] tests/qtest: add qtests for npcm7xx sdhci Patrick Venture
2022-01-10 16:39 ` Patrick Venture
@ 2022-01-13 11:43 ` Peter Maydell
2022-01-13 14:15 ` Thomas Huth
2 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2022-01-13 11:43 UTC (permalink / raw)
To: Patrick Venture
Cc: lvivier, thuth, Shengtan Mao, qemu-devel, hskinnemoen, Hao Wu,
kfting, qemu-arm, pbonzini, Chris Rauer
On Fri, 7 Jan 2022 at 22:32, Patrick Venture <venture@google.com> wrote:
>
> From: Shengtan Mao <stmao@google.com>
>
> Reviewed-by: Hao Wu <wuhaotsh@google.com>
> Reviewed-by: Chris Rauer <crauer@google.com>
> Signed-off-by: Shengtan Mao <stmao@google.com>
> ---
> tests/qtest/meson.build | 1 +
> tests/qtest/npcm7xx_sdhci-test.c | 201 +++++++++++++++++++++++++++++++
> 2 files changed, 202 insertions(+)
> create mode 100644 tests/qtest/npcm7xx_sdhci-test.c
>
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index 37e1eaa449..b406eba8f6 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -189,6 +189,7 @@ qtests_npcm7xx = \
> 'npcm7xx_gpio-test',
> 'npcm7xx_pwm-test',
> 'npcm7xx_rng-test',
> + 'npcm7xx_sdhci-test',
> 'npcm7xx_smbus-test',
> 'npcm7xx_timer-test',
> 'npcm7xx_watchdog_timer-test'] + \
> diff --git a/tests/qtest/npcm7xx_sdhci-test.c b/tests/qtest/npcm7xx_sdhci-test.c
> new file mode 100644
> index 0000000000..feb09b921a
> --- /dev/null
> +++ b/tests/qtest/npcm7xx_sdhci-test.c
> @@ -0,0 +1,201 @@
> +/*
> + * QTests for NPCM7xx SD-3.0 / MMC-4.51 Host Controller
> + *
> + * Copyright (c) 2021 Google LLC
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the
> + * Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> + * for more details.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "hw/sd/npcm7xx_sdhci.h"
> +
> +#include "libqos/libqtest.h"
> +#include "libqtest-single.h"
> +#include "libqos/sdhci-cmd.h"
> +
> +#define NPCM7XX_MMC_BA 0xF0842000
> +#define NPCM7XX_BLK_SIZE 512
> +#define NPCM7XX_TEST_IMAGE_SIZE (1 << 30)
> +
> +char *sd_path;
> +
> +static QTestState *setup_sd_card(void)
> +{
> + QTestState *qts = qtest_initf(
> + "-machine kudo-bmc "
> + "-device sd-card,drive=drive0 "
> + "-drive id=drive0,if=none,file=%s,format=raw,auto-read-only=off",
> + sd_path);
> +
> + qtest_writew(qts, NPCM7XX_MMC_BA + SDHC_SWRST, SDHC_RESET_ALL);
> + qtest_writew(qts, NPCM7XX_MMC_BA + SDHC_CLKCON,
> + SDHC_CLOCK_SDCLK_EN | SDHC_CLOCK_INT_STABLE |
> + SDHC_CLOCK_INT_EN);
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0, 0, SDHC_APP_CMD);
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0x41200000, 0, (41 << 8));
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0, 0, SDHC_ALL_SEND_CID);
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0, 0, SDHC_SEND_RELATIVE_ADDR);
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0x45670000, 0,
> + SDHC_SELECT_DESELECT_CARD);
> +
> + return qts;
> +}
> +
> +static void write_sdread(QTestState *qts, const char *msg)
> +{
> + size_t len = strlen(msg);
> + char *rmsg = g_malloc(len);
> +
> + /* write message to sd */
> + int fd = open(sd_path, O_WRONLY);
> + int ret = write(fd, msg, len);
You're not checking that open() succeeded before using the fd
(similarly in a function later on).
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tests/qtest: add qtests for npcm7xx sdhci
2022-01-07 22:25 [PATCH] tests/qtest: add qtests for npcm7xx sdhci Patrick Venture
2022-01-10 16:39 ` Patrick Venture
2022-01-13 11:43 ` Peter Maydell
@ 2022-01-13 14:15 ` Thomas Huth
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Huth @ 2022-01-13 14:15 UTC (permalink / raw)
To: Patrick Venture, lvivier, pbonzini
Cc: Shengtan Mao, hskinnemoen, qemu-devel, Hao Wu, kfting, qemu-arm,
Chris Rauer
Hi!
On 07/01/2022 23.25, Patrick Venture wrote:
[...]
> diff --git a/tests/qtest/npcm7xx_sdhci-test.c b/tests/qtest/npcm7xx_sdhci-test.c
> new file mode 100644
> index 0000000000..feb09b921a
> --- /dev/null
> +++ b/tests/qtest/npcm7xx_sdhci-test.c
> @@ -0,0 +1,201 @@
> +/*
> + * QTests for NPCM7xx SD-3.0 / MMC-4.51 Host Controller
> + *
> + * Copyright (c) 2021 Google LLC
You might want to update to 2022 now.
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the
> + * Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> + * for more details.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "hw/sd/npcm7xx_sdhci.h"
> +
> +#include "libqos/libqtest.h"
> +#include "libqtest-single.h"
> +#include "libqos/sdhci-cmd.h"
> +
> +#define NPCM7XX_MMC_BA 0xF0842000
> +#define NPCM7XX_BLK_SIZE 512
> +#define NPCM7XX_TEST_IMAGE_SIZE (1 << 30)
> +
> +char *sd_path;
> +
> +static QTestState *setup_sd_card(void)
> +{
> + QTestState *qts = qtest_initf(
> + "-machine kudo-bmc "
> + "-device sd-card,drive=drive0 "
> + "-drive id=drive0,if=none,file=%s,format=raw,auto-read-only=off",
> + sd_path);
> +
> + qtest_writew(qts, NPCM7XX_MMC_BA + SDHC_SWRST, SDHC_RESET_ALL);
> + qtest_writew(qts, NPCM7XX_MMC_BA + SDHC_CLKCON,
> + SDHC_CLOCK_SDCLK_EN | SDHC_CLOCK_INT_STABLE |
> + SDHC_CLOCK_INT_EN);
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0, 0, SDHC_APP_CMD);
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0x41200000, 0, (41 << 8));
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0, 0, SDHC_ALL_SEND_CID);
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0, 0, SDHC_SEND_RELATIVE_ADDR);
> + sdhci_cmd_regs(qts, NPCM7XX_MMC_BA, 0, 0, 0x45670000, 0,
> + SDHC_SELECT_DESELECT_CARD);
> +
> + return qts;
> +}
> +
> +static void write_sdread(QTestState *qts, const char *msg)
> +{
> + size_t len = strlen(msg);
> + char *rmsg = g_malloc(len);
> +
> + /* write message to sd */
> + int fd = open(sd_path, O_WRONLY);
> + int ret = write(fd, msg, len);
> + close(fd);
> + g_assert(ret == len);
> +
> + /* read message using sdhci */
> + ret = sdhci_read_cmd(qts, NPCM7XX_MMC_BA, rmsg, len);
> + g_assert(ret == len);
> + g_assert(!strcmp(rmsg, msg));
> +
> + free(rmsg);
g_free(), please. Or you could use g_autofree instead.
> +}
> +
> +/* Check MMC can read values from sd */
> +static void test_read_sd(void)
> +{
> + QTestState *qts = setup_sd_card();
> +
> + write_sdread(qts, "hello world");
> + write_sdread(qts, "goodbye");
> +
> + qtest_quit(qts);
> +}
> +
> +static void sdwrite_read(QTestState *qts, const char *msg)
> +{
> + size_t len = strlen(msg);
> + char *rmsg = g_malloc(len);
> +
> + /* write message using sdhci */
> + sdhci_write_cmd(qts, NPCM7XX_MMC_BA, msg, len, NPCM7XX_BLK_SIZE);
> +
> + /* read message from sd */
> + int fd = open(sd_path, O_RDONLY);
> + int ret = read(fd, rmsg, len);
according to the QEMU coding style:
"declarations should be at the beginning
of blocks"
So please separate the declarations from the assignment here.
> + close(fd);
> + g_assert(ret == len);
> +
> + g_assert(!strcmp(rmsg, msg));
> +
> + free(rmsg);
g_free() or g_autofree please.
> +}
> +
> +/* Check MMC can write values to sd */
> +static void test_write_sd(void)
> +{
> + QTestState *qts = setup_sd_card();
> +
> + sdwrite_read(qts, "hello world");
> + sdwrite_read(qts, "goodbye");
> +
> + qtest_quit(qts);
> +}
> +
> +/* Check SDHCI has correct default values. */
> +static void test_reset(void)
> +{
> + QTestState *qts = qtest_init("-machine kudo-bmc");
> +
> + uint64_t addr = NPCM7XX_MMC_BA;
> + uint64_t end_addr = addr + NPCM7XX_REG_SIZE;
> + uint16_t prstvals_resets[] = {NPCM7XX_PRSTVALS_0_RESET,
> + NPCM7XX_PRSTVALS_1_RESET,
> + 0,
> + NPCM7XX_PRSTVALS_3_RESET,
> + 0,
> + 0};
I'd prefer a space after the "{" and before the "}" ... I wonder why
checkpatch doesn't complain here... maybe it's just a matter of taste, indeed.
> + int i;
> + uint32_t mask;
> + while (addr < end_addr) {
> + switch (addr - NPCM7XX_MMC_BA) {
> + case SDHC_PRNSTS:
> + /* ignores bits 20 to 24: they are changed when reading registers */
> + mask = 0x1f00000;
> + g_assert_cmphex(qtest_readl(qts, addr) | mask, ==,
> + NPCM7XX_PRSNTS_RESET | mask);
> + addr += 4;
> + break;
> + case SDHC_BLKGAP:
> + g_assert_cmphex(qtest_readb(qts, addr), ==, NPCM7XX_BLKGAP_RESET);
> + addr += 1;
> + break;
> + case SDHC_CAPAB:
> + g_assert_cmphex(qtest_readq(qts, addr), ==, NPCM7XX_CAPAB_RESET);
> + addr += 8;
> + break;
> + case SDHC_MAXCURR:
> + g_assert_cmphex(qtest_readq(qts, addr), ==, NPCM7XX_MAXCURR_RESET);
> + addr += 8;
> + break;
> + case SDHC_HCVER:
> + g_assert_cmphex(qtest_readw(qts, addr), ==, NPCM7XX_HCVER_RESET);
> + addr += 2;
> + break;
> + case NPCM7XX_PRSTVALS:
> + for (i = 0; i < NPCM7XX_PRSTVALS_SIZE; ++i) {
> + g_assert_cmphex(qtest_readw(qts, addr + 2 * i), ==,
> + prstvals_resets[i]);
> + }
> + addr += NPCM7XX_PRSTVALS_SIZE * 2;
> + break;
> + default:
> + g_assert_cmphex(qtest_readb(qts, addr), ==, 0);
> + addr += 1;
> + }
> + }
> +
> + qtest_quit(qts);
> +}
> +
> +static void drive_destroy(void)
> +{
> + unlink(sd_path);
> + g_free(sd_path);
> +}
> +
> +static void drive_create(void)
> +{
> + int fd, ret;
> + sd_path = g_strdup("/tmp/qtest.XXXXXX");
> +
> + /* Create a temporary raw image */
> + fd = mkstemp(sd_path);
Maybe use g_file_open_tmp() instead, so you don't have to hard-code the /tmp
directory (in case we ever want to run the qtests on non-POSIX systems).
> + g_assert_cmpint(fd, >=, 0);
> + ret = ftruncate(fd, NPCM7XX_TEST_IMAGE_SIZE);
> + g_assert_cmpint(ret, ==, 0);
> + g_message("%s", sd_path);
> + close(fd);
> +}
> +
> +int main(int argc, char **argv)
> +{
> + drive_create();
> +
> + g_test_init(&argc, &argv, NULL);
> +
> + qtest_add_func("npcm7xx_sdhci/reset", test_reset);
> + qtest_add_func("npcm7xx_sdhci/write_sd", test_write_sd);
> + qtest_add_func("npcm7xx_sdhci/read_sd", test_read_sd);
> +
> + int ret = g_test_run();
> + drive_destroy();
> + return ret;
> +}
Thomas
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-13 14:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-07 22:25 [PATCH] tests/qtest: add qtests for npcm7xx sdhci Patrick Venture
2022-01-10 16:39 ` Patrick Venture
2022-01-13 11:43 ` Peter Maydell
2022-01-13 14:15 ` Thomas Huth
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.