From patchwork Fri Sep 1 09:42:13 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: 719507 Delivered-To: patch@linaro.org Received: by 2002:adf:d08b:0:b0:31d:da82:a3b4 with SMTP id y11csp141955wrh; Fri, 1 Sep 2023 02:45:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGUyD8HytYQx8hkh+FVgv75UVQnDjfDvcKNAQi2jzBFHYUPuUx+GesK5JPQHuaTItcjrP2o X-Received: by 2002:a05:620a:2195:b0:76f:19fd:5063 with SMTP id g21-20020a05620a219500b0076f19fd5063mr1742689qka.34.1693561547352; Fri, 01 Sep 2023 02:45:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693561547; cv=none; d=google.com; s=arc-20160816; b=ol5L+EnoLfFdGCDESaT4XCqIntJRxRlLWupA0qa9ueRNDBRDjJvGuB4TrKAj8ZJrlu 8rAYOdnAOuzOZ/2SJ4BBNRg2Y5RQ9ZYHxp9OZWkimaInK88TKWFhwIxCTMcexnZjbiey PtDBpDcYMxP+KDLrghvpU/Iqs8nQz7xSCp3ZBe79j8CurUGY9fVXGMth944LeJmHb0ir tOvdyhBmk/1tRntl2hZbiv6Ezvio4IAKCVNbc6V3nlsmXtVWeqvWreENN9QkadrjUHGh RairZ6gTONXTsm+zva5mUkuxTc0JWVGgy1wkvDEp0PEH3e1z1lUOTgv6DDnx8yiRokkC 0O4A== 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=0FldW4XPCIVeBr3v546UBzvfCk0aVDrArGpyFJOOCns=; b=yIGdTxo8fxBJWdLxSI6TDi6orAups4GPF3FUaBOT1Lmeb4mTpU4xsDg+iq6j7/4fwE 6zQ5w0AFTrjWQ0wCsZMrJVn+WYmB0f5lOHmzGkhBb2GrAmjW3CGu1OCqK0zm2gwJoBdH VQLkuRRB1lwd20fXnIfxdfhDl+F1plHyZSLkHXgZLgqsau1jhMPEtz0hkjJiZ3OT5u3R /Dt7EJOhK59FyQfUTmMrlV1iVadgijXQFINvsKVpAkIEAAAuMHQ73PY1iSuZumzxZyNM vdeepGV0C3MEQLnRGmE8pnecCdUSxpBG61I/AzASO9XcmddGRBQCF66jl/lRbS0wV46g XnVQ== 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 x4-20020a05620a448400b0076ccb70f8c0si2317273qkp.494.2023.09.01.02.45.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Sep 2023 02:45:47 -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 1qc0gW-00037j-0k; Fri, 01 Sep 2023 05:43:24 -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 1qc0gU-00032s-3F; Fri, 01 Sep 2023 05:43:22 -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 1qc0gR-0003CS-Pq; Fri, 01 Sep 2023 05:43:21 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4RcY4P3KMtz4x3G; Fri, 1 Sep 2023 19:43:17 +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 4RcY4M6lBQz4x3D; Fri, 1 Sep 2023 19:43:15 +1000 (AEST) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= Subject: [PULL 25/26] hw/sd: Add sd_cmd_SET_BLOCK_COUNT() handler Date: Fri, 1 Sep 2023 11:42:13 +0200 Message-ID: <20230901094214.296918-26-clg@kaod.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230901094214.296918-1-clg@kaod.org> References: <20230901094214.296918-1-clg@kaod.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2404:9400:2221:ea00::3; envelope-from=SRS0=SnXb=ER=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 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,