From patchwork Thu Jan 18 20:40:55 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: 863149 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="YEK3D+j0"; 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 3zMx6840JSz9sP1 for ; Fri, 19 Jan 2018 07:54:40 +1100 (AEDT) Received: from localhost ([::1]:53987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecHCo-0003Dz-Km for incoming@patchwork.ozlabs.org; Thu, 18 Jan 2018 15:54:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecH0R-0000sy-Nf for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:41:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecH0O-0007k4-K7 for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:41:51 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:42372) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ecH0O-0007jy-F9 for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:41:48 -0500 Received: by mail-qt0-x242.google.com with SMTP id c2so33614225qtn.9 for ; Thu, 18 Jan 2018 12:41:48 -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=jvk24fOZB1Cqnp1BZd85W9+FTl0g7X7Oa9KeY0ANaoI=; b=YEK3D+j0l/4TANuU4GyKQFO58B1Wll3Wz9Q8YSj7ubXqijy3Sq8Xd7gNAi7NgtzJxc jf48GE6yR29WXedcM/rrtb1h7go5AurcR/JwKfUd93ViTf7TyzvJci2dzCKsrZLDZy7Q QE6iekSdCzbzA8UEDPxBtjA6UZ5n31yQSi1z4E+A0nkvRND0Hxv2665K4cMkPdhMbM1h ih+fXKguGBzPWA/m6pE/J05ADY5MOZz5YN2rdz2HoIr6oPGPdQ2ZMWY8id4x8MnzwNY1 rRVuIHD3T0rKoSF1ZEW29mIjopAit4XmSmA16QGMI/KUMfIHtWnc0brF6UPVsj5+Owcy aPiw== 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=jvk24fOZB1Cqnp1BZd85W9+FTl0g7X7Oa9KeY0ANaoI=; b=W1VBVMsL/nbFC428DTUrVlr8HmyTYjwOraIUR2+nQBJk2LT2wC0i3CPPal5WZlQAU9 u5L0YJ/NYhjo2sBlA3EJmm+BUad7NobXR96GArNYR10Mw73AhbAIWlBsD/4tpT1xcNcb okGbVthcgOL6g0B5wRtSCZvK/z/ysATy6BmxyG9/6YsYNWBdeKxb17Enj2Wr5sHiHzFD FM6G3lFmWkmj7lJidVwdR6hmaMNZgbFsFES0uAvYoW7GNzvivTG0b+2taXdY8aw+K1yJ hWXtg/pcCyXqEZAj9K6azvScfitsvjDqPmCUFZKqoyWsojAEeKS6hqyekxCY1xORHMfe 1Pyg== X-Gm-Message-State: AKwxytdmK/XLZ4IPsDOR+exRTgVxpAtJPjMhPZx3gKz0Meg+aTLapQe7 4acMM8nZgTW7Rjcl6DILSL+s4oni X-Google-Smtp-Source: ACJfBouz/UAsc9Dwn1TWq/htoJ5D6kkfXJWD86JHeXTPk+jjx7cigEwYQwy6TdP2K3IsbKLxNyx4Nw== X-Received: by 10.55.78.74 with SMTP id c71mr4047478qkb.59.1516308107961; Thu, 18 Jan 2018 12:41:47 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 24sm5484621qkv.64.2018.01.18.12.41.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2018 12:41:47 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 18 Jan 2018 17:40:55 -0300 Message-Id: <20180118204058.5768-12-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::242 Subject: [Qemu-devel] [PATCH v7 11/14] sdhci: implement the Host Control 2 register for the tunning 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: "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" [based on a patch from Alistair Francis from qemu/xilinx tag xilinx-v2015.2] Signed-off-by: Philippe Mathieu-Daudé --- include/hw/sd/sdhci.h | 1 + hw/sd/sdhci.c | 22 +++++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 98edcc1048..9d3f656441 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -71,6 +71,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 */ /* Read-only registers */ diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 651f523089..37b3b265ef 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -315,14 +315,29 @@ static void sdhci_end_transfer(SDHCIState *s) static void sdhci_read_block_from_card(SDHCIState *s) { int index = 0; + uint8_t data; + const uint16_t blk_size = s->blksize & BLOCK_SIZE_MASK; if ((s->trnmod & SDHC_TRNS_MULTI) && (s->trnmod & SDHC_TRNS_BLK_CNT_EN) && (s->blkcnt == 0)) { return; } - for (index = 0; index < (s->blksize & BLOCK_SIZE_MASK); index++) { - s->fifo_buffer[index] = sdbus_read_data(&s->sdbus); + for (index = 0; index < blk_size; index++) { + data = sdbus_read_data(&s->sdbus); + if (!FIELD_EX32(s->hostctl2, SDHC_HOSTCTL2, EXECUTE_TUNING)) { + /* Device is not in tunning */ + s->fifo_buffer[index] = data; + } + } + + if (FIELD_EX32(s->hostctl2, SDHC_HOSTCTL2, EXECUTE_TUNING)) { + /* Device is in tunning */ + s->hostctl2 &= ~R_SDHC_HOSTCTL2_EXECUTE_TUNING_MASK; + s->hostctl2 |= R_SDHC_HOSTCTL2_SAMPLING_CLKSEL_MASK; + s->prnsts &= ~(SDHC_DAT_LINE_ACTIVE | SDHC_DOING_READ | + SDHC_DATA_INHIBIT); + goto read_done; } /* New data now available for READ through Buffer Port Register */ @@ -347,6 +362,7 @@ static void sdhci_read_block_from_card(SDHCIState *s) } } +read_done: sdhci_update_irq(s); } @@ -912,7 +928,7 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset, unsigned size) ret = s->norintsigen | (s->errintsigen << 16); break; case SDHC_ACMD12ERRSTS: - ret = s->acmd12errsts; + ret = s->acmd12errsts | (s->hostctl2 << 16); break; case SDHC_CAPAB: ret = (uint32_t)s->capareg;