From patchwork Fri Sep 1 09:42:01 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: 719500 Delivered-To: patch@linaro.org Received: by 2002:adf:d08b:0:b0:31d:da82:a3b4 with SMTP id y11csp141405wrh; Fri, 1 Sep 2023 02:44:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGfjLnc6YYKep0ibCIOxErcoO9JW068YgpBF9mrsY2KsgPd94EYSOQhQwlZxCFkW4U4rQqd X-Received: by 2002:a05:6214:258d:b0:651:6604:bee6 with SMTP id fq13-20020a056214258d00b006516604bee6mr6606813qvb.30.1693561458241; Fri, 01 Sep 2023 02:44:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693561458; cv=none; d=google.com; s=arc-20160816; b=eBIwnssUJiuuDhT0QFFN4jX93lGWpVn232aTHwEjQOitUW6kUyG7bfou31yMIsImoU j/kYCJk82t6LoACbnNuINWBK4SRGLboB/+hPR0Ws5UyBvqRiRDvGER9O188k28lXsfs1 5MYvOi4F1cY0F0Apw9CoLK5MW/FJPG3GtMNk4aOQkOP9hLjnBFNuyO7np4s0wJSxcIjD mwPZDA+9a1gxE4ok6vSDB8yPGhjm8okicIb0VI2YFCmkGytNXusuDKIDzIIYm8sMZW+f 43j4CYPBlbBeFhNqCun9PulHrm3RY98SzOkpIkGst8wKLKCAlCFrYGoZI4QDd9YoqODo KCmQ== 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=Bho2ZC5PMS/GMiVTVmKTYhEWvUB5WGA2o2VijYaWBL8=; fh=sAFxsovMRUpeK1m2ZrUTkWk2zuchzNgVidyR5jMbIm8=; b=GsHfxWVLhHZg0hhflyU7qxr1Dw8P4UGkXRC9bv2zfM0RIOC3qTEUlPp6SP8N4ghoW/ reUmmwmjYOMWSV1SF4uCxnCc4r+fFVbd2Hv56Oz1/clXyqWFwvUzaY0H/QXGvsAyBzi+ vs8rbGCZCpU7zzVS321qeaTmdSeRb7ECrF2ZtuVR6fGlUy/2SRNn9ulNCfYg77Vx70dZ y0uQ3r+y1ampUpY8CrkjrRnHgGdiPAdgo8kvHTfkcHJx/FHc+psp7cP+0uYWjID8QCm5 MzRVDSWOjeLEBlUcU1wcjxPgQDN3aACDmu5ra3qC2lLv58btGqS8WVygrIeKH/WNhGzL 4IBQ== 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 g16-20020a0caad0000000b0064bda96f16fsi2034130qvb.318.2023.09.01.02.44.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Sep 2023 02:44:18 -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 1qc0gE-0002DG-Fk; Fri, 01 Sep 2023 05:43:06 -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 1qc0g4-0001wj-0o; Fri, 01 Sep 2023 05:42:57 -0400 Received: from gandalf.ozlabs.org ([150.107.74.76]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qc0g1-000370-Fp; Fri, 01 Sep 2023 05:42:55 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4RcY3v1bSVz4x2Y; Fri, 1 Sep 2023 19:42:51 +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 4RcY3s3CXNz4x2D; Fri, 1 Sep 2023 19:42:49 +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?= , Bin Meng , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PULL 13/26] hw/sd/sdcard: Return ILLEGAL for CMD19/CMD23 prior SD spec v3.01 Date: Fri, 1 Sep 2023 11:42:01 +0200 Message-ID: <20230901094214.296918-14-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=150.107.74.76; envelope-from=SRS0=SnXb=ER=kaod.org=clg@ozlabs.org; helo=gandalf.ozlabs.org X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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é CMD19 (SEND_TUNING_BLOCK) and CMD23 (SET_BLOCK_COUNT) were added in the Physical Layer Simplified Specification v3.01. When earlier spec version is requested, we should return ILLEGAL. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Bin Meng Message-Id: <20220509141320.98374-1-philippe.mathieu.daude@gmail.com> Signed-off-by: Cédric Le Goater --- hw/sd/sd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 77a717d35507..0be9ee965ac9 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1263,7 +1263,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) case 19: /* CMD19: SEND_TUNING_BLOCK (SD) */ if (sd->spec_version < SD_PHY_SPECv3_01_VERS) { - break; + goto bad_cmd; } if (sd->state == sd_transfer_state) { sd->state = sd_sendingdata_state; @@ -1274,7 +1274,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) case 23: /* CMD23: SET_BLOCK_COUNT */ if (sd->spec_version < SD_PHY_SPECv3_01_VERS) { - break; + goto bad_cmd; } switch (sd->state) { case sd_transfer_state: