From nobody Tue Oct 28 01:56:37 2025 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 1514997877689969.8370273455566; Wed, 3 Jan 2018 08:44:37 -0800 (PST) Received: from localhost ([::1]:57580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWm9d-00083L-0o for importer@patchew.org; Wed, 03 Jan 2018 11:44:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWm6d-0005ea-Gn for qemu-devel@nongnu.org; Wed, 03 Jan 2018 11:41:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWm6a-0007g7-BA for qemu-devel@nongnu.org; Wed, 03 Jan 2018 11:41:31 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:39872) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWm6a-0007g1-7C; Wed, 03 Jan 2018 11:41:28 -0500 Received: by mail-qk0-x244.google.com with SMTP id c5so2219443qkg.6; Wed, 03 Jan 2018 08:41:28 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id a67sm846643qkg.64.2018.01.03.08.41.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 08:41:27 -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=FGVjh/Ntw9ISO2b5A08bWNkUL+3nUOQ7qiE8j4pw/PE=; b=JQP0wyP/a8BF2qwmpn3U++qkOH9FNju5eyARqBQ67RxP9L7jGaXzk3rJ76d++IvTh9 gaHcjftL21wv+yh5K5tvcXAfYB31zAYYafAtlK2zHSkQi4eErOhYBE05S2HmMtI1VUnR jf8rw5ItSGjerlm7SGENRc2jFzoEgW7/Vw0TufKMbZW/VTxt1t/YkDZ74Bk+C0jMm4e9 2i/Cq+HNaDYpHnx/bzhlms0HK1tlxMh3ZfJJIZkgAtFm7Wm7r273KIJ3lp+EioZZtmM4 SonYnUaALs/1wcdHuKakhIdeiNbw4ukjoMSlqV4nRFykrkGh/rTbmW18kY1Y7A/FB9FH H+aw== 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=FGVjh/Ntw9ISO2b5A08bWNkUL+3nUOQ7qiE8j4pw/PE=; b=NNanqTwlLBOMHkVKyX976WzHH1aNSeYFmrOmO2H1L/CuB0zAizgyt1KVDkJEStquMQ 5JZYFsRnVsR08UDaAGHPB6+Oj5r4pH+xMyrH9+kXkzc5oLCrdCcon3CfBZ2YcT89eZ+9 UBkyMPDKDeXScfMiWzts7BNER8HScaXcZ5xjiR0vBmmAWnDFkCaKrDOlaTSacUbObCRg 4XgOPakFYUBRje2h8/3/GfljQnPaeAkaLwyfh4uPaoa9+ocmaVpWuhHmuaxy9HvD+wG9 gjnq8ZbwBWNOP2/hl9nD0x5n09VG9vPu0qKo9DUxAW1zi6ziBM+ZWtaDTxPsq84ARLto 0+XQ== X-Gm-Message-State: AKGB3mLubEF5mcH7VSYHa5BLGf1HVcq9Rf2c/84vf7XC0qXSBXtDxE0l 97PvQFn9oNnPP10m3siABBYfd3Cd X-Google-Smtp-Source: ACJfBotp0ccfqCVhNViVsjRMzK/kfGiGSsm2wxj+F5XsqVly9cMxidUIRBO2hXOcFPnEGf5v6Q6X7A== X-Received: by 10.55.41.28 with SMTP id p28mr2623363qkh.56.1514997687664; Wed, 03 Jan 2018 08:41:27 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Andrzej Zaborowski Date: Wed, 3 Jan 2018 13:41:16 -0300 Message-Id: <20180103164117.11850-2-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103164117.11850-1-f4bug@amsat.org> References: <20180103164117.11850-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: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH 1/2] hw/timer/pxa2xx_timer: replace hw_error() -> qemu_log_mask() 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: Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, 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: Alistair Francis --- hw/timer/pxa2xx_timer.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index 68ba5a70b3..cfea0a5e22 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -13,6 +13,7 @@ #include "sysemu/sysemu.h" #include "hw/arm/pxa.h" #include "hw/sysbus.h" +#include "qemu/log.h" =20 #define OSMR0 0x00 #define OSMR1 0x04 @@ -252,8 +253,12 @@ static uint64_t pxa2xx_timer_read(void *opaque, hwaddr= offset, case OSNR: return s->snapshot; default: + qemu_log_mask(LOG_UNIMP, "%s: unknown reg 0x%02" HWADDR_PRIx + "\n", __func__, offset); + break; badreg: - hw_error("pxa2xx_timer_read: Bad offset " REG_FMT "\n", offset); + qemu_log_mask(LOG_GUEST_ERROR, "%s: incorrect reg 0x%02" HWADDR_PR= Ix + "\n", __func__, offset); } =20 return 0; @@ -377,8 +382,12 @@ static void pxa2xx_timer_write(void *opaque, hwaddr of= fset, } break; default: + qemu_log_mask(LOG_UNIMP, "%s: unknown reg 0x%02" HWADDR_PRIx " " + "(value 0x%08" PRIx64 ")\n", __func__, offset, value= ); + break; badreg: - hw_error("pxa2xx_timer_write: Bad offset " REG_FMT "\n", offset); + qemu_log_mask(LOG_GUEST_ERROR, "%s: incorrect reg 0x%02" HWADDR_PR= Ix " " + "(value 0x%08" PRIx64 ")\n", __func__, offset, value= ); } } =20 --=20 2.15.1 From nobody Tue Oct 28 01:56:37 2025 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514997809198644.4993443975676; Wed, 3 Jan 2018 08:43:29 -0800 (PST) Received: from localhost ([::1]:57542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWm8M-0006dA-1P for importer@patchew.org; Wed, 03 Jan 2018 11:43:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWm6e-0005eu-3Z for qemu-devel@nongnu.org; Wed, 03 Jan 2018 11:41:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWm6d-0007hL-4w for qemu-devel@nongnu.org; Wed, 03 Jan 2018 11:41:32 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:39507) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWm6c-0007h4-VK; Wed, 03 Jan 2018 11:41:31 -0500 Received: by mail-qt0-x244.google.com with SMTP id k19so2789739qtj.6; Wed, 03 Jan 2018 08:41:30 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id a67sm846643qkg.64.2018.01.03.08.41.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 08:41:29 -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=kp0v9BZBdkpa54HNbA4v69D2pn6p6erAf7fA8SMR8YA=; b=dL3LCTmk+l1xpVJ2KlK0LvXPlHIPzWZ8jpPmUKpMhfxyKa0rgQuMRzhQ6etPpM5mJ6 vHG6+L+0QEs9riMLbaBxcuAYzyXgQR2WqaXwBP5i1OLqkT2ahdvTRbu8JnxjgBhbl+P+ tpQKRSCwwmnF6pSDLPjj2KLnliYl12s/aEMD3tAhvCeN4FWkjzkB07RhLq6LpeOS4IUM oRtTZkyMz5/PBhV+kqCbKxwPtps/k83KU70n9kEJmLjWcxMNFop/NpGBKCBaZNhSJ4aH Cdpv6qxVW5v9yKGMdr148zb4se8gs+9ou5iWxnqqyIyQSlTTy543ocDDca6TllomIXQz 8Cwg== 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=kp0v9BZBdkpa54HNbA4v69D2pn6p6erAf7fA8SMR8YA=; b=ZVDsSFrZrSCcl3cWHQcEAc3VFzI5cwVx1hBC/w2T3iMyhASIzA6Sn6O7O5SP0xQ5Mn hjNS5INpOLIyKCMd82vsN75la3ZelYpFDdOqwx6hDCkEeFgib162eHGivOkztCTkUmc2 Mh+BLTdYy2XuXBfUsEbrQcx8DAWzoP+I1z1Usx5h1T2lN5F9qPPZTkahp3UeWyqgduHp QoWINHafPNA9iMzAC9ilkNq4lkKuxGDmWWjIKNmP+Nsmy6Q9EroK0ou9XO0Q/RQxNSy3 Hv213SxQwUIYdyrsJs/Vp8haNACErlzp79Jb0suf76kofyAmxCEdS14lhFJbOh/EVidb 6HMw== X-Gm-Message-State: AKGB3mK7oiNaPlz7YDXsPwvVJGoXoxWTofeLff/mnY66TBDFPWHoBAP3 n5lc999CGo5dt3PcLLYgGzI= X-Google-Smtp-Source: ACJfBos21zBD33nc7fOvj9CwmINR3I1VKYbDwCdmaYPYGf4nUk6Hf7xQNjMxplWFScn//s5o7ZPQ0Q== X-Received: by 10.200.3.194 with SMTP id z2mr2497171qtg.309.1514997690295; Wed, 03 Jan 2018 08:41:30 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Alistair Francis , "Edgar E . Iglesias" , Andrzej Zaborowski Date: Wed, 3 Jan 2018 13:41:17 -0300 Message-Id: <20180103164117.11850-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103164117.11850-1-f4bug@amsat.org> References: <20180103164117.11850-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: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH 2/2] hw/sd/pxa2xx_mmci: add read/write() 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: qemu-arm@nongnu.org, =?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: Alistair Francis --- hw/sd/pxa2xx_mmci.c | 63 ++++++++++++++++++++++++++++++++++---------------= ---- hw/sd/trace-events | 4 ++++ 2 files changed, 44 insertions(+), 23 deletions(-) diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index 3deccf02c9..0759a0d2eb 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -19,6 +19,7 @@ #include "hw/qdev.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" +#include "trace.h" =20 #define TYPE_PXA2XX_MMCI "pxa2xx-mmci" #define PXA2XX_MMCI(obj) OBJECT_CHECK(PXA2xxMMCIState, (obj), TYPE_PXA2XX_= MMCI) @@ -278,43 +279,55 @@ static void pxa2xx_mmci_wakequeues(PXA2xxMMCIState *s) static uint64_t pxa2xx_mmci_read(void *opaque, hwaddr offset, unsigned siz= e) { PXA2xxMMCIState *s =3D (PXA2xxMMCIState *) opaque; - uint32_t ret; + uint32_t ret =3D 0; =20 switch (offset) { case MMC_STRPCL: - return 0; + break; case MMC_STAT: - return s->status; + ret =3D s->status; + break; case MMC_CLKRT: - return s->clkrt; + ret =3D s->clkrt; + break; case MMC_SPI: - return s->spi; + ret =3D s->spi; + break; case MMC_CMDAT: - return s->cmdat; + ret =3D s->cmdat; + break; case MMC_RESTO: - return s->resp_tout; + ret =3D s->resp_tout; + break; case MMC_RDTO: - return s->read_tout; + ret =3D s->read_tout; + break; case MMC_BLKLEN: - return s->blklen; + ret =3D s->blklen; + break; case MMC_NUMBLK: - return s->numblk; + ret =3D s->numblk; + break; case MMC_PRTBUF: - return 0; + break; case MMC_I_MASK: - return s->intmask; + ret =3D s->intmask; + break; case MMC_I_REG: - return s->intreq; + ret =3D s->intreq; + break; case MMC_CMD: - return s->cmd | 0x40; + ret =3D s->cmd | 0x40; + break; case MMC_ARGH: - return s->arg >> 16; + ret =3D s->arg >> 16; + break; case MMC_ARGL: - return s->arg & 0xffff; + ret =3D s->arg & 0xffff; + break; case MMC_RES: - if (s->resp_len < 9) - return s->resp_fifo[s->resp_len ++]; - return 0; + ret =3D (s->resp_len < 9) ? s->resp_fifo[s->resp_len++] : 0; + break; case MMC_RXFIFO: ret =3D 0; while (size-- && s->rx_len) { @@ -324,16 +337,19 @@ static uint64_t pxa2xx_mmci_read(void *opaque, hwaddr= offset, unsigned size) } s->intreq &=3D ~INT_RXFIFO_REQ; pxa2xx_mmci_fifo_update(s); - return ret; + break; + ret =3D ret; case MMC_RDWAIT: - return 0; + break; case MMC_BLKS_REM: - return s->numblk; + ret =3D s->numblk; + break; default: hw_error("%s: Bad offset " REG_FMT "\n", __FUNCTION__, offset); } + trace_pxa2xx_mmci_read(size, offset, ret); =20 - return 0; + return ret; } =20 static void pxa2xx_mmci_write(void *opaque, @@ -341,6 +357,7 @@ static void pxa2xx_mmci_write(void *opaque, { PXA2xxMMCIState *s =3D (PXA2xxMMCIState *) opaque; =20 + trace_pxa2xx_mmci_write(size, offset, value); switch (offset) { case MMC_STRPCL: if (value & STRPCL_STRT_CLK) { diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 1fc0bcf44b..6eca3470e2 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -3,3 +3,7 @@ # hw/sd/milkymist-memcard.c milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x = value 0x%08x" milkymist_memcard_memory_write(uint32_t addr, uint32_t value) "addr 0x%08x= value 0x%08x" + +# hw/sd/pxa2xx_mmci.c +pxa2xx_mmci_read(uint8_t size, uint32_t addr, uint32_t value) "size %d add= r 0x%02x value 0x%08x" +pxa2xx_mmci_write(uint8_t size, uint32_t addr, uint32_t value) "size %d ad= dr 0x%02x value 0x%08x" --=20 2.15.1