From nobody Mon Nov 25 02:00:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 171950545590532.154356681541344; Thu, 27 Jun 2024 09:24:15 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BAE5BD94; Thu, 27 Jun 2024 12:24:14 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id BE7BC11E9; Thu, 27 Jun 2024 12:23:36 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3E4A4BFA; Thu, 27 Jun 2024 12:23:33 -0400 (EDT) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4E14BD83 for ; Thu, 27 Jun 2024 12:23:24 -0400 (EDT) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-3636c572257so6550082f8f.0 for ; Thu, 27 Jun 2024 09:23:24 -0700 (PDT) Received: from localhost.localdomain (33.red-95-127-46.staticip.rima-tde.net. [95.127.46.33]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3674357fcb2sm2365842f8f.30.2024.06.27.09.23.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 27 Jun 2024 09:23:21 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719505403; x=1720110203; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IJEAX/bFYJE8abBHAC9lGeH6fM4rczNBP33ZEV8FrPw=; b=tWj5DplGfmtJ3jgaQhyteaEsNM/vnAwsC2fbXyQl+AD142HNFWw5aOJsg97yxvlZEq 1eBqS2urGwOkrsMME/dxl697O6WWktawUShs32nx0Q7bin4DEJjTutv9D9Z+2VDnLzqV JaisOQhcY2Jq0PD5DRR6NK4yHuOH7+HExBLrRnlN6Q96mDxlxmYXr0JYYIp3IbG6dUSk 0cYZuZ6k3NPQc2DH5Y14P2WjYvh9sNY9qcxhK9Helc4HjNZIG5/E7AoYVX9qgvGOibYY MrzDelrKsIKAiCtLUd5NjlIIW7IyJjLGJ5EOnjr0gigD80vVrDsGxgZBBLL4gSQc2ZYL CHIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719505403; x=1720110203; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IJEAX/bFYJE8abBHAC9lGeH6fM4rczNBP33ZEV8FrPw=; b=Z1aZ+w6w29MEBYIa/n0wkHziBIEHbMpdRxJbIJf7bTr+3WzRFUkyO4UVrzGV9BZmQo Ey1/UD5I3yH02qRV5BtHQ6YirdQpsMDU8Tqr4vrTey3OV/WhX3fCYxOC0Bg1l3BGUpO2 SZqBlBCLw86E52Ta3j6UN7PwfNw0g2lhssiCILIwwC3S58vTHLB5uGrN74rKJ7VX87zJ q8+EGdRBt28xN1XUxgRLPpZIJv/duS110fFyK5MV9EfOL3H/zBeVQdqX3jlIyI9Upt2X HM51S4lllmVJNg0wduPmSdi2aGYjQ5v+yw6TRPzXzxbguoe4BebHRjQRYZ364qncEnSL XZCg== X-Forwarded-Encrypted: i=1; AJvYcCWYaU3cKrFVPTTsuGJx2ZJ/sPT+PyIwX0E1Vr55/IWFHcv+UYaIoW74cZowzF2WIXPCJX+Y52Iani3o1lbsxMWuYm9+tVQS3g== X-Gm-Message-State: AOJu0YxnhBrbsRXp/ojm3YyHI83X3H4FAxmxri5LH8RK9hhUC28Hycuo Qk5xeYlh8Wrb69bZ/kuSmqPikVfcLMWuMrhLL3ZGya8z/+Y6u4GZSOIRE+hhJ+o= X-Google-Smtp-Source: AGHT+IHDso9iBAmZ45O4b4/yd5ccUNCg8WepPyq1ui6Sfz5s+WmeEMpYJjCUWzR0uQqivTlA/p/iBQ== X-Received: by 2002:a5d:64a3:0:b0:362:4f55:6c43 with SMTP id ffacd0b85a97d-366e937f048mr15617205f8f.0.1719505402204; Thu, 27 Jun 2024 09:23:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 03/17] hw/sd/sdcard: Track last command used to help logging Date: Thu, 27 Jun 2024 18:22:18 +0200 Message-ID: <20240627162232.80428-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240627162232.80428-1-philmd@linaro.org> References: <20240627162232.80428-1-philmd@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: S5KTSAJTURLUXYSB3PF5UEWXNPQSFAHJ X-Message-ID-Hash: S5KTSAJTURLUXYSB3PF5UEWXNPQSFAHJ X-MailFrom: philmd@linaro.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 CC: qemu-block@nongnu.org, Laurent Vivier , Tyrone Ting , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , Hao Wu , Francisco Iglesias , Paolo Bonzini , Thomas Huth , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-arm@nongnu.org, Joel Stanley , Sai Pavan Boddu , devel@lists.libvirt.org, Luc Michel , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1719505456408100001 Content-Type: text/plain; charset="utf-8" The command is selected on the I/O lines, and further processing might be done on the DAT lines via the sd_read_byte() and sd_write_byte() handlers. Since these methods can't distinct between normal and APP commands, keep the name of the current command in the SDState and use it in the DAT handlers. This fixes a bug that all normal commands were displayed as APP commands. Fixes: 2ed61fb57b ("sdcard: Display command name when tracing CMD/ACMD") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: C=C3=A9dric Le Goater --- hw/sd/sd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index d0a1d5db18..bc87807793 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -133,6 +133,7 @@ struct SDState { uint32_t pwd_len; uint8_t function_group[6]; uint8_t current_cmd; + const char *last_cmd_name; /* True if we will handle the next command as an ACMD. Note that this = does * *not* track the APP_CMD status bit! */ @@ -1154,12 +1155,13 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,= SDRequest req) uint16_t rca; uint64_t addr; =20 + sd->last_cmd_name =3D sd_cmd_name(req.cmd); /* CMD55 precedes an ACMD, so we are not interested in tracing it. * However there is no ACMD55, so we want to trace this particular cas= e. */ if (req.cmd !=3D 55 || sd->expecting_acmd) { trace_sdcard_normal_command(sd_proto(sd)->name, - sd_cmd_name(req.cmd), req.cmd, + sd->last_cmd_name, req.cmd, req.arg, sd_state_name(sd->state)); } =20 @@ -1620,7 +1622,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) static sd_rsp_type_t sd_app_command(SDState *sd, SDRequest req) { - trace_sdcard_app_command(sd_proto(sd)->name, sd_acmd_name(req.cmd), + sd->last_cmd_name =3D sd_acmd_name(req.cmd); + trace_sdcard_app_command(sd_proto(sd)->name, sd->last_cmd_name, req.cmd, req.arg, sd_state_name(sd->state)); sd->card_status |=3D APP_CMD; =20 @@ -1913,7 +1916,7 @@ void sd_write_byte(SDState *sd, uint8_t value) return; =20 trace_sdcard_write_data(sd_proto(sd)->name, - sd_acmd_name(sd->current_cmd), + sd->last_cmd_name, sd->current_cmd, value); switch (sd->current_cmd) { case 24: /* CMD24: WRITE_SINGLE_BLOCK */ @@ -2069,7 +2072,7 @@ uint8_t sd_read_byte(SDState *sd) io_len =3D (sd->ocr & (1 << 30)) ? 512 : sd->blk_len; =20 trace_sdcard_read_data(sd_proto(sd)->name, - sd_acmd_name(sd->current_cmd), + sd->last_cmd_name, sd->current_cmd, io_len); switch (sd->current_cmd) { case 6: /* CMD6: SWITCH_FUNCTION */ @@ -2214,6 +2217,7 @@ static void sd_instance_init(Object *obj) { SDState *sd =3D SD_CARD(obj); =20 + sd->last_cmd_name =3D "UNSET"; sd->enable =3D true; sd->ocr_power_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, sd_ocr_poweru= p, sd); } --=20 2.41.0