From patchwork Wed Dec 13 23:20:21 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: 848314 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="V4L7RDYa"; 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 3yxtS35J9Bz9s81 for ; Thu, 14 Dec 2017 10:38:42 +1100 (AEDT) Received: from localhost ([::1]:38317 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGbo-0001F1-FP for incoming@patchwork.ozlabs.org; Wed, 13 Dec 2017 18:38:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGN5-0006bZ-1O for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:23:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePGMz-0000Mg-RY for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:23:27 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:44888) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePGMz-0000MC-N8 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:23:21 -0500 Received: by mail-qk0-x244.google.com with SMTP id h19so4158028qkj.11 for ; Wed, 13 Dec 2017 15:23:21 -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=r220NieAJUXPOS1rsLdEODC25XEONfLUafvVg92OYl4=; b=V4L7RDYauJt6bFLb75e+4YoWpmCYANoLqKN0cgb8uQu12r6chG5hrbjm/a/Qek2UL9 EJ0YivScU1zR1XziM6jHAQYweUHEErI9B0k6LQdLpjPFaXL8v30YqqwasfyNCdMYy8vK /89wiPaIKullhsWYdXaF2Ybauo0vXlmreHQlfPY31b9Q72T6RFsCcty3FXYHYrmTeXab kzGTQ+lhX53a7SgI2Q4w8zQgokMIjmQzwesfbMiavcLBctZaTjm+stoitRrtkwov9q0O w7OBCpIElxSrHiMThy2Y0OHSGnCx26+jQCq55ZJiQ50tBqHLrPmVs9QoVm1J4aOaLN8N aO7w== 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=r220NieAJUXPOS1rsLdEODC25XEONfLUafvVg92OYl4=; b=uYVvaPQCQYEXvspuC8k46McE8y/pPcm+nKwwyl6zn7Z9xW5hDWnt4KN83w69MjY50R DjStlKQfxkakXiVws6pq0hsH7Ln4+r0WQtavXXj/MjgecGCwu7a1IvWuHcdIE7qbtzBt /oxhilAC3+zcYCQ31qgPgV7Sxy3jabrOopcNSG1Q0GXBA4GA78EGN95nszkgIcLRmZNy cGahjd1IaS8+MmWsXyChmBRPR0uzA3z1GGuhlGOG+yqPLv9uUMXAGmp+Vu2PBAelLV5y KKlXakm0dn5HRANyqR6adAaEKqLarPhwoEhAY1HISaTowNSaF4DRt/XVgWa7W5FmTV4z NLmA== X-Gm-Message-State: AKGB3mIyRfl9E3czsDbtJDzxNdHiJ7HcQZpiZVFeH9HalDHDbm4Z8bzI uVbyQTIiPIrrqh+jJm6yYRY= X-Google-Smtp-Source: ACJfBovGN4pD9vdBsgJfoLIhKI0sY7IUwV0nU+dIqDMxWF6rX/crH551x79XCmFQ/lRdlxl5Uw9wUA== X-Received: by 10.55.27.212 with SMTP id m81mr12331724qkh.307.1513207401208; Wed, 13 Dec 2017 15:23:21 -0800 (PST) Received: from x1.local ([181.91.222.165]) by smtp.gmail.com with ESMTPSA id l1sm1666918qkk.74.2017.12.13.15.23.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 15:23:20 -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:21 -0300 Message-Id: <20171213232025.24503-23-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:c09::244 Subject: [Qemu-devel] [PATCH 22/26] sdcard: reduce sd_cmd traces 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" Do not trace CMD55 used to start an ACMD. Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 6 ++++-- hw/sd/trace-events | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index c50ac752d4..8104d6c055 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -826,8 +826,10 @@ 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), - sd_cmd_abbreviation(req.cmd)); + if (req.cmd != 55 || sd->expecting_acmd) { + trace_sdcard_normal_command(sd_cmd_abbreviation(req.cmd), req.cmd, + req.arg, sd_state_name(sd->state)); + } /* Not interpreting this as an app command */ sd->card_status &= ~APP_CMD; diff --git a/hw/sd/trace-events b/hw/sd/trace-events index f3714a6dc5..412f01a832 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -24,7 +24,7 @@ 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, const char *cmd_desc) "CMD%d arg 0x%08x (state %s) %s" +sdcard_normal_command(const char *cmd_desc, uint8_t cmd, uint32_t arg, const char *state) "%20s/ CMD%02d arg 0x%08x (state %s)" sdcard_app_command(uint8_t acmd, uint32_t arg) "ACMD%d arg 0x%08x" sdcard_command_response(const char *hexdump, const char *state) "%s (state %s)" sdcard_reset(void) ""