From nobody Tue Feb 10 02:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624544538; cv=none; d=zohomail.com; s=zohoarc; b=GEOa4nbxolIccgM3L/6ybyuDlwy3Y2EgMYgminT7ZqUouneDx2kwbnDF/cUN3I1oxK950jTWbVvGTSILHLloI5xNqQN8iKOsPS4el7mj8re3dFvS5DEczLGT7PEwT8/UJpLUPttuGv/v4QnT1+gBsn9M1Z7QtRfpnvmygwS0T3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624544538; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CELNymjR/8pwAF7b6jcb3aIuZvp+QTfxg6AbWcEaa2w=; b=bl3iMdeZPyaQyX8k8NusFPQCk/IH+IxKy2+JaOlabQjsO6VGQjdVhNPLablVfBrxZKnxI/V/Grqw3y+OyJTv3H2YQNIL4ublyjs2Kvdz9XYKaSTxLh0Ps86O59FxRudeHDf9Nyp6N1vcUqEmEdrDVGdnjWkZBpjlFxeYoCRMXQk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 16245445382356.045993795878076; Thu, 24 Jun 2021 07:22:18 -0700 (PDT) Received: by mail-wm1-f44.google.com with SMTP id j10so4126141wms.1 for ; Thu, 24 Jun 2021 07:22:17 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id g7sm16121wmq.27.2021.06.24.07.22.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Jun 2021 07:22:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CELNymjR/8pwAF7b6jcb3aIuZvp+QTfxg6AbWcEaa2w=; b=XNP2q+upJXB8OfRl7+3GITQyL9vqcNFZWNeZbdt1/m3VbIN/h+f6OCOmyvRsX3KhJP 2Y12RVAwaxGcgWcp75lU7/W0AoMybDp5LKldsxQobDHh6uPqdwKCmMYEZ30IXkXQdpmD cnCbuXOKkVue8EABxbA4QnN0ffjXmBPjPPVq0BnFV3Su6e66sapO6VG1sDgynrNzZRDJ /SISFeWCfk+N0Pg0vhVZ9XS6xxOoLnMkhOzqNlXO8IamzyQOqEO4JO89qyyNPqThSB0O 3ge7EHmTHs9ToajywVOIHqMhUdT2sG4Ird1ClaQcqMEy7QECs7R7aFJ5P1ZHJRfhKWMd scbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CELNymjR/8pwAF7b6jcb3aIuZvp+QTfxg6AbWcEaa2w=; b=CCRccLe/nKsjWsQoabLilpXjXLPomovHoNx+Ihsp4AJa9zum8tLF7M2Rkll/4pbtlh O2SfgXBZ7O3UPhq4c1IOxgG4k2a80HJfJZ63RtkYGbf/78wbDRkf//nutgT75FH/k8Js YL+pBJgk9uftxvLBHmuX6etEHrEaebWt/6uRTzwo9irbswv+RegX1Qe0QbODNnR1gx47 DkuvqakLSpq9/jJn4eOOMPd7Ztx/lbvkqzF+XPsNnSWBH+u5WAvACjlYfZNbICF29f0/ 5nagw3yTnZFDZDlwmMcwUGs7DW3NvutcGrfr/ri/+44IUN/ZZnr2JH75GrCbVBHwseQn mqOA== X-Gm-Message-State: AOAM533AqKZevuNROm2wUmoGgGOnap18iKMb8YijHq3CCaUGF/iG+3o0 2/C+ehxp33rXxtfzbk38sDk= X-Google-Smtp-Source: ABdhPJwyA+pGRoln1P3Q55Z3GpfdFXAoG5WclsqFpS74C8uFmjAP5OR+upxhxL97vV5TyaMhfeYdZw== X-Received: by 2002:a05:600c:c6:: with SMTP id u6mr4593816wmm.146.1624544536469; Thu, 24 Jun 2021 07:22:16 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Jeffery , Bin Meng , Joel Stanley , qemu-block@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [RFC PATCH 01/10] hw/sd: When card is in wrong state, log which state it is Date: Thu, 24 Jun 2021 16:22:00 +0200 Message-Id: <20210624142209.1193073-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210624142209.1193073-1-f4bug@amsat.org> References: <20210624142209.1193073-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 Reviewed-by: Bin Meng --- hw/sd/sd.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 282d39a7042..288ae059e3d 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -937,6 +937,14 @@ static void sd_lock_command(SDState *sd) sd->card_status &=3D ~CARD_IS_LOCKED; } =20 +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 =3D 0x0000; @@ -1504,8 +1512,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) return sd_illegal; } =20 - qemu_log_mask(LOG_GUEST_ERROR, "SD: CMD%i in a wrong state\n", req.cmd= ); - return sd_illegal; + return sd_invalid_state_for_cmd(sd, req); } =20 static sd_rsp_type_t sd_app_command(SDState *sd, --=20 2.31.1