From nobody Wed May 15 04:00:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576394604; cv=none; d=zohomail.com; s=zohoarc; b=NrkKBjOWcEQL35N5NE8SKk28X3vVUPkogHqG0MPCSQ4ZxoSFff+AgPB7H06cMDmSR+9ztD5lHyFz/Gz4trxxZ0jupiw/1KNoh2aTvCleW/Z6dAl2vNwcDKvqeLfiDsiKq8iOTa0CZCtaI8eDbaJTbUr6g8es8wVojSV8xJb/MmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576394604; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PkmSvsEigE9S+xAFo+Nr+49mjR10SDU0z0m/UqWEQoE=; b=FkDw0Or8MgJOCdm8foEHFLcAapyKTCQyfNy4Ko4ppshr+Ylqg4SguUoG9zGOB5heDZXjmOZyxKjWpyCV3mIA40g4Lzae+clvkuqG/+FjenstGDFI/7b8Q7Db34ZPxqfd72+hdKmpvRMD7PFMy4+VQSlgGZogi+tyMtd/S6KR0x8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576394604088183.15657361296167; Sat, 14 Dec 2019 23:23:24 -0800 (PST) Received: from localhost ([::1]:36762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igOFO-0001kr-V2 for importer@patchew.org; Sun, 15 Dec 2019 02:23:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52431) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igOD9-0008Iz-4J for qemu-devel@nongnu.org; Sun, 15 Dec 2019 02:21:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igOD8-0006ck-7h for qemu-devel@nongnu.org; Sun, 15 Dec 2019 02:21:03 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:33061 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1igOD8-0006bX-48 for qemu-devel@nongnu.org; Sun, 15 Dec 2019 02:21:02 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-255-Azj97_YHOde4sQC9S7rBMg-1; Sun, 15 Dec 2019 02:20:57 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 37A35800EB8; Sun, 15 Dec 2019 07:20:56 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-147.brq.redhat.com [10.40.205.147]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F24C26172; Sun, 15 Dec 2019 07:20:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576394461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PkmSvsEigE9S+xAFo+Nr+49mjR10SDU0z0m/UqWEQoE=; b=Ody9d4qDBfZ6wpGzL4SEe4emvvpdkU80Iv51kXXcCTFV/cSfeJDBbvraa8/qfacyLLPW2O F77OA3L5lqUFThxWXZ4GO99zEyMsu6mPdI7tfCAH2nER4itY+HS0CoN79KX/8gVZgBHQf1 vX5cFxrdrCLqEBo3WCSjpC16TI5AcoQ= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org Subject: [PATCH v2 1/2] MAINTAINERS: Add missing m48t59 files to the PReP section Date: Sun, 15 Dec 2019 08:20:44 +0100 Message-Id: <20191215072045.7198-2-philmd@redhat.com> In-Reply-To: <20191215072045.7198-1-philmd@redhat.com> References: <20191215072045.7198-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: Azj97_YHOde4sQC9S7rBMg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 5e5e3e52d6..4519592e64 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1078,6 +1078,8 @@ F: hw/pci-host/prep.[hc] F: hw/isa/i82378.c F: hw/isa/pc87312.c F: hw/dma/i82374.c +F: hw/rtc/m48t59.c +F: hw/rtc/m48t59-internal.h F: hw/rtc/m48t59-isa.c F: include/hw/isa/pc87312.h F: include/hw/rtc/m48t59.h --=20 2.21.0 From nobody Wed May 15 04:00:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576394659; cv=none; d=zohomail.com; s=zohoarc; b=av3++eksOTx346/eBqV1q3BbjMjbGFwbzbllbNgO1hp4dlO8O06S8N55P8SVmNutep8jGsor8d/QshuAfpRYSdmyiB4K1cKKaYEYwU71KQMj+RUHhb0UN26l5G5ZdpeSXDveHuwTTrQmLKVQXRDQyhew6llDOe4GWI06mtGn/t0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576394659; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0pGfJm/TGowlztGp6XpdBVnICvwvarC3xa5cFuIdSIg=; b=LhdkXU/xrFGDZqNC5EUsX16yWyZ4IoV0TaOBu3pnouGmwDtt1p5zj58k10VpRXW8cyHoFtGaiU0Z9MEDkNdm84GxSqmmcCRyb1f+fW5tGIkdiO4/GCiY96nUVkCr5Q25/ZwL7TnaSwL7qrKFuESBuwnF+Ty2cEAWKyBraHl/NcQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576394659606472.73156380912906; Sat, 14 Dec 2019 23:24:19 -0800 (PST) Received: from localhost ([::1]:36768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igOGI-0002c9-JB for importer@patchew.org; Sun, 15 Dec 2019 02:24:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52798) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igODC-0008Nz-OW for qemu-devel@nongnu.org; Sun, 15 Dec 2019 02:21:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igODB-0006gv-Dv for qemu-devel@nongnu.org; Sun, 15 Dec 2019 02:21:06 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:42935 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1igODB-0006gA-8o for qemu-devel@nongnu.org; Sun, 15 Dec 2019 02:21:05 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-333-zuxFDwmoNIGGY4ZeH5Zraw-1; Sun, 15 Dec 2019 02:21:01 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2C1851005502; Sun, 15 Dec 2019 07:20:59 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-147.brq.redhat.com [10.40.205.147]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E0922384; Sun, 15 Dec 2019 07:20:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576394464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0pGfJm/TGowlztGp6XpdBVnICvwvarC3xa5cFuIdSIg=; b=Y5HRpmE7sWlzfMjT1b0Uut0I3uCnuwML3nZs6eh1gFN8P1DcWwPDBEw/sOMqUQJBQ5VEsd QSh9rGCzJVJ7u+urJVYsibDtUDatcFBHJltyT2Awr+99Kti5OuQEpaQNBB3blHFYxZLEV+ YtnamzqrDzNvHNM/HPPGHDvkNalBSfE= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org Subject: [PATCH v2 2/2] hw/timer/m48t59: Convert debug printf()s to trace events Date: Sun, 15 Dec 2019 08:20:45 +0100 Message-Id: <20191215072045.7198-3-philmd@redhat.com> In-Reply-To: <20191215072045.7198-1-philmd@redhat.com> References: <20191215072045.7198-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: zuxFDwmoNIGGY4ZeH5Zraw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/rtc/m48t59-internal.h | 5 ----- hw/rtc/m48t59.c | 11 +++++------ hw/rtc/trace-events | 6 ++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/rtc/m48t59-internal.h b/hw/rtc/m48t59-internal.h index 4d4f2a6fed..cd648241e9 100644 --- a/hw/rtc/m48t59-internal.h +++ b/hw/rtc/m48t59-internal.h @@ -26,11 +26,6 @@ #ifndef HW_M48T59_INTERNAL_H #define HW_M48T59_INTERNAL_H =20 -#define M48T59_DEBUG 0 - -#define NVRAM_PRINTF(fmt, ...) do { \ - if (M48T59_DEBUG) { printf(fmt , ## __VA_ARGS__); } } while (0) - /* * The M48T02, M48T08 and M48T59 chips are very similar. The newer '59 has * alarm and a watchdog timer and related control registers. In the diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c index fc592b9fb1..ecc92ca476 100644 --- a/hw/rtc/m48t59.c +++ b/hw/rtc/m48t59.c @@ -35,6 +35,7 @@ #include "exec/address-spaces.h" #include "qemu/bcd.h" #include "qemu/module.h" +#include "trace.h" =20 #include "m48t59-internal.h" #include "migration/vmstate.h" @@ -192,8 +193,7 @@ void m48t59_write(M48t59State *NVRAM, uint32_t addr, ui= nt32_t val) struct tm tm; int tmp; =20 - if (addr > 0x1FF8 && addr < 0x2000) - NVRAM_PRINTF("%s: 0x%08x =3D> 0x%08x\n", __func__, addr, val); + trace_m48txx_nvram_mem_write(addr, val); =20 /* check for NVRAM access */ if ((NVRAM->model =3D=3D 2 && addr < 0x7f8) || @@ -450,8 +450,7 @@ uint32_t m48t59_read(M48t59State *NVRAM, uint32_t addr) } break; } - if (addr > 0x1FF9 && addr < 0x2000) - NVRAM_PRINTF("%s: 0x%08x <=3D 0x%08x\n", __func__, addr, retval); + trace_m48txx_nvram_mem_read(addr, retval); =20 return retval; } @@ -462,7 +461,7 @@ static void NVRAM_writeb(void *opaque, hwaddr addr, uin= t64_t val, { M48t59State *NVRAM =3D opaque; =20 - NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" =3D> 0x%"PRIx64"\n", __func__, addr= , val); + trace_m48txx_nvram_io_write(addr, val); switch (addr) { case 0: NVRAM->addr &=3D ~0x00FF; @@ -494,7 +493,7 @@ static uint64_t NVRAM_readb(void *opaque, hwaddr addr, = unsigned size) retval =3D -1; break; } - NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" <=3D 0x%08x\n", __func__, addr, ret= val); + trace_m48txx_nvram_io_read(addr, retval); =20 return retval; } diff --git a/hw/rtc/trace-events b/hw/rtc/trace-events index d6749f4616..52c1566198 100644 --- a/hw/rtc/trace-events +++ b/hw/rtc/trace-events @@ -17,3 +17,9 @@ pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks" # aspeed-rtc.c aspeed_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value= 0x%08" PRIx64 aspeed_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " valu= e 0x%08" PRIx64 + +# m48t59.c +m48txx_nvram_io_read(uint64_t addr, uint64_t value) "io read addr:0x%04" P= RIx64 " value:0x%02" PRIx64 +m48txx_nvram_io_write(uint64_t addr, uint64_t value) "io write addr:0x%04"= PRIx64 " value:0x%02" PRIx64 +m48txx_nvram_mem_read(uint32_t addr, uint32_t value) "mem read addr:0x%04x= value:0x%02x" +m48txx_nvram_mem_write(uint32_t addr, uint32_t value) "mem write addr:0x%0= 4x value:0x%02x" --=20 2.21.0