From patchwork Mon Jul 3 13:24:39 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: 698677 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp1753604wrs; Mon, 3 Jul 2023 06:34:37 -0700 (PDT) X-Google-Smtp-Source: APBJJlEeilPiKCxPkDDfAtC0+qjtA3TLCDD9eU7dPq5L2JJAz0nPNoIfpBUL54P5P4DGiiXuq8sj X-Received: by 2002:a05:622a:208:b0:403:5e74:e833 with SMTP id b8-20020a05622a020800b004035e74e833mr2318482qtx.39.1688391276903; Mon, 03 Jul 2023 06:34:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688391276; cv=none; d=google.com; s=arc-20160816; b=WrZbrCEo0x+8ORQadQbi5klFyIXb+J/XCarkuEA0gjOvzBg9UiwiM6iwat5Vkv1h/b wPmOQH+2VSHu7A9T/00TNzZSXqLrRpVSJ1M/0b+l/w34g2Wvasi0EARZlxXt30Fj4+Jl KJsumxGcgcYKQqjk1JuIVTeHx9nHAHEeIObRqw0032rmUSkFTfBMU/sdmg65OQ0SrDYO NZOTh4fwJv+5SgAh9If8WNgy+cDewKm4L29dquilze/JTOBnGq9p2RuqFagFBGrbwcIv ED4LUHV/ArayZJYYWSfloWBLVq4cBr17Q9oR31h8AIO0J2wfu2wYZkXjAFyKLp4J7x61 wEcg== 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=1BLIrNyVfCivsjfZ5ORSKPavJojsslslzD2FBIGPVoY=; fh=1TrT0PYyEK7er4Ab9GZHs8q84ATye5Z3OY6erb1zI7k=; b=TxPBZSVCg0MTqDEhp+24c1C7G8LIVi6zCqUN+dCJajGyGIHQ1C4uEvWmBTqJ5pNUWv OVFgBj3xC3oh9HbQc+iLJr85chItkMM0upEANJQKpxydCsYPt5RsCZ+RToOBpyEgmb7M 0mdH8I4zScLE3QZSU6akL5Pvq/o5NH0s5ch/PB5tKv/goangDpiClfJufsPCovf/T1dj G2pHVHFvHs1Oh1vkFE6/U1ydsY92cRa848jEBxBnN3+V1sXEIaBzda9iIDFhO3CCU42V 7zOa+hyR/xP8AvGAVCpejEKJKvvKSei0xVB9BBkWiTHdZtazva/DltfUl+pPSEeCLGgE aP7g== 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 s13-20020a05622a1a8d00b003fdea42e025si7800855qtc.362.2023.07.03.06.34.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jul 2023 06:34:36 -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 1qGJYZ-0008PD-Es; Mon, 03 Jul 2023 09:25:31 -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 1qGJYV-0008Np-JH for qemu-devel@nongnu.org; Mon, 03 Jul 2023 09:25:27 -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 1qGJYT-0000en-Hr for qemu-devel@nongnu.org; Mon, 03 Jul 2023 09:25:27 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4QvmrL6Qscz4wxn; Mon, 3 Jul 2023 23:25:22 +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 4QvmrJ38lcz4wb1; Mon, 3 Jul 2023 23:25:20 +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?= , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PATCH 02/32] hw/sd: When card is in wrong state, log which spec version is used Date: Mon, 3 Jul 2023 15:24:39 +0200 Message-ID: <20230703132509.2474225-3-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=150.107.74.76; envelope-from=SRS0=mKPa=CV=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, T_SCC_BODY_TEXT_LINE=-0.01 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é Add the sd_version_str() helper. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Cédric Le Goater --- hw/sd/sd.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 4412559c05be..20e62aff70b6 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -145,6 +145,19 @@ struct SDState { static void sd_realize(DeviceState *dev, Error **errp); +static const char *sd_version_str(enum SDPhySpecificationVersion version) +{ + static const char *sdphy_version[] = { + [SD_PHY_SPECv1_10_VERS] = "v1.10", + [SD_PHY_SPECv2_00_VERS] = "v2.00", + [SD_PHY_SPECv3_01_VERS] = "v3.01", + }; + if (version >= ARRAY_SIZE(sdphy_version)) { + return "unsupported version"; + } + return sdphy_version[version]; +} + static const char *sd_state_name(enum SDCardStates state) { static const char *state_name[] = { @@ -968,8 +981,9 @@ static bool address_in_range(SDState *sd, const char *desc, 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)); + qemu_log_mask(LOG_GUEST_ERROR, "SD: CMD%i in a wrong state: %s (spec %s)\n", + req.cmd, sd_state_name(sd->state), + sd_version_str(sd->spec_version)); return sd_illegal; }