From patchwork Fri Sep 1 09:42:02 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: 719505 Delivered-To: patch@linaro.org Received: by 2002:adf:d08b:0:b0:31d:da82:a3b4 with SMTP id y11csp141637wrh; Fri, 1 Sep 2023 02:44:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEDi4iVVfQ4CwtExNmUF5TBdmRbe0cuV3qRfo0hShTufXdeT2wC5oSp/rXc9Q409Ixcfbp+ X-Received: by 2002:ad4:4d85:0:b0:63d:2cc7:bef9 with SMTP id cv5-20020ad44d85000000b0063d2cc7bef9mr1541106qvb.37.1693561496522; Fri, 01 Sep 2023 02:44:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693561496; cv=none; d=google.com; s=arc-20160816; b=TbytMNT5XDdHmyma2JZzf8uaOHjxgEEnf/LqhmvSTiXbPkSg7yFsgtaum3/jgGwlgz GrMnqYilcmu5S3xq/N0sgWPCy/ddkrgq7LixKgM3H1EL6cuHuLgTmHTbfnZhaZNaNcKU fSJrqvy71Kav+Gu8903Tq1D8mka8iMHnyQcmXUOUKAyv6lBEWEE2mEPQexGDsflkY9mx D0jE9BLb+lrkcLLML2EKCIPiutOw1iICJzsNHv/jCQ+qqkjuLbcT7oPJWrRtC/dvZnos d6XAq5bG2wFAKq7O5N2XCXAV9Xv+YphoFdxIb6hH38lL/qTzT52YDApR0+HWN7XyC4wB EC9w== 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=EGEDk8TfESpb2jaQTDwyMomp/1h2Qs+UivBpvTtwSFY=; fh=sAFxsovMRUpeK1m2ZrUTkWk2zuchzNgVidyR5jMbIm8=; b=ogOzWIkMHg8ZXHrJaHG3Mr1qzrIdRuRNJhMr+8T/BoLKv7zhVoEXE+JzHRfgj/CV5u oqhomJxY+gJX0GtboVlLzfs9Wf0XrRCsIH6DchH/RrXPTnRaafDajGj3HK4WHhxI4wwK kGuECsVZSMn1lbag7gdrH2dQKD7pWeG0LQbxbvxlIStGoKJJgCPLlRqMgcCd9wzPzuKo KNDXvhEgOdS4DsEYnb8abKJx5b7WhTuNv5aiizbkIljHWvLW7djAVxM/+bycfkHar42N pSwnyZ5rA4G/mcAd/WrZpV/IMFhCbRoCJPv2ROewFgp66TRAGVN0yGkZvHqIVXDwK3ra OmEA== 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 a18-20020a0ce392000000b006238cbeeb49si2070182qvl.175.2023.09.01.02.44.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Sep 2023 02:44:56 -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 1qc0gG-0002HK-FX; Fri, 01 Sep 2023 05:43:08 -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 1qc0g6-0001yu-Fv; Fri, 01 Sep 2023 05:42:59 -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 1qc0g2-0002wb-Ea; Fri, 01 Sep 2023 05:42:58 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4RcY3x3WTYz4wy9; Fri, 1 Sep 2023 19:42:53 +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 4RcY3v59hhz4x2D; Fri, 1 Sep 2023 19:42:51 +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 14/26] hw/sd: When card is in wrong state, log which state it is Date: Fri, 1 Sep 2023 11:42:02 +0200 Message-ID: <20230901094214.296918-15-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é We report the card is in an inconsistent state, but don't precise in which state it is. Add this information, as it is useful when debugging problems. Since we will reuse this code, extract as sd_invalid_state_for_cmd() helper. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Bin Meng Message-Id: <20210624142209.1193073-2-f4bug@amsat.org> Signed-off-by: Cédric Le Goater --- hw/sd/sd.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 0be9ee965ac9..4412559c05be 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -966,6 +966,14 @@ static bool address_in_range(SDState *sd, const char *desc, return true; } +static sd_rsp_type_t sd_invalid_state_for_cmd(SDState *sd, SDRequest req) +{ + qemu_log_mask(LOG_GUEST_ERROR, "SD: CMD%i in a wrong state: %s\n", + req.cmd, sd_state_name(sd->state)); + + return sd_illegal; +} + static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) { uint32_t rca = 0x0000; @@ -1534,9 +1542,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) return sd_illegal; } - qemu_log_mask(LOG_GUEST_ERROR, "SD: CMD%i in a wrong state: %s\n", - req.cmd, sd_state_name(sd->state)); - return sd_illegal; + return sd_invalid_state_for_cmd(sd, req); } static sd_rsp_type_t sd_app_command(SDState *sd,