From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDA1AC43331 for ; Tue, 31 Mar 2020 10:55:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 923BA20772 for ; Tue, 31 Mar 2020 10:55:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="N8Jg/+Z9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 923BA20772 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEYg-00087t-OG for qemu-devel@archiver.kernel.org; Tue, 31 Mar 2020 06:55:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52980) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEU5-0002Rr-31 for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJEU3-0006Kn-Um for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:04 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:39868) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJEU3-0006Jo-OJ for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:03 -0400 Received: by mail-wr1-x42a.google.com with SMTP id p10so25307423wrt.6 for ; Tue, 31 Mar 2020 03:51:03 -0700 (PDT) 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=dEC1bGb3P9A30oXg5tR4om/EOk+NZGxuzJFx+2IxYmA=; b=N8Jg/+Z9wzqrZ2RKQHcN41u9xSqe48OAgOB8KwoSTIkUiMhs02J+alroqO56KZj9Dr odx5y8AxsACmsU/sNaIPn+f9BbjsmA3F1JkzZMRwU+YGriwxWuwClpaZ9KDhtRYkC88Q wrwDyM16CRyDtr7oLT23FDV1JVJ33T7wLgGqRjxOcbO4Nw9UA13gXdjz/AdqP7MW/n9g 33Gx3mRywWZX6V/GTJsGjToiaCMrEwVyP3/OCSWHSxO9MCuo8gmzUiJjxTgSVNhobbrD TczWUTxoW1yxIIBiRhLBO5I1poYtMnQEPKo7CXNDmnUtEJjlm2O7T5EfnT+C1tNg7H9n PJOQ== 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=dEC1bGb3P9A30oXg5tR4om/EOk+NZGxuzJFx+2IxYmA=; b=n9UUS8PwKxBcOnHhdoJyeLBnPH2Sro+RrLyA/LTzsbN6ptOplHVDLULpWjgg2lX8MF A3HCV3bhsl43AvsNBTTrLti2ZAIpXeX/6ztSfxJGO4JXeDHTABnwXI1f1mIQErsVuNKL TWVUuySFyxNMVjMnx2kXrANCojr2RFNw3w0OiNnCKOFSSIcMqph3qNXjf/sY2lHoaOBY CTeH/jUVULBt1wmCY7iZaXIhTPE2rjlGk92BPy/O4f+fmLCzqQEaQIF21jgoIwSAUo2J dblNj96h8VpzVbseF6gEMgEB8gpALS+klkJkdRoHg3pchu1+RkRpeUdQkdX6hdvceOfj CCPw== X-Gm-Message-State: ANhLgQ0Osx/uZrzKJZX6z31jSu8j0iVyexMWLk4oBc/o0G8L4kLAI8Qg 0SF2oari4+6fdqsdIHu+T5PoHHMgmrw= X-Google-Smtp-Source: ADFU+vsuqFR7gRmyHV8ugr5RIWVdBtijl4He6v/cvZKXw9SKrXeIm5DHGDINiMCK8qhD/R76pyFILQ== X-Received: by 2002:a5d:6a43:: with SMTP id t3mr18991985wrw.87.1585651862468; Tue, 31 Mar 2020 03:51:02 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id w3sm26042830wrn.31.2020.03.31.03.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 03:51:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1 4/7] hw/misc/grlib_ahb_apb_pnp: Add trace events on read accesses Date: Tue, 31 Mar 2020 12:50:45 +0200 Message-Id: <20200331105048.27989-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200331105048.27989-1-f4bug@amsat.org> References: <20200331105048.27989-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a 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: Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabien Chouteau , KONRAD Frederic , Jiri Gaisler , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- hw/misc/grlib_ahb_apb_pnp.c | 13 +++++++++++-- hw/misc/trace-events | 4 ++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/hw/misc/grlib_ahb_apb_pnp.c b/hw/misc/grlib_ahb_apb_pnp.c index d22ed00206..43e001c3c7 100644 --- a/hw/misc/grlib_ahb_apb_pnp.c +++ b/hw/misc/grlib_ahb_apb_pnp.c @@ -25,6 +25,7 @@ #include "qemu/log.h" #include "hw/sysbus.h" #include "hw/misc/grlib_ahb_apb_pnp.h" +#include "trace.h" #define GRLIB_PNP_VENDOR_SHIFT (24) #define GRLIB_PNP_VENDOR_SIZE (8) @@ -132,8 +133,12 @@ void grlib_ahb_pnp_add_entry(AHBPnp *dev, uint32_t address, uint32_t mask, static uint64_t grlib_ahb_pnp_read(void *opaque, hwaddr offset, unsigned size) { AHBPnp *ahb_pnp = GRLIB_AHB_PNP(opaque); + uint32_t val; - return ahb_pnp->regs[offset >> 2]; + val = ahb_pnp->regs[offset >> 2]; + trace_grlib_ahb_pnp_read(offset, val); + + return val; } static void grlib_ahb_pnp_write(void *opaque, hwaddr addr, @@ -239,8 +244,12 @@ void grlib_apb_pnp_add_entry(APBPnp *dev, uint32_t address, uint32_t mask, static uint64_t grlib_apb_pnp_read(void *opaque, hwaddr offset, unsigned size) { APBPnp *apb_pnp = GRLIB_APB_PNP(opaque); + uint32_t val; - return apb_pnp->regs[offset >> 2]; + val = apb_pnp->regs[offset >> 2]; + trace_grlib_apb_pnp_read(offset, val); + + return val; } static void grlib_apb_pnp_write(void *opaque, hwaddr addr, diff --git a/hw/misc/trace-events b/hw/misc/trace-events index a5862b2bed..9387664823 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -198,3 +198,7 @@ via1_rtc_cmd_pram_read(int addr, int value) "addr=%u value=0x%02x" via1_rtc_cmd_pram_write(int addr, int value) "addr=%u value=0x%02x" via1_rtc_cmd_pram_sect_read(int sector, int offset, int addr, int value) "sector=%u offset=%u addr=%d value=0x%02x" via1_rtc_cmd_pram_sect_write(int sector, int offset, int addr, int value) "sector=%u offset=%u addr=%d value=0x%02x" + +# grlib_ahb_apb_pnp.c +grlib_ahb_pnp_read(uint64_t addr, uint32_t value) "AHB PnP read addr:0x%03"PRIx64" data:0x%08x" +grlib_apb_pnp_read(uint64_t addr, uint32_t value) "APB PnP read addr:0x%03"PRIx64" data:0x%08x" -- 2.21.1