From nobody Tue Feb 10 10:07:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611519094; cv=none; d=zohomail.com; s=zohoarc; b=NcZtHdN+bzQzmEKQXWbdWqjvWMSqxLIq3uo+1o0tSs+FjTTMjAptl1vUXoHPtuaqQF8SSDynIt3C2PRQQr/8j8y4NUN5EqOGnvKTk+C/jutp8fs4OW+hP6PdKpXypcrJyTZR17H/Uj45TeGSgLmAYygtvFpqJEVHoLTjbzoaYoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611519094; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=azG5XzPp/6ZRHAy0TjMc2B6T/f3v9NNr1zArUdRagcQ=; b=lSYn4dKr5xzOkTAZtvjuzc1GlGyQm3BKp+TuEEJzis7CJa1dao/N5Q46/yJRejEusUb5bgsZ4albAnEoTKnNDLuSsundZvqxlUxXXLv7WRemwry6CO2UwmOmfOFlMHQ7fOL6da3Lz6eMV7JCGg2P214kyi0GtVEvgs6Vp8+MQAA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1611519094791475.9569699273238; Sun, 24 Jan 2021 12:11:34 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id m187so8800992wme.2 for ; Sun, 24 Jan 2021 12:11:34 -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 p15sm20093565wrt.15.2021.01.24.12.11.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 12:11:32 -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=azG5XzPp/6ZRHAy0TjMc2B6T/f3v9NNr1zArUdRagcQ=; b=sfRqk+XumWyD0xgDZrmsstFrJuXQ0kf+RgjYr+iGQGoXERjkwwZUmmDu8+L009Lmsm 4bYVJPjEyni5HewZm3IQ520a4ytCDU1sV9BqUNtI+PCUD9xOCOsOuIxnsEQiw9YIR0oy z/SGfHEwht9GrDRRfLX8gJTlUYqmYCDEwdOzAN+UfNeW9/B7cfc4M3JHqi1ZpCI6zPBV iRg9VqMh5UbTWhHRt/8B3Pt0WXn1xWl6uP9XU8CTl8cQyBRwAm8eAvQNqKLO6gm4IAeF F2ZZSRJuyRcS814NDo/1vnRC2aLhxQtDz8ndZQrXS3SaeD47f6ciq54GtZxGJb70Q/ED bb4A== 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=azG5XzPp/6ZRHAy0TjMc2B6T/f3v9NNr1zArUdRagcQ=; b=SqPT/c7HW6gK3tgEj38fP/pHqn8FhdtoydbpYr/RP3aYXUictMYhs20rnm5UJQ4Cbd V5v0ijgsU7zeMvsO7i8qE6+HeyV1nf/103mpU2Nod+DOzclRoMs59w4mbQawkvcRfyrg vmEdZYVenrr0J0BabkzFYq0JVP48RAxyc7MbfuA8t/x4VKQzl9M86iZAeDXgpe3lXvFb OHzlw62lkDeGBhzHWX0CtXB/taGU4PvptQj9woPMslj1zgBgrXL31nRHRT837EHdbObY F7TWTHfqBgK0KiJnJJUvxVbFCE8KbGPncwX3nWrcUDvXIQ4VfgySiZYPCJU6WuWjZ1EB A+qQ== X-Gm-Message-State: AOAM533SbcjC/0CcpoXuPZmE/59TlSOCtluSG2sivCm9kkwOBAkPtfxC hysz71dR7cPmz4JE87A4LYE= X-Google-Smtp-Source: ABdhPJxumd4XypZkhbsxeJA3Ww995/hZ5X68B6CI3XKragxrObBGunRGttV+PbvUUDX2fhJdagFaCw== X-Received: by 2002:a1c:a406:: with SMTP id n6mr3220348wme.53.1611519093071; Sun, 24 Jan 2021 12:11:33 -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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Bin Meng , Alistair Francis Subject: [PULL 5/9] hw/sd: ssi-sd: Suffix a data block with CRC16 Date: Sun, 24 Jan 2021 21:11:02 +0100 Message-Id: <20210124201106.2602238-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210124201106.2602238-1-f4bug@amsat.org> References: <20210124201106.2602238-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 Per the SD spec, a valid data block is suffixed with a 16-bit CRC generated by the standard CCITT polynomial x16+x12+x5+1. This part is currently missing in the ssi-sd state machine. Without it, all data block transfer fails in guest software because the expected CRC16 is missing on the data out line. Fixes: 775616c3ae8c ("Partial SD card SPI mode support") Signed-off-by: Bin Meng Acked-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210123104016.17485-8-bmeng.cn@gmail.com> [PMD: Change VMState version id 3 -> 4, check s->mode validity in post_load()] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/ssi-sd.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index d97646795a2..08852dc8d4b 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -17,6 +17,7 @@ #include "hw/qdev-properties.h" #include "hw/sd/sd.h" #include "qapi/error.h" +#include "qemu/crc-ccitt.h" #include "qemu/module.h" #include "qom/object.h" =20 @@ -40,6 +41,7 @@ typedef enum { SSI_SD_RESPONSE, SSI_SD_DATA_START, SSI_SD_DATA_READ, + SSI_SD_DATA_CRC16, } ssi_sd_mode; =20 struct ssi_sd_state { @@ -48,6 +50,7 @@ struct ssi_sd_state { int cmd; uint8_t cmdarg[4]; uint8_t response[5]; + uint16_t crc16; int32_t arglen; int32_t response_pos; int32_t stopping; @@ -194,12 +197,24 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev, u= int32_t val) case SSI_SD_DATA_START: DPRINTF("Start read block\n"); s->mode =3D SSI_SD_DATA_READ; + s->response_pos =3D 0; return 0xfe; case SSI_SD_DATA_READ: val =3D sdbus_read_byte(&s->sdbus); + s->crc16 =3D crc_ccitt_false(s->crc16, (uint8_t *)&val, 1); if (!sdbus_data_ready(&s->sdbus)) { DPRINTF("Data read end\n"); + s->mode =3D SSI_SD_DATA_CRC16; + } + return val; + case SSI_SD_DATA_CRC16: + val =3D (s->crc16 & 0xff00) >> 8; + s->crc16 <<=3D 8; + s->response_pos++; + if (s->response_pos =3D=3D 2) { + DPRINTF("CRC16 read end\n"); s->mode =3D SSI_SD_CMD; + s->response_pos =3D 0; } return val; } @@ -211,7 +226,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_READ) { + if (s->mode > SSI_SD_DATA_CRC16) { return -EINVAL; } if (s->mode =3D=3D SSI_SD_CMDARG && @@ -229,14 +244,15 @@ static int ssi_sd_post_load(void *opaque, int version= _id) =20 static const VMStateDescription vmstate_ssi_sd =3D { .name =3D "ssi_sd", - .version_id =3D 3, - .minimum_version_id =3D 3, + .version_id =3D 4, + .minimum_version_id =3D 4, .post_load =3D ssi_sd_post_load, .fields =3D (VMStateField []) { VMSTATE_UINT32(mode, ssi_sd_state), VMSTATE_INT32(cmd, ssi_sd_state), VMSTATE_UINT8_ARRAY(cmdarg, ssi_sd_state, 4), VMSTATE_UINT8_ARRAY(response, ssi_sd_state, 5), + VMSTATE_UINT16(crc16, ssi_sd_state), VMSTATE_INT32(arglen, ssi_sd_state), VMSTATE_INT32(response_pos, ssi_sd_state), VMSTATE_INT32(stopping, ssi_sd_state), @@ -288,6 +304,7 @@ static void ssi_sd_reset(DeviceState *dev) s->cmd =3D 0; memset(s->cmdarg, 0, sizeof(s->cmdarg)); memset(s->response, 0, sizeof(s->response)); + s->crc16 =3D 0; s->arglen =3D 0; s->response_pos =3D 0; s->stopping =3D 0; --=20 2.26.2