From patchwork Wed Dec 13 23:20:11 2017 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: 848307 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="MNNIM2OU"; 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 3yxtMj5kKZz9s81 for ; Thu, 14 Dec 2017 10:34:57 +1100 (AEDT) Received: from localhost ([::1]:38294 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGYB-00071z-HJ for incoming@patchwork.ozlabs.org; Wed, 13 Dec 2017 18:34:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60800) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGMJ-0005qu-Lk for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:22:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePGMI-00085h-MM for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:22:39 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:46527) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePGMI-00085M-H9 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:22:38 -0500 Received: by mail-qt0-x241.google.com with SMTP id r39so5824702qtr.13 for ; Wed, 13 Dec 2017 15:22:38 -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=0IZpuw6jEfFtsAjlshRTa5inemC5XHSJqrzpr+/bsUE=; b=MNNIM2OUuVObdFwe+FoIQNWTVYBTE3q9QD5hD7YQLDvnU6l3cg1aerif6+d076IzLC RzDZlqB4XUYAfk22gtd26qCUyknvUHFj5zp97CHi/p9fpclU8FmPtCSNHXkDnUmNvjq/ lS4kzP3ZbujHWivBMVVxUhOn/xfLkx5DXWzdai7sglgnJFsbjLybkElVlLFKLcsLl5p7 3h0wLwLQs8foEpl8hYfeZVnjvUwMU6TI/WTrn+hecmSJxa/HYCUCwbUsyZfWUSYRci5K YBG2KWgVkZ6nx7q0umFyZqMYl9MOeYkhRUYFvZVF/5hHEWs9LaSABkjeMTWLatDgZ0wB zuzA== 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=0IZpuw6jEfFtsAjlshRTa5inemC5XHSJqrzpr+/bsUE=; b=FKcZpxhnm3LZUN4Iy42aKEpSDbnDwK5Z7DYcC3O6RSy4SleF+AlcmgbFB7OUr0xDxt HqTDjt5X5cJKEii4Te0N7KcDJFkSuHp3TLD+Jfa3+/qQaNtcLsOcAUR+PV2RoU50329K CnoaCsWKMu9IH3NxvrWWt8wpscivR3V1lo0z+Rd9N22BJBN3xBfdMWGIo5hqLWJVg5Wz hnFgNBY/whz4akl6SH+euWyQUowjquUsVI5TJP1E4gNRK7aJK8RRh+XUkd1HVu8Vqiy/ GESPIi9hnLlNOO1+hLFeURZ/4dfZEdOguDRnovTzp1iOMz7kBJZS03QakY7A5gxhYZY6 rk1g== X-Gm-Message-State: AKGB3mIq65oZgii8gMPPYmFRQSGzjpFsT6YLbDiWUWbf8qqu8k4ZB2AB DPylEWe8bgPCbrNO7FxcjZc= X-Google-Smtp-Source: ACJfBouYBzdsXVKW6RvT5BWl7eLwJkTN9NsLKFf+k+KReoxIPEGDkkdpCAtopur9cqYglascLk/APg== X-Received: by 10.200.27.225 with SMTP id m30mr14381427qtk.260.1513207358128; Wed, 13 Dec 2017 15:22:38 -0800 (PST) Received: from x1.local ([181.91.222.165]) by smtp.gmail.com with ESMTPSA id l1sm1666918qkk.74.2017.12.13.15.22.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 15:22:37 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrew Baumann , Prasad J Pandit , Clement Deschamps Date: Wed, 13 Dec 2017 20:20:11 -0300 Message-Id: <20171213232025.24503-13-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213232025.24503-1-f4bug@amsat.org> References: <20171213232025.24503-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::241 Subject: [Qemu-devel] [PATCH 12/26] sdcard: replace DPRINTF() by trace events 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: Sai Pavan Boddu , Peter Crosthwaite , =?utf-8?q?Philippe_Mathieu-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 | 11 +++++------ hw/sd/trace-events | 4 ++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 2fa05f42b7..bd583be835 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -773,6 +773,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, uint32_t rca = 0x0000; uint64_t addr = (sd->ocr & (1 << 30)) ? (uint64_t) req.arg << 9 : req.arg; + trace_sdcard_normal_command(req.cmd, req.arg, sd_state_name(sd->state)); + /* Not interpreting this as an app command */ sd->card_status &= ~APP_CMD; @@ -787,7 +789,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, sd->multi_blk_cnt = 0; } - DPRINTF("CMD%d 0x%08x state %d\n", req.cmd, req.arg, sd->state); switch (req.cmd) { /* Basic commands (Class 0 and Class 1) */ case 0: /* CMD0: GO_IDLE_STATE */ @@ -1307,8 +1308,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, return sd_r1; case 56: /* CMD56: GEN_CMD */ - fprintf(stderr, "SD: GEN_CMD 0x%08x\n", req.arg); - switch (sd->state) { case sd_transfer_state: sd->data_offset = 0; @@ -1343,7 +1342,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, static sd_rsp_type_t sd_app_command(SDState *sd, SDRequest req) { - DPRINTF("ACMD%d 0x%08x\n", req.cmd, req.arg); + trace_sdcard_app_command(req.cmd, req.arg); sd->card_status |= APP_CMD; switch (req.cmd) { case 6: /* ACMD6: SET_BUS_WIDTH */ @@ -1603,8 +1602,7 @@ send_response: static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len) { - DPRINTF("sd_blk_read: addr = 0x%08llx, len = %d\n", - (unsigned long long) addr, len); + trace_sdcard_read_block(addr, len); if (!sd->blk || blk_pread(sd->blk, addr, sd->data, len) < 0) { qemu_log_mask(LOG_GUEST_ERROR, "sd_blk_read: read error on host side\n"); @@ -1613,6 +1611,7 @@ static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len) static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len) { + trace_sdcard_write_block(addr, len); if (!sd->blk || blk_pwrite(sd->blk, addr, sd->data, len, 0) < 0) { qemu_log_mask(LOG_GUEST_ERROR, "sd_blk_write: write error on host side\n"); diff --git a/hw/sd/trace-events b/hw/sd/trace-events index db5a5e62f2..117da83014 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -24,6 +24,10 @@ sdhci_led(bool state) "LED: %u" # hw/sd/sd.c sdcard_set_mode(const char *current_mode, const char *new_mode, const char *state) "%s -> %s (state: %s)" sdcard_set_state(const char *current_state, const char *new_state, const char *mode) "%s -> %s (mode: %s)" +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_read_block(uint64_t addr, uint32_t len) "addr 0x%08lx size 0x%x" +sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%08lx size 0x%x" # hw/sd/milkymist-memcard.c milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"