From nobody Sun Oct 26 00:02:40 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516279261907424.266211040642; Thu, 18 Jan 2018 04:41:01 -0800 (PST) Received: from localhost ([::1]:56267 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ec9V1-0006PP-Gs for importer@patchew.org; Thu, 18 Jan 2018 07:40:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ec9NQ-0000Ai-2I for qemu-devel@nongnu.org; Thu, 18 Jan 2018 07:33:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ec9NL-0007Ek-4C for qemu-devel@nongnu.org; Thu, 18 Jan 2018 07:33:04 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:43846) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ec9NK-0007Eb-VI for qemu-devel@nongnu.org; Thu, 18 Jan 2018 07:32:59 -0500 Received: by mail-qt0-x241.google.com with SMTP id s3so29706836qtb.10 for ; Thu, 18 Jan 2018 04:32:58 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id s12sm4489623qke.4.2018.01.18.04.32.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2018 04:32:57 -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=eZITO1ix4N/UjXKzZvNd9qBdqI1gd3a17OQQsHFKaHA=; b=h3KTsxTghqDvGxO7G/ZfPBHhcoGOwNydKdPUp0Rpl4FU6TZ+QChkwOkEYsD7a10yqX 1FVZQBICGkYwLCmkZ+QNBoKcNNhwaZZq3SBB4Ui+OHlvJaC9jBthvnJNxLDZU1Wv9Zq5 GZwlUzSuePHt+V9DQGI7+OeGqIypOPh7SAZC8kxaDuGs9rhTs/frmqCXyRBXkbDGNk/h DfLQpvLgQjS4ebqGuyfWuB1qiFDaKHsdIiLOsX5xcFJXSgtCpCYyxTCUUs8Tv7qYSbw8 63XVNYIsHM4O2+pEL/B2Q6p8Ex4Qfn9bstODKnHy7JaudFkiUzkO/DMIDW9kvGORVUEk vMWw== 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=eZITO1ix4N/UjXKzZvNd9qBdqI1gd3a17OQQsHFKaHA=; b=Av5LnYn8mGYtdPzyvtuUuHS0MYW5OK9JpRQvc8WfpOVTwnASEGRzR5xAk7a4K5yEZh 8I/fZnuYY93aNC78+NcHfazRdipGXiQCz2LWaMMiONwAb5XVpFTG7v7QunEJbw06Oe2S XY13EOpqRaV9OhbIfK5RtKOAp/Kiyssi0fHGQGNrgktRg66M5NdnEizHC5TEmpBOU5UN JyYc0Ta8kfurqoFoOlZlrFWHiZbu/Vt3QZItFD0K2ZcbAtYpMc1mo0WD9cc+Id2G66vw KDrwnknAKaxdsuEoRhSD2Zim39LHWy6fF2dAaoFHfvFlfrdyEV6iM8WPQyRjSS9P36X2 cKhw== X-Gm-Message-State: AKwxytexKHClkOP2FuRZVtPaiYfitsHPNQP3afYlfFsPNzstlLRAiZI1 +jiK++kGdj0/Lk0ByUcGGQ4= X-Google-Smtp-Source: ACJfBouKuWTRE2Y4enfGrvieDLhoLB8K0gLaRrAyu6YTetI7M8m0OgOaY7YDuFW8dxyk6IVkRFwUrA== X-Received: by 10.55.100.141 with SMTP id y135mr20530820qkb.3.1516278778488; Thu, 18 Jan 2018 04:32:58 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Alistair Francis , Peter Maydell , Stefan Hajnoczi Date: Thu, 18 Jan 2018 09:32:11 -0300 Message-Id: <20180118123219.19410-10-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180118123219.19410-1-f4bug@amsat.org> References: <20180118123219.19410-1-f4bug@amsat.org> 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: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v7 09/16] sdhci: add max-block-length capability (Spec v1) 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Marcel Apfelbaum 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci-internal.h | 1 - include/hw/sd/sdhci.h | 2 ++ hw/sd/sdhci.c | 36 +++++++++++------------------------- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 9acafe7b01..c5e26bf8f3 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -188,7 +188,6 @@ FIELD(SDHC_ACMD12ERRSTS, INDEX_ERR, 4, 1); #define SDHC_CAN_DO_ADMA2 0x00080000 #define SDHC_CAN_DO_ADMA1 0x00100000 #define SDHC_64_BIT_BUS_SUPPORT (1 << 28) -#define SDHC_CAPAB_BLOCKSIZE(x) (((x) >> 16) & 0x3) FIELD(SDHC_CAPAB, TOCLKFREQ, 0, 6); FIELD(SDHC_CAPAB, TOUNIT, 7, 1); FIELD(SDHC_CAPAB, BASECLKFREQ, 8, 8); diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index bc80f59d3c..d3d438879c 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -96,6 +96,8 @@ typedef struct SDHCIState { /*********** * Spec v1 ***********/ + /* Maximum host controller R/W buffers size (512, 1024, 2048 bytes= ) */ + uint16_t max_blk_len; /* Suspend/resume */ bool suspend; bool high_speed; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 18152e61be..f91e5fd499 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -48,9 +48,6 @@ #define SDHC_CAPAB_64BITBUS 0ul /* 64-bit System Bus Support = */ #define SDHC_CAPAB_ADMA1 1ul /* ADMA1 support */ #define SDHC_CAPAB_ADMA2 1ul /* ADMA2 support */ -/* Maximum host controller R/W buffers size - * Possible values: 512, 1024, 2048 bytes */ -#define SDHC_CAPAB_MAXBLOCKLENGTH 512ul /* Maximum clock frequency for SDclock in MHz * value in range 10-63 MHz, 0 - not defined */ #define SDHC_CAPAB_BASECLKFREQ 52ul @@ -64,16 +61,6 @@ #error Capabilities features can have value 0 or 1 only! #endif =20 -#if SDHC_CAPAB_MAXBLOCKLENGTH =3D=3D 512 -#define MAX_BLOCK_LENGTH 0ul -#elif SDHC_CAPAB_MAXBLOCKLENGTH =3D=3D 1024 -#define MAX_BLOCK_LENGTH 1ul -#elif SDHC_CAPAB_MAXBLOCKLENGTH =3D=3D 2048 -#define MAX_BLOCK_LENGTH 2ul -#else -#error Max host controller block size can have value 512, 1024 or 2048 onl= y! -#endif - #if (SDHC_CAPAB_BASECLKFREQ > 0 && SDHC_CAPAB_BASECLKFREQ < 10) || \ SDHC_CAPAB_BASECLKFREQ > 63 #error SDclock frequency can have value in range 0, 10-63 only! @@ -85,7 +72,7 @@ =20 #define SDHC_CAPAB_REG_DEFAULT \ ((SDHC_CAPAB_64BITBUS << 28) | (SDHC_CAPAB_ADMA1 << 20) | \ - (SDHC_CAPAB_ADMA2 << 19) | (MAX_BLOCK_LENGTH << 16) | \ + (SDHC_CAPAB_ADMA2 << 19) | \ (SDHC_CAPAB_BASECLKFREQ << 8) | (SDHC_CAPAB_TOUNIT << 7) | \ (SDHC_CAPAB_TOCLKFREQ)) =20 @@ -94,12 +81,20 @@ static uint64_t sdhci_init_capareg(SDHCIState *s, Error **errp) { uint64_t capareg =3D 0; + uint32_t val; =20 switch (s->spec_version) { case 2: /* default version */ =20 /* fallback */ case 1: + val =3D ctz32(s->cap.max_blk_len >> 9); + if (val >=3D 0b11) { + error_setg(errp, "block size can be 512, 1024 or 2048 only"); + return 0; + } + capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, MAXBLOCKLENGTH, val); + capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, HIGHSPEED, s->cap.high= _speed); capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, SDMA, s->cap.sdma); capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, SUSPRESUME, s->cap.sus= pend); @@ -1176,17 +1171,7 @@ static const MemoryRegionOps sdhci_mmio_ops =3D { =20 static inline unsigned int sdhci_get_fifolen(SDHCIState *s) { - switch (SDHC_CAPAB_BLOCKSIZE(s->capareg)) { - case 0: - return 512; - case 1: - return 1024; - case 2: - return 2048; - default: - hw_error("SDHC: unsupported value for maximum block size\n"); - return 0; - } + return 1 << (9 + FIELD_EX32(s->capareg, SDHC_CAPAB, MAXBLOCKLENGTH)); } =20 static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) @@ -1219,6 +1204,7 @@ static void sdhci_init_readonly_registers(SDHCIState = *s, Error **errp) DEFINE_PROP_UINT8("sd-spec-version", _state, spec_version, 2), \ \ /* Spec v1 properties */ \ + DEFINE_PROP_UINT16("max-block-length", _state, cap.max_blk_len, 512), \ DEFINE_PROP_BOOL("sdma", _state, cap.sdma, true), \ DEFINE_PROP_BOOL("suspend", _state, cap.suspend, false), \ DEFINE_PROP_BOOL("high-speed", _state, cap.high_speed, true), \ --=20 2.15.1