From nobody Sat Nov 15 08:31:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1753998155; cv=none; d=zohomail.com; s=zohoarc; b=gk56ZJ6MDmGKSDdrSv7wxBk/Y9b288XWUAzmkW/EKLTDiT1hntiTavCK488La1GPVR3EMCKaAmlZ+Sy+USZzuVSD3UR5EjOHjmaYu+TybjdCDM0P4QaUdWyX1ve9xIXKXh2WEwttP0ZBeMX3DF3aS7OLogJjpVg2sJ5OpD8cRFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753998155; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oWBEps/IHV7G68SkGN78QP86K/TyIINFKInszR+1c2o=; b=Gowyt7G09OEUpL7HDlK6XHFGIf7PYluLt2mj4cSZ2O/Tlopw961MmnGhSxTx5/uszOJLFcwad9SBiwo67fRoZwNFLV0JammNsLx3UdoAngsQHLRIT3DD+7V4+rvEw8nsr61/Kd74PIn0f5a7F7bULosRLHS5Cm9udhYUD/1Jlnc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1753998155665170.61640583641963; Thu, 31 Jul 2025 14:42:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhb2M-0007B5-8z; Thu, 31 Jul 2025 17:42:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uhapO-0001H7-LO for qemu-devel@nongnu.org; Thu, 31 Jul 2025 17:28:42 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uhapL-0007vh-UK for qemu-devel@nongnu.org; Thu, 31 Jul 2025 17:28:42 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-45619d70c72so19151295e9.0 for ; Thu, 31 Jul 2025 14:28:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c467994sm3569009f8f.50.2025.07.31.14.28.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Jul 2025 14:28:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753997317; x=1754602117; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oWBEps/IHV7G68SkGN78QP86K/TyIINFKInszR+1c2o=; b=ebP6tiO3DCPWhK3zfDIkjAx1NVyv/gK+Kr/A6bHbsG1pQbshgbKkN7e1KDaI9657IE Bf2L9Gb5//z2LgBv5RgAGBYWlbPOgYdwgHUiQyFq0c2BalSuMHc5wIRiNPXcZCyH6Yc3 7XH670+7oVrxA4KmEACxd9viJ/b0jWlhL36q46Mxd72KzVYsmnyP/QTo75rmZ9jhkX+l 84gTdAoavOEJw1i7IIICXu0xiY5R2X3SeqULydLX3XCIp34awFIGVb+MVJ+7oJa01gQX u2fpU47MT5lEkZAjqvw4EzkQRW4Yks9w273B4I26+t6TfXuAVBn6R3dEOmcI5c9hP2PR Xbqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753997317; x=1754602117; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oWBEps/IHV7G68SkGN78QP86K/TyIINFKInszR+1c2o=; b=BegbiHPceob0/6D74+DwI2xRpt3wZ+7t1jmQyrGaaya9SXprLIO746Op/UMtlxs0f6 TmBQj+pcIMBz+lrVSieuAR+Xn50VmihV1oyhOFGC5sypBwY8WvQvmznk2dFabI3UIvzE WZy5qTXdUCHf/eB52nl3IMW/zLiX9EwLNC+NMGF6/pHP5vqlTLANLJM5gJf/5msAbLlt CjV5XV/bkvnfBt6lumFJsvNttzpvhvvne6uwRH6cphyWWBktavQfoeJbMOdQPHNcKahR CxSNCgpFgvFNV6fkStASgKVqVGpJm/Y51X4BCruN+vlWFwTPhlj6dzAwKUOIEXwxQraS fQxg== X-Gm-Message-State: AOJu0YyaARkqmiX+WBIb7OBKqkERg63tfQ+K1H9cJW76/02OGe42vB5X mS6sFs3vCk7qNaCB6RYWnZkWPvsxsxk9eCuxWd44tk0Iyh59NBYn4N98cyR9P4rnAAKfbG4HgOt nSUph X-Gm-Gg: ASbGncu5W1qmprKRcz5hx91V1XhXZ7rfKbUMP1TLN4sfKAjq1138nOcjdX1zdkxi+mU gg1V9E0HC6Nw6+9zOZuBlSYirHk/EHMV/3Wa0DWb9l19C0812g+qP5aPzIlMG1RHNSLkxFM5yvA attxjqumBiHTn706lacNvpalZJgGJXbR3l1Cp/yTiq+NCIKRjtqnhRZvScZv57lzIkYOxDxgtW5 6R6Cy6OMKYfWmjhZzyNHN6UvebEsAp+0xng+M+9hXJp3lOJQWLqDQQ9KW6RIqFkV0kXpp1URj3D kFmWckFNxC7uv/2zCSHysYcRuCK6NyZDIJiqYZpJWRB16ZAr9JxZT3wEWBIjODqtAx3E0iO636f XGjyTuvWPwv2I0SXckxrKbtu+wsu+jVLQhowcmpRiWTq0e7lUfq3YHgR/2aKoFeHRs28gaEWd X-Google-Smtp-Source: AGHT+IFjFXvvqb59RVjZVs8PSLccxOE6ccsUXrudgefeE44V5UyNFjtIJexdbtBY1GGye27mxbtnug== X-Received: by 2002:a05:6000:2004:b0:3b7:882c:778 with SMTP id ffacd0b85a97d-3b79d4e38b5mr2767800f8f.17.1753997317444; Thu, 31 Jul 2025 14:28:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: Guenter Roeck , Palmer Dabbelt , Liu Zhiwei , Daniel Henrique Barboza , Strahinja Jankovic , qemu-riscv@nongnu.org, qemu-arm@nongnu.org, Bin Meng , Alistair Francis , Beniamino Galvani , Ben Dooks , Weiwei Li , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 05/11] hw/sd/sdcard: Implement SPI R2 return value Date: Thu, 31 Jul 2025 23:28:00 +0200 Message-ID: <20250731212807.2706-6-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250731212807.2706-1-philmd@linaro.org> References: <20250731212807.2706-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1753998157141116600 In SPI mode, R2 is a 2-byte value. Implement in spi_response_r2_make() and return SPI R2 in the SEND_STATUS commands. Reported-by: Guenter Roeck Fixes: 775616c3ae8 ("Partial SD card SPI mode support") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 36 +++++++++++++++++++++++++++++++++--- hw/sd/ssi-sd.c | 3 --- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index f7c231d9f30..078bc5ef091 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -61,6 +61,7 @@ typedef enum { sd_r0 =3D 0, /* no response */ sd_r1, /* normal response command */ + spi_r2, /* STATUS */ sd_r2_i, /* CID register */ sd_r2_s, /* CSD register */ sd_r3, /* OCR register */ @@ -247,6 +248,7 @@ static const char *sd_response_name(sd_rsp_type_t rsp) static const char *response_name[] =3D { [sd_r0] =3D "RESP#0 (no response)", [sd_r1] =3D "RESP#1 (normal cmd)", + [spi_r2] =3D "RESP#2 (STATUS reg)", [sd_r2_i] =3D "RESP#2 (CID reg)", [sd_r2_s] =3D "RESP#2 (CSD reg)", [sd_r3] =3D "RESP#3 (OCR reg)", @@ -757,6 +759,24 @@ static size_t sd_response_r1_make(SDState *sd, uint8_t= *response, size_t respsz) return rsplen; } =20 +static size_t spi_response_r2_make(SDState *sd, uint8_t *resp, size_t resp= sz) +{ + sd_response_r1_make(sd, resp, respsz); + + assert(respsz >=3D 2); + resp[1] =3D FIELD_EX32(sd->card_status, CSR, CARD_IS_LOCKED) << 0; + resp[1] |=3D (FIELD_EX32(sd->card_status, CSR, LOCK_UNLOCK_FAILED) + || FIELD_EX32(sd->card_status, CSR, WP_ERASE_SKIP)) << 1; + resp[1] |=3D FIELD_EX32(sd->card_status, CSR, ERROR) << 2; + resp[1] |=3D FIELD_EX32(sd->card_status, CSR, CC_ERROR) << 3; + resp[1] |=3D FIELD_EX32(sd->card_status, CSR, CARD_ECC_FAILED) << 4; + resp[1] |=3D FIELD_EX32(sd->card_status, CSR, WP_VIOLATION) << 5; + resp[1] |=3D FIELD_EX32(sd->card_status, CSR, ERASE_PARAM) << 6; + resp[1] |=3D FIELD_EX32(sd->card_status, CSR, OUT_OF_RANGE) << 7; + + return 2; +} + static size_t sd_response_r3_make(SDState *sd, uint8_t *response, size_t r= espsz) { size_t rsplen =3D 4; @@ -1633,7 +1653,7 @@ static sd_rsp_type_t sd_cmd_SEND_STATUS(SDState *sd, = SDRequest req) } =20 if (sd_is_spi(sd)) { - return sd_r2_s; + return spi_r2; } =20 return sd_req_rca_same(sd, req) ? sd_r1 : sd_r0; @@ -1947,8 +1967,14 @@ static sd_rsp_type_t sd_acmd_SET_BUS_WIDTH(SDState *= sd, SDRequest req) /* ACMD13 */ static sd_rsp_type_t sd_acmd_SD_STATUS(SDState *sd, SDRequest req) { - return sd_cmd_to_sendingdata(sd, req, 0, - sd->sd_status, sizeof(sd->sd_status)); + sd_rsp_type_t rsp; + + rsp =3D sd_cmd_to_sendingdata(sd, req, 0, + sd->sd_status, sizeof(sd->sd_status)); + if (sd_is_spi(sd) && rsp !=3D sd_illegal) { + return spi_r2; + } + return rsp; } =20 /* ACMD22 */ @@ -2251,6 +2277,10 @@ send_response: rsplen =3D sd_response_r1_make(sd, response, respsz); break; =20 + case spi_r2: + rsplen =3D spi_response_r2_make(sd, response, respsz); + break; + case sd_r2_i: assert(respsz >=3D 16); memcpy(response, sd->cid, sizeof(sd->cid)); diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index 79b6d34a489..ace155186cf 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -158,9 +158,6 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev, uin= t32_t val) longresp, sizeof(longresp)); DPRINTF("CMD%d arg 0x%08x =3D %d\n", s->cmd, request.arg, s->a= rglen); assert(s->arglen > 0); - /* CMD13 returns a 2-byte statuse work. Other commands - only return the first byte. */ - s->arglen =3D (s->cmd =3D=3D 13) ? 2 : 1; memcpy(s->response, longresp, s->arglen); =20 /* handle R1b (busy signal) */ --=20 2.49.0