From patchwork Thu Jan 18 20:40:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 863142 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="U07/oY2+"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zMwz16dRfz9sP1 for ; Fri, 19 Jan 2018 07:48:29 +1100 (AEDT) Received: from localhost ([::1]:53857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecH6p-0005mm-Tb for incoming@patchwork.ozlabs.org; Thu, 18 Jan 2018 15:48:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecH0H-0000i8-4z for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:41:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecH0E-0007da-1w for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:41:41 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:46804) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ecH0D-0007dM-TV for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:41:37 -0500 Received: by mail-qt0-x241.google.com with SMTP id o35so23493883qtj.13 for ; Thu, 18 Jan 2018 12:41:37 -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=B/Dj4ooWTtxu2gvLfvvJB+hj0BvCQAuwP7NiB4pOGvU=; b=U07/oY2+VrjFyTXv8UMJTQ9IxefsJH1+ibzegtq5L58oy2Z6++yiry6WATIv1Hf6kO ubC4LCYZzjz/rrJR2pX03sFoJNMzVz3iOpGkiWAC0bh2+0D70DLr6U+f0mGxw41LAEq2 yecjDZb3yz2eOf1OIE5zUbRfF+6xMoKPXyQA3DJQj2q+U1eCLOZjCksZfirGGBkOJbjm HqAakQ3cwzE/6hDHpIYUM9N3RcgJEc2ZigqQCqsAzRmm5ph0422uLY+BIACvhF+z8pxE KBuhdEMCZ0/VaCwXGFwSHehrjMNCdEbFVwOjdPLNAY2fZUNTEZRLwxj87IoQ8QWB2Xhy LTcA== 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=B/Dj4ooWTtxu2gvLfvvJB+hj0BvCQAuwP7NiB4pOGvU=; b=WEFjdaTDm9Htz8YvtY6r6p0n9+EC38fER/2+HK8KRbTraF3QNwg5zRjNjAWHVC93to 2VIuMKfY0wrliliarP4m+4OY4cW/bYqhhh1ZNo0kQ498p/lkivNpGfSTpuFjunUOt5aW X0/F/kVnAExZmlCY2ZL+OAemNS4ggYC5oYnxNVPU0+heydbXWZuN2RF32uFLPFAm6PTd zv+zZb84HvaMZTP69+nRnvWthEbAaT2kYM8Hag16k0lbP+6WTDu/cxYB/J0zj34C30TK tQVk1NeVjOiQwjJRACQJRnyVJbe44riSh2lJybgQlKTZ/n16vmwWqTho/dfNVpVD0AgG gH/g== X-Gm-Message-State: AKwxyteJV7PmGbhuvU/dXAMECbmWUgoOEe9Lk2h7YFjO1L1wg46k4mFH pauLCfvSuk0Iv/IT59TSUNU= X-Google-Smtp-Source: AH8x226GagWPiUCkLaoS5TVvUkJdpUSN7ED+hdljcdfMHe30/pq2muIHQ1bhngKuoaKC1rrF2UrOyg== X-Received: by 10.55.123.69 with SMTP id w66mr1275342qkc.326.1516308097437; Thu, 18 Jan 2018 12:41:37 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 24sm5484621qkv.64.2018.01.18.12.41.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2018 12:41:36 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 18 Jan 2018 17:40:52 -0300 Message-Id: <20180118204058.5768-9-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180118204058.5768-1-f4bug@amsat.org> References: <20180118204058.5768-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v7 08/14] sdhci: add a check_capab_v3() qtest 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: "Edgar E . Iglesias" , Prasad J Pandit , Peter Crosthwaite , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Sai Pavan Boddu Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Hajnoczi --- tests/sdhci-test.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/sdhci-test.c b/tests/sdhci-test.c index dd01a47839..51eaed6df8 100644 --- a/tests/sdhci-test.c +++ b/tests/sdhci-test.c @@ -16,6 +16,8 @@ #define SDHC_CAPAB 0x40 FIELD(SDHC_CAPAB, BASECLKFREQ, 8, 8); /* since v2 */ FIELD(SDHC_CAPAB, SDMA, 22, 1); +FIELD(SDHC_CAPAB, SDR, 32, 3); /* since v3 */ +FIELD(SDHC_CAPAB, DRIVER, 36, 3); /* since v3 */ #define SDHC_HCVER 0xFE static const struct sdhci_t { @@ -159,6 +161,20 @@ static void check_capab_sdma(uintptr_t addr, bool supported) g_assert_cmpuint(capab_sdma, ==, supported); } +static void check_capab_v3(uintptr_t addr, uint8_t version) +{ + uint64_t capab, capab_v3; + + if (version < 3) { + /* before v3 those fields are RESERVED */ + capab = sdhci_readq(addr, SDHC_CAPAB); + capab_v3 = FIELD_EX64(capab, SDHC_CAPAB, SDR); + g_assert_cmpuint(capab_v3, ==, 0); + capab_v3 = FIELD_EX64(capab, SDHC_CAPAB, DRIVER); + g_assert_cmpuint(capab_v3, ==, 0); + } +} + static void machine_start(const struct sdhci_t *test) { if (test->pci.vendor_id) { @@ -201,6 +217,7 @@ static void test_machine(const void *data) check_specs_version(test->sdhci.addr, test->sdhci.version); check_capab_capareg(test->sdhci.addr, test->sdhci.capab.reg); check_capab_readonly(test->sdhci.addr); + check_capab_v3(test->sdhci.addr, test->sdhci.version); check_capab_sdma(test->sdhci.addr, test->sdhci.capab.sdma); check_capab_baseclock(test->sdhci.addr, test->sdhci.baseclock);