From patchwork Thu Jul 30 09:53:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 11692685 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4452F913 for ; Thu, 30 Jul 2020 09:54:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 269682082E for ; Thu, 30 Jul 2020 09:54:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="a6IA+Hkt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729191AbgG3Jyc (ORCPT ); Thu, 30 Jul 2020 05:54:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726832AbgG3Jyb (ORCPT ); Thu, 30 Jul 2020 05:54:31 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB3A6C061794 for ; Thu, 30 Jul 2020 02:54:30 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id g8so5160018wmk.3 for ; Thu, 30 Jul 2020 02:54:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yCtoTmQBVaA8gm6t22/gL7cKLjCk2p79iKqAR6+EKu4=; b=a6IA+HktRFMnS647jLsgICsCzXuX5wzRyWIUj+jWA9npia1VbLV/V41MGtbXsfLfdt SjIz2R1GBGuPBojbfEQ2u0ZtmNBxo4Lm8YVU5/4JewLngMqfHQojf/65WZriYt93qQkC Mf9Q3OZS0H2N1lat19Rhno6hQQTxs5RBYAGxXbRezj4phfD/f4C8OmPyzei/kJEd/qcI CfMNAkeSuyjnBRL5TxpVq7A1g/2T1E2ap2w5RCCB1Tvp0Xg9aGhvI+cgkVsKfFgekka1 1gG6SnVMsI1XChee4WJ6smY8aQr13H78sxSiELGnKo+4RGG+qt6OO40878oGeI+EFElE gc7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yCtoTmQBVaA8gm6t22/gL7cKLjCk2p79iKqAR6+EKu4=; b=C2Li6a3j+WTBgyywfhIjOcFf946CVF65qkN14rJUJXxyxlKs+1y8MroqtV2jKHh4zf O70zdr7efxGhPtP5R5X6iYUQwijfmB4QldAbdv89Qs5Yx57UBRa6U0ns2Kv9xMuUmagr FaOL0vs3j7VYPzEsu5HYYyr5HOpyYvejs6RkZzK1y+m5WoHNQI4hVZjEb2fBYu19J7Nv h1GYKm7ocI1J/WOPk3KC0eypSz3dISLsnrgKvmDQtLZS3hZqY0hA+LBi7s38aEVwhumb 8fribpXlEhzuZqaPfpHcfqZSjXvpieoho2aKZ+kQnjQVgJnRH2FoYYEjtWmN6A+6Mxvb a69g== X-Gm-Message-State: AOAM530P80D0HeViZ/aaZGPOHkLwZq5MYMToVkQTP8EdvReo7gpA940q z3yFkp313ce7rmMu8BB86bRv5A== X-Google-Smtp-Source: ABdhPJxPeQEXMSvrDKRSsrWWPXxj78OyJ7LLv2CDGWEdI/MzoRcAd4rUzFrUjXciE+3y+aqqUgCpTg== X-Received: by 2002:a1c:28c4:: with SMTP id o187mr12029262wmo.62.1596102869374; Thu, 30 Jul 2020 02:54:29 -0700 (PDT) Received: from localhost.localdomain ([195.24.90.54]) by smtp.gmail.com with ESMTPSA id u1sm10623139wrb.78.2020.07.30.02.54.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2020 02:54:28 -0700 (PDT) From: Stanimir Varbanov To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: jim.cromie@gmail.com, Joe Perches , Jason Baron , Greg Kroah-Hartman , Stanimir Varbanov Subject: [PATCH v5 1/3] venus: Add debugfs interface to set firmware log level Date: Thu, 30 Jul 2020 12:53:48 +0300 Message-Id: <20200730095350.13925-2-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200730095350.13925-1-stanimir.varbanov@linaro.org> References: <20200730095350.13925-1-stanimir.varbanov@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This will be useful when debugging specific issues related to firmware HFI interface. Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/Makefile | 2 +- drivers/media/platform/qcom/venus/core.c | 3 +++ drivers/media/platform/qcom/venus/core.h | 3 +++ drivers/media/platform/qcom/venus/dbgfs.c | 21 +++++++++++++++++++ drivers/media/platform/qcom/venus/dbgfs.h | 12 +++++++++++ drivers/media/platform/qcom/venus/hfi_venus.c | 6 +++++- 6 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 drivers/media/platform/qcom/venus/dbgfs.c create mode 100644 drivers/media/platform/qcom/venus/dbgfs.h diff --git a/drivers/media/platform/qcom/venus/Makefile b/drivers/media/platform/qcom/venus/Makefile index 64af0bc1edae..dfc636865709 100644 --- a/drivers/media/platform/qcom/venus/Makefile +++ b/drivers/media/platform/qcom/venus/Makefile @@ -3,7 +3,7 @@ venus-core-objs += core.o helpers.o firmware.o \ hfi_venus.o hfi_msgs.o hfi_cmds.o hfi.o \ - hfi_parser.o pm_helpers.o + hfi_parser.o pm_helpers.o dbgfs.o venus-dec-objs += vdec.o vdec_ctrls.o venus-enc-objs += venc.o venc_ctrls.o diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 203c6538044f..249141e27fea 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -290,6 +290,8 @@ static int venus_probe(struct platform_device *pdev) if (ret) goto err_dev_unregister; + venus_dbgfs_init(core); + return 0; err_dev_unregister: @@ -337,6 +339,7 @@ static int venus_remove(struct platform_device *pdev) v4l2_device_unregister(&core->v4l2_dev); mutex_destroy(&core->pm_lock); mutex_destroy(&core->lock); + venus_dbgfs_deinit(core); return ret; } diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index 7118612673c9..b48782f9aa95 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -12,6 +12,7 @@ #include #include +#include "dbgfs.h" #include "hfi.h" #define VIDC_CLKS_NUM_MAX 4 @@ -136,6 +137,7 @@ struct venus_caps { * @priv: a private filed for HFI operations * @ops: the core HFI operations * @work: a delayed work for handling system fatal error + * @root: debugfs root directory */ struct venus_core { void __iomem *base; @@ -185,6 +187,7 @@ struct venus_core { unsigned int codecs_count; unsigned int core0_usage_count; unsigned int core1_usage_count; + struct dentry *root; }; struct vdec_controls { diff --git a/drivers/media/platform/qcom/venus/dbgfs.c b/drivers/media/platform/qcom/venus/dbgfs.c new file mode 100644 index 000000000000..782d54ac1b8f --- /dev/null +++ b/drivers/media/platform/qcom/venus/dbgfs.c @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2020 Linaro Ltd. + */ + +#include + +#include "core.h" + +extern int venus_fw_debug; + +void venus_dbgfs_init(struct venus_core *core) +{ + core->root = debugfs_create_dir("venus", NULL); + debugfs_create_x32("fw_level", 0644, core->root, &venus_fw_debug); +} + +void venus_dbgfs_deinit(struct venus_core *core) +{ + debugfs_remove_recursive(core->root); +} diff --git a/drivers/media/platform/qcom/venus/dbgfs.h b/drivers/media/platform/qcom/venus/dbgfs.h new file mode 100644 index 000000000000..b7b621a8472f --- /dev/null +++ b/drivers/media/platform/qcom/venus/dbgfs.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2020 Linaro Ltd. */ + +#ifndef __VENUS_DBGFS_H__ +#define __VENUS_DBGFS_H__ + +struct venus_core; + +void venus_dbgfs_init(struct venus_core *core); +void venus_dbgfs_deinit(struct venus_core *core); + +#endif diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c index 0d8855014ab3..450c4800c12e 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus.c +++ b/drivers/media/platform/qcom/venus/hfi_venus.c @@ -130,7 +130,7 @@ struct venus_hfi_device { }; static bool venus_pkt_debug; -static int venus_fw_debug = HFI_DEBUG_MSG_ERROR | HFI_DEBUG_MSG_FATAL; +int venus_fw_debug = HFI_DEBUG_MSG_ERROR | HFI_DEBUG_MSG_FATAL; static bool venus_sys_idle_indicator; static bool venus_fw_low_power_mode = true; static int venus_hw_rsp_timeout = 1000; @@ -1133,6 +1133,10 @@ static int venus_session_init(struct venus_inst *inst, u32 session_type, struct hfi_session_init_pkt pkt; int ret; + ret = venus_sys_set_debug(hdev, venus_fw_debug); + if (ret) + goto err; + ret = pkt_session_init(&pkt, inst, session_type, codec); if (ret) goto err;