From nobody Tue Feb 10 01:34:53 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 1518109319406108.36094272587991; Thu, 8 Feb 2018 09:01:59 -0800 (PST) Received: from localhost ([::1]:52949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejpaA-0001eD-7Y for importer@patchew.org; Thu, 08 Feb 2018 12:01:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejpOC-0008R7-EA for qemu-devel@nongnu.org; Thu, 08 Feb 2018 11:49:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejpO9-0004Jv-OU for qemu-devel@nongnu.org; Thu, 08 Feb 2018 11:49:34 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:41212) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ejpO9-0004Jm-J5 for qemu-devel@nongnu.org; Thu, 08 Feb 2018 11:49:33 -0500 Received: by mail-qt0-x242.google.com with SMTP id a9so389385qtj.8 for ; Thu, 08 Feb 2018 08:49:33 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id z66sm240905qkc.9.2018.02.08.08.49.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 08:49:32 -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=gcQcN4I6zW+GsY8WY7Fk4KrHNt9NsVVIpUKPEWUezmI=; b=EkNPeX4ff5cbpyFApwLGjEHe1jd9i5TcKTqch/ptNhrfBWa2571AXRJGKKcrag5uBk mTAPDzHykFdwg0cwuZueakER8FonAiFzQRQq3pUhqwYJbDrrNWrkH/Qle+fYkIbJRrXE Wd2DC9RZz4ZfvY0m9FJ7ozHgGsoRj6NTNHuS1OBjIs75w2hlUsDzVnIwDKdZrqUrBnnk h5LEVtRbrYSc4XpN1VtcTJKhhCuCzo+UTDo7LgcrnsA/ECK+xrBtBzolQqpqah0fM0v9 z8ab5SXFdsitEkM/KQlNdGo44NHcr+W+56nQQul00nC1/R7RlInjdwF4NF76eH0Wpfl1 iO0g== 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=gcQcN4I6zW+GsY8WY7Fk4KrHNt9NsVVIpUKPEWUezmI=; b=aHwoWjnSN5etjyKvibReX85g7NRLqExpy1XFHM+ioN93+7PV/4Sa/7jFX2c+IItPQP 4dtJHwKfFo9v5mxr3fayMOuGSNeAuiTkkbCM4DaeIG59N/AQbkJ45RMEHKy7hWLehv2p W8Zv3jzkOWOLBy5jjO2Cej7h3lzn99GXLzBgGi28I28UGvJMY8JCLFv5bB51hksc40XA 7x1L9om4SVaJvkVrnzrMYF+EvQ3VM0bsXfrX7Sb4QpWpHdJY9+3QhMpPYJOmKLD5rKrA Lstz7PwE6/aNvX7W+8/oPSjwmSqcoiBIf7gdEvyGp8T6ZFOHUdRKroSIuw3pCG90rxul ENzw== X-Gm-Message-State: APf1xPApezYuk/giN58+Vi2kG9WuYBXeL0HsYuaz7cnxTk3s4+0VfY9g VQmxxvs7ersClQSTMIs2el4= X-Google-Smtp-Source: AH8x226MuMCBw8I5YuoXStK8ij3WSCdOXlnBjy6brdHtbjIvoa19EeT4ml0A/d2MVx4r+sfI0Bk62w== X-Received: by 10.200.46.145 with SMTP id h17mr1922820qta.111.1518108573026; Thu, 08 Feb 2018 08:49:33 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Peter Maydell Date: Thu, 8 Feb 2018 13:48:09 -0300 Message-Id: <20180208164818.7961-22-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180208164818.7961-1-f4bug@amsat.org> References: <20180208164818.7961-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::242 Subject: [Qemu-devel] [PATCH v11 21/30] sdhci: implement UHS-I voltage switch 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" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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 Reviewed-by: Alistair Francis --- include/hw/sd/sd.h | 16 ++++++++++++++++ include/hw/sd/sdhci.h | 1 + hw/sd/core.c | 13 +++++++++++++ hw/sd/sd.c | 13 +++++++++++++ hw/sd/sdhci.c | 12 +++++++++++- hw/sd/trace-events | 1 + 6 files changed, 55 insertions(+), 1 deletion(-) diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index 96caefe373..f086679493 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -55,6 +55,20 @@ #define AKE_SEQ_ERROR (1 << 3) #define OCR_CCS_BITN 30 =20 +typedef enum { + SD_VOLTAGE_0_4V =3D 400, /* currently not supported */ + SD_VOLTAGE_1_8V =3D 1800, + SD_VOLTAGE_3_0V =3D 3000, + SD_VOLTAGE_3_3V =3D 3300, +} sd_voltage_mv_t; + +typedef enum { + UHS_NOT_SUPPORTED =3D 0, + UHS_I =3D 1, + UHS_II =3D 2, /* currently not supported */ + UHS_III =3D 3, /* currently not supported */ +} sd_uhs_mode_t; + typedef enum { sd_none =3D -1, sd_bc =3D 0, /* broadcast -- no response */ @@ -88,6 +102,7 @@ typedef struct { void (*write_data)(SDState *sd, uint8_t value); uint8_t (*read_data)(SDState *sd); bool (*data_ready)(SDState *sd); + void (*set_voltage)(SDState *sd, uint16_t millivolts); void (*enable)(SDState *sd, bool enable); bool (*get_inserted)(SDState *sd); bool (*get_readonly)(SDState *sd); @@ -134,6 +149,7 @@ void sd_enable(SDState *sd, bool enable); /* Functions to be used by qdevified callers (working via * an SDBus rather than directly with SDState) */ +void sdbus_set_voltage(SDBus *sdbus, uint16_t millivolts); 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/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 05ac0e763f..129d212337 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -94,6 +94,7 @@ typedef struct SDHCIState { /* Configurable properties */ bool pending_insert_quirk; /* Quirk for Raspberry Pi card insert int */ uint8_t sd_spec_version; + uint8_t uhs_mode; } SDHCIState; =20 #define TYPE_PCI_SDHCI "sdhci-pci" diff --git a/hw/sd/core.c b/hw/sd/core.c index 498284f109..6d198ea775 100644 --- a/hw/sd/core.c +++ b/hw/sd/core.c @@ -41,6 +41,19 @@ static SDState *get_card(SDBus *sdbus) return SD_CARD(kid->child); } =20 +void sdbus_set_voltage(SDBus *sdbus, uint16_t millivolts) +{ + SDState *card =3D get_card(sdbus); + + trace_sdbus_set_voltage(sdbus_name(sdbus), millivolts); + if (card) { + SDCardClass *sc =3D SD_CARD_GET_CLASS(card); + + assert(sc->set_voltage); + sc->set_voltage(card, millivolts); + } +} + int sdbus_do_command(SDBus *sdbus, SDRequest *req, uint8_t *response) { SDState *card =3D get_card(sdbus); diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 73e405a04f..a8d7a522c0 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -128,6 +128,18 @@ struct SDState { bool enable; }; =20 +static void sd_set_voltage(SDState *sd, uint16_t millivolts) +{ + switch (millivolts) { + case 3001 ... 3600: /* SD_VOLTAGE_3_3V */ + case 2001 ... 3000: /* SD_VOLTAGE_3_0V */ + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, "SD card voltage not supported: %.3= fV", + millivolts / 1000.f); + } +} + static void sd_set_mode(SDState *sd) { switch (sd->state) { @@ -1926,6 +1938,7 @@ static void sd_class_init(ObjectClass *klass, void *d= ata) dc->reset =3D sd_reset; dc->bus_type =3D TYPE_SD_BUS; =20 + sc->set_voltage =3D sd_set_voltage; 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 9f56eb55e2..d2df1fb728 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1255,7 +1255,16 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t va= l, unsigned size) sdhci_update_irq(s); break; case SDHC_ACMD12ERRSTS: - MASKED_WRITE(s->acmd12errsts, mask, value); + MASKED_WRITE(s->acmd12errsts, mask, value & UINT16_MAX); + if (s->uhs_mode >=3D UHS_I) { + MASKED_WRITE(s->hostctl2, mask >> 16, value >> 16); + + if (FIELD_EX32(s->hostctl2, SDHC_HOSTCTL2, V18_ENA)) { + sdbus_set_voltage(&s->sdbus, SD_VOLTAGE_1_8V); + } else { + sdbus_set_voltage(&s->sdbus, SD_VOLTAGE_3_3V); + } + } break; =20 case SDHC_CAPAB: @@ -1310,6 +1319,7 @@ static void sdhci_init_readonly_registers(SDHCIState = *s, Error **errp) =20 #define DEFINE_SDHCI_COMMON_PROPERTIES(_state) \ DEFINE_PROP_UINT8("sd-spec-version", _state, sd_spec_version, 2), \ + DEFINE_PROP_UINT8("uhs", _state, uhs_mode, UHS_NOT_SUPPORTED), \ \ /* Capabilities registers provide information on supported * features of this specific host controller implementation */ \ diff --git a/hw/sd/trace-events b/hw/sd/trace-events index ea2746c8b7..84d2f398b1 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -4,6 +4,7 @@ sdbus_command(const char *bus_name, uint8_t cmd, uint32_t arg, uint8_t crc= ) "@%s CMD%02d arg 0x%08x crc 0x%02x" 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)" =20 # hw/sd/sdhci.c sdhci_set_inserted(const char *level) "card state changed: %s" --=20 2.16.1