From patchwork Tue Jul 2 09:19:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 809050 Delivered-To: patch@linaro.org Received: by 2002:adf:a199:0:b0:367:895a:4699 with SMTP id u25csp116524wru; Tue, 2 Jul 2024 02:22:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW7scXQwNoomf9DTC4T17fjN+rRrSkQWMw9kj4RmOcJGwF5/USZ8zNDngL/qXEqKF8rkAYqxbQtgxZQewSDFojN X-Google-Smtp-Source: AGHT+IGLFDOMlW4vpEXYM7sggp0xlLqu9P6LWTXttWVrOvx+VcII8X54ydjcqv2p6lBEhB2klW/Z X-Received: by 2002:a25:d64b:0:b0:df7:6030:bb4e with SMTP id 3f1490d57ef6-e036ec85491mr8380417276.61.1719912177109; Tue, 02 Jul 2024 02:22:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719912177; cv=none; d=google.com; s=arc-20160816; b=FBCKi97HChUOHtF+WCM8XGXPfFQlncu7SY6EMJk2RWSZTeOJhzSptFSclFgnzXbtjq yyGjORTmCcoTZIUtGzJtKyhbDNugyEksy+ydKWznqcdaY6CWLV7YeAP+DNS738iXS4Ao e9Troe9wYCK3miYhD2ZtXuNGjgVOTDyClNKn6XKNGcsjtuXIOAusAsMvbyK9WMnfX0gJ KeZqVmHdK21zt6bovpnxAKKrSe1S7msYss7y9J1Lp2PMsUedXMYn1LaxZ/ryu4WvCc03 hl+GVKNiAK+HhfhKzeeukZ7a3zXglsQ+7zjzW/7Iaf41teMVpambKW5UjPALF0Rfdk6J Po3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pum4FAVUTjoo+qizzaMYQ9jJ7vnP2diemnQewFpOPU0=; fh=SWrD6ZzKChsLNd0MI2/W9aN13/YqYpoy69YA//3JWDk=; b=P2rjWtknjx4PBtdee1iA+PyuHQH5pDYPi/obVDpPfmw5ReOGyEXs+zslMfrLig6Qn1 YOvCH/A3jP5f8gYTUefsHRQUOxb0i6CJjB9NwvAdFHzecjpfTFnVmfGE6RJ9023LIIgn UKJTpvCngeI/f0KNtwkf0vPQAIOzz/NZ7k+UEv8lwntgit1HCEqDBn43i4JHngV7vfHZ jryyvIDOW2TONSEaQVSH5a4HilO8kpsfcLTZYUvQAPoGAyyzR4+9V9LGGtwOZhbZc3XF oAKec1UbX4/Rl8pjBNQphNF89aXaW/vqgcLt8NcE8hNzESu+smB5G78FjP5g3Yl68ljX pHig==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wKiZhufl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-446514aa227si100652631cf.504.2024.07.02.02.22.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Jul 2024 02:22:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wKiZhufl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOZid-0002Q4-Fl; Tue, 02 Jul 2024 05:22:35 -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 1sOZia-0002Aa-EI for qemu-devel@nongnu.org; Tue, 02 Jul 2024 05:22:32 -0400 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sOZiY-0006XL-Ej for qemu-devel@nongnu.org; Tue, 02 Jul 2024 05:22:31 -0400 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-52ce674da85so4260900e87.2 for ; Tue, 02 Jul 2024 02:22:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719912148; x=1720516948; 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=pum4FAVUTjoo+qizzaMYQ9jJ7vnP2diemnQewFpOPU0=; b=wKiZhuflJZNOvfwwMtQRds6slGjwZWQXrAoDs0d2Kt8pl/b8CGg5nvZVgwVg4RdUhl CzVUNkVF0xTA1jo/hxSWchlFUJDbpCWe2srNlneVL4RZagkKfuH9sSQa+n6DXOOu2UbF wmwQDUBAXky9uvLqs3kv9sXciar+g2GN/q0zTAOdHnayfo9BlLNH5X5yIjWz8fY+hbg0 oSKZ8jcLm+OIQE3zm4eNgdo+yuqeoGOcznk2tQLDrzA8QmchszxkLOVxCJg22AXtNqQL 6GUgDT9S61ucQ+1xWtFn4thRxl9J8B/cp3ojzpWTDRoHmZ+hjHBF0kh7uYM61sn9aWAp chiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719912148; x=1720516948; 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=pum4FAVUTjoo+qizzaMYQ9jJ7vnP2diemnQewFpOPU0=; b=RoTYbiYkJXW00jPfsALoOr4Kzg9Y59uh70qlXAIjTLp6gYbTQwJyG0rKiWYo7AphKV mAAO+tMy7HQ0FFtSevChISUBJW0uVgfS3cLyZ+SkxboP81I2Stm/970EwLD+XDsse6Sl 4lfHfPJhuU3Sshf0gxBcYspREJdroYIaTgbjyPekQ0pA02Ti0Ajw8ARqX7YbKzVRmmKZ hkDtTYggZ1hmGs22rYaRbekEdc65+v/dVvpIhZyCvPkyHnjT01UGsBe1Y0xmZ5bzyJEb FcOwj+8m26+gaESAEFraVk5p44HS0nVbL7S/jvZFbSdj05K0TM4fqfyM6z7qecnK840q baJQ== X-Gm-Message-State: AOJu0YzqsicqpRG41DV6Bww0vU92pqgeQp8DNjpDwUMQlCUXMud7U0Lm GzhD2ZuL1Qec4JZAwl7m8VujgQwEZROkiHD6BwB3TA7bDWe35EvAtz6JqOQ8wKMtA05sa5XtJVV e X-Received: by 2002:a05:6512:398f:b0:52c:e4bf:d55d with SMTP id 2adb3069b0e04-52e8264d9fdmr6743732e87.8.1719912147962; Tue, 02 Jul 2024 02:22:27 -0700 (PDT) Received: from m1x-phil.lan ([176.187.209.58]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3675a0cd623sm12678718f8f.16.2024.07.02.02.22.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Jul 2024 02:22:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?C=C3=A9?= =?utf-8?q?dric_Le_Goater?= Subject: [PULL 16/67] hw/sd/sdcard: Convert SEND_CSD/SEND_CID to generic_read_byte (CMD9 & 10) Date: Tue, 2 Jul 2024 11:19:59 +0200 Message-ID: <20240702092051.45754-17-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240702092051.45754-1-philmd@linaro.org> References: <20240702092051.45754-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::129; envelope-from=philmd@linaro.org; helo=mail-lf1-x129.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=ham 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Tested-by: Cédric Le Goater Reviewed-by: Cédric Le Goater Message-Id: <20240628070216.92609-21-philmd@linaro.org> --- hw/sd/sd.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index b073700180..6b02e0a178 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1304,11 +1304,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) if (!sd_is_spi(sd)) { break; } - sd->state = sd_sendingdata_state; - memcpy(sd->data, sd->csd, 16); - sd->data_start = sd_req_get_address(sd, req); - sd->data_offset = 0; - return sd_r1; + return sd_cmd_to_sendingdata(sd, req, sd_req_get_address(sd, req), + sd->csd, 16); default: break; @@ -1328,11 +1325,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) if (!sd_is_spi(sd)) { break; } - sd->state = sd_sendingdata_state; - memcpy(sd->data, sd->cid, 16); - sd->data_start = sd_req_get_address(sd, req); - sd->data_offset = 0; - return sd_r1; + return sd_cmd_to_sendingdata(sd, req, sd_req_get_address(sd, req), + sd->cid, 16); default: break; @@ -2123,15 +2117,9 @@ uint8_t sd_read_byte(SDState *sd) sd->current_cmd, sd->data_offset, io_len); switch (sd->current_cmd) { case 6: /* CMD6: SWITCH_FUNCTION */ - sd_generic_read_byte(sd, &ret); - break; - case 9: /* CMD9: SEND_CSD */ - case 10: /* CMD10: SEND_CID */ - ret = sd->data[sd->data_offset ++]; - - if (sd->data_offset >= 16) - sd->state = sd_transfer_state; + case 10: /* CMD10: SEND_CID */ + sd_generic_read_byte(sd, &ret); break; case 13: /* ACMD13: SD_STATUS */