From nobody Tue Feb 10 14:49:15 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 1516309129554772.1156174973132; Thu, 18 Jan 2018 12:58:49 -0800 (PST) Received: from localhost ([::1]:54034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecHGp-0007QS-Lw for importer@patchew.org; Thu, 18 Jan 2018 15:58:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecH0h-00017Z-Qt for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:42:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecH0e-0007vt-NI for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:42:07 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:43434) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ecH0e-0007vg-HW for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:42:04 -0500 Received: by mail-qt0-x243.google.com with SMTP id s3so33590238qtb.10 for ; Thu, 18 Jan 2018 12:42:04 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 24sm5484621qkv.64.2018.01.18.12.41.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2018 12:41:54 -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=BxKiZHGByoJWOYnXqTeTxukzMR69ct1qeGtE2uhHY24=; b=n4kXeH14QWNarB35RxnDi/bBKeF3/QcY9XbJUsKYNQ32DNCZWnE3V+OCYxHH7WL9Wf /vEgYy4U3QW8RDYEU1Znb6APtfIkWoqQtfvG7I4aZPfqUUCJqOGTg0gBnveR5gPZVEEl 0waoEnq73cOT/xADNuY6iQ9xttX/3j27KIztXI1x8CuEwx3akvknkIade9xJPs4JpFL6 3viIXgoVtAldURkXPs77wufpRGiWpYV1kDxRMvvdzgH1mqf1P5YPvMXqoUcstzP80XPX KY3tyYMJp6J3TD4qsTnC1SH0SsSqmeWjdDJb9tT0QwDWCS3UaRjKDtPOEsYwaK0AF4gT I/CQ== 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=BxKiZHGByoJWOYnXqTeTxukzMR69ct1qeGtE2uhHY24=; b=bE+HChLhkl1shr4LQnQcpcVUizEaYftOWp8+BsGt0cg6ia1m7BUYEULcgGXrT8sFu6 sTUOQlKTlE/7uyE9ALmJ95EgTAdP7JRliV9UZebX2Leo68Do48sNPqP6JnD18o92DY1D 2kzulOVmzNjnJO1pyW3DlleVs/uKW50mRkrQvGuASL2hdL7G59vEF252zFjqth21509G 7dnw80NkZCjP4WiyZsIe1H2htwBhUg0gGnTB2oFDvY+S0wHhFtKp8hZsNzFLQzPnu/PL UIdqwsRHFrKC3pd3T9ICxDmh9q1W9kUZrfNoY2Jyq2p1GbsnGVBWR8pThMQKyxqmj0QH /wRQ== X-Gm-Message-State: AKwxytc5KasXy4h1nPs3CMlr3MlHto2WW6oWP8yzQgD8Pemg1jO27WNg KUwNJEMLbZXGcgkLF+AhqNs= X-Google-Smtp-Source: ACJfBovsb7R6HQtPOT74KqO3jJncliV7OsRL88hU5T2op04rztcYd9gKdgFa5/F0jexm5gKkpNVGsw== X-Received: by 10.200.56.170 with SMTP id f39mr22449046qtc.243.1516308123968; Thu, 18 Jan 2018 12:42:03 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 18 Jan 2018 17:40:57 -0300 Message-Id: <20180118204058.5768-14-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::243 Subject: [Qemu-devel] [PATCH v7 13/14] 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" , 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 --- 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 9d3f656441..5951b3fb2d 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -121,6 +121,7 @@ typedef struct SDHCIState { * Spec v3 ***********/ uint8_t slot_type, sdr, strength; + uint8_t uhs_mode; } cap; } SDHCIState; =20 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 35347a5bbc..609b2da14f 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) { @@ -1925,6 +1937,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 37b3b265ef..3846182371 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1162,7 +1162,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->cap.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: @@ -1244,6 +1253,7 @@ static void sdhci_init_readonly_registers(SDHCIState = *s, Error **errp) DEFINE_PROP_UINT8("slot-type", _state, cap.slot_type, 0), \ DEFINE_PROP_UINT8("bus-speed", _state, cap.sdr, 0), \ DEFINE_PROP_UINT8("driver-strength", _state, cap.strength, 0), \ + DEFINE_PROP_UINT8("uhs", _state, cap.uhs_mode, UHS_NOT_SUPPORTED), \ \ DEFINE_PROP_UINT64("maxcurr", _state, maxcurr, 0) =20 diff --git a/hw/sd/trace-events b/hw/sd/trace-events index c0f51f11d4..f874489980 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.15.1