Message ID | 1518523252-49106-20-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WiP0/Cnv"; 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 3zghSG4pcgz9t6B for <incoming@patchwork.ozlabs.org>; Tue, 13 Feb 2018 23:19:58 +1100 (AEDT) Received: from localhost ([::1]:50585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1elZYy-0001WL-4l for incoming@patchwork.ozlabs.org; Tue, 13 Feb 2018 07:19:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1elZHX-0004Ha-IN for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1elZHW-0007gt-NQ for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:01:55 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:52543) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1elZHW-0007gE-Gw for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:01:54 -0500 Received: by mail-wm0-x241.google.com with SMTP id j199so3414441wmj.2 for <qemu-devel@nongnu.org>; Tue, 13 Feb 2018 04:01:54 -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=8Y4Z6pViymnUfM70UBaTRF8Mn2OrAjLmRrQvGPGxrOI=; b=WiP0/CnvGumFPsCm/p2HXgLTkKTbKQESr9yqI4N3JYdjNDnlGGLFNDx6C3i+jNaPws NHztISRX6UuD5dFMiG4T7gnLU/pzoWuV4tZU9xmLZVYBUOsM9Dg7YHckT9k9q1Bn5dDW Qd/66lSYTVqqyktiPxAfKRXGh+kGh/HyiZw3a1zqla5WVnAnv3G2GvsgQeNO76/CEKdv +6RoJHH3Q2skFg8SfhCkpPTrx8tKpnJpvcby/1n437XSTrb+ViJldJxTL5L88raB4yHU /y02b94y2uPIl6Wj7rbnEw0hkjc9hanMl/eJzZIHy5XummDzX2G6soTCMQDxZx4KKcjn hItw== 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=8Y4Z6pViymnUfM70UBaTRF8Mn2OrAjLmRrQvGPGxrOI=; b=jK0VPJht5qjUyC3EaQaZjUcDRNZb3e2Qs1HjqabOeOrwCjCNt/XMMbVqJIUCf5vmLN ZkijYjlZYpVuQyvvijYNZuGtiI8qmbbf29hdMXC9LWp1XIGvxBMu3l/fACs7IRPi4nKP RokgdjtQUSyu9vreR3skOonyn6d2R7BUMdy4209XAtI6wz8hzqUMbe/a/KHR7N3tM3fT WmPRlCc7eJXQn9L4aQD7STDhJbAtwCl3/8oRukRCkM3Bu0Y7ZJnMGqoSRNsdMB0hxKmu uREKXKDr9Xh8xcEKv277TZ2R+YTlm4vJ1FXccWsgOsYeQPizTXzQRf5pWzLtuvFs7gCE wLWg== X-Gm-Message-State: APf1xPA0lgoz1frZiIwtw6210lUMO4fMVDTGQebhxzN2bt4QYcypw1+G lExhCmxMuam1R/HkF6KF7Zu+5YDy X-Google-Smtp-Source: AH8x226yfqDnjBVG0mkMW+X7TZRAjlrEN7USRQotza3p/Vo5R3zhw3eitrpJ1XnEKo6Ej0OkeDGEuA== X-Received: by 10.28.111.23 with SMTP id k23mr1165476wmc.69.1518523313046; Tue, 13 Feb 2018 04:01:53 -0800 (PST) Received: from 640k.lan ([82.84.102.245]) by smtp.gmail.com with ESMTPSA id f9sm6870298wmf.12.2018.02.13.04.01.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Feb 2018 04:01:52 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 13 Feb 2018 13:00:23 +0100 Message-Id: <1518523252-49106-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1518523252-49106-1-git-send-email-pbonzini@redhat.com> References: <1518523252-49106-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 19/48] sdhci: add qtest to check the SD Spec version X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/48] Revert "build-sys: silence make by default or V=0"
|
expand
|
diff --git a/tests/sdhci-test.c b/tests/sdhci-test.c index 6fa3ddb..3e9a5bf 100644 --- a/tests/sdhci-test.c +++ b/tests/sdhci-test.c @@ -54,6 +54,19 @@ typedef struct QSDHCI { }; } QSDHCI; +static uint32_t sdhci_readl(QSDHCI *s, uint32_t reg) +{ + uint32_t val; + + if (s->pci.dev) { + qpci_memread(s->pci.dev, s->mem_bar, reg, &val, sizeof(val)); + } else { + val = qtest_readl(global_qtest, s->addr + reg); + } + + return val; +} + static uint64_t sdhci_readq(QSDHCI *s, uint32_t reg) { uint64_t val; @@ -76,6 +89,16 @@ static void sdhci_writeq(QSDHCI *s, uint32_t reg, uint64_t val) } } +static void check_specs_version(QSDHCI *s, uint8_t version) +{ + uint32_t v; + + v = sdhci_readl(s, SDHC_HCVER); + v &= 0xff; + v += 1; + g_assert_cmpuint(v, ==, version); +} + static void check_capab_capareg(QSDHCI *s, uint64_t expec_capab) { uint64_t capab; @@ -164,6 +187,7 @@ static void test_machine(const void *data) s = machine_start(test); + check_specs_version(s, test->sdhci.version); check_capab_capareg(s, test->sdhci.capab.reg); check_capab_readonly(s); check_capab_sdma(s, test->sdhci.capab.sdma);