From nobody Tue Feb 10 11:34:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520610198842819.4043208302736; Fri, 9 Mar 2018 07:43:18 -0800 (PST) Received: from localhost ([::1]:46047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euKAu-00038J-2k for importer@patchew.org; Fri, 09 Mar 2018 10:43:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euK4v-0006Ly-BJ for qemu-devel@nongnu.org; Fri, 09 Mar 2018 10:37:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euK4u-0008Co-2Y for qemu-devel@nongnu.org; Fri, 09 Mar 2018 10:37:05 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:50580) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1euK4t-0008CW-Ok for qemu-devel@nongnu.org; Fri, 09 Mar 2018 10:37:04 -0500 Received: by mail-wm0-x242.google.com with SMTP id w128so4708492wmw.0 for ; Fri, 09 Mar 2018 07:37:03 -0800 (PST) Received: from x1.local (ABayonne-654-1-76-150.w86-222.abo.wanadoo.fr. [86.222.219.150]) by smtp.gmail.com with ESMTPSA id m191sm1584175wma.21.2018.03.09.07.37.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Mar 2018 07:37:01 -0800 (PST) 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=pTryUmqf7oXhx3ZYI6ydYUYsrPS+M8+E7U2BZnQi14I=; b=mAYNb3bgSZbx9E9fH0ddo3k7BM3LrsHFFJxgixJYN3Vk/yChVqUKAba/ZBKVgaZB+f LS0BVKIoZFGcB9U4iebo+RkrSaGelozWMl0JtZd2CcClzxEBXX95x2x/IwP9yn1Ar9fQ nwnxspwc+5oGyQQxMoP1nVonLTkxpjaQDUiNQTykChL/kX4ZTRKQ0bel2sp8FcBqoL6M Sv9uH+i7efPeLC8US6xLzf0uZhK3WR/23YyAooA20dlLljyWnXOcXEsqRxIMUmmoi+6m HkFwkcakbiSjoH8rz9qzmJNRh7N8r1UPM5jvwaHz5QOryInLvG0rKizbnCf3KhWhBzEy xjZQ== 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=pTryUmqf7oXhx3ZYI6ydYUYsrPS+M8+E7U2BZnQi14I=; b=WbC0BcHXpo+3FVv58OCMbQnj7xk7va9nNWhrr4x4Vs7I3LNObeOa1yyuSoCECVxC6l rSWagACQwQzkqM6zSb5SQWF3LrRmPo3wGTk5JDaHVoTWptqyLttTGo+qFdsz7wO0eOJh 9UZmnwYGYlBKhNy2+MCT2NOtqZNuMsqO4s7kQa/1KAPX1crmUJLpt8OkTHbNBouctYo2 b8AbQ+gOhrSuxPIIzhC2DnE9R0dZUSASseQxaCtxqaYFLf7hxOwYhfBu+YzBAyc21Xcx PNMbkCf/WRk22u8e5/rnXGFAApNrg8rA+l1891nip/5heNte3m9CwILHbWYHdhS+lhQ9 /SHg== X-Gm-Message-State: AElRT7Gv8sRFMWIt/uBV+UTnzpnO0r/A2WRFlizfFaU7NMdSultQBRYq RCsBwhm2S2nUGnnPxCfwkDXAgwHi X-Google-Smtp-Source: AG47ELuQsW1bVUKYMkLLh0cwZOqIx0qced3UD92gvu7L4mlLNHUq3dpRwE6tVUFM2YVQn8+hAE/khQ== X-Received: by 10.28.146.19 with SMTP id u19mr2335990wmd.67.1520609822542; Fri, 09 Mar 2018 07:37:02 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , "Edgar E . Iglesias" Date: Fri, 9 Mar 2018 16:36:49 +0100 Message-Id: <20180309153654.13518-4-f4bug@amsat.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180309153654.13518-1-f4bug@amsat.org> References: <20180309153654.13518-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PATCH 3/8] sdcard: Display which protocol is used when tracing (SD or SPI) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/sd/sd.c | 14 ++++++++++---- hw/sd/trace-events | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index bb149aa644..dc50d6bbf7 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -120,6 +120,7 @@ struct SDState { qemu_irq readonly_cb; qemu_irq inserted_cb; QEMUTimer *ocr_power_timer; + const char *proto_name; bool enable; uint8_t dat_lines; bool cmd_line; @@ -875,7 +876,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDR= equest req) * 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_cmd_name(req.cmd), req.cmd, + trace_sdcard_normal_command(sd->proto_name, + sd_cmd_name(req.cmd), req.cmd, req.arg, sd_state_name(sd->state)); } =20 @@ -1455,7 +1457,7 @@ 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_acmd_name(req.cmd), + trace_sdcard_app_command(sd->proto_name, sd_acmd_name(req.cmd), req.cmd, req.arg, sd_state_name(sd->state)); sd->card_status |=3D APP_CMD; switch (req.cmd) { @@ -1771,7 +1773,8 @@ void sd_write_data(SDState *sd, uint8_t value) if (sd->card_status & (ADDRESS_ERROR | WP_VIOLATION)) return; =20 - trace_sdcard_write_data(sd_acmd_name(sd->current_cmd), + trace_sdcard_write_data(sd->proto_name, + sd_acmd_name(sd->current_cmd), sd->current_cmd, value); switch (sd->current_cmd) { case 24: /* CMD24: WRITE_SINGLE_BLOCK */ @@ -1910,7 +1913,8 @@ uint8_t sd_read_data(SDState *sd) =20 io_len =3D (sd->ocr & (1 << 30)) ? 512 : sd->blk_len; =20 - trace_sdcard_read_data(sd_acmd_name(sd->current_cmd), + trace_sdcard_read_data(sd->proto_name, + sd_acmd_name(sd->current_cmd), sd->current_cmd, io_len); switch (sd->current_cmd) { case 6: /* CMD6: SWITCH_FUNCTION */ @@ -2037,6 +2041,8 @@ static void sd_realize(DeviceState *dev, Error **errp) SDState *sd =3D SD_CARD(dev); int ret; =20 + sd->proto_name =3D sd->spi ? "SPI" : "SD"; + if (sd->blk && blk_is_read_only(sd->blk)) { error_setg(errp, "Cannot use read-only drive as SD card"); return; diff --git a/hw/sd/trace-events b/hw/sd/trace-events index cdddca3dbf..2059ace61f 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -24,8 +24,8 @@ sdhci_write_dataport(uint16_t data_count) "write buffer f= illed with %u bytes of sdhci_capareg(const char *desc, uint16_t val) "%s: %u" =20 # hw/sd/sd.c -sdcard_normal_command(const char *cmd_desc, uint8_t cmd, uint32_t arg, con= st char *state) "%20s/ CMD%02d arg 0x%08x (state %s)" -sdcard_app_command(const char *acmd_desc, uint8_t acmd, uint32_t arg, cons= t char *state) "%23s/ACMD%02d arg 0x%08x (state %s)" +sdcard_normal_command(const char *proto, const char *cmd_desc, uint8_t cmd= , uint32_t arg, const char *state) "%s %20s/ CMD%02d arg 0x%08x (state %s)" +sdcard_app_command(const char *proto, const char *acmd_desc, uint8_t acmd,= uint32_t arg, const char *state) "%s %23s/ACMD%02d arg 0x%08x (state %s)" sdcard_response(const char *rspdesc, int rsplen) "%s (sz:%d)" sdcard_powerup(void) "" sdcard_inquiry_cmd41(void) "" @@ -39,8 +39,8 @@ sdcard_lock(void) "" sdcard_unlock(void) "" sdcard_read_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x= %x" sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0= x%x" -sdcard_write_data(const char *cmd_desc, uint8_t cmd, uint8_t value) "%20s/= CMD%02d value 0x%02x" -sdcard_read_data(const char *cmd_desc, uint8_t cmd, int length) "%20s/ CMD= %02d len %d" +sdcard_write_data(const char *proto, const char *cmd_desc, uint8_t cmd, ui= nt8_t value) "%s %20s/ CMD%02d value 0x%02x" +sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd, int= length) "%s %20s/ CMD%02d len %d" sdcard_set_voltage(uint16_t millivolts) "%u mV" =20 # hw/sd/milkymist-memcard.c --=20 2.16.2