From nobody Mon Feb 9 23:40:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of _spf.google.com designates 209.85.220.196 as permitted sender) client-ip=209.85.220.196; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-qk0-f196.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of _spf.google.com designates 209.85.220.196 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by mx.zohomail.com with SMTPS id 1518494907189338.93268907641414; Mon, 12 Feb 2018 20:08:27 -0800 (PST) Received: by mail-qk0-f196.google.com with SMTP id h129so1099970qke.8 for ; Mon, 12 Feb 2018 20:08:26 -0800 (PST) Return-Path: Return-Path: Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q2sm7350435qki.10.2018.02.12.20.08.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2018 20:08:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z4FASCEUvqUvC0+szYHxgDAw1bVHuiNDfdpt5p/lp3A=; b=LkBSvry9u3bFGrYU2dTTvDJ2uZSM0ZLqKH0i/Dl8HSSiDT7sqcQVHCBA3s6cDNjtRz MWLWl0XJ/RYRFECxvsEqQR+DC1w98FFRJdqeDoHcoCWVcj4mmlOy3E7JZMO5CIrsftSo zncfEoaLhQWB9hX+IKIWKFrUfUxEeGi2n2db4xTgxueDBuYblzIu35FzUClOnUv1FZVc OrQpfvWoiKic9GG1K02PxwW7hR3qDAWzFrIFI291ZhnQKvttLEIWdyiiA2b0CdrEy9AV q4xZUDa9VqXWzoypiPrRhAB2KhOo6liUuXkik2u3YCq1mFOq5eUJ1PgkZVSOjMmoQ1o5 UoSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Z4FASCEUvqUvC0+szYHxgDAw1bVHuiNDfdpt5p/lp3A=; b=r9KmSYWNa973gBh5qMH0cAaYJNHlLGcQFEQKUG89Uy7RBl0gj1VZVc7jhTROHT6BwW 81hAtoEYvWeA3tphWhBx4hlv3L+eFjkYUpA0Y+DGZ8N7ZhhIbu6wxoknccd9uIJT9k2i Iwo04vFKembSXkdwGZIHz93VtD9K3bYSpmlJBjcKScwh/XqAmjFyntP9XYWF2msi7nRX +oMF2l5qveH3N1R/NWonQYtXm2V8bsnmDbQ3AO9IqDIngISk3czrwVQ6E01bnJfpYnhr GEC06hm1YHH0Bf1FklTAvSxJdzfwuyzn7weJm9aZWpKwN54UX+STQ+XDRzjKwEMQq3lq v9lg== X-Gm-Message-State: APf1xPCxVuFnNwXsGtoZTJHn0xv0okx+KrTvCFyseq1ApnwhPvaQMRUu zLDFA/E3tw8pTI2DhfihC8A= X-Google-Smtp-Source: AH8x2272HTnlkAg+Ll/eLrxA9R2R1azkKm3cq94Ww2KwZIOYpeepLE/qrUzytsX7tNmMJ+kAO2MdtA== X-Received: by 10.55.144.2 with SMTP id s2mr20237685qkd.257.1518494906011; Mon, 12 Feb 2018 20:08:26 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Peter Maydell , Alistair Francis , "Edgar E . Iglesias" , Fam Zheng Subject: [PATCH v13 02/30] sdhci: add qtest to check the SD capabilities register Date: Tue, 13 Feb 2018 01:07:41 -0300 Message-Id: <20180213040809.26021-3-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180213040809.26021-1-f4bug@amsat.org> References: <20180213040809.26021-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZohoMail: RDKM_0 RSF_0 Z_629925259 SPT_0 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=C3=A9 Reviewed-by: Paolo Bonzini --- tests/sdhci-test.c | 145 +++++++++++++++++++++++++++++++++++++++++++++= ++++ tests/Makefile.include | 3 + 2 files changed, 148 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..82f3785a72 --- /dev/null +++ b/tests/sdhci-test.c @@ -0,0 +1,145 @@ +/* + * QTest testcase for SDHCI controllers + * + * Written by Philippe Mathieu-Daud=C3=A9 + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * 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[] =3D { + /* PC via PCI */ + { "x86_64", "pc", + {-1, 2, 0, {1, 0x057834b4} }, + .pci =3D { PCI_VENDOR_ID_REDHAT, PCI_DEVICE_ID_REDHAT_SDHCI } }, + + /* Exynos4210 */ + { "arm", "smdkc210", + {0x12510000, 2, 0, {1, 0x5e80080} } }, +}; + +typedef struct QSDHCI { + struct { + QPCIBus *bus; + QPCIDevice *dev; + } pci; + union { + QPCIBar mem_bar; + uint64_t addr; + }; +} QSDHCI; + +static uint64_t sdhci_readq(QSDHCI *s, uint32_t reg) +{ + uint64_t val; + + if (s->pci.dev) { + qpci_memread(s->pci.dev, s->mem_bar, reg, &val, sizeof(val)); + } else { + val =3D qtest_readq(global_qtest, s->addr + reg); + } + + return val; +} + +/* tests */ + +static void check_capab_capareg(QSDHCI *s, uint64_t expected_capab) +{ + uint64_t capab; + + capab =3D sdhci_readq(s, SDHC_CAPAB); + g_assert_cmphex(capab, =3D=3D, expected_capab); +} + +static QSDHCI *machine_start(const struct sdhci_t *test) +{ + QSDHCI *s =3D g_new0(QSDHCI, 1); + + if (test->pci.vendor_id) { + /* PCI */ + uint16_t vendor_id, device_id; + uint64_t barsize; + + global_qtest =3D qtest_startf("-machine %s -device sdhci-pci", + test->machine); + + s->pci.bus =3D qpci_init_pc(NULL); + + /* Find PCI device and verify it's the right one */ + s->pci.dev =3D qpci_device_find(s->pci.bus, QPCI_DEVFN(4, 0)); + g_assert_nonnull(s->pci.dev); + vendor_id =3D qpci_config_readw(s->pci.dev, PCI_VENDOR_ID); + device_id =3D qpci_config_readw(s->pci.dev, PCI_DEVICE_ID); + g_assert(vendor_id =3D=3D test->pci.vendor_id); + g_assert(device_id =3D=3D test->pci.device_id); + s->mem_bar =3D qpci_iomap(s->pci.dev, 0, &barsize); + qpci_device_enable(s->pci.dev); + } else { + /* SysBus */ + global_qtest =3D qtest_startf("-machine %s", test->machine); + s->addr =3D test->sdhci.addr; + } + + return s; +} + +static void machine_stop(QSDHCI *s) +{ + g_free(s->pci.dev); + qtest_quit(global_qtest); +} + +static void test_machine(const void *data) +{ + const struct sdhci_t *test =3D data; + QSDHCI *s; + + s =3D machine_start(test); + + check_capab_capareg(s, test->sdhci.capab.reg); + + machine_stop(s); +} + +int main(int argc, char *argv[]) +{ + const char *arch =3D qtest_get_arch(); + char *name; + int i; + + g_test_init(&argc, &argv, NULL); + for (i =3D 0; i < ARRAY_SIZE(models); i++) { + if (strcmp(arch, models[i].arch)) { + continue; + } + name =3D 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 f41da235ae..52be9b3fa5 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -294,6 +294,7 @@ check-qtest-i386-y +=3D tests/migration-test$(EXESUF) check-qtest-i386-y +=3D tests/test-x86-cpuid-compat$(EXESUF) check-qtest-i386-y +=3D tests/numa-test$(EXESUF) check-qtest-x86_64-y +=3D $(check-qtest-i386-y) +check-qtest-x86_64-y +=3D tests/sdhci-test$(EXESUF) gcov-files-i386-y +=3D i386-softmmu/hw/timer/mc146818rtc.c gcov-files-x86_64-y =3D $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files= -i386-y)) =20 @@ -367,6 +368,7 @@ gcov-files-arm-y +=3D arm-softmmu/hw/block/virtio-blk.c check-qtest-arm-y +=3D tests/test-arm-mptimer$(EXESUF) gcov-files-arm-y +=3D hw/timer/arm_mptimer.c check-qtest-arm-y +=3D tests/boot-serial-test$(EXESUF) +check-qtest-arm-y +=3D tests/sdhci-test$(EXESUF) =20 check-qtest-aarch64-y =3D tests/numa-test$(EXESUF) =20 @@ -822,6 +824,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 test= s/acpi-utils.o +tests/sdhci-test$(EXESUF): tests/sdhci-test.o $(libqos-pc-obj-y) =20 tests/migration/stress$(EXESUF): tests/migration/stress.o $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"L= INK","$(TARGET_DIR)$@") --=20 2.16.1