From nobody Tue Feb 10 09:57:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611520108; cv=none; d=zohomail.com; s=zohoarc; b=htPbX8pX+onrY4mVpIi9D41MUx2DiFVn+OT21qnYAGLgs/KREkBSLfbvvDNfnHfUO2y3oaPsakq+E//S3Chm1NXrmttMerH8fStSNI4lmLXTc92l9vZZcssMQS7oQgThvOe7Oj3lX+HBcFugKoHOHLqKTn+4geK+3RJnaRWB67I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611520108; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vbPgcE8iMHZqcnJv4lm0MKaKfzQFYn4DZYh80ZJfCVg=; b=JiPuzUgdsnUTdm/0JTa8x1MdIbJjUhhideRe+wHYzQBhu9dEvWq/pUonpa7pVrx6nQsk1iYNF3ORgDVh7Cc7iCEF5/wA77URhP9VptxZjAZMeR6TxCEGa67brlDrvlNvzVdq2DN+is9li8cPCFFZ6+Ip4B4RVvjrnUm1iOmF0iQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1611520108035678.0801669071712; Sun, 24 Jan 2021 12:28:28 -0800 (PST) Received: by mail-wr1-f53.google.com with SMTP id v15so10245339wrx.4 for ; Sun, 24 Jan 2021 12:28:26 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id u142sm11558013wmu.3.2021.01.24.12.28.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 12:28:24 -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=vbPgcE8iMHZqcnJv4lm0MKaKfzQFYn4DZYh80ZJfCVg=; b=rU7F7V+Jx17yHER5emQDtiYKjj+I6z3sn4wtgHJSJ9Q7VYrQu0hBpjb9Tsc1tpAxxo ssFAaMBizane7hab6SwLDoXP/V6qSoMsjYX+28zE1Ho4zyL+okjP+dbOP7bS9m4OXAZq n45h1af5wkm8iOFgMEggUPXa+kPxp2wp+PKEGRmf1i1UkNO5Zg+ku0zNIdBoOr8TdTc7 j5atjYitcdnxV/eEWNqjg+fDb5WlXe+MtoB/lrIUXFbFkwKEaG9Uowp45SHqGnnXb4o0 xDDoBDrggJnnPCnDSEG9l0gUNzrmtmsIv7zJ4+CcJInpftF8Nvxf3jVNjeMyh6OidyEZ HSxQ== 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=vbPgcE8iMHZqcnJv4lm0MKaKfzQFYn4DZYh80ZJfCVg=; b=DIclLnBDwOQy/bt4AgysR5039ny9r+IatGhTcRrlh4cAR0fj0EDHQdnLEUwtMjMRg1 5JjVTVg2fr3a8LK967VAjXuYN044D+2U9RqADe6hfbCeBIYf7+Oq0FFP3L273QuGXh5v 3F95y6wF94wGXxV3+A5eiMbSRvqQ4N2CBgzik5lJ0I9EQIdzF8K/JCaQ5swTI6Mx+mP+ MKUaDCUmPNVmhnLBpq6sZQlIvuC3D2dVTc2LE9t0uX13h1vDmN8k+lSkzIAA2v9zUREu l4kgjsKg3B6f+s8mksHNaowrCLFo+W8zVdQoPtNPVauBy1/413hvma/mvxgli0KkIlY/ Fo0A== X-Gm-Message-State: AOAM532PZYfUPMHwyjWtsVf4q2jLjGdqrTwqWZUYr7ZVlKY2InQSox2M 1vRe79Wwah4FkKgxMpPpWnzD1StMD28= X-Google-Smtp-Source: ABdhPJy/9zyS+y5qLEzys8BJ+U+V+A1D/WzpUBrD9VGOTtRtHRY+nG0L6RIrT9FE9Hqe5M79PA6FkQ== X-Received: by 2002:a05:6000:1ce:: with SMTP id t14mr2852074wrx.297.1611520105301; Sun, 24 Jan 2021 12:28:25 -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, Bin Meng Cc: Alistair Francis , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pragnesh Patel , Bin Meng Subject: [PATCH v3 1/6] hw/sd: ssi-sd: Support multiple block read Date: Sun, 24 Jan 2021 21:28:12 +0100 Message-Id: <20210124202817.2624557-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210124202817.2624557-1-f4bug@amsat.org> References: <20210124202817.2624557-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 Acked-by: Alistair Francis Message-Id: <20210123104016.17485-11-bmeng.cn@gmail.com> [PMD: Change VMState version id 5 -> 6] 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