From patchwork Fri Sep 1 09:42:07 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: 719503 Delivered-To: patch@linaro.org Received: by 2002:adf:d08b:0:b0:31d:da82:a3b4 with SMTP id y11csp141488wrh; Fri, 1 Sep 2023 02:44:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKAK9/eFP8kBZmYtNqscZLq0XGGO+NcZuO+SRht8yrISrNRqB2Px/85NU3VRk0mP5xXg5i X-Received: by 2002:ac8:7fd5:0:b0:412:1926:3365 with SMTP id b21-20020ac87fd5000000b0041219263365mr2536612qtk.47.1693561469488; Fri, 01 Sep 2023 02:44:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693561469; cv=none; d=google.com; s=arc-20160816; b=oitEQnLDT7cyJHlm4QrduBXsPwEV8xRS2qQySX4fMrH56z/voYIfMUMEMNvzqZz1CJ RHia10T4I8beujNXhxK3AZ3i3HDz/oh2GPf9tg/0Oz8ZDs/t0a5eV0JQRwrZU3cqYLOK /bdNlRjnagxDYB4bsfEgwpTnQhHP1WJ04Et3ODux8Fj61dyTE/nzPt6kTO7bgHISfCEN MJIEcS2S9ueXCtGvWTn0yUNLG1nSJwRqdKjLPIEqKHYYSxlUF3Ko4uoCcy3BPp9gpqef rc9abun6kcqbnQ6n+hvdfLpDNMNYAoTN3c1AH4QXXKYfWMPeTbU9EAVbP9WOhz+HbI+8 ZWpg== 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=iNCZyiLgNI7Uv3B2DtI+CbxKLRcsCcU5ZsEydQgu5gc=; fh=0FldW4XPCIVeBr3v546UBzvfCk0aVDrArGpyFJOOCns=; b=lvsVUcEcmzXvVx2WXA+C/CKEGmjx1DpCgP/6Cnm1S5bu8oWB2dY+96LmsniwTQlxAY ZzVkjDXrZiK3cv5exXuaME94aKqWNzPZAWqZD3Zye9gxJjjOnm5QU89SZc6RNAvR6Y3o Wmf6dJGodZou/aQJ323WwQsX4USp2PIfIuPcKToISqtxnIBtK2iC4T8D0jl0diZBlV1T kG8FpifTh7+Vrbuei1Qovhd3vXDSaJqx3iLDhfPs0rwRIATWOpu5ZElLBkrJ2ISfYqLC HUMM+OsqR4MrapFlWcLde0lvJcgSDBK9Wjd66ltMeiV2wMZULCtjCpPmiyPO1M9T/jY6 H3Vw== 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 u14-20020a05622a010e00b00403e5fdada3si2039761qtw.735.2023.09.01.02.44.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Sep 2023 02:44:29 -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 1qc0gK-0002ct-J5; Fri, 01 Sep 2023 05:43:12 -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 1qc0gF-0002Gi-Tq; Fri, 01 Sep 2023 05:43:08 -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 1qc0gD-00032X-9o; Fri, 01 Sep 2023 05:43:07 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4RcY482Rxyz4wy9; Fri, 1 Sep 2023 19:43:04 +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 4RcY465tcsz4x2n; Fri, 1 Sep 2023 19:43:02 +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 19/26] hw/sd: Add sd_cmd_unimplemented() handler Date: Fri, 1 Sep 2023 11:42:07 +0200 Message-ID: <20230901094214.296918-20-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é [ clg: Fix redundant assignment of .cmd ] Message-Id: <20210624142209.1193073-7-f4bug@amsat.org> Signed-off-by: Cédric Le Goater --- hw/sd/sd.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 83a0d6825147..e88bfcb8c802 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1011,6 +1011,15 @@ static sd_rsp_type_t sd_cmd_illegal(SDState *sd, SDRequest req) return sd_illegal; } +/* Commands that are recognised but not yet implemented. */ +static sd_rsp_type_t sd_cmd_unimplemented(SDState *sd, SDRequest req) +{ + qemu_log_mask(LOG_UNIMP, "%s: CMD%i not implemented\n", + sd_proto(sd)->name, req.cmd); + + return sd_illegal; +} + static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) { uint32_t rca = 0x0000; @@ -1565,9 +1574,6 @@ static sd_rsp_type_t sd_app_command(SDState *sd, switch (req.cmd) { case 6: /* ACMD6: SET_BUS_WIDTH */ - if (sd->spi) { - goto unimplemented_spi_cmd; - } switch (sd->state) { case sd_transfer_state: sd->sd_status[0] &= 0x3f; @@ -1698,12 +1704,6 @@ static sd_rsp_type_t sd_app_command(SDState *sd, default: /* Fall back to standard commands. */ return sd_normal_command(sd, req); - - unimplemented_spi_cmd: - /* Commands that are recognised but not yet implemented in SPI mode. */ - qemu_log_mask(LOG_UNIMP, "SD: CMD%i not implemented in SPI mode\n", - req.cmd); - return sd_illegal; } qemu_log_mask(LOG_GUEST_ERROR, "SD: ACMD%i in a wrong state\n", req.cmd); @@ -2139,6 +2139,9 @@ static const SDProto sd_proto_spi = { [26] = sd_cmd_illegal, [52 ... 54] = sd_cmd_illegal, }, + .acmd = { + [6] = sd_cmd_unimplemented, + }, }; static const SDProto sd_proto_sd = {