From patchwork Mon Jun 27 12:16:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akash.goel@intel.com X-Patchwork-Id: 9200437 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 CA24B60752 for ; Mon, 27 Jun 2016 12:04:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA63E26212 for ; Mon, 27 Jun 2016 12:04:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE7D028587; Mon, 27 Jun 2016 12:04:54 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 4F42F26212 for ; Mon, 27 Jun 2016 12:04:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F6816E28B; Mon, 27 Jun 2016 12:04:52 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id DFBB16E215 for ; Mon, 27 Jun 2016 12:04:15 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP; 27 Jun 2016 05:03:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,536,1459839600"; d="scan'208";a="984026031" Received: from akashgoe-desktop.iind.intel.com ([10.223.82.36]) by orsmga001.jf.intel.com with ESMTP; 27 Jun 2016 05:03:53 -0700 From: akash.goel@intel.com To: intel-gfx@lists.freedesktop.org Date: Mon, 27 Jun 2016 17:46:55 +0530 Message-Id: <1467029818-3417-9-git-send-email-akash.goel@intel.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1467029818-3417-1-git-send-email-akash.goel@intel.com> References: <1467029818-3417-1-git-send-email-akash.goel@intel.com> Cc: Akash Goel Subject: [Intel-gfx] [PATCH 08/11] drm/i915: Debugfs support for GuC logging control X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Sagar Arun Kamble This patch provides debugfs interface i915_guc_output_control for on the fly enabling/disabling of logging in GuC firmware and controlling the verbosity level of logs. v2: Add a forceful flush, to collect left over logs, on disabling logging. Useful for Validation. Signed-off-by: Sagar Arun Kamble Signed-off-by: Akash Goel --- drivers/gpu/drm/i915/i915_debugfs.c | 35 +++++++++++++++++++- drivers/gpu/drm/i915/i915_guc_submission.c | 52 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 1 + 3 files changed, 87 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index f664884..3dd29af 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2629,6 +2629,38 @@ static int i915_guc_log_dump(struct seq_file *m, void *data) return 0; } +static int +i915_guc_log_control_set(void *data, u64 val) +{ + struct drm_device *dev = data; + struct drm_i915_private *dev_priv = dev->dev_private; + struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; + struct intel_guc *guc = &dev_priv->guc; + int ret; + + if (!HAS_GUC_UCODE(dev)) + return -EINVAL; + + if (!i915.enable_guc_submission) + return -EINVAL; + + if (guc_fw->guc_fw_load_status != GUC_FIRMWARE_SUCCESS) + return -EINVAL; + + if (!guc->log_obj || !guc->log_relay_chan) + return -EINVAL; + + intel_runtime_pm_get(dev_priv); + ret = i915_guc_log_control(dev, val); + intel_runtime_pm_put(dev_priv); + + return ret; +} + +DEFINE_SIMPLE_ATTRIBUTE(i915_guc_log_control_fops, + NULL, i915_guc_log_control_set, + "0x%08llx\n"); + static int i915_edp_psr_status(struct seq_file *m, void *data) { struct drm_info_node *node = m->private; @@ -5491,7 +5523,8 @@ static const struct i915_debugfs_files { {"i915_fbc_false_color", &i915_fbc_fc_fops}, {"i915_dp_test_data", &i915_displayport_test_data_fops}, {"i915_dp_test_type", &i915_displayport_test_type_fops}, - {"i915_dp_test_active", &i915_displayport_test_active_fops} + {"i915_dp_test_active", &i915_displayport_test_active_fops}, + {"i915_guc_log_control", &i915_guc_log_control_fops} }; void intel_display_crc_init(struct drm_device *dev) diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c index a32346a..fd26a9e 100644 --- a/drivers/gpu/drm/i915/i915_guc_submission.c +++ b/drivers/gpu/drm/i915/i915_guc_submission.c @@ -168,6 +168,16 @@ static int host2guc_sample_forcewake(struct intel_guc *guc, return host2guc_action(guc, data, ARRAY_SIZE(data)); } +static int host2guc_logging_control(struct intel_guc *guc, u32 control_val) +{ + u32 data[2]; + + data[0] = HOST2GUC_ACTION_UK_LOG_ENABLE_LOGGING; + data[1] = control_val; + + return host2guc_action(guc, data, 2); +} + static int host2guc_force_logbuffer_flush(struct intel_guc *guc) { u32 data[2]; @@ -1306,3 +1316,45 @@ void i915_guc_capture_logs_on_reset(struct drm_device *dev) /* GuC would have updated the log buffer by now, so capture it */ i915_guc_capture_logs(dev); } + +int i915_guc_log_control(struct drm_device *dev, uint64_t control_val) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + struct intel_guc *guc = &dev_priv->guc; + union guc_log_control log_param; + + log_param.logging_enabled = control_val & 0x1; + log_param.verbosity = (control_val >> 4) & 0xF; + + if (log_param.verbosity < GUC_LOG_VERBOSITY_MIN || + log_param.verbosity > GUC_LOG_VERBOSITY_MAX) + return -EINVAL; + + if (!host2guc_logging_control(guc, log_param.value)) { + /* If log_level was set as -1 at boot time, then interrupt would + * not have been enabled. Can keep the interrupt on even when + * logging is being disabled at runtime, as GuC itself won't + * generate an interrupt in that case. + */ + if (i915.guc_log_level < 0) + gen9_enable_guc_interrupts(dev_priv); + + /* Once logging is disabled, GuC won't generate logs & send an + * interrupt. But there could be some data in the log buffer + * which is yet to be captured. So request GuC to update the log + * buffer state and send the flush interrupt so that Host can + * collect the left over logs also. + */ + if (!log_param.logging_enabled) { + flush_work(&guc->events_work); + host2guc_force_logbuffer_flush(guc); + } + + i915.guc_log_level = log_param.verbosity; + } else { + DRM_ERROR("Failed\n"); + return -EINVAL; + } + + return 0; +} diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h index 1379df4..01a1bb5 100644 --- a/drivers/gpu/drm/i915/intel_guc.h +++ b/drivers/gpu/drm/i915/intel_guc.h @@ -171,5 +171,6 @@ void i915_guc_submission_disable(struct drm_i915_private *dev_priv); void i915_guc_submission_fini(struct drm_i915_private *dev_priv); void i915_guc_capture_logs(struct drm_device *dev); void i915_guc_capture_logs_on_reset(struct drm_device *dev); +int i915_guc_log_control(struct drm_device *dev, uint64_t control_val); #endif