From nobody Tue Feb 10 04:02:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611520127; cv=none; d=zohomail.com; s=zohoarc; b=mBtrIEqA7AhKEAhAJARWp7UfUpu633ZmYAoT4Vmec04+jKe+YvnfNH1zZ7HClfi04XhVLwN8SfdlCH0iqnT4ln45goVXoWlf0VwW42QjgGdVz1zf6jsqGUWHiuGqLf4FVuQPk1+6cqFVQ+UuZTkLLUVLEZQQ1+xdtHTx5oIHrto= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611520127; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8cyx359tJuUV31B1jXXoRAIiQKjeJQ7/Oz0pZLR+MTQ=; b=lu8U/imd6x8CKPvOIxwdR4eCZUojTGc83WKLBznCkpG8qtv8amCoXM1UUxzzwnfyT7+j5H3dSpA2q9EpsD6opsOpQSqK58FrbmYXVkOBUJGXJh6rtGTMoxhRhDC+6RB+JrK0zvaMGi0cF+sQ8+Q1k84pm7wDKLFEFMwYITnQc6w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1611520127379899.462273985588; Sun, 24 Jan 2021 12:28:47 -0800 (PST) Received: by mail-wr1-f46.google.com with SMTP id m1so9558920wrq.12 for ; Sun, 24 Jan 2021 12:28:46 -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 m82sm19364651wmf.29.2021.01.24.12.28.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 12:28:45 -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=8cyx359tJuUV31B1jXXoRAIiQKjeJQ7/Oz0pZLR+MTQ=; b=a9wYft/xQe+7/tTaxmt1V5nDg+L0UBufe8rSk21RnUESoUYEHxXhs65QBT9VOT5N56 l8FLQVZKSbe9TlgtKjZVu7q9PEkHG7ov5Hvv15aqGn8SReB4Q3a4rItSEgdUx8QSVo+a QVPm8yltETWflut4YGNJnad+2LcbQtRnWKIL70BdiiBfdOO677cG/z3NnnH88A5tvDca 3yfmEhjbTURT+/Pc2v8buVgQp/ZwHQlycUeqtKqxXVR5BOUaDAFM+3x0OBENHeUvIYIe GEoUJKBiydEpY35UZ4RCx3wQT35YNpkXQXXnAV/XYOm96il/Qqu2YcWKjEcLpOzWHPCd bx3g== 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=8cyx359tJuUV31B1jXXoRAIiQKjeJQ7/Oz0pZLR+MTQ=; b=FVeuMTWALz1wxaFyrgUtJPMkJnWh2Db9ODDEkOpEhlchWaeOGRpsYrRXh9yNK36Wxd tVvEhhY+sbNe1KalSjMpPbepoTpRuhkD/PJR2P+IvCpYekoI+NiMzWp2Ltbje55XtB3d VoNBU62mWVSGDCUg09ccHqPDcZTlLm7WeHHWqFEoCsRbo/jUVIieJgMjpjm+ZFP90b6W ek+vPNht+2jQVe1S7JrB3+TDOZltq0Hh/f6uM6pBl7mHs9bjmlDDdCQKaRCR4fenGhkF TCqmeFgVSxcdvYiAOk3ttziiagwkdmcD5ZkjBUEm0zpKOId9bHAUNj6GRzbBhTfoR+UU VxjA== X-Gm-Message-State: AOAM532wZmIgSWZ5v3LhxZJo2Jm4z77yhQE6vCbF32P4ahqfFZ1xeD6H JHDEAxOqGJk2B+XlTWk3dJs= X-Google-Smtp-Source: ABdhPJyFegcgHD0JxJKxXyO2zJKacCOEcOdl4JWpcbwL8SbhdyCMurclxebCZYkqSYD1biMfgN1JAQ== X-Received: by 2002:adf:c6c4:: with SMTP id c4mr3692701wrh.348.1611520125663; Sun, 24 Jan 2021 12:28:45 -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 5/6] hw/sd: ssi-sd: Support single block write Date: Sun, 24 Jan 2021 21:28:16 +0100 Message-Id: <20210124202817.2624557-6-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 Add 2 more states for the block write operation. The SPI host needs to send a data start token to start the transfer, and the data block written to the card will be acknowledged by a data response token. Signed-off-by: Bin Meng Acked-by: Alistair Francis Message-Id: <20210123104016.17485-17-bmeng.cn@gmail.com> [PMD: Change VMState version id 6 -> 7] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/ssi-sd.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index 6d20a240c69..1205ad8b52c 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -43,6 +43,8 @@ typedef enum { SSI_SD_DATA_START, SSI_SD_DATA_READ, SSI_SD_DATA_CRC16, + SSI_SD_DATA_WRITE, + SSI_SD_SKIP_CRC16, } ssi_sd_mode; =20 struct ssi_sd_state { @@ -53,6 +55,7 @@ struct ssi_sd_state { uint8_t response[5]; uint16_t crc16; int32_t read_bytes; + int32_t write_bytes; int32_t arglen; int32_t response_pos; int32_t stopping; @@ -85,6 +88,9 @@ OBJECT_DECLARE_SIMPLE_TYPE(ssi_sd_state, SSI_SD) /* dummy value - don't care */ #define SSI_DUMMY 0xff =20 +/* data accepted */ +#define DATA_RESPONSE_ACCEPTED 0x05 + static uint32_t ssi_sd_transfer(SSIPeripheral *dev, uint32_t val) { ssi_sd_state *s =3D SSI_SD(dev); @@ -113,10 +119,17 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev, u= int32_t val) =20 switch (s->mode) { case SSI_SD_CMD: - if (val =3D=3D SSI_DUMMY) { + switch (val) { + case SSI_DUMMY: DPRINTF("NULL command\n"); return SSI_DUMMY; + break; + case SSI_TOKEN_SINGLE: + DPRINTF("Start write block\n"); + s->mode =3D SSI_SD_DATA_WRITE; + return SSI_DUMMY; } + s->cmd =3D val & 0x3f; s->mode =3D SSI_SD_CMDARG; s->arglen =3D 0; @@ -250,6 +263,27 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev, ui= nt32_t val) s->response_pos =3D 0; } return val; + case SSI_SD_DATA_WRITE: + sdbus_write_byte(&s->sdbus, val); + s->write_bytes++; + if (!sdbus_receive_ready(&s->sdbus) || s->write_bytes =3D=3D 512) { + DPRINTF("Data write end\n"); + s->mode =3D SSI_SD_SKIP_CRC16; + s->response_pos =3D 0; + } + return val; + case SSI_SD_SKIP_CRC16: + /* we don't verify the crc16 */ + s->response_pos++; + if (s->response_pos =3D=3D 2) { + DPRINTF("CRC16 receive end\n"); + s->mode =3D SSI_SD_RESPONSE; + s->write_bytes =3D 0; + s->arglen =3D 1; + s->response[0] =3D DATA_RESPONSE_ACCEPTED; + s->response_pos =3D 0; + } + return SSI_DUMMY; } /* Should never happen. */ return SSI_DUMMY; @@ -259,7 +293,7 @@ static int ssi_sd_post_load(void *opaque, int version_i= d) { ssi_sd_state *s =3D (ssi_sd_state *)opaque; =20 - if (s->mode > SSI_SD_DATA_CRC16) { + if (s->mode > SSI_SD_SKIP_CRC16) { return -EINVAL; } if (s->mode =3D=3D SSI_SD_CMDARG && @@ -277,8 +311,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 6, - .minimum_version_id =3D 6, + .version_id =3D 7, + .minimum_version_id =3D 7, .post_load =3D ssi_sd_post_load, .fields =3D (VMStateField []) { VMSTATE_UINT32(mode, ssi_sd_state), @@ -287,6 +321,7 @@ static const VMStateDescription vmstate_ssi_sd =3D { VMSTATE_UINT8_ARRAY(response, ssi_sd_state, 5), VMSTATE_UINT16(crc16, ssi_sd_state), VMSTATE_INT32(read_bytes, ssi_sd_state), + VMSTATE_INT32(write_bytes, ssi_sd_state), VMSTATE_INT32(arglen, ssi_sd_state), VMSTATE_INT32(response_pos, ssi_sd_state), VMSTATE_INT32(stopping, ssi_sd_state), @@ -340,6 +375,7 @@ static void ssi_sd_reset(DeviceState *dev) memset(s->response, 0, sizeof(s->response)); s->crc16 =3D 0; s->read_bytes =3D 0; + s->write_bytes =3D 0; s->arglen =3D 0; s->response_pos =3D 0; s->stopping =3D 0; --=20 2.26.2