From nobody Tue Feb 10 03:40:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) client-ip=209.85.218.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1613779999; cv=none; d=zohomail.com; s=zohoarc; b=V2SADuWmRjZT0TiOBT7kgOD354aYNkg05ccNH1t8fEj2fme7pnNYVkbwAlkB4mVAf37rZSIMohbLh3CwXOs17Ce9i0OtxOyuzbRNZBDtMOluYPpfckAQG8NbPnxCQNrmfPPOC3fWUkSGej8Ph0kPoJcyDtrnZhoHFJ47bh9Y6qw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613779999; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/u/xjf4UYFb69kyu3yFPBKnJe5Gy0CQG9X8dWyHsftQ=; b=VhgEZhEw360JNRwxDWhqR81ixKQcGULD5/YZfxtlVV3FaE9wGVIDk6B9fC+FQEX7feGaJz8Q/DI9opxnO8cjFlt67mjfyLSmNeyv9hD32qTHIQ+S7z8Sb5cBdBd4Iu4JKqmrgL6y8s0pa95Sw9BR8WAxkcRBz7mr4eaMtC3MGL4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by mx.zohomail.com with SMTPS id 1613779999367606.8854166523727; Fri, 19 Feb 2021 16:13:19 -0800 (PST) Received: by mail-ej1-f53.google.com with SMTP id hs11so16977945ejc.1 for ; Fri, 19 Feb 2021 16:13:18 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id kz4sm5357871ejc.38.2021.02.19.16.13.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Feb 2021 16:13:16 -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=/u/xjf4UYFb69kyu3yFPBKnJe5Gy0CQG9X8dWyHsftQ=; b=VIzQS8y+ecHm3uvQeKJVueeuStSdzbRKyYrXRQqvX0q12Yjf2HoyHbhhGaw+o6CQGG nbvLtHxLA1WMIYO0CZcXVf4ncGWXTX3Sr7JZMjOP9BlEy51/sibKusyYTPaZopb+oGQf +DTslNjynxk78V2NLehCRBdI8UcsThNt1xfc+HzrikV4JRPa9fxUXWeoG5rHo0mPR+gs ps3P8a//pVDfS+BovAlQcFM5AlTeK2xZzyvBJvPE07hYLiSHNEj6ojJ4NmHJTPDOLOh1 DHtI/Fo5W9T2BrGHM0u48SgyqIuIfh+LTHKZK/NntmwbHWNcw2adYSUauzZPlQ2FXsZd C46Q== 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=/u/xjf4UYFb69kyu3yFPBKnJe5Gy0CQG9X8dWyHsftQ=; b=QVSL3uGDtoEXVSxb7FfC11t2ixj+gKcXYF3BuNWPpv4kvCogE7nDTyyp/GXGp0Jh/x e1lfHvyGGNWf8rm9LT/AsTO4ldbmPxtTwXRJWi1tb9pMwLbPjIR5pi8GJFRDU2Hazjzk fNxJQVJHgfMzdPL+2FpH7wsg1BIfHz07JgjvqIXrz5OEPFeN1+DfaUzx4GPvHxJG7AC3 e21u53QO6yA4397gPL59qvGYSeynxwNAnCe8vQmxIJsom/ZWB8P4JBfSlEWj9n765jB+ EvlC8DRHfxkzBGi9D2ySSFJPvv4KLLPU6nDt6cqNr5v+7pfYMJCE8Xh8tArB/EUHexG+ c5BA== X-Gm-Message-State: AOAM530NU7QoKZzzx/yJhLdlljCQfA5uDdOlAePEcNjfmybM9l6BVP9Q 81oSRl/fR6T1qcN3EKS95l0= X-Google-Smtp-Source: ABdhPJwkT4QxH8ZRDePCzdamCNx+78ChKXQiAknGagchqWQdrRVF8eWanV0n5x2M/vTMkX8Y0uYrbw== X-Received: by 2002:a17:906:9259:: with SMTP id c25mr10982020ejx.37.1613779997553; Fri, 19 Feb 2021 16:13:17 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bin Meng , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Subject: [PULL 01/18] hw/sd: ssi-sd: Support multiple block read Date: Sat, 20 Feb 2021 01:12:52 +0100 Message-Id: <20210220001309.2225022-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210220001309.2225022-1-f4bug@amsat.org> References: <20210220001309.2225022-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Bin Meng In the case of a multiple block read operation every transferred block has its suffix of CRC16. Update the state machine logic to handle multiple block read. Signed-off-by: Bin Meng [PMD: Change VMState version id 5 -> 6] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Alistair Francis Message-Id: <20210128063035.15674-2-bmeng.cn@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/ssi-sd.c | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index be1bb101645..6d20a240c69 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -52,6 +52,7 @@ struct ssi_sd_state { uint8_t cmdarg[4]; uint8_t response[5]; uint16_t crc16; + int32_t read_bytes; int32_t arglen; int32_t response_pos; int32_t stopping; @@ -88,11 +89,26 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev, uin= t32_t val) { ssi_sd_state *s =3D SSI_SD(dev); =20 - /* Special case: allow CMD12 (STOP TRANSMISSION) while reading data. = */ - if (s->mode =3D=3D SSI_SD_DATA_READ && val =3D=3D 0x4c) { - s->mode =3D SSI_SD_CMD; - /* There must be at least one byte delay before the card responds.= */ - s->stopping =3D 1; + /* + * Special case: allow CMD12 (STOP TRANSMISSION) while reading data. + * + * See "Physical Layer Specification Version 8.00" chapter 7.5.2.2, + * to avoid conflict between CMD12 response and next data block, + * timing of CMD12 should be controlled as follows: + * + * - CMD12 issued at the timing that end bit of CMD12 and end bit of + * data block is overlapped + * - CMD12 issued after one clock cycle after host receives a token + * (either Start Block token or Data Error token) + * + * We need to catch CMD12 in all of the data read states. + */ + if (s->mode >=3D SSI_SD_PREP_DATA && s->mode <=3D SSI_SD_DATA_CRC16) { + if (val =3D=3D 0x4c) { + s->mode =3D SSI_SD_CMD; + /* There must be at least one byte delay before the card respo= nds */ + s->stopping =3D 1; + } } =20 switch (s->mode) { @@ -212,8 +228,9 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev, uin= t32_t val) return SSI_TOKEN_SINGLE; case SSI_SD_DATA_READ: val =3D sdbus_read_byte(&s->sdbus); + s->read_bytes++; s->crc16 =3D crc_ccitt_false(s->crc16, (uint8_t *)&val, 1); - if (!sdbus_data_ready(&s->sdbus)) { + if (!sdbus_data_ready(&s->sdbus) || s->read_bytes =3D=3D 512) { DPRINTF("Data read end\n"); s->mode =3D SSI_SD_DATA_CRC16; } @@ -224,7 +241,12 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev, ui= nt32_t val) s->response_pos++; if (s->response_pos =3D=3D 2) { DPRINTF("CRC16 read end\n"); - s->mode =3D SSI_SD_CMD; + if (s->read_bytes =3D=3D 512 && s->cmd !=3D 17) { + s->mode =3D SSI_SD_PREP_DATA; + } else { + s->mode =3D SSI_SD_CMD; + } + s->read_bytes =3D 0; s->response_pos =3D 0; } return val; @@ -255,8 +277,8 @@ static int ssi_sd_post_load(void *opaque, int version_i= d) =20 static const VMStateDescription vmstate_ssi_sd =3D { .name =3D "ssi_sd", - .version_id =3D 5, - .minimum_version_id =3D 5, + .version_id =3D 6, + .minimum_version_id =3D 6, .post_load =3D ssi_sd_post_load, .fields =3D (VMStateField []) { VMSTATE_UINT32(mode, ssi_sd_state), @@ -264,6 +286,7 @@ static const VMStateDescription vmstate_ssi_sd =3D { VMSTATE_UINT8_ARRAY(cmdarg, ssi_sd_state, 4), VMSTATE_UINT8_ARRAY(response, ssi_sd_state, 5), VMSTATE_UINT16(crc16, ssi_sd_state), + VMSTATE_INT32(read_bytes, ssi_sd_state), VMSTATE_INT32(arglen, ssi_sd_state), VMSTATE_INT32(response_pos, ssi_sd_state), VMSTATE_INT32(stopping, ssi_sd_state), @@ -316,6 +339,7 @@ static void ssi_sd_reset(DeviceState *dev) memset(s->cmdarg, 0, sizeof(s->cmdarg)); memset(s->response, 0, sizeof(s->response)); s->crc16 =3D 0; + s->read_bytes =3D 0; s->arglen =3D 0; s->response_pos =3D 0; s->stopping =3D 0; --=20 2.26.2