From patchwork Wed Jan 3 21:24:14 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: 10143413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3DAA9601A1 for ; Wed, 3 Jan 2018 21:26:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 363972936C for ; Wed, 3 Jan 2018 21:26:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B04D2937C; Wed, 3 Jan 2018 21:26:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C2F402936C for ; Wed, 3 Jan 2018 21:26:25 +0000 (UTC) Received: from localhost ([::1]:37620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWqYK-0003Ju-Rc for patchwork-qemu-devel@patchwork.kernel.org; Wed, 03 Jan 2018 16:26:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWqWz-0001xS-If for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:25:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWqWy-0007b3-7m for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:25:01 -0500 Received: from mail-qt0-x22e.google.com ([2607:f8b0:400d:c0d::22e]:41721) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWqWy-0007ah-2v for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:25:00 -0500 Received: by mail-qt0-x22e.google.com with SMTP id i40so3789435qti.8 for ; Wed, 03 Jan 2018 13:25:00 -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=yUqsh/zSZAAM1IBghF3xAwJP+F0aVnNZAHE+FsfqeBo=; b=BsLuRkABI1ANMQAkwXl8R7akOtAdrl5ZhgOzWKZcFQJ06mT6xgIv1gFFfU8wB2EV/b 76OOx07YU2e+ccRvrYsQ/swrCijDdanaR9GQJSHnHPy/tzTdQjcsX3z3TPlqRSZd20Yz Y6x34Jw0BMVeepZdQUCs2teZ5GxN7tB1bRf+q7x38nHZWLrvwrEgWHoa6td7A8rHy0+r BQc235JvlXiSZdZuolgWET6eYvOhDWqtWR2ckDqtllyVHhj41fDl+KgQktzAI9v7X2hq VX/DjOYgfR2Kja9ovIYEIEtAOo6gc8sPapHzod1Iexiw643GkWUcy8ySinNoUQkUJwsu AhrA== 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=yUqsh/zSZAAM1IBghF3xAwJP+F0aVnNZAHE+FsfqeBo=; b=mu7DyNG04abtCeuS0kOgVtOs+CzN4A3s5BFqNQ6rykncqx3oLgir5ptZbxoCebwXZx zLdcqhcI3PJRg6NSKEclNxqBGAwDksgGYXpl2J2A2VcUBaJwWAudNzyMoHVw9zQV0cAx wJaI/6of1zfZ+IAPpcSLBBc4wNQ+9A7xDWrA2z8W8DVGAIU9tb0KxOJZgdULBsW5gxrw oE14Ymb1BLMh/o7/d2kwoHxcjvFNj7bSi7yV0ANZGyAmBEiu9b7jBFwe1DyDCZNfre9e Xz4JePQ8yTq+muRwTG/qzuQOOi6riplDYjprZ94p9nHjFafRFNDO+W1JLZTisu4Zx9/A ODqA== X-Gm-Message-State: AKGB3mJqhiPQnl3LXZUr5th1jriR2sFgn61WBqmnXYfduLH+zJMVeUoq aUPY0uITMX4YLsT+8/Yf12U= X-Google-Smtp-Source: ACJfBov+tgJVW7GRhtEilgOrHGoE4IVKPTWM9zi9k45zAVSSnJ46dAWo5EL5wZlAYmv+GZzmmu8ewQ== X-Received: by 10.200.25.47 with SMTP id t44mr3596516qtj.323.1515014699595; Wed, 03 Jan 2018 13:24:59 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id a19sm1104402qtj.74.2018.01.03.13.24.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 13:24:59 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Igor Mitsyanko , Andrew Baumann , Olbrich , Andrzej Zaborowski Date: Wed, 3 Jan 2018 18:24:14 -0300 Message-Id: <20180103212436.15762-4-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103212436.15762-1-f4bug@amsat.org> References: <20180103212436.15762-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::22e Subject: [Qemu-devel] [PATCH v2 03/25] sdcard: add more 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: "Edgar E . Iglesias" , Prasad J Pandit , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Paul Brook , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 12 ++++++++++++ hw/sd/trace-events | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index df2e099151..f0eaac4d42 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -440,6 +440,7 @@ static void sd_reset(DeviceState *dev) uint64_t size; uint64_t sect; + trace_sdcard_reset(); if (sd->blk) { blk_get_geometry(sd->blk, §); } else { @@ -491,7 +492,10 @@ static void sd_cardchange(void *opaque, bool load, Error **errp) bool readonly = sd_get_readonly(sd); if (inserted) { + trace_sdcard_inserted(readonly); sd_reset(dev); + } else { + trace_sdcard_ejected(); } /* The IRQ notification is for legacy non-QOM SD controller devices; @@ -623,6 +627,7 @@ static void sd_erase(SDState *sd) uint64_t erase_start = sd->erase_start; uint64_t erase_end = sd->erase_end; + trace_sdcard_erase(); if (!sd->erase_start || !sd->erase_end) { sd->card_status |= ERASE_SEQ_ERROR; return; @@ -712,6 +717,11 @@ static void sd_lock_command(SDState *sd) else pwd_len = 0; + if (lock) { + trace_sdcard_lock(); + } else { + trace_sdcard_unlock(); + } if (erase) { if (!(sd->card_status & CARD_IS_LOCKED) || sd->blk_len > 1 || set_pwd || clr_pwd || lock || sd->wp_switch || @@ -1635,6 +1645,7 @@ void sd_write_data(SDState *sd, uint8_t value) if (sd->card_status & (ADDRESS_ERROR | WP_VIOLATION)) return; + trace_sdcard_write_data(value); switch (sd->current_cmd) { case 24: /* CMD24: WRITE_SINGLE_BLOCK */ sd->data[sd->data_offset ++] = value; @@ -1772,6 +1783,7 @@ uint8_t sd_read_data(SDState *sd) io_len = (sd->ocr & (1 << 30)) ? 512 : sd->blk_len; + trace_sdcard_read_data(io_len); switch (sd->current_cmd) { case 6: /* CMD6: SWITCH_FUNCTION */ ret = sd->data[sd->data_offset ++]; diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 86c1687572..727d6fd904 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -18,8 +18,16 @@ sdhci_led(bool state) "LED: %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_reset(void) "" +sdcard_inserted(bool readonly) "read_only: %d" +sdcard_ejected(void) "" +sdcard_erase(void) "" +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 0x%x" +sdcard_write_data(uint8_t value) "value 0x%02x" +sdcard_read_data(int length) "len %d" # hw/sd/milkymist-memcard.c milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"