From patchwork Mon Jul 3 13:24:38 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: 698670 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp1749741wrs; Mon, 3 Jul 2023 06:26:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlG0uF3PhbTS2KtDpesW2r0EiZkB11HYCIY0wsIdzTf9tX6ZUC7xb69XWt/RK09U8A9JPe41 X-Received: by 2002:a05:6214:27c4:b0:635:df49:719c with SMTP id ge4-20020a05621427c400b00635df49719cmr13758600qvb.22.1688390800369; Mon, 03 Jul 2023 06:26:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688390800; cv=none; d=google.com; s=arc-20160816; b=FNzd1pAIur/5ZNDxPUSfJGo/xWfDuT9YwIzR3ISKvbDuvnID09tyoKVtYapSBOVNul oHRxqZ+fLxGbvRQEiJXU+1bng5F7wUWZgrxE/FfVYIYY8g6UmbPhJ2x+4RR0IZCVmu1s A2TBlGJD1OfydEqa7KXWCMp0/BcctllhIxENGDPhNaTAq09pVCyUZLCU7tweywQ7FHKi othHebqlQpyiOMKWG1SngHe3Is6HjxW3I3MImQHR8+yC9xfwtJD8vlwdUatuWoXCu+2z RrN+IM1mS9JdtWipLlNOu1UzOWjMogO3Q72f3M1jtxzzpViJSJPyw4XCv/zXoAZCvauB O1LA== 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=r4syDaV3G3LiWeo8FbYKgqn+w8cwBFTOjL41cVc53DU=; b=ZpquvJkNejmmgMzDpq3P8mlI4BLcx6/4Wb4Amust+Wus6Z2uEukPTdFzcb9SaNahcJ RSaYPNcsgCRQCG/2XACIOuNNJl1Sdk7iR/XfDj+LHrzCxmMTxBrZmpsoLigwQPC9KmSw d+I8L2oRsbZhkbrLlJ1gzlq1smC9YSAQXTzE8ZLU1oB3XyMXhR222Z5Z5a9PPPyljqTl 6+WTe0HdYeFd27dypNEwOgjoe5CNUf2nTwPjEILB486lGdqGf+1R3JdRYHeaRIDIKA/R +5axnUEE9dB+RvfJpPwH4xp50hQz7FAvf3LhYx1GeSehfDBM9ZJlDBNIyVPfivCZE+7Z Yt2A== 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 gc4-20020a056214230400b006239d6bb9a2si12132654qvb.512.2023.07.03.06.26.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jul 2023 06:26:40 -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 1qGJYY-0008Od-7Y; Mon, 03 Jul 2023 09:25:30 -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 1qGJYU-0008Nb-Ov for qemu-devel@nongnu.org; Mon, 03 Jul 2023 09:25:27 -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 1qGJYS-0000ak-MY for qemu-devel@nongnu.org; Mon, 03 Jul 2023 09:25:26 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4QvmrH6RXSz4wZp; Mon, 3 Jul 2023 23:25:19 +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 4QvmrF1KnBz4wb1; Mon, 3 Jul 2023 23:25:16 +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?= , Bin Meng , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PATCH 01/32] hw/sd: When card is in wrong state, log which state it is Date: Mon, 3 Jul 2023 15:24:38 +0200 Message-ID: <20230703132509.2474225-2-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é 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,