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 082E6C2BBCA for ; Fri, 28 Jun 2024 08:04:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sN6Zm-0005hI-60; Fri, 28 Jun 2024 04:03:22 -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 1sN6Zk-0005Wv-1M for qemu-devel@nongnu.org; Fri, 28 Jun 2024 04:03:20 -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 1sN6Zi-0005rY-3J for qemu-devel@nongnu.org; Fri, 28 Jun 2024 04:03:19 -0400 Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4W9Sc40jNdz4wb7; Fri, 28 Jun 2024 18:03:16 +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) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4W9Sc25Kd1z4w2Q; Fri, 28 Jun 2024 18:03:14 +1000 (AEST) Message-ID: <175aa824-b8d3-4895-8f77-e0e7b18f0aa3@kaod.org> Date: Fri, 28 Jun 2024 10:03:12 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v42 68/98] hw/sd/sdcard: Add sd_acmd_SET_BUS_WIDTH handler (ACMD6) To: =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org References: <20240628070216.92609-1-philmd@linaro.org> <20240628070216.92609-69-philmd@linaro.org> Content-Language: en-US, fr From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= In-Reply-To: <20240628070216.92609-69-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: > Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater Thanks, C. > --- > hw/sd/sd.c | 28 +++++++++++++++------------- > 1 file changed, 15 insertions(+), 13 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index 2f853a89d1..0310a5a3a1 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -260,7 +260,6 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd) > static const char *sd_acmd_name(SDState *sd, uint8_t cmd) > { > static const char *acmd_abbrev[SDMMC_CMD_MAX] = { > - [6] = "SET_BUS_WIDTH", > [13] = "SD_STATUS", > [14] = "DPS_spec", [15] = "DPS_spec", > [16] = "DPS_spec", > @@ -1672,6 +1671,18 @@ static sd_rsp_type_t spi_cmd_CRC_ON_OFF(SDState *sd, SDRequest req) > return sd_r1; > } > > +/* ACMD6 */ > +static sd_rsp_type_t sd_acmd_SET_BUS_WIDTH(SDState *sd, SDRequest req) > +{ > + if (sd->state != sd_transfer_state) { > + return sd_invalid_state_for_cmd(sd, req); > + } > + > + sd->sd_status[0] &= 0x3f; > + sd->sd_status[0] |= (req.arg & 0x03) << 6; > + return sd_r1; > +} > + > static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) > { > uint64_t addr; > @@ -1780,18 +1791,6 @@ static sd_rsp_type_t sd_app_command(SDState *sd, > } > > switch (req.cmd) { > - case 6: /* ACMD6: SET_BUS_WIDTH */ > - switch (sd->state) { > - case sd_transfer_state: > - sd->sd_status[0] &= 0x3f; > - sd->sd_status[0] |= (req.arg & 0x03) << 6; > - return sd_r1; > - > - default: > - break; > - } > - break; > - > case 13: /* ACMD13: SD_STATUS */ > switch (sd->state) { > case sd_transfer_state: > @@ -2385,6 +2384,9 @@ static const SDProto sd_proto_sd = { > [58] = {11, sd_adtc, "READ_EXTR_MULTI", sd_cmd_optional}, > [59] = {11, sd_adtc, "WRITE_EXTR_MULTI", sd_cmd_optional}, > }, > + .acmd = { > + [6] = {8, sd_ac, "SET_BUS_WIDTH", sd_acmd_SET_BUS_WIDTH}, > + }, > }; > > static void sd_instance_init(Object *obj)