Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp4339187imm; Mon, 11 Jun 2018 10:36:39 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIry5IXCl0QKXIme1nveVVolI6IvRwfsHAFD8Km0OGfFWmcm0QelwsPr3Y8xMi2n4GzchGJ X-Received: by 2002:aa7:8148:: with SMTP id d8-v6mr163168pfn.78.1528738598973; Mon, 11 Jun 2018 10:36:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528738598; cv=none; d=google.com; s=arc-20160816; b=bPenQhBVQLUVym34TPkjzxohWi7lWtfAO90dBr9QERCgpYOG9Yh6VqeIPhUiDowkuB /LtLnpMNY1Aed8Bnb6NcfHIkfx17y0qcYlljD/uZ+xJ4ez77oxROV431SdMEj7a+1LP1 PvlSITSpLYJSIJhEsn++5KCFT5hm1z0wDeo8N634zipIgWgoL8gyMAtCkSfs1B063Acm XWFfAOsJhN5PZHK8xwP2fbeujfwjmlqty8N5B/IPoctGaH6cDIJO2fBq8mRvzKDGCyN5 EjQQ8K6Ku3Z40SyI3L0adKsiHb/OUGr8yejNDkdBLoxRqIYA2dzeH9MSw8+0SACkept1 TVKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:dkim-signature:dkim-signature :arc-authentication-results; bh=rTaqx3Ye7stbzvoW8w9jRLGxhljCa6y4zTUxRKm91kA=; b=Ayc7yxzLWmolgqWuUR9Yuu7qna+Bu/BPH9vR5ICad8vNlippotW5lDFXkWgtl95QKj rmfp7LuTPRGZO0s4r7xKYV85v7XqBt7G1d1dICVbHJ/nD877wzfX6QdbRk1RDL1YCDYD h7fAa8iDGJukVcAc+wxJf++cme/IPeSNx0KdbminLglYn3YoQODyUB3zIQM+wGtrFi6A x9GAkzPpDNJLry75zcyNWXy9KDpGy6wVCi0H8KayR26aI1JzfrSh0R4CvznGfmq+yASH 7Cr9K+RRAD1YXHqgyBfHHvtf6wGWFihzL3950MdikUqw+godmb+Awqb5RbqxEANXn/BL CmUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=PW61SXYH; dkim=pass header.i=@codeaurora.org header.s=default header.b=T3FToaKS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l17-v6si20266673pfi.179.2018.06.11.10.35.54; Mon, 11 Jun 2018 10:36:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=PW61SXYH; dkim=pass header.i=@codeaurora.org header.s=default header.b=T3FToaKS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934239AbeFKR0q (ORCPT + 99 others); Mon, 11 Jun 2018 13:26:46 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:52208 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934225AbeFKR0m (ORCPT ); Mon, 11 Jun 2018 13:26:42 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B9FF5607E7; Mon, 11 Jun 2018 17:26:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1528738001; bh=SmOZRxKp5IQK9chwYKqLvJ0KOXP0YHo2VMF6vpN43Ps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PW61SXYH5lh9V9oT+/eODHF6UYX426zf3fGltnVmK+RgMW+iGyaV8OzBMO6R69nl3 2Ey0gNUfvFVVPy9/6XJtfLMQsCfy0FiAtOII0V6ALynZAhNqkdfDaJieFSxdfqiFWx NbDJXEHQBnOs7YwbWvZcPpemkDHFDrnXpewvR4YM= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,FROM_LOCAL_NOVOWEL,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from rplsssn-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: rplsssn@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6656A6089E; Mon, 11 Jun 2018 17:26:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1528738000; bh=SmOZRxKp5IQK9chwYKqLvJ0KOXP0YHo2VMF6vpN43Ps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T3FToaKS+XIakXwzdpdgbIPhFVrpfNfa9k7mtJkoo81aW449mGuokiMUOEl16MBw9 gtyg4SlUTYYw3ugl3zwWjHVJCw4XGlYvhcujKMOqUWlTjtHRNGPLEU6va9+acPZ0Of s7E0l7SksEn3EthfIhjXw1YPREqfoGncUA1h3E5U= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6656A6089E Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=rplsssn@codeaurora.org From: Raju P L S S S N To: andy.gross@linaro.org, david.brown@linaro.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org Cc: rnayak@codeaurora.org, bjorn.andersson@linaro.org, linux-kernel@vger.kernel.org, sboyd@kernel.org, evgreen@chromium.org, dianders@chromium.org, mka@chromium.org, ilina@codeaurora.org, "Raju P.L.S.S.S.N" Subject: [PATCH v10 03/10] drivers: qcom: rpmh-rsc: log RPMH requests in FTRACE Date: Mon, 11 Jun 2018 22:55:42 +0530 Message-Id: <1528737949-17495-4-git-send-email-rplsssn@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1528737949-17495-1-git-send-email-rplsssn@codeaurora.org> References: <1528737949-17495-1-git-send-email-rplsssn@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lina Iyer Log sent RPMH requests and interrupt responses in FTRACE. Signed-off-by: Lina Iyer Signed-off-by: Raju P.L.S.S.S.N Reviewed-by: Steven Rostedt (VMware) --- Changes in v7: - varible name changes and white space Changes in v6: - struct tcs_response was removed. Fix in trace as well. Changes in v4: - fix compilation issues, use __assign_str - use %#x instead of 0x%08x Changes in v3: - Use __string() instead of char * - fix TRACE_INCLUDE_PATH --- drivers/soc/qcom/Makefile | 1 + drivers/soc/qcom/rpmh-rsc.c | 11 +++++- drivers/soc/qcom/trace-rpmh.h | 82 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 drivers/soc/qcom/trace-rpmh.h diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index 39d3a05..cb6300f 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 +CFLAGS_rpmh-rsc.o := -I$(src) obj-$(CONFIG_QCOM_GLINK_SSR) += glink_ssr.o obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o obj-$(CONFIG_QCOM_MDT_LOADER) += mdt_loader.o diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c index c5e0793..89d41cd 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c @@ -23,6 +23,9 @@ #include "rpmh-internal.h" +#define CREATE_TRACE_POINTS +#include "trace-rpmh.h" + #define RSC_DRV_TCS_OFFSET 672 #define RSC_DRV_CMD_OFFSET 20 @@ -135,7 +138,7 @@ static const struct tcs_request *get_req_from_tcs(struct rsc_drv *drv, static irqreturn_t tcs_tx_done(int irq, void *p) { struct rsc_drv *drv = p; - int i, j; + int i, j, err; unsigned long irq_status; const struct tcs_request *req; struct tcs_cmd *cmd; @@ -149,6 +152,7 @@ static irqreturn_t tcs_tx_done(int irq, void *p) goto skip; } + err = 0; for (j = 0; j < req->num_cmds; j++) { u32 sts; @@ -159,8 +163,11 @@ static irqreturn_t tcs_tx_done(int irq, void *p) !(sts & CMD_STATUS_COMPL))) { pr_err("Incomplete request: %s: addr=%#x data=%#x", drv->name, cmd->addr, cmd->data); + err = -EIO; } } + + trace_rpmh_tx_done(drv, i, req, err); skip: /* Reclaim the TCS */ write_tcs_reg(drv, RSC_DRV_CMD_ENABLE, i, 0); @@ -194,9 +201,11 @@ static void __tcs_buffer_write(struct rsc_drv *drv, int tcs_id, int cmd_id, cmd_complete |= cmd->wait << j; msgid = cmd_msgid; msgid |= cmd->wait ? CMD_MSGID_RESP_REQ : 0; + write_tcs_cmd(drv, RSC_DRV_CMD_MSGID, tcs_id, j, msgid); write_tcs_cmd(drv, RSC_DRV_CMD_ADDR, tcs_id, j, cmd->addr); write_tcs_cmd(drv, RSC_DRV_CMD_DATA, tcs_id, j, cmd->data); + trace_rpmh_send_msg(drv, tcs_id, j, msgid, cmd); } write_tcs_reg(drv, RSC_DRV_CMD_WAIT_FOR_CMPL, tcs_id, cmd_complete); diff --git a/drivers/soc/qcom/trace-rpmh.h b/drivers/soc/qcom/trace-rpmh.h new file mode 100644 index 0000000..feb0cb4 --- /dev/null +++ b/drivers/soc/qcom/trace-rpmh.h @@ -0,0 +1,82 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. + */ + +#if !defined(_TRACE_RPMH_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_RPMH_H + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM rpmh + +#include +#include "rpmh-internal.h" + +TRACE_EVENT(rpmh_tx_done, + + TP_PROTO(struct rsc_drv *d, int m, const struct tcs_request *r, int e), + + TP_ARGS(d, m, r, e), + + TP_STRUCT__entry( + __string(name, d->name) + __field(int, m) + __field(u32, addr) + __field(u32, data) + __field(int, err) + ), + + TP_fast_assign( + __assign_str(name, d->name); + __entry->m = m; + __entry->addr = r->cmds[0].addr; + __entry->data = r->cmds[0].data; + __entry->err = e; + ), + + TP_printk("%s: ack: tcs-m: %d addr: %#x data: %#x errno: %d", + __get_str(name), __entry->m, __entry->addr, __entry->data, + __entry->err) +); + +TRACE_EVENT(rpmh_send_msg, + + TP_PROTO(struct rsc_drv *d, int m, int n, u32 h, + const struct tcs_cmd *c), + + TP_ARGS(d, m, n, h, c), + + TP_STRUCT__entry( + __string(name, d->name) + __field(int, m) + __field(int, n) + __field(u32, hdr) + __field(u32, addr) + __field(u32, data) + __field(bool, wait) + ), + + TP_fast_assign( + __assign_str(name, d->name); + __entry->m = m; + __entry->n = n; + __entry->hdr = h; + __entry->addr = c->addr; + __entry->data = c->data; + __entry->wait = c->wait; + ), + + TP_printk("%s: send-msg: tcs(m): %d cmd(n): %d msgid: %#x addr: %#x data: %#x complete: %d", + __get_str(name), __entry->m, __entry->n, __entry->hdr, + __entry->addr, __entry->data, __entry->wait) +); + +#endif /* _TRACE_RPMH_H */ + +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH . + +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_FILE trace-rpmh + +#include -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project