From patchwork Tue Jan 23 03:21:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 864559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MrfSm5rm"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zQYb61PJyz9s72 for ; Tue, 23 Jan 2018 14:25:22 +1100 (AEDT) Received: from localhost ([::1]:59025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpD6-0005qH-7i for incoming@patchwork.ozlabs.org; Mon, 22 Jan 2018 22:25:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edp9m-0003X4-T7 for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:21:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edp9j-0000UU-PH for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:21:54 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:45579) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edp9j-0000Tc-LR for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:21:51 -0500 Received: by mail-qt0-x243.google.com with SMTP id x27so26416310qtm.12 for ; Mon, 22 Jan 2018 19:21:51 -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=oKQiUVFit0rsE020SuCd4GncF/+cY5OdFxF+vT2y+5M=; b=MrfSm5rm25WgVLHvTMHS2a/KkX0j3woNMd5/L0Nre1XCxzAMMIazuYQ/khQmyWoWa6 r+XAU/mGrqZ3qcqIg8333y5uJ7oM6FyLsDjYHDIKbKhRz3qeMObgh/dPKVQVh6LBaU6u 2dmAArf/0sSoiySHGupvymZw3NRkG9mmZoyjEjf5Q4X8zaB+Wpsbz101QmLhwuKJZu30 d1En2jD02lUZ6lkn5rON7P0AyYpZQTXXQp2j9O/vwd3MqnE1wdL5FLZp+l9sr+gX16b0 mX3l/JnCB9CiYQIGSwRhExIYoOArfuHwGfirUiwiwozklqWdGe924uEiTQEwoxEZVe4N 0bbA== 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=oKQiUVFit0rsE020SuCd4GncF/+cY5OdFxF+vT2y+5M=; b=Ywa/UxTaE7E83TcGrSrIufdrdpAXMKNCYwbBPJB+JlrelvE8ICMuvlrC91Rkj7oyqa Y25z6zE95mvuui99lNimjJ3Wit50poGuDtOMH9+agZ025KZTuuD9v22s3WPj9ctdP1fh NZwHlecHZtXplstgojW+XYGMWr8zDf9UykNpfwgonhuVE0jK6N7GaLoMpjIvlkGivafM zfwzj02E4T4hqkdCvSCRfYZvOd7j73rG9TQjyzLzjpqnaXJgZ0c6Qn+sg0bVst6TAiVT uy/fwP4JfhAqvn+igGjTMiIdt9pd4aPK9eDX+yMYObVZx5SpVxx8r3zbV6VKcGQ9ImSP ZLcg== X-Gm-Message-State: AKwxytcOCdd1eX4gfy3S8INYVCwu5V7E+hLGsWOl/gnzoZtBoHaQCsQ/ gwejF+QxlxqUDfV79cJiNRY= X-Google-Smtp-Source: AH8x226Vb00maLFopbFTa9yQycUfWeDONgqyVYvNCDY1xyo+x5Oc3iuMIK0o/2xh1AwDqmF3Kz4Ngg== X-Received: by 10.55.21.2 with SMTP id f2mr1528694qkh.320.1516677711167; Mon, 22 Jan 2018 19:21:51 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id x207sm5545567qka.91.2018.01.22.19.21.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 19:21:50 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Igor Mitsyanko Date: Tue, 23 Jan 2018 00:21:26 -0300 Message-Id: <20180123032135.28863-4-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180123032135.28863-1-f4bug@amsat.org> References: <20180123032135.28863-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v3 03/12] sdcard: add a trace event for command responses 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: "Edgar E . Iglesias" , Prasad J Pandit , Peter Crosthwaite , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 26 +++++++++++++++++++++++--- hw/sd/trace-events | 1 + 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index f876973a2b..3590099ce8 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -152,6 +152,26 @@ static const char *sd_state_name(enum SDCardStates state) return state_name[state]; } +static const char *sd_response_name(sd_rsp_type_t rsp) +{ + static const char *response_name[] = { + [sd_r0] = "RESP#0 (no response)", + [sd_r1] = "RESP#1 (normal cmd)", + [sd_r2_i] = "RESP#2 (CID reg)", + [sd_r2_s] = "RESP#2 (CSD reg)", + [sd_r3] = "RESP#3 (OCR reg)", + [sd_r6] = "RESP#6 (RCA)", + [sd_r7] = "RESP#7 (operating voltage)", + }; + if (rsp == sd_illegal) { + return "ILLEGAL RESP"; + } + if (rsp == sd_r1b) { + rsp = sd_r1; + } + return response_name[rsp]; +} + static uint8_t sd_get_dat_lines(SDState *sd) { return sd->enable ? sd->dat_lines : 0; @@ -1595,10 +1615,12 @@ send_response: case sd_r0: case sd_illegal: - default: rsplen = 0; break; + default: + g_assert_not_reached(); } + trace_sdcard_response(sd_response_name(rtype), rsplen); if (rtype != sd_illegal) { /* Clear the "clear on valid command" status bits now we've @@ -1614,8 +1636,6 @@ send_response: for (i = 0; i < rsplen; i++) fprintf(stderr, " %02x", response[i]); fputc('\n', stderr); - } else { - DPRINTF("No response %d\n", sd->state); } #endif diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 75dac5a2cd..b2aa19ec0d 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -26,6 +26,7 @@ sdhci_capareg(const char *desc, uint16_t val) "%s: %u" # hw/sd/sd.c sdcard_normal_command(uint8_t cmd, uint32_t arg, const char *state) "CMD%d arg 0x%08x (state %s)" sdcard_app_command(uint8_t acmd, uint32_t arg) "ACMD%d arg 0x%08x" +sdcard_response(const char *rspdesc, int rsplen) "%s (sz:%d)" 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 0x%x"