From patchwork Fri Jun 3 22:45:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 9154213 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 5361360751 for ; Fri, 3 Jun 2016 22:46:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3992E28340 for ; Fri, 3 Jun 2016 22:46:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C74A28345; Fri, 3 Jun 2016 22:46:15 +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=-3.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D00D928340 for ; Fri, 3 Jun 2016 22:46:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4B99F6E2DC; Fri, 3 Jun 2016 22:46:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-io0-x242.google.com (mail-io0-x242.google.com [IPv6:2607:f8b0:4001:c06::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id B6CD26E2DC for ; Fri, 3 Jun 2016 22:46:09 +0000 (UTC) Received: by mail-io0-x242.google.com with SMTP id f128so1395728iof.3 for ; Fri, 03 Jun 2016 15:46:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EpaLzw0hvBqOLOwg2oIuy5a94siUn51baFJQhBN15So=; b=BQxRhGOVpsn7DSX/PKeLAO4NvxNZHTmih86OE85Z3es5DUMduYyuNJv/jQAZ701lw8 HvSSzQiShuXGbYVCaG7asiBAehuSH43WpZiY7LsOJIftetCe8IEDOatAKidvVpUr3SiU Ws6K9R+gO8/mqaCT13z7lzoG3t2qjWdspqV9jCt4Mr4yjqNWMvaDBbYLmOwGoAN22Kps f003Um2pxduqnlXmBx2b6829sVGTarYT82eqpoedNUufH3u57kIp8R5ITyJiiNWN5w4t 0+b9rGrkLP0pozsy96Kr7UlRdGXs0L12/LkTdJ4Gh1WjdgVnGlOBoMfMg28GbAW6qiI9 Qf0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EpaLzw0hvBqOLOwg2oIuy5a94siUn51baFJQhBN15So=; b=VICe68FV+8IkLxtATIxtOJ3HOeqE6YPJOwrLWsy2THsMhXGZ3QPKXM6ogKNicW+BcO /PVVdR4hyn+s2OXvStCwjqXoL3tyxCvouoxtDpYrd6vdhrpAP6HYPcUhS9686WcxPUU8 HHzJj7r1ykoH+lYfC5NSPhwgcJAo3WV90YWeyhigOt3uyKyPqG3jBQWz9yqgxu0fDT+D yE/yL/xru5t0KbrKQH/RuS+ayOHP3HmxlH2wU1vDwPDoNxrNiKHnwD0tGGfkcOXE5VSd ehpxuxNPt1sgv5np5pcE+YhTOiBorMJHvu7bsFEyqzrtOhEUUVqSyZV6oJpusBMlzdZc yhwA== X-Gm-Message-State: ALyK8tLJJSpkGfyD3yRIUobojD3IB+tZ8dCdy+ScObcn1f+ufOEcOG4OWdLsurRQ77Ppbw== X-Received: by 10.107.23.69 with SMTP id 66mr8480249iox.186.1464993968802; Fri, 03 Jun 2016 15:46:08 -0700 (PDT) Received: from cm.amd.com ([165.204.55.251]) by smtp.gmail.com with ESMTPSA id b190sm791607itc.3.2016.06.03.15.46.07 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Jun 2016 15:46:08 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/amdgpu/trace: Add tracepoints to MMIO read/writes Date: Fri, 3 Jun 2016 18:45:56 -0400 Message-Id: <1464993956-17698-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 MIME-Version: 1.0 Cc: Tom St Denis , Alex Deucher X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Tom St Denis Add tracepoints to the MMIO read/write so we can log MMIO traffic. Signed-off-by: Tom St Denis Reviewed-by: Christian König Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 ++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 38 ++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index c78579b..e1b2fe7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -35,6 +35,7 @@ #include #include #include "amdgpu.h" +#include "amdgpu_trace.h" #include "amdgpu_i2c.h" #include "atom.h" #include "amdgpu_atombios.h" @@ -79,24 +80,27 @@ bool amdgpu_device_is_px(struct drm_device *dev) uint32_t amdgpu_mm_rreg(struct amdgpu_device *adev, uint32_t reg, bool always_indirect) { + uint32_t ret; + if ((reg * 4) < adev->rmmio_size && !always_indirect) - return readl(((void __iomem *)adev->rmmio) + (reg * 4)); + ret = readl(((void __iomem *)adev->rmmio) + (reg * 4)); else { unsigned long flags; - uint32_t ret; spin_lock_irqsave(&adev->mmio_idx_lock, flags); writel((reg * 4), ((void __iomem *)adev->rmmio) + (mmMM_INDEX * 4)); ret = readl(((void __iomem *)adev->rmmio) + (mmMM_DATA * 4)); spin_unlock_irqrestore(&adev->mmio_idx_lock, flags); - - return ret; } + trace_amdgpu_mm_rreg(adev->pdev->device, reg, ret); + return ret; } void amdgpu_mm_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, bool always_indirect) { + trace_amdgpu_mm_wreg(adev->pdev->device, reg, v); + if ((reg * 4) < adev->rmmio_size && !always_indirect) writel(v, ((void __iomem *)adev->rmmio) + (reg * 4)); else { diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h index 26a5f4a..38e5689 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h @@ -11,6 +11,44 @@ #define TRACE_SYSTEM amdgpu #define TRACE_INCLUDE_FILE amdgpu_trace +TRACE_EVENT(amdgpu_mm_rreg, + TP_PROTO(unsigned did, uint32_t reg, uint32_t value), + TP_ARGS(did, reg, value), + TP_STRUCT__entry( + __field(unsigned, did) + __field(uint32_t, reg) + __field(uint32_t, value) + ), + TP_fast_assign( + __entry->did = did; + __entry->reg = reg; + __entry->value = value; + ), + TP_printk("0x%04lx, 0x%04lx, 0x%08lx", + (unsigned long)__entry->did, + (unsigned long)__entry->reg, + (unsigned long)__entry->value) +); + +TRACE_EVENT(amdgpu_mm_wreg, + TP_PROTO(unsigned did, uint32_t reg, uint32_t value), + TP_ARGS(did, reg, value), + TP_STRUCT__entry( + __field(unsigned, did) + __field(uint32_t, reg) + __field(uint32_t, value) + ), + TP_fast_assign( + __entry->did = did; + __entry->reg = reg; + __entry->value = value; + ), + TP_printk("0x%04lx, 0x%04lx, 0x%08lx", + (unsigned long)__entry->did, + (unsigned long)__entry->reg, + (unsigned long)__entry->value) +); + TRACE_EVENT(amdgpu_bo_create, TP_PROTO(struct amdgpu_bo *bo), TP_ARGS(bo),