From nobody Tue Feb 10 05:45:05 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516308564124847.4239759713915; Thu, 18 Jan 2018 12:49:24 -0800 (PST) Received: from localhost ([::1]:53860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecH7e-0006gf-LD for importer@patchew.org; Thu, 18 Jan 2018 15:49:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecH0k-000199-5Z for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:42:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecH0i-00081J-RY for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:42:10 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:39377) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ecH0i-00080x-Na for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:42:08 -0500 Received: by mail-qt0-x244.google.com with SMTP id f4so12719141qtj.6 for ; Thu, 18 Jan 2018 12:42:08 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 24sm5484621qkv.64.2018.01.18.12.42.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2018 12:42: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=+Ala6uhUp8lwaaJzvLv+JorWwig/DcEJUAjnjzR+yIQ=; b=us2ztv6W0q6SNGLi8b2RrNVD/JIarKSKDYhI6JD4Awxy1FiwkPg/jy2n0DsJhCBILC FOqKgHagFsDRbFP1uREs14mnmesXEgUOwGJkGA+kctW5ZAyvzQIFp1fW8CIZW5GjoVJu pXoXsOZrvvmlS3ZUOrAS+tvjugOGB8F1w7fmnEUTmpw2qbJIHoVHJw6gNJBQFfmEy1lA VNdnlAGAQfgOCuBXu3CqVwhOveWLDGbF8Nn58zEdGNWFIX0hKx6nSWUD5qZZqFTD086f aC/CGQERPYf+WOp006R1Gmkuq2XfYli3Y14t9C1tctQ8ySMvJHXniF3QvLcNYmpViXFN +BKg== 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=+Ala6uhUp8lwaaJzvLv+JorWwig/DcEJUAjnjzR+yIQ=; b=JJUxoZFskOv8HEqESuxsh0oy1hy9v0TyX7n/FNTseAq2KSfeNthRh4dE7h0en/BqbV JzrXvJKKQCn2huOGJreN/O3GaZL7YZBVaF4CNhdc25UKIblFvhUPP3YMpD+jk57REJoA bP7gMWsd4b3pI8ADLxGhTBwcy1BNxJf9uJMmx6hZ5xYHOpkqLZLeHIK1u8caclFo6lF/ vVrumaqS06WZ4AplEsKCjhkmkRlKsIeqnsu1TJoDM4Eqt6znjxDue7JsJ/c6gAHUa5PP q3AqHPpalmAfC8+fsGw9OH6E/RMbNn1bCbtfJxjVQDxLVhe7FRcq0jR3pKStaoB8Teci Fnpg== X-Gm-Message-State: AKwxyteCsxtBkV2Vna/ybQ6nfwQvFEfGQrc9mNZSUTPsrYyRL8Y6NpeX GJtPbWbmu/lAizK8vqQlj94= X-Google-Smtp-Source: AH8x225OW74E/9v+C5uFKre9zLiQzT9uCEgLG/1LAXkm2xIWdVgoC8lF1D3xJBoN+TvHvdQhWQ8C1A== X-Received: by 10.55.123.69 with SMTP id w66mr1277686qkc.326.1516308128195; Thu, 18 Jan 2018 12:42:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 18 Jan 2018 17:40:58 -0300 Message-Id: <20180118204058.5768-15-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 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::244 Subject: [Qemu-devel] [PATCH v7 14/14] sdhci: implement CMD/DAT[] fields in the Present State register 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=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Sai Pavan Boddu 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 [based on a patch from Alistair Francis from qemu/xilinx tag xilinx-v2015.2] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci-internal.h | 2 ++ include/hw/sd/sd.h | 4 ++++ hw/sd/core.c | 34 ++++++++++++++++++++++++++++++++++ hw/sd/sd.c | 16 ++++++++++++++++ hw/sd/sdhci.c | 4 ++++ hw/sd/trace-events | 2 ++ 6 files changed, 62 insertions(+) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index b82e847636..8bcca39310 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -82,6 +82,8 @@ #define SDHC_CARD_PRESENT 0x00010000 #define SDHC_CARD_DETECT 0x00040000 #define SDHC_WRITE_PROTECT 0x00080000 +FIELD(SDHC_PRNSTS, DAT_LVL, 20, 4); +FIELD(SDHC_PRNSTS, CMD_LVL, 24, 1); #define TRANSFERRING_DATA(x) \ ((x) & (SDHC_DOING_READ | SDHC_DOING_WRITE)) =20 diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index f086679493..bf1eb0713c 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -103,6 +103,8 @@ typedef struct { uint8_t (*read_data)(SDState *sd); bool (*data_ready)(SDState *sd); void (*set_voltage)(SDState *sd, uint16_t millivolts); + uint8_t (*get_dat_lines)(SDState *sd); + bool (*get_cmd_line)(SDState *sd); void (*enable)(SDState *sd, bool enable); bool (*get_inserted)(SDState *sd); bool (*get_readonly)(SDState *sd); @@ -150,6 +152,8 @@ void sd_enable(SDState *sd, bool enable); * an SDBus rather than directly with SDState) */ void sdbus_set_voltage(SDBus *sdbus, uint16_t millivolts); +uint8_t sdbus_get_dat_lines(SDBus *sdbus); +bool sdbus_get_cmd_line(SDBus *sdbus); int sdbus_do_command(SDBus *sd, SDRequest *req, uint8_t *response); void sdbus_write_data(SDBus *sd, uint8_t value); uint8_t sdbus_read_data(SDBus *sd); diff --git a/hw/sd/core.c b/hw/sd/core.c index 6d198ea775..3c6eae6c88 100644 --- a/hw/sd/core.c +++ b/hw/sd/core.c @@ -41,6 +41,40 @@ static SDState *get_card(SDBus *sdbus) return SD_CARD(kid->child); } =20 +uint8_t sdbus_get_dat_lines(SDBus *sdbus) +{ + SDState *slave =3D get_card(sdbus); + uint8_t dat_lines =3D 0b1111; /* 4 bit bus width */ + + if (slave) { + SDCardClass *sc =3D SD_CARD_GET_CLASS(slave); + + if (sc->get_dat_lines) { + dat_lines =3D sc->get_dat_lines(slave); + } + } + trace_sdbus_get_dat_lines(sdbus_name(sdbus), dat_lines); + + return dat_lines; +} + +bool sdbus_get_cmd_line(SDBus *sdbus) +{ + SDState *slave =3D get_card(sdbus); + bool cmd_line =3D true; + + if (slave) { + SDCardClass *sc =3D SD_CARD_GET_CLASS(slave); + + if (sc->get_cmd_line) { + cmd_line =3D sc->get_cmd_line(slave); + } + } + trace_sdbus_get_cmd_line(sdbus_name(sdbus), cmd_line); + + return cmd_line; +} + void sdbus_set_voltage(SDBus *sdbus, uint16_t millivolts) { SDState *card =3D get_card(sdbus); diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 609b2da14f..ab9be561d2 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -126,8 +126,20 @@ struct SDState { BlockBackend *blk; =20 bool enable; + uint8_t dat_lines; + bool cmd_line; }; =20 +static uint8_t sd_get_dat_lines(SDState *sd) +{ + return sd->enable ? sd->dat_lines : 0; +} + +static bool sd_get_cmd_line(SDState *sd) +{ + return sd->enable ? sd->cmd_line : false; +} + static void sd_set_voltage(SDState *sd, uint16_t millivolts) { switch (millivolts) { @@ -457,6 +469,8 @@ static void sd_reset(DeviceState *dev) sd->blk_len =3D 0x200; sd->pwd_len =3D 0; sd->expecting_acmd =3D false; + sd->dat_lines =3D 0xf; + sd->cmd_line =3D true; sd->multi_blk_cnt =3D 0; } =20 @@ -1938,6 +1952,8 @@ static void sd_class_init(ObjectClass *klass, void *d= ata) dc->bus_type =3D TYPE_SD_BUS; =20 sc->set_voltage =3D sd_set_voltage; + sc->get_dat_lines =3D sd_get_dat_lines; + sc->get_cmd_line =3D sd_get_cmd_line; sc->do_command =3D sd_do_command; sc->write_data =3D sd_write_data; sc->read_data =3D sd_read_data; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 3846182371..01e608b6f8 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -910,6 +910,10 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset= , unsigned size) break; case SDHC_PRNSTS: ret =3D s->prnsts; + ret =3D FIELD_DP32(ret, SDHC_PRNSTS, DAT_LVL, + sdbus_get_dat_lines(&s->sdbus)); + ret =3D FIELD_DP32(ret, SDHC_PRNSTS, CMD_LVL, + sdbus_get_cmd_line(&s->sdbus)); break; case SDHC_HOSTCTL: ret =3D s->hostctl1 | (s->pwrcon << 8) | (s->blkgap << 16) | diff --git a/hw/sd/trace-events b/hw/sd/trace-events index f874489980..82efd79bea 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -5,6 +5,8 @@ sdbus_command(const char *bus_name, uint8_t cmd, uint32_t a= rg, uint8_t crc) "@%s sdbus_read(const char *bus_name, uint8_t value) "@%s value 0x%02x" sdbus_write(const char *bus_name, uint8_t value) "@%s value 0x%02x" sdbus_set_voltage(const char *bus_name, uint16_t millivolts) "@%s %u (mV)" +sdbus_get_dat_lines(const char *bus_name, uint8_t dat_lines) "@%s dat_line= s: %u" +sdbus_get_cmd_line(const char *bus_name, bool cmd_line) "@%s cmd_line: %u" =20 # hw/sd/sdhci.c sdhci_set_inserted(const char *level) "card state changed: %s" --=20 2.15.1