From nobody Mon Feb 9 17:24:31 2026 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518524675582872.4691764271904; Tue, 13 Feb 2018 04:24:35 -0800 (PST) Received: from localhost ([::1]:50628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elZdP-0005OV-5d for importer@patchew.org; Tue, 13 Feb 2018 07:24:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elZHm-0004Rp-Cv for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elZHl-0007mt-G0 for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:10 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:33038) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1elZHl-0007mW-8S for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:09 -0500 Received: by mail-wm0-x243.google.com with SMTP id x4so12964080wmc.0 for ; Tue, 13 Feb 2018 04:02:09 -0800 (PST) Received: from 640k.lan ([82.84.102.245]) by smtp.gmail.com with ESMTPSA id f9sm6870298wmf.12.2018.02.13.04.02.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Feb 2018 04:02:07 -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=sgP6PBOMy2/SQNKGyU46rYEzko4bt8uCT9aPwdaacng=; b=lOKndiXHlb5GZt7aiAbZCra8oafvuYm/wokCR2FyHuxekG7OeQ8EtrtYMASu87UgBW oi9T/Sh+uAOU2Lo3DvFORJswflXeV9l3XCQgG69n1/rs7B+90SfVv07NcArnFkA78fQY w7SwhrAr0zBwOoTtJzbKXC/kDA3eDoIwH3uabZdVlqHAfHsb7DXeHmVpXbF2O3mbdOXl Q/dDBiFjewcXJ5I2dazN5kueBhUYwmtw7xajn/C0R6mswMnwz2B1CjvansK2nBx8PjcG WFul1eGGvoObfnlIk29atG0yrLa8TWLJFBhCFyPZ22mGRW5d8b1ED/xGEdQpcriZCEPV nDCg== 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=sgP6PBOMy2/SQNKGyU46rYEzko4bt8uCT9aPwdaacng=; b=HmMGe/SG8ENM8P3yEvHbGplKRB1VnBxV2mg7s4pauLDXHBTBTsDsoc7ADkj/do0YAB 5VsUhjEC+b//D5UiTjf/3sjYOQlLKy/atkHugAuDXigml0aatIL1KnNB2lJjo5/9Il+f mi0C2lCywyVGR+GrTC19MYgwVf3ZD0qDXvpvjki4wB3Ez/kCSRjeKPXVsWCmWonsKsRf VJgvor/zziPmppIARdsxivTe2jgMT9mZxNaZRS5Qg2tZAdAoiUgt3SkICbP1dH7FlziC 3X42s+bmOiEUom6bJLjcFrGA0w+3O/VM5Y/kXq0/DSaBslxg0U/6Ylj+GaUEq7OpAwPh Z3wA== X-Gm-Message-State: APf1xPDMGEHW89YoHkMbi0Ss8C9NJlty+IqpCJfz4K2dC8Rz8b5iQVCm eOtKib71Frax7AbYKiwbhy4Xza0v X-Google-Smtp-Source: AH8x2255pDxdVIlykIgrKXvdkvaq/HzsXheH+l9eIlAD4QLLQdI4Ts/a0D6Ptu+35beGe9BUd+nACg== X-Received: by 10.28.109.83 with SMTP id i80mr1167110wmc.89.1518523327829; Tue, 13 Feb 2018 04:02:07 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Feb 2018 13:00:36 +0100 Message-Id: <1518523252-49106-33-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: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 32/48] sdhci: implement the Host Control 2 register (tuning sequence) 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Philippe Mathieu-Daud=C3=A9 [based on a patch from Alistair Francis from qemu/xilinx tag xilinx-v2015.2] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Message-Id: <20180208164818.7961-20-f4bug@amsat.org> --- hw/sd/sdhci-internal.h | 10 ++++++++++ hw/sd/sdhci.c | 22 +++++++++++++++++++--- include/hw/sd/sdhci.h | 1 + 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 9ab1a71..b3f2692 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -188,6 +188,16 @@ FIELD(SDHC_ACMD12ERRSTS, TIMEOUT_ERR, 1, 1); FIELD(SDHC_ACMD12ERRSTS, CRC_ERR, 2, 1); FIELD(SDHC_ACMD12ERRSTS, INDEX_ERR, 4, 1); =20 +/* Host Control Register 2 (since v3) */ +#define SDHC_HOSTCTL2 0x3E +FIELD(SDHC_HOSTCTL2, UHS_MODE_SEL, 0, 3); +FIELD(SDHC_HOSTCTL2, V18_ENA, 3, 1); /* UHS-I only */ +FIELD(SDHC_HOSTCTL2, DRIVER_STRENGTH, 4, 2); /* UHS-I only */ +FIELD(SDHC_HOSTCTL2, EXECUTE_TUNING, 6, 1); /* UHS-I only */ +FIELD(SDHC_HOSTCTL2, SAMPLING_CLKSEL, 7, 1); /* UHS-I only */ +FIELD(SDHC_HOSTCTL2, ASYNC_INT, 14, 1); +FIELD(SDHC_HOSTCTL2, PRESET_ENA, 15, 1); + /* HWInit Capabilities Register 0x05E80080 */ #define SDHC_CAPAB 0x40 FIELD(SDHC_CAPAB, TOCLKFREQ, 0, 6); diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 55b3f3a..2712b82 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -408,14 +408,29 @@ static void sdhci_end_transfer(SDHCIState *s) static void sdhci_read_block_from_card(SDHCIState *s) { int index =3D 0; + uint8_t data; + const uint16_t blk_size =3D s->blksize & BLOCK_SIZE_MASK; =20 if ((s->trnmod & SDHC_TRNS_MULTI) && (s->trnmod & SDHC_TRNS_BLK_CNT_EN) && (s->blkcnt =3D=3D 0)) { return; } =20 - for (index =3D 0; index < (s->blksize & BLOCK_SIZE_MASK); index++) { - s->fifo_buffer[index] =3D sdbus_read_data(&s->sdbus); + for (index =3D 0; index < blk_size; index++) { + data =3D sdbus_read_data(&s->sdbus); + if (!FIELD_EX32(s->hostctl2, SDHC_HOSTCTL2, EXECUTE_TUNING)) { + /* Device is not in tunning */ + s->fifo_buffer[index] =3D data; + } + } + + if (FIELD_EX32(s->hostctl2, SDHC_HOSTCTL2, EXECUTE_TUNING)) { + /* Device is in tunning */ + s->hostctl2 &=3D ~R_SDHC_HOSTCTL2_EXECUTE_TUNING_MASK; + s->hostctl2 |=3D R_SDHC_HOSTCTL2_SAMPLING_CLKSEL_MASK; + s->prnsts &=3D ~(SDHC_DAT_LINE_ACTIVE | SDHC_DOING_READ | + SDHC_DATA_INHIBIT); + goto read_done; } =20 /* New data now available for READ through Buffer Port Register */ @@ -440,6 +455,7 @@ static void sdhci_read_block_from_card(SDHCIState *s) } } =20 +read_done: sdhci_update_irq(s); } =20 @@ -1005,7 +1021,7 @@ static uint64_t sdhci_read(void *opaque, hwaddr offse= t, unsigned size) ret =3D s->norintsigen | (s->errintsigen << 16); break; case SDHC_ACMD12ERRSTS: - ret =3D s->acmd12errsts; + ret =3D s->acmd12errsts | (s->hostctl2 << 16); break; case SDHC_CAPAB: ret =3D (uint32_t)s->capareg; diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 5459484..fd606e9 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -73,6 +73,7 @@ typedef struct SDHCIState { uint16_t norintsigen; /* Normal Interrupt Signal Enable Register */ uint16_t errintsigen; /* Error Interrupt Signal Enable Register */ uint16_t acmd12errsts; /* Auto CMD12 error status register */ + uint16_t hostctl2; /* Host Control 2 */ uint64_t admasysaddr; /* ADMA System Address Register */ =20 /* Read-only registers */ --=20 1.8.3.1