From nobody Mon Feb 9 17:59:08 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151852486868020.257240036342864; Tue, 13 Feb 2018 04:27:48 -0800 (PST) Received: from localhost ([::1]:50648 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elZgZ-0007zH-Ox for importer@patchew.org; Tue, 13 Feb 2018 07:27:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elZHq-0004To-Gi for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elZHp-0007oY-3i for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:14 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:37365) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1elZHo-0007oC-Qq for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:13 -0500 Received: by mail-wm0-x242.google.com with SMTP id v71so15612764wmv.2 for ; Tue, 13 Feb 2018 04:02:12 -0800 (PST) Received: from 640k.lan ([82.84.102.245]) by smtp.gmail.com with ESMTPSA id f9sm6870298wmf.12.2018.02.13.04.02.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Feb 2018 04:02:10 -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=Kf17ewg48U2NUjC0jybN2y3mfODJLqVT/XOem/KKlkQ=; b=TQjooy3oQmmnWkzlEGvf4cOE/8nqLiK1CKNSn6lbYAJFJzfufR8zKfA3nrZlS6GqtS glpNdMPWpl9Jt7+vI1t/fNwHYJqpW3BNwncxQ/qfRUyUIbd0vazjCSJ3ZPw7adZhbtoV XulETJGDPRGiHfWHvNkIhdAnCCxKkMFJC8cEROga1FxMJTsAWtUKYmMP3LWDNCMaMChk wm+Q6YItvqA2OcVYx/eWYkMW6xBJqUHx2S1op71Ne2P5QD2+q38ykFbXGi+s3e73RFH5 rAhnCjTQKl64Jt87/ZkGbNZpdRJ6/0C+qNUN4yANEczvSkJimCBYqMhJAuTYBm0AuUpx j6kw== 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=Kf17ewg48U2NUjC0jybN2y3mfODJLqVT/XOem/KKlkQ=; b=SqcPvWATAl6L7cZR+XCY5/Pvqs+mHWiR9AYwESKjktfxhbirtHNZXNomG/4NgXUPWu vtmKyMX8AlOySlab/pkSkhGGdIvhS2ShSylNcjhot+ZKit2Dr62BHDgGdteD+JoAsnyd ak2mjGAvd6Fuxm45/yk7el7HT76PN+iCuFG2AVy52PnSG1HPMF3/Bv8PaKwgKVmkeh0Y mvTmRS6JunPNu6ux11pAwv7fa6O8ILSLh8mL/YHT1ghRjvvMyXKvLsIFxi45NUgBE1lR nKwtuJomf6wdt8uwV15+ysb3eXqIOZDB0uoZiHkMXwJb4lXgT7yAGRIHEHJ/wP3Hf2eq n00g== X-Gm-Message-State: APf1xPA5Xk2bAaglCqbKCr/apDtepJd+LDyd+iijlFzLtwK5Eg7EmglA hS1oNapZ0sFOM8UOGu4+wvhErHBI X-Google-Smtp-Source: AH8x224YrDZtPBPy777iMzCk+jhff6Sw1vUeD4sfbvMtK7JhX4J5SWBTSVqAghotlDdquhysCZpirA== X-Received: by 10.28.237.23 with SMTP id l23mr1160267wmh.113.1518523331283; Tue, 13 Feb 2018 04:02:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Feb 2018 13:00:39 +0100 Message-Id: <1518523252-49106-36-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1518523252-49106-1-git-send-email-pbonzini@redhat.com> References: <1518523252-49106-1-git-send-email-pbonzini@redhat.com> 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: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 35/48] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 From: Philippe Mathieu-Daud=C3=A9 [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 Message-Id: <20180208164818.7961-23-f4bug@amsat.org> --- hw/sd/core.c | 34 ++++++++++++++++++++++++++++++++++ hw/sd/sd.c | 16 ++++++++++++++++ hw/sd/sdhci-internal.h | 2 ++ hw/sd/sdhci.c | 4 ++++ hw/sd/trace-events | 2 ++ include/hw/sd/sd.h | 4 ++++ 6 files changed, 62 insertions(+) diff --git a/hw/sd/core.c b/hw/sd/core.c index 6d198ea..3c6eae6 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 a8d7a52..9ac9b63 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 @@ -1939,6 +1953,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-internal.h b/hw/sd/sdhci-internal.h index b3f2692..33e8768 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/hw/sd/sdhci.c b/hw/sd/sdhci.c index 5ca82cf..1a6771b 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1003,6 +1003,10 @@ static uint64_t sdhci_read(void *opaque, hwaddr offs= et, 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 84d2f39..0f8536d 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" diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index f086679..bf1eb07 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); --=20 1.8.3.1