From nobody Tue Oct 28 01:58:02 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 1515019430261667.7752441052228; Wed, 3 Jan 2018 14:43:50 -0800 (PST) Received: from localhost ([::1]:39959 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWrl7-0006LY-H3 for importer@patchew.org; Wed, 03 Jan 2018 17:43:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWrjm-0005E3-Ed for qemu-devel@nongnu.org; Wed, 03 Jan 2018 17:42:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWrjl-0002Ji-Lm for qemu-devel@nongnu.org; Wed, 03 Jan 2018 17:42:18 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:38070) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWrjl-0002JI-Hy; Wed, 03 Jan 2018 17:42:17 -0500 Received: by mail-qk0-x244.google.com with SMTP id l19so3470775qke.5; Wed, 03 Jan 2018 14:42:17 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id f13sm1325127qke.47.2018.01.03.14.42.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 14:42:16 -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=ZJq1D+6X52CnnyC1bfI/X/6oJwh8LSIHrDElxC0RtR0=; b=f1hke0B/e9zYirnhNQooO/EibY332z7emEpBOEsdImd2vpNgRjh8FWKnz+Dij0o14v 2Ffsri+xe8wKSBRIO8zrFjYQey4UcFqMKHycM3bw7F0RLoveLuhrLLHvSQGaHevE+1Jz nQ82NUw/a7z3IBkJPYakY7+M1PHM6zpYzaGcy717vJ983FtVZbfLI+FzZv8OQqAWGOOE BaKrcKJ3U+mzp+XL5crGBeF2pn+RV+fmNB2/v8jvSlzBJtM7lIl2HbEDh7eWrJicXWth gKjh/hNhvV6IgktwjehtVKgv1TuIeJNfZQugdU4ymMfYMKuFGItl/ntJmtod1+sr7s6x KexA== 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=ZJq1D+6X52CnnyC1bfI/X/6oJwh8LSIHrDElxC0RtR0=; b=V4utluxs1cL250/KR4mZy+MEm2fqIq/p2lGQit+ra3SoaYWGffbNTp4fk8zUEN+YNS SLTtyQu8YemZrwcdETC5fUBUF4KCK0G01oZ7qWiRvvVV/Egb4UCcBxSeZe77mG1pQsmG bgc2HytnSiQMIVnEo+OLCH2UTPb6CmhGcqInGOXaes+y73F1t790MryfrAGiAcXpGLYq 24AalyJ8UUw66qTpmiBs72xb2r6j7zqHx2wKGWLNJb2WN40gmMwfTp1G083FmuOsU6/0 42ymaSbpukO/qXyAxZ0cStdpQmUxHy1ZkaUettlS1pNsPGPt9DTqEVwK16X8l/lXQlbP s4zQ== X-Gm-Message-State: AKGB3mLgSFg3x27CG0wDXH022/0OkJU8LhHKxyPpqDtfAhPA0fXSmhzv 6QEKztrbubnwD4MAAh29lYs= X-Google-Smtp-Source: ACJfBotFbDVix3uoD8HMZa+MEARupTzlL4JjlfwnbZVax2e5Mt53ZkYdJ5xY+asW0kDJL0Zt134ogg== X-Received: by 10.55.4.130 with SMTP id 124mr3549257qke.330.1515019336992; Wed, 03 Jan 2018 14:42:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Andrzej Zaborowski Date: Wed, 3 Jan 2018 19:42:07 -0300 Message-Id: <20180103224208.30291-2-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103224208.30291-1-f4bug@amsat.org> References: <20180103224208.30291-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 v2 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: "Edgar E . Iglesias" , 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/timer/pxa2xx_timer.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index 68ba5a70b3..a489bf5159 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,14 @@ static uint64_t pxa2xx_timer_read(void *opaque, hwaddr= offset, case OSNR: return s->snapshot; default: + qemu_log_mask(LOG_UNIMP, + "%s: unknown register 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 register 0x%02" HWADDR_PRIx "\n", + __func__, offset); } =20 return 0; @@ -377,8 +384,14 @@ static void pxa2xx_timer_write(void *opaque, hwaddr of= fset, } break; default: + qemu_log_mask(LOG_UNIMP, + "%s: unknown register 0x%02" HWADDR_PRIx " " + "(value 0x%08" PRIx64 ")\n", __func__, offset, valu= e); + break; badreg: - hw_error("pxa2xx_timer_write: Bad offset " REG_FMT "\n", offset); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: incorrect register 0x%02" HWADDR_PRIx " " + "(value 0x%08" PRIx64 ")\n", __func__, offset, value= ); } } =20 --=20 2.15.1 From nobody Tue Oct 28 01:58:02 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 1515024211030451.54575636621564; Wed, 3 Jan 2018 16:03:31 -0800 (PST) Received: from localhost ([::1]:42329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWt0K-0003rB-65 for importer@patchew.org; Wed, 03 Jan 2018 19:03:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWszK-0003RD-7q for qemu-devel@nongnu.org; Wed, 03 Jan 2018 19:02:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWszH-0007IT-1A for qemu-devel@nongnu.org; Wed, 03 Jan 2018 19:02:26 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:42957) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWszG-0007I6-Sm; Wed, 03 Jan 2018 19:02:22 -0500 Received: by mail-qt0-x244.google.com with SMTP id g9so56560qth.9; Wed, 03 Jan 2018 16:02:22 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id v58sm1367928qtk.18.2018.01.03.16.02.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 16:02: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=a3g00lNMHzJKsv7I9WtwrBC30R37RN+3JMtQb/2m2rM=; b=snLYc4Tk2CbW+2OygkqYYswLKbc5tTcB4v+8MlZW2VBH+pLmOn1fzZKzJUsViYm508 ixwQG+cNoCRz3I5rPqYMiZEOJMYsmSio4fj2nw9z4llX9QNkrwpW6OSCzIDukj+Ip8yA dDQQaMdXO86blxFBsvIfCXRLM0dzhk5YXzcH1AxVAlKVts3aYoIJl0/GVZXoRRjeLp7G Ocd+7yysGz4yCxndYf4uTiDNHRzJuix+bCQFJDP1S6Fow1zxgg8Jall3hXoRIZmYEOH7 PkWOFCZuBpPTjC0sfM0TvR1T+nRJ4cLbcDEhamOAof2PQzI5SHMO++Y56Lf/UAFYPpiY 03Ug== 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=a3g00lNMHzJKsv7I9WtwrBC30R37RN+3JMtQb/2m2rM=; b=W9Woj38qr286eSCYmEOCEcZyQPu/pBCAJYzG/2Gzb1Thn096TIB0kGzdl+xlB0LChJ 0gHrs/levJ/7WCbrpepcnFogjMFj7Ad8TL0Mhlr1ohu9P8XtPoksF3o+pSMdbaJmsqWt Txy5vsmMYz5jDevM11tpfisWSb40G7jpMLGaemnyScpPcgXYmAkMF1pgfm5dUPm75M7G qknU9QEh08hbArC1qZDcveIwPGq25kP54WV+E/JHfGrPPBagokXvz2+rvURA+kg5DQRK FmT6KG5FaUmp3CSdzPxEiBHxYE8N4ijAOMazRBcgVT+ixQRCeP2uc08ewERhc0bFds2c N9QQ== X-Gm-Message-State: AKGB3mL7OLB1qrpMFM9x2eChR0HrqgAEaStF30SnRDGUXUOuJIGiGz2S t23xFf6m3eOzRIeVriUYkoU= X-Google-Smtp-Source: ACJfBovecEbJjTwcdZFqk5DUwQgrhP14W0HzFcgpVazqDEaCJzf0yIf8WOHVbewMEo2jBGLwFCY4ug== X-Received: by 10.200.49.29 with SMTP id g29mr4215850qtb.215.1515024142252; Wed, 03 Jan 2018 16:02:22 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Andrzej Zaborowski Date: Wed, 3 Jan 2018 21:01:56 -0300 Message-Id: <20180104000156.30932-1-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103224208.30291-1-f4bug@amsat.org> References: <20180103224208.30291-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 v2 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: "Edgar E . Iglesias" , 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 | 77 ++++++++++++++++++++++++++++++++++---------------= ---- hw/sd/trace-events | 4 +++ 2 files changed, 53 insertions(+), 28 deletions(-) diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index 3deccf02c9..63223b797e 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,45 +279,56 @@ 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) { ret |=3D s->rx_fifo[s->rx_start++] << (size << 3); s->rx_start &=3D 0x1f; @@ -324,16 +336,20 @@ 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; 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); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: incorrect register 0x%02" HWADDR_PRIx "\n", + __func__, 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) { @@ -368,8 +385,10 @@ static void pxa2xx_mmci_write(void *opaque, =20 case MMC_SPI: s->spi =3D value & 0xf; - if (value & SPI_SPI_MODE) - printf("%s: attempted to use card in SPI mode\n", __FUNCTION__= ); + if (value & SPI_SPI_MODE) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: attempted to use card in SPI mode\n", __fun= c__); + } break; =20 case MMC_CMDAT: @@ -442,7 +461,9 @@ static void pxa2xx_mmci_write(void *opaque, break; =20 default: - hw_error("%s: Bad offset " REG_FMT "\n", __FUNCTION__, offset); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: incorrect reg 0x%02" HWADDR_PRIx " " + "(value 0x%08" PRIx64 ")\n", __func__, offset, value= ); } } =20 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