From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1A687C30659 for ; Fri, 28 Jun 2024 07:48:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sN6Kr-0003cM-HR; Fri, 28 Jun 2024 03:47:57 -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 1sN6Kp-0003TS-17 for qemu-devel@nongnu.org; Fri, 28 Jun 2024 03:47:55 -0400 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sN6Kn-0005hc-3x for qemu-devel@nongnu.org; Fri, 28 Jun 2024 03:47:54 -0400 Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4W9SGG6kcgz4w2N; Fri, 28 Jun 2024 17:47:50 +1000 (AEST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4W9SGF6cBYz4wb7; Fri, 28 Jun 2024 17:47:49 +1000 (AEST) Message-ID: <33e7ef03-12be-4c8f-9e92-4984f6bb2fb2@kaod.org> Date: Fri, 28 Jun 2024 09:47:47 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v42 25/98] hw/sd/sdcard: Convert GEN_CMD to generic_read_byte (CMD56) To: =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org References: <20240628070216.92609-1-philmd@linaro.org> <20240628070216.92609-26-philmd@linaro.org> Content-Language: en-US, fr From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= In-Reply-To: <20240628070216.92609-26-philmd@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2404:9400:2221:ea00::3; envelope-from=SRS0=GU6n=N6=kaod.org=clg@ozlabs.org; helo=mail.ozlabs.org X-Spam_score_int: -39 X-Spam_score: -4.0 X-Spam_bar: ---- X-Spam_report: (-4.0 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 6/28/24 9:01 AM, Philippe Mathieu-Daudé wrote: > From: Philippe Mathieu-Daudé > > Signed-off-by: Philippe Mathieu-Daudé > Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater Thanks, C. > --- > hw/sd/sd.c | 19 +++++++------------ > 1 file changed, 7 insertions(+), 12 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index bf922da2cc..ccf81b9e59 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -1648,10 +1648,12 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) > switch (sd->state) { > case sd_transfer_state: > sd->data_offset = 0; > - if (req.arg & 1) > - sd->state = sd_sendingdata_state; > - else > - sd->state = sd_receivingdata_state; > + if (req.arg & 1) { > + return sd_cmd_to_sendingdata(sd, req, 0, > + sd->vendor_data, > + sizeof(sd->vendor_data)); > + } > + sd->state = sd_receivingdata_state; > return sd_r1; > > default: > @@ -2137,6 +2139,7 @@ uint8_t sd_read_byte(SDState *sd) > case 17: /* CMD17: READ_SINGLE_BLOCK */ > case 19: /* CMD19: SEND_TUNING_BLOCK (SD) */ > case 30: /* CMD30: SEND_WRITE_PROT */ > + case 56: /* CMD56: GEN_CMD */ > sd_generic_read_byte(sd, &ret); > break; > > @@ -2185,14 +2188,6 @@ uint8_t sd_read_byte(SDState *sd) > sd->state = sd_transfer_state; > break; > > - case 56: /* CMD56: GEN_CMD */ > - ret = sd->vendor_data[sd->data_offset ++]; > - > - if (sd->data_offset >= sizeof(sd->vendor_data)) { > - sd->state = sd_transfer_state; > - } > - break; > - > default: > qemu_log_mask(LOG_GUEST_ERROR, "%s: unknown command\n", __func__); > return 0x00;