Re: [Qemu-devel] [PATCH v9 02/16] sdhci: add qtest to check the SD capabilities register

[Philippe Mathieu-Daudé]

On 02/07/2018 02:10 PM, Paolo Bonzini wrote:
> On 23/01/2018 03:08, Philippe Mathieu-Daudé wrote:
>> The PCI model is tested with the pc/x86_64 machine,
>> the SysBus model with the smdkc210/arm machine.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
>> ---
>>  tests/sdhci-test.c     | 134 
>> +++++++++++++++++++++++++++++++++++++++++++++++++
>>  tests/Makefile.include |   3 ++
>>  2 files changed, 137 insertions(+)
>>  create mode 100644 tests/sdhci-test.c
>>
>> diff --git a/tests/sdhci-test.c b/tests/sdhci-test.c
>> new file mode 100644
>> index 0000000000..517e2ed5a2
>> --- /dev/null
>> +++ b/tests/sdhci-test.c
>> @@ -0,0 +1,134 @@
>> +/*
>> + * QTest testcase for SDHCI controllers
>> + *
>> + * Written by Philippe Mathieu-Daudé <address@hidden>
>> + *
>> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
>> + * See the COPYING file in the top-level directory.
>> + * SPDX-License-Identifier: GPL-2.0-or-later
>> + */
>> +#include "qemu/osdep.h"
>> +#include "hw/registerfields.h"
>> +#include "libqtest.h"
>> +#include "libqos/pci-pc.h"
>> +#include "hw/pci/pci.h"
>> +
>> +#define SDHC_CAPAB                      0x40
>> +#define SDHC_HCVER                      0xFE
>> +
>> +static const struct sdhci_t {
>> +    const char *arch, *machine;
>> +    struct {
>> +        uintptr_t addr;
>> +        uint8_t version;
>> +        uint8_t baseclock;
>> +        struct {
>> +            bool sdma;
>> +            uint64_t reg;
>> +        } capab;
>> +    } sdhci;
>> +    struct {
>> +        uint16_t vendor_id, device_id;
>> +    } pci;
>> +} models[] = {
>> +    /* PC via PCI */
>> +    { "x86_64", "pc",
>> +        {-1,         2, 0,  {1, 0x057834b4} },
>> +        .pci = { PCI_VENDOR_ID_REDHAT, PCI_DEVICE_ID_REDHAT_SDHCI } },
>> +
>> +    /* Exynos4210 */
>> +    { "arm",    "smdkc210",
>> +        {0x12510000, 2, 0,  {1, 0x5e80080} } },
>> +};
>> +
>> +static struct {
>> +    QPCIBus *pcibus;
>> +    QPCIDevice *dev;
>> +    QPCIBar mem_bar;
>> +} g = { };
>> +
>> +static uint64_t sdhci_readq(uintptr_t base, uint32_t reg_addr)
>> +{
>> +    if (g.dev) {
>> +        uint64_t value;
>> +
>> +        qpci_memread(g.dev, g.mem_bar, reg_addr, &value, sizeof(value));
>> +
>> +        return value;
>> +    } else {
>> +        QTestState *qtest = global_qtest;
>> +
>> +        return qtest_readq(qtest, base + reg_addr);
>> +    }
>> +}
> 
> Maybe the struct about could be a "QSDHCI*" that is returned by
> machine_start and accepted by sdhci_readq and check_capab_capareg?
> Later the same would work for sdhci_readl, check_specs_version, etc.

Good idea, I didn't like the global 'g' but wanted to have PCI/qtesting
feedback before improving this.

> 
> That's my only remark though.  Thanks!

Thanks :)

> 
> Paolo
> 
>> +static void check_capab_capareg(uintptr_t addr, uint64_t expected_capab)
>> +{
>> +    uint64_t capab;
>> +
>> +    capab = sdhci_readq(addr, SDHC_CAPAB);
>> +    g_assert_cmphex(capab, ==, expected_capab);
>> +}
>> +
>> +static void machine_start(const struct sdhci_t *test)
>> +{
>> +    if (test->pci.vendor_id) {
>> +        /* PCI */
>> +        uint16_t vendor_id, device_id;
>> +        uint64_t barsize;
>> +
>> +        global_qtest = qtest_startf("-machine %s -d unimp -device 
>> sdhci-pci",
>> +                                    test->machine);
>> +
>> +        g.pcibus = qpci_init_pc(NULL);
>> +
>> +        /* Find PCI device and verify it's the right one */
>> +        g.dev = qpci_device_find(g.pcibus, QPCI_DEVFN(4, 0));
>> +        g_assert_nonnull(g.dev);
>> +        vendor_id = qpci_config_readw(g.dev, PCI_VENDOR_ID);
>> +        device_id = qpci_config_readw(g.dev, PCI_DEVICE_ID);
>> +        g_assert(vendor_id == test->pci.vendor_id);
>> +        g_assert(device_id == test->pci.device_id);
>> +        g.mem_bar = qpci_iomap(g.dev, 0, &barsize);
>> +        qpci_device_enable(g.dev);
>> +    } else {
>> +        /* SysBus */
>> +        global_qtest = qtest_startf("-machine %s -d unimp", test->machine);
>> +    }
>> +}
>> +
>> +static void machine_stop(void)
>> +{
>> +    g_free(g.dev);
>> +    qtest_quit(global_qtest);
>> +}
>> +
>> +static void test_machine(const void *data)
>> +{
>> +    const struct sdhci_t *test = data;
>> +
>> +    machine_start(test);
>> +
>> +    check_capab_capareg(test->sdhci.addr, test->sdhci.capab.reg);
>> +
>> +    machine_stop();
>> +}
>> +
>> +int main(int argc, char *argv[])
>> +{
>> +    const char *arch = qtest_get_arch();
>> +    char *name;
>> +    int i;
>> +
>> +    g_test_init(&argc, &argv, NULL);
>> +    for (i = 0; i < ARRAY_SIZE(models); i++) {
>> +        if (strcmp(arch, models[i].arch)) {
>> +            continue;
>> +        }
>> +        name = g_strdup_printf("sdhci/%s", models[i].machine);
>> +        qtest_add_data_func(name, &models[i], test_machine);
>> +        g_free(name);
>> +    }
>> +
>> +    return g_test_run();
>> +}
>> diff --git a/tests/Makefile.include b/tests/Makefile.include
>> index 8883274ae1..756725b0f9 100644
>> --- a/tests/Makefile.include
>> +++ b/tests/Makefile.include
>> @@ -293,6 +293,7 @@ check-qtest-i386-y += tests/migration-test$(EXESUF)
>>  check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF)
>>  check-qtest-i386-y += tests/numa-test$(EXESUF)
>>  check-qtest-x86_64-y += $(check-qtest-i386-y)
>> +check-qtest-x86_64-y += tests/sdhci-test$(EXESUF)
>>  gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
>>  gcov-files-x86_64-y = $(subst 
>> i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
>>  
>> @@ -363,6 +364,7 @@ gcov-files-arm-y += arm-softmmu/hw/block/virtio-blk.c
>>  check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF)
>>  gcov-files-arm-y += hw/timer/arm_mptimer.c
>>  check-qtest-arm-y += tests/boot-serial-test$(EXESUF)
>> +check-qtest-arm-y += tests/sdhci-test$(EXESUF)
>>  
>>  check-qtest-aarch64-y = tests/numa-test$(EXESUF)
>>  
>> @@ -816,6 +818,7 @@ tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o
>>  tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y)
>>  tests/numa-test$(EXESUF): tests/numa-test.o
>>  tests/vmgenid-test$(EXESUF): tests/vmgenid-test.o tests/boot-sector.o 
>> tests/acpi-utils.o
>> +tests/sdhci-test$(EXESUF): tests/sdhci-test.o $(libqos-pc-obj-y)
>>  
>>  tests/migration/stress$(EXESUF): tests/migration/stress.o
>>      $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< 
>> ,"LINK","$(TARGET_DIR)$@")
>>
>