From nobody Tue Nov 4 21:59:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533566457477350.0845098220684; Mon, 6 Aug 2018 07:40:57 -0700 (PDT) Received: from localhost ([::1]:34376 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmggj-0000zX-5Q for importer@patchew.org; Mon, 06 Aug 2018 10:40:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmgas-0004nJ-Lf for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:34:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmgar-0000ne-0N for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:34:46 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:33042) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fmgaq-0000nI-ML for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:34:44 -0400 Received: by mail-ed1-x543.google.com with SMTP id x5-v6so5274017edr.0 for ; Mon, 06 Aug 2018 07:34:44 -0700 (PDT) Received: from localhost.localdomain ([194.230.159.126]) by smtp.gmail.com with ESMTPSA id x13-v6sm14615157edx.17.2018.08.06.07.34.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 07:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tDT+K0engTl8rMkF91rVwzbwe86TrFJAOAllKRv7ua0=; b=YFdIOThs2MG50Njb62ypdbNXs35S1yOQL/BXI3TGcw6d2njMCe1esZhy5dMLz3Rj7S 8ALhQaDKwKZi6w2vkT3APYtZFIOet9H7nTH6HmyTCpGtnIIFy2ztXOTSdla/2TLyIyuL 6BxieMQUVosfNe0HmjZu6FNlKSJIBZSpTAl8T7QqyN2OI6o4WZaP6SWkjHXJ0ihh6sbu x3wCVi/Zujj3wGuY34oTXbZ79AwQyKN/eJpy3OC0VbM6yaGo7RBlCuGSPzCGcun3TG3j dksGTv853lAvYs+/SJA48M7pQiJOkf/3rzDiugSaYS6us7j4r3/8lb6f+iaZrQyzMgAA 9iag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tDT+K0engTl8rMkF91rVwzbwe86TrFJAOAllKRv7ua0=; b=K+Cv4qisIvz0z00cuP3AeTMwpuFXEwb9vSRXjSZAa9s4j+9gxqEfcKr88/EW+d2KLb 8F0Y+0DlRwWSph7ptQTNYwRM2qP3o6PnTZJd8khT3wA91MWMCU7zZUB1ljEzbCAMdiqo czFp7w1gM3qV5bay7172Za6D/derX7LwT21XtsbudS2pLJfV8yTkVy6R/s90oIrHVmgO jtKtn8vwr7WWoa5Mxv8T6anpvwRp8GD7SYKlFfO+Buwh3TUPIfqDKYNuihFoRW+REoTy NY3STY6OczVL6Ta2qQFOQoghXO6kY0s70Ur3aYb89cgtmklXzks/mWuVP9BrSRBhULUk dWsw== X-Gm-Message-State: AOUpUlF1QzcwNkFt0uBoKwNglOKasJt+CbnigjMwcxdIdtMdmrvGk8vk DiAuuubs+oysIBlCWF2oDXA= X-Google-Smtp-Source: AAOMgpciL6TPDoiaD1UbdRPbEVbxRMLXR86NA+77O5SSBx152TUWbAwzw4fydmPmkQmTJ8CA1Tsk7g== X-Received: by 2002:a50:b2a6:: with SMTP id p35-v6mr18973469edd.215.1533566083574; Mon, 06 Aug 2018 07:34:43 -0700 (PDT) From: Emanuele Giuseppe Esposito To: Paolo Bonzini Date: Mon, 6 Aug 2018 16:33:44 +0200 Message-Id: <20180806143412.27722-7-e.emanuelegiuseppe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180806143412.27722-1-e.emanuelegiuseppe@gmail.com> References: <20180806143412.27722-1-e.emanuelegiuseppe@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::543 Subject: [Qemu-devel] [PATCH v2 06/34] tests/qgraph: sdhci test node X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Stefan Hajnoczi , Emanuele Giuseppe Esposito , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Convert tests/sdhci-test in first qgraph test node, sdhci-test. This test consumes an sdhci interface and checks that its function return the expected values. Note that this test does not allocate any sdhci structure, it's all done by= the qtest walking graph mechanism Signed-off-by: Emanuele Giuseppe Esposito Reviewed-by: Laurent Vivier --- tests/Makefile.include | 9 +- tests/sdhci-test.c | 222 ++++++++++++----------------------------- 2 files changed, 68 insertions(+), 163 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index be00fb71ec..fec6cf35bb 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -311,7 +311,6 @@ 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 @@ -385,10 +384,8 @@ 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) -check-qtest-aarch64-y +=3D tests/sdhci-test$(EXESUF) check-qtest-aarch64-y +=3D tests/boot-serial-test$(EXESUF) =20 check-qtest-microblazeel-y =3D $(check-qtest-microblaze-y) @@ -777,11 +774,14 @@ libqgraph-pci-obj-y =3D $(libqos-pc-obj-y) libqgraph-pci-obj-y +=3D $(libqgraph-machines-obj-y) libqgraph-pci-obj-y +=3D tests/libqos/sdhci.o =20 +libqgraph-tests-obj-y =3D $(libqgraph-pci-obj-y) +libqgraph-tests-obj-y +=3D tests/sdhci-test.o + check-unit-y +=3D tests/test-qgraph$(EXESUF) tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) =20 check-qtest-pci-y +=3D tests/qos-test$(EXESUF) -tests/qos-test$(EXESUF): tests/qos-test.o $(libqgraph-pci-obj-y) +tests/qos-test$(EXESUF): tests/qos-test.o $(libqgraph-tests-obj-y) =20 tests/qmp-test$(EXESUF): tests/qmp-test.o tests/device-introspect-test$(EXESUF): tests/device-introspect-test.o @@ -867,7 +867,6 @@ 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) tests/cdrom-test$(EXESUF): tests/cdrom-test.o tests/boot-sector.o $(libqos= -obj-y) =20 tests/migration/stress$(EXESUF): tests/migration/stress.o diff --git a/tests/sdhci-test.c b/tests/sdhci-test.c index 5e97590573..77719bdb8b 100644 --- a/tests/sdhci-test.c +++ b/tests/sdhci-test.c @@ -12,6 +12,8 @@ #include "libqtest.h" #include "libqos/pci-pc.h" #include "hw/pci/pci.h" +#include "libqos/qgraph.h" +#include "libqos/sdhci.h" =20 #define SDHC_CAPAB 0x40 FIELD(SDHC_CAPAB, BASECLKFREQ, 8, 8); /* since v2 */ @@ -20,99 +22,60 @@ FIELD(SDHC_CAPAB, SDR, 32, 3); /* = since v3 */ FIELD(SDHC_CAPAB, DRIVER, 36, 3); /* since v3 */ #define SDHC_HCVER 0xFE =20 -static const struct sdhci_t { - const char *arch, *machine; - struct { - uintptr_t addr; - uint8_t version; - uint8_t baseclock; +/** + * Old sdhci_t structure: + * + struct sdhci_t { + const char *arch, *machine; 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} } }, - - /* i.MX 6 */ - { "arm", "sabrelite", - {0x02190000, 3, 0, {1, 0x057834b4} } }, - - /* BCM2835 */ - { "arm", "raspi2", - {0x3f300000, 3, 52, {0, 0x052134b4} } }, - - /* Zynq-7000 */ - { "arm", "xilinx-zynq-a9", /* Datasheet: UG585 (v1.12.1) */ - {0xe0100000, 2, 0, {1, 0x69ec0080} } }, - - /* ZynqMP */ - { "aarch64", "xlnx-zcu102", /* Datasheet: UG1085 (v1.7) */ - {0xff160000, 3, 0, {1, 0x280737ec6481} } }, - -}; - -typedef struct QSDHCI { - struct { - QPCIBus *bus; - QPCIDevice *dev; - } pci; - union { - QPCIBar mem_bar; - uint64_t addr; - }; -} QSDHCI; - -static uint16_t sdhci_readw(QSDHCI *s, uint32_t reg) -{ - uint16_t val; - - if (s->pci.dev) { - val =3D qpci_io_readw(s->pci.dev, s->mem_bar, reg); - } else { - val =3D qtest_readw(global_qtest, s->addr + reg); + 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; } + * + * implemented drivers: + * + PC via PCI + { "x86_64", "pc", + {-1, 2, 0, {1, 0x057834b4} }, + .pci =3D { PCI_VENDOR_ID_REDHAT, PCI_DEVICE_ID_REDHAT_SDHCI } = }, + + BCM2835 + { "arm", "raspi2", + {0x3f300000, 3, 52, {0, 0x052134b4} } }, + * + * FIXME: the following drivers are missing: + * + Exynos4210 + { "arm", "smdkc210", + {0x12510000, 2, 0, {1, 0x5e80080} } }, =20 - return val; -} - -static uint64_t sdhci_readq(QSDHCI *s, uint32_t reg) -{ - uint64_t val; - - if (s->pci.dev) { - val =3D qpci_io_readq(s->pci.dev, s->mem_bar, reg); - } else { - val =3D qtest_readq(global_qtest, s->addr + reg); - } + i.MX 6 + { "arm", "sabrelite", + {0x02190000, 3, 0, {1, 0x057834b4} } }, =20 - return val; -} + Zynq-7000 + { "arm", "xilinx-zynq-a9", Datasheet: UG585 (v1.12.1) + {0xe0100000, 2, 0, {1, 0x69ec0080} } }, =20 -static void sdhci_writeq(QSDHCI *s, uint32_t reg, uint64_t val) -{ - if (s->pci.dev) { - qpci_io_writeq(s->pci.dev, s->mem_bar, reg, val); - } else { - qtest_writeq(global_qtest, s->addr + reg, val); - } -} + ZynqMP + { "aarch64", "xlnx-zcu102", Datasheet: UG1085 (v1.7) + {0xff160000, 3, 0, {1, 0x280737ec6481} } }, + */ =20 static void check_specs_version(QSDHCI *s, uint8_t version) { uint32_t v; =20 - v =3D sdhci_readw(s, SDHC_HCVER); + v =3D s->readw(s, SDHC_HCVER); v &=3D 0xff; v +=3D 1; g_assert_cmpuint(v, =3D=3D, version); @@ -122,7 +85,7 @@ static void check_capab_capareg(QSDHCI *s, uint64_t expe= c_capab) { uint64_t capab; =20 - capab =3D sdhci_readq(s, SDHC_CAPAB); + capab =3D s->readq(s, SDHC_CAPAB); g_assert_cmphex(capab, =3D=3D, expec_capab); } =20 @@ -131,11 +94,11 @@ static void check_capab_readonly(QSDHCI *s) const uint64_t vrand =3D 0x123456789abcdef; uint64_t capab0, capab1; =20 - capab0 =3D sdhci_readq(s, SDHC_CAPAB); + capab0 =3D s->readq(s, SDHC_CAPAB); g_assert_cmpuint(capab0, !=3D, vrand); =20 - sdhci_writeq(s, SDHC_CAPAB, vrand); - capab1 =3D sdhci_readq(s, SDHC_CAPAB); + s->writeq(s, SDHC_CAPAB, vrand); + capab1 =3D s->readq(s, SDHC_CAPAB); g_assert_cmpuint(capab1, !=3D, vrand); g_assert_cmpuint(capab1, =3D=3D, capab0); } @@ -147,7 +110,7 @@ static void check_capab_baseclock(QSDHCI *s, uint8_t ex= pec_freq) if (!expec_freq) { return; } - capab =3D sdhci_readq(s, SDHC_CAPAB); + capab =3D s->readq(s, SDHC_CAPAB); capab_freq =3D FIELD_EX64(capab, SDHC_CAPAB, BASECLKFREQ); g_assert_cmpuint(capab_freq, =3D=3D, expec_freq); } @@ -156,7 +119,7 @@ static void check_capab_sdma(QSDHCI *s, bool supported) { uint64_t capab, capab_sdma; =20 - capab =3D sdhci_readq(s, SDHC_CAPAB); + capab =3D s->readq(s, SDHC_CAPAB); capab_sdma =3D FIELD_EX64(capab, SDHC_CAPAB, SDMA); g_assert_cmpuint(capab_sdma, =3D=3D, supported); } @@ -167,7 +130,7 @@ static void check_capab_v3(QSDHCI *s, uint8_t version) =20 if (version < 3) { /* before v3 those fields are RESERVED */ - capab =3D sdhci_readq(s, SDHC_CAPAB); + capab =3D s->readq(s, SDHC_CAPAB); capab_v3 =3D FIELD_EX64(capab, SDHC_CAPAB, SDR); g_assert_cmpuint(capab_v3, =3D=3D, 0); capab_v3 =3D FIELD_EX64(capab, SDHC_CAPAB, DRIVER); @@ -175,78 +138,21 @@ static void check_capab_v3(QSDHCI *s, uint8_t version) } } =20 -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_pc_new(global_qtest, 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) +static void test_machine(void *obj, void *data, QGuestAllocator *alloc) { - qpci_free_pc(s->pci.bus); - g_free(s->pci.dev); - qtest_quit(global_qtest); - g_free(s); -} + QSDHCI *s =3D obj; =20 -static void test_machine(const void *data) -{ - const struct sdhci_t *test =3D data; - QSDHCI *s; - - s =3D machine_start(test); - - check_specs_version(s, test->sdhci.version); - check_capab_capareg(s, test->sdhci.capab.reg); + check_specs_version(s, s->props.version); + check_capab_capareg(s, s->props.capab.reg); check_capab_readonly(s); - check_capab_v3(s, test->sdhci.version); - check_capab_sdma(s, test->sdhci.capab.sdma); - check_capab_baseclock(s, test->sdhci.baseclock); - - machine_stop(s); + check_capab_v3(s, s->props.version); + check_capab_sdma(s, s->props.capab.sdma); + check_capab_baseclock(s, s->props.baseclock); } =20 -int main(int argc, char *argv[]) +static void sdhci_test(void) { - 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(); + qos_add_test("sdhci-test", "sdhci", test_machine, NULL); } + +libqos_init(sdhci_test); --=20 2.17.1