From patchwork Mon Jul 3 13:24:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 698673 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp1750321wrs; Mon, 3 Jul 2023 06:28:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4WmZuCk2eWbvHLOR5R/GeCL8FpJWMKZZfe2r0ez1B4Gz4aD+iGqosrTktXEeu/28ny5+Ot X-Received: by 2002:a05:620a:4116:b0:767:35bc:540a with SMTP id j22-20020a05620a411600b0076735bc540amr15000557qko.17.1688390887464; Mon, 03 Jul 2023 06:28:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688390887; cv=none; d=google.com; s=arc-20160816; b=j144+tTpbkTOtsqMw4wJlvSN7vHenxBkpVuiT5fG5DG5U5qbvIZRJVRrm4IV0daM1b e57dzbOC6Dr5gFr+XEm8QmFnH0hRO3UNtDQE9sbe8yzExpeCdTsOxXem/3gJ73CEI6XF evMZH+I2gneiLSD4uglbYPQJa0bMZ07mSRNkCGxz7/kKjeuo9zhXKquIkVkrXxOW2qfK gNJhT7bAXoX8IoDXdMdAuvkxjAm1scn2pK9byHz+2Uy5GnU1Mxn5q+m90i0LvFqnHe9O e9oIy7rTT3G4h1s8V+qtnE2I5tljgrp0IXU51pVlolkJL5AwJCBo0M9HmJbwiRLlOuJZ B3pg== 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; bh=kfrxVkkDpSbWy4zcrLc72DNUkVBubZ8PY78R9b89HKU=; fh=1TrT0PYyEK7er4Ab9GZHs8q84ATye5Z3OY6erb1zI7k=; b=RY7+I3Wn/ZNS9CbkfhzOQsAV2zpfDb6pgVmFAVuUpfJPRXh9e4yWWR2eEz2Diz8WKs 9C+FbJydDDnohOrzXj3feUdE5hUmfnLZqSS6HCMb6HQVX0y7Z6OuA6u+UBXtYNfs9vTy kbFD4ZbKahYBDgRaX+xEyNJ2INAdeHXI6ON1p6hUpphcrd69skH4cUep/PMJRGLvtgfK GtNdZ3IdPqILlXwL8LXuFx9nU5WEIC8gFDCs+z/hrTcP9zn4xotV2AOw6NpHCUqglf25 doFV7RdthIsyXNOsU/LSrVSh76lO5vQ01fKTy/GR84Zuh2P7wky5bU32Wfyx4jBkuHHU 689A== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x17-20020a05620a099100b00765a6315442si10351591qkx.321.2023.07.03.06.28.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jul 2023 06:28:07 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGJZ4-0000A9-Nm; Mon, 03 Jul 2023 09:26:02 -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 1qGJZ1-00006Z-47 for qemu-devel@nongnu.org; Mon, 03 Jul 2023 09:26:00 -0400 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3] helo=gandalf.ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGJYz-0000nL-6F for qemu-devel@nongnu.org; Mon, 03 Jul 2023 09:25:58 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4Qvmry4g9hz4wZp; Mon, 3 Jul 2023 23:25:54 +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 4Qvmrw1Wrgz4wxS; Mon, 3 Jul 2023 23:25:51 +1000 (AEST) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng , Peter Maydell , Lucien Murray-Pitts , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PATCH 12/32] hw/sd: Add sd_cmd_SET_BLOCK_COUNT() handler Date: Mon, 3 Jul 2023 15:24:49 +0200 Message-ID: <20230703132509.2474225-13-clg@kaod.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230703132509.2474225-1-clg@kaod.org> References: <20230703132509.2474225-1-clg@kaod.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2404:9400:2221:ea00::3; envelope-from=SRS0=mKPa=CV=kaod.org=clg@ozlabs.org; helo=gandalf.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, T_SCC_BODY_TEXT_LINE=-0.01 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: Cédric Le Goater --- hw/sd/sd.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 00a59450b726..d1c0b132c227 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1078,6 +1078,21 @@ static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK(SDState *sd, SDRequest req) return sd_r1; } +static sd_rsp_type_t sd_cmd_SET_BLOCK_COUNT(SDState *sd, SDRequest req) +{ + if (sd->spec_version < SD_PHY_SPECv3_01_VERS) { + return sd_cmd_illegal(sd, req); + } + + if (sd->state != sd_transfer_state) { + return sd_invalid_state_for_cmd(sd, req); + } + + sd->multi_blk_cnt = req.arg; + + return sd_r1; +} + static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) { uint32_t rca = 0x0000; @@ -1321,20 +1336,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) } break; - case 23: /* CMD23: SET_BLOCK_COUNT */ - if (sd->spec_version < SD_PHY_SPECv3_01_VERS) { - return sd_invalid_state_for_cmd(sd, req); - } - switch (sd->state) { - case sd_transfer_state: - sd->multi_blk_cnt = req.arg; - return sd_r1; - - default: - break; - } - break; - /* Block write commands (Class 4) */ case 24: /* CMD24: WRITE_SINGLE_BLOCK */ case 25: /* CMD25: WRITE_MULTIPLE_BLOCK */ @@ -2158,6 +2159,7 @@ static const SDProto sd_proto_sd = { [3] = sd_cmd_SEND_RELATIVE_ADDR, [5] = sd_cmd_illegal, [19] = sd_cmd_SEND_TUNING_BLOCK, + [23] = sd_cmd_SET_BLOCK_COUNT, [52 ... 54] = sd_cmd_illegal, [58] = sd_cmd_illegal, [59] = sd_cmd_illegal,