From: "Belgaumkar, Vinay" <vinay.belgaumkar@intel.com>
To: Michal Wajdeczko <michal.wajdeczko@intel.com>,
<intel-gfx@lists.freedesktop.org>,
<dri-devel@lists.freedesktop.org>
Subject: Re: [Intel-gfx] [PATCH 06/14] drm/i915/guc/slpc: Enable SLPC and add related H2G events
Date: Fri, 23 Jul 2021 12:28:23 -0700 [thread overview]
Message-ID: <86aa07c9-92bb-4239-a3ae-77f035ac001d@intel.com> (raw)
In-Reply-To: <4f6bbfd1-42a3-a1b6-ca13-f9022bc39fab@intel.com>
On 7/21/2021 10:38 AM, Michal Wajdeczko wrote:
>
>
> On 21.07.2021 18:11, Vinay Belgaumkar wrote:
>> Add methods for interacting with GuC for enabling SLPC. Enable
>> SLPC after GuC submission has been established. GuC load will
>> fail if SLPC cannot be successfully initialized. Add various
>> helper methods to set/unset the parameters for SLPC. They can
>> be set using H2G calls or directly setting bits in the shared
>> data structure.
>>
>> This patch also removes the GEM_BUG_ON from guc_submission_disable().
>> The assumption when that was added was there would be no wakerefs
>> when it would be called. However, if we fail to enable slpc, we will
>
> s/slpc/SLPC
done.
>
>> still be holding a wakeref.
>>
>> v2: Address several review comments, add new helpers for
>> decoding the slpc min/max frequencies. Use masks instead of hardcoded
>> constants. (Michal W)
>>
>> Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
>> Signed-off-by: Sundaresan Sujaritha <sujaritha.sundaresan@intel.com>
>> ---
>> drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 206 ++++++++++++++++++
>> .../gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 2 +
>> .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 -
>> drivers/gpu/drm/i915/gt/uc/intel_uc.c | 10 +
>> 4 files changed, 218 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
>> index a99d727b5bf0..48db2a8f67d1 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
>> @@ -45,6 +45,40 @@ void intel_guc_slpc_init_early(struct intel_guc_slpc *slpc)
>> guc->slpc_selected = __guc_slpc_selected(guc);
>> }
>>
>> +static void slpc_mem_set_param(struct slpc_shared_data *data,
>> + u32 id, u32 value)
>> +{
>> + GEM_BUG_ON(id >= SLPC_MAX_OVERRIDE_PARAMETERS);
>> + /*
>> + * When the flag bit is set, corresponding value will be read
>> + * and applied by slpc.
>> + */
>> + data->override_params.bits[id >> 5] |= (1 << (id % 32));
>> + data->override_params.values[id] = value;
>> +}
>> +
>> +static void slpc_mem_set_enabled(struct slpc_shared_data *data,
>> + u8 enable_id, u8 disable_id)
>> +{
>> + /*
>> + * Enabling a param involves setting the enable_id
>> + * to 1 and disable_id to 0.
>> + */
>> + slpc_mem_set_param(data, enable_id, 1);
>> + slpc_mem_set_param(data, disable_id, 0);
>> +}
>> +
>> +static void slpc_mem_set_disabled(struct slpc_shared_data *data,
>> + u8 enable_id, u8 disable_id)
>> +{
>> + /*
>> + * Disabling a param involves setting the enable_id
>> + * to 0 and disable_id to 1.
>> + */
>> + slpc_mem_set_param(data, disable_id, 1);
>> + slpc_mem_set_param(data, enable_id, 0);
>> +}
>> +
>> static int slpc_shared_data_init(struct intel_guc_slpc *slpc)
>> {
>> struct intel_guc *guc = slpc_to_guc(slpc);
>> @@ -63,6 +97,116 @@ static int slpc_shared_data_init(struct intel_guc_slpc *slpc)
>> return err;
>> }
>>
>> +static u32 slpc_get_state(struct intel_guc_slpc *slpc)
>> +{
>> + struct slpc_shared_data *data;
>> +
>> + GEM_BUG_ON(!slpc->vma);
>> +
>> + drm_clflush_virt_range(slpc->vaddr, sizeof(u32));
>> + data = slpc->vaddr;
>> +
>> + return data->header.global_state;
>> +}
>> +
>> +static bool slpc_is_running(struct intel_guc_slpc *slpc)
>> +{
>> + return (slpc_get_state(slpc) == SLPC_GLOBAL_STATE_RUNNING);
>> +}
>> +
>> +static int guc_action_slpc_query(struct intel_guc *guc, u32 offset)
>> +{
>> + u32 request[] = {
>> + INTEL_GUC_ACTION_SLPC_REQUEST,
>> + SLPC_EVENT(SLPC_EVENT_QUERY_TASK_STATE, 2),
>> + offset,
>> + 0,
>> + };
>> +
>> + return intel_guc_send(guc, request, ARRAY_SIZE(request));
>> +}
>> +
>> +static int slpc_query_task_state(struct intel_guc_slpc *slpc)
>> +{
>> + struct intel_guc *guc = slpc_to_guc(slpc);
>> + struct drm_i915_private *i915 = slpc_to_i915(slpc);
>> + u32 shared_data_gtt_offset = intel_guc_ggtt_offset(guc, slpc->vma);
>> + int ret;
>> +
>> + ret = guc_action_slpc_query(guc, shared_data_gtt_offset);
>> + if (ret)
>> + drm_err(&i915->drm, "Query task state data returned (%pe)\n",
>> + ERR_PTR(ret));
>> +
>> + drm_clflush_virt_range(slpc->vaddr, SLPC_PAGE_SIZE_BYTES);
>> +
>> + return ret;
>> +}
>> +
>> +static const char *slpc_state_string(struct intel_guc_slpc *slpc)
>> +{
>> + const char *str = NULL;
>> + u32 state = slpc_get_state(slpc);
>> +
>> + switch (state) {
>> + case SLPC_GLOBAL_STATE_NOT_RUNNING:
>> + str = "not running";
>> + break;
>> + case SLPC_GLOBAL_STATE_INITIALIZING:
>> + str = "initializing";
>> + break;
>> + case SLPC_GLOBAL_STATE_RESETTING:
>> + str = "resetting";
>> + break;
>> + case SLPC_GLOBAL_STATE_RUNNING:
>> + str = "running";
>> + break;
>> + case SLPC_GLOBAL_STATE_SHUTTING_DOWN:
>> + str = "shutting down";
>> + break;
>> + case SLPC_GLOBAL_STATE_ERROR:
>> + str = "error";
>> + break;
>> + default:
>> + str = "unknown";
>> + break;
>> + }
>
> nit: you can split as:
>
> static const char *
> slpc_global_state_to_string(enum slpc_global_state state)
> {
> switch (state) {
> case SLPC_GLOBAL_STATE_NOT_RUNNING:
> return "not running";
> case SLPC_GLOBAL_STATE_INITIALIZING:
> return "initializing";
> ...
>
> and
>
> static const char *slpc_get_state_string(struct intel_guc_slpc *slpc)
> {
> return slpc_global_state_to_string(slpc_get_state(slpc));
> }
Ok, done.
>
>
>> +
>> + return str;
>> +}
>> +
>> +static int guc_action_slpc_reset(struct intel_guc *guc, u32 offset)
>> +{
>> + u32 request[] = {
>> + INTEL_GUC_ACTION_SLPC_REQUEST,
>> + SLPC_EVENT(SLPC_EVENT_RESET, 2),
>> + offset,
>> + 0,
>> + };
>> +
>> + return intel_guc_send(guc, request, ARRAY_SIZE(request));
>
> don't know details of H2G request/response message (btw, maybe you can
> include something in ABI.h) but be aware that guc_send() might return
> non-zero DATA0 so if you don't expect it, return -EPROTO
>
>> +}
>> +
>> +static int slpc_reset(struct intel_guc_slpc *slpc)
>> +{
>> + struct drm_i915_private *i915 = slpc_to_i915(slpc);
>> + struct intel_guc *guc = slpc_to_guc(slpc);
>> + u32 shared_data_gtt_offset = intel_guc_ggtt_offset(guc, slpc->vma);
>
> just "offset" ?
yup.
>
>> + int ret;
>> +
>> + ret = guc_action_slpc_reset(guc, shared_data_gtt_offset);
>> +
>> + if (!ret) {
>
> if (unlikely(ret < 0))
> return ret;
>
>> + if (wait_for(slpc_is_running(slpc), SLPC_RESET_TIMEOUT_MS)) {
>> + drm_err(&i915->drm, "SLPC not enabled! State = %s\n",
>> + slpc_state_string(slpc));
>> + return -EIO;
>> + }
>> + }
>> +
>> + return ret;
>> +}
>> +
>> int intel_guc_slpc_init(struct intel_guc_slpc *slpc)
>> {
>> GEM_BUG_ON(slpc->vma);
>> @@ -70,6 +214,30 @@ int intel_guc_slpc_init(struct intel_guc_slpc *slpc)
>> return slpc_shared_data_init(slpc);
>> }
>>
>> +u32 slpc_decode_min_freq(struct intel_guc_slpc *slpc)
>> +{
>> + struct slpc_shared_data *data = slpc->vaddr;
>> +
>> + GEM_BUG_ON(!slpc->vma);
>> +
>> + return DIV_ROUND_CLOSEST(
>> + REG_FIELD_GET(SLPC_MIN_UNSLICE_FREQ_MASK,
>> + data->task_state_data.freq) *
>> + GT_FREQUENCY_MULTIPLIER, GEN9_FREQ_SCALER);
>> +}
>> +
>> +u32 slpc_decode_max_freq(struct intel_guc_slpc *slpc)
>> +{
>> + struct slpc_shared_data *data = slpc->vaddr;
>> +
>> + GEM_BUG_ON(!slpc->vma);
>> +
>> + return DIV_ROUND_CLOSEST(
>> + REG_FIELD_GET(SLPC_MAX_UNSLICE_FREQ_MASK,
>> + data->task_state_data.freq) *
>> + GT_FREQUENCY_MULTIPLIER, GEN9_FREQ_SCALER);
>> +}
>> +
>> /*
>> * intel_guc_slpc_enable() - Start SLPC
>> * @slpc: pointer to intel_guc_slpc.
>> @@ -85,6 +253,44 @@ int intel_guc_slpc_init(struct intel_guc_slpc *slpc)
>> */
>> int intel_guc_slpc_enable(struct intel_guc_slpc *slpc)
>> {
>> + struct drm_i915_private *i915 = slpc_to_i915(slpc);
>> + struct slpc_shared_data *data;
>> + int ret;
>> +
>> + GEM_BUG_ON(!slpc->vma);
>> +
>> + memset(slpc->vaddr, 0, sizeof(struct slpc_shared_data));
>> +
>> + data = slpc->vaddr;
>> + data->header.size = sizeof(struct slpc_shared_data);
>> +
>> + /* Enable only GTPERF task, disable others */
>> + slpc_mem_set_enabled(data, SLPC_PARAM_TASK_ENABLE_GTPERF,
>> + SLPC_PARAM_TASK_DISABLE_GTPERF);
>> +
>> + slpc_mem_set_disabled(data, SLPC_PARAM_TASK_ENABLE_BALANCER,
>> + SLPC_PARAM_TASK_DISABLE_BALANCER);
>> +
>> + slpc_mem_set_disabled(data, SLPC_PARAM_TASK_ENABLE_DCC,
>> + SLPC_PARAM_TASK_DISABLE_DCC);
>> +
>> + ret = slpc_reset(slpc);
>> + if (ret) {
>
> if (unlikely(ret < 0)) ?
ok.
>
>> + drm_err(&i915->drm, "SLPC Reset event returned (%pe)\n",
>> + ERR_PTR(ret));
>> + return ret;
>> + }
>> +
>> + drm_info(&i915->drm, "SLPC state: %s\n", slpc_state_string(slpc));
>
> do we expect here something else than "running" ?
No, changed this to enabled instead, fixes the ordering below as well.
>
>> +
>> + slpc_query_task_state(slpc);
>> +
>> + /* min and max frequency limits being used by SLPC */
>> + drm_info(&i915->drm, "SLPC min freq: %u Mhz, max is %u Mhz\n",
>> + slpc_decode_min_freq(slpc),
>> + slpc_decode_max_freq(slpc));
>> +
>> +
>> return 0;
>> }
>>
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h
>> index 214a449e78f2..c417992b1346 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h
>> @@ -9,6 +9,8 @@
>> #include <linux/types.h>
>> #include "abi/guc_actions_slpc_abi.h"
>>
>> +#define SLPC_RESET_TIMEOUT_MS 5
>> +
>> struct intel_guc_slpc {
>>
>> struct i915_vma *vma;
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
>> index 9083bd4adb22..142e44dc5bf1 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
>> @@ -2506,10 +2506,6 @@ void intel_guc_submission_enable(struct intel_guc *guc)
>>
>> void intel_guc_submission_disable(struct intel_guc *guc)
>> {
>> - struct intel_gt *gt = guc_to_gt(guc);
>> -
>> - GEM_BUG_ON(gt->awake); /* GT should be parked first */
>> -> /* Note: By the time we're here, GuC may have already been reset */
>> }
>>
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
>> index e6bd9406c7b2..3f2aa83c5c45 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
>> @@ -506,6 +506,14 @@ static int __uc_init_hw(struct intel_uc *uc)
>> "submission",
>> enableddisabled(intel_uc_uses_guc_submission(uc)));
>>
>> + if (intel_uc_uses_guc_slpc(uc)) {
>> + ret = intel_guc_slpc_enable(&guc->slpc);
>> + if (ret)
>> + goto err_submission;
>> + drm_info(&i915->drm, "GuC SLPC %s\n",
>> + enableddisabled(intel_uc_uses_guc_slpc(uc)));
>
> there will be (in this order):
>
> "GuC submission enabled\n"
> "SLPC state: running\n"
> "SLPC min freq: %u Mhz, max is %u Mhz\n"
> "GuC SLPC enabled\n"
>
> is this what you wanted ?
Fixed now.
Thanks,
Vinay.
>
> Michal
>
>> + }
>> +
>> if (intel_uc_uses_huc(uc)) {
>> drm_info(&i915->drm, "%s firmware %s version %u.%u %s:%s\n",
>> intel_uc_fw_type_repr(INTEL_UC_FW_TYPE_HUC),
>> @@ -520,6 +528,8 @@ static int __uc_init_hw(struct intel_uc *uc)
>> /*
>> * We've failed to load the firmware :(
>> */
>> +err_submission:
>> + intel_guc_submission_disable(guc);
>> err_log_capture:
>> __uc_capture_load_err_log(uc);
>> err_out:
>>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-07-23 19:28 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 16:11 [Intel-gfx] [PATCH v2 00/14] drm/i915/guc: Enable GuC based power management features Vinay Belgaumkar
2021-07-21 16:11 ` [Intel-gfx] [PATCH 01/14] drm/i915/guc: SQUASHED PATCH - DO NOT REVIEW Vinay Belgaumkar
2021-07-21 16:11 ` [Intel-gfx] [PATCH 02/14] drm/i915/guc/slpc: Initial definitions for SLPC Vinay Belgaumkar
2021-07-21 17:24 ` Michal Wajdeczko
2021-07-22 0:56 ` Belgaumkar, Vinay
2021-07-21 16:11 ` [Intel-gfx] [PATCH 03/14] drm/i915/guc/slpc: Gate Host RPS when SLPC is enabled Vinay Belgaumkar
2021-07-21 16:11 ` [Intel-gfx] [PATCH 04/14] drm/i915/guc/slpc: Adding SLPC communication interfaces Vinay Belgaumkar
2021-07-21 17:25 ` Michal Wajdeczko
2021-07-23 19:26 ` Belgaumkar, Vinay
2021-07-21 16:11 ` [Intel-gfx] [PATCH 05/14] drm/i915/guc/slpc: Allocate, initialize and release SLPC Vinay Belgaumkar
2021-07-21 17:26 ` Michal Wajdeczko
2021-07-23 19:30 ` Belgaumkar, Vinay
2021-07-21 16:11 ` [Intel-gfx] [PATCH 06/14] drm/i915/guc/slpc: Enable SLPC and add related H2G events Vinay Belgaumkar
2021-07-21 17:38 ` Michal Wajdeczko
2021-07-23 19:28 ` Belgaumkar, Vinay [this message]
2021-07-21 23:44 ` kernel test robot
2021-07-22 2:36 ` kernel test robot
2021-07-22 18:07 ` kernel test robot
2021-07-22 18:07 ` [Intel-gfx] [RFC PATCH] drm/i915/guc/slpc: slpc_decode_min_freq() can be static kernel test robot
2021-07-23 13:04 ` [Intel-gfx] [PATCH 06/14] drm/i915/guc/slpc: Enable SLPC and add related H2G events kernel test robot
2021-07-24 16:30 ` kernel test robot
2021-07-21 16:11 ` [Intel-gfx] [PATCH 07/14] drm/i915/guc/slpc: Add methods to set min/max frequency Vinay Belgaumkar
2021-07-21 17:42 ` Michal Wajdeczko
2021-07-23 19:35 ` Belgaumkar, Vinay
2021-07-21 16:11 ` [Intel-gfx] [PATCH 08/14] drm/i915/guc/slpc: Add get max/min freq hooks Vinay Belgaumkar
2021-07-21 18:00 ` Michal Wajdeczko
2021-07-23 19:43 ` Belgaumkar, Vinay
2021-07-21 16:11 ` [Intel-gfx] [PATCH 09/14] drm/i915/guc/slpc: Add debugfs for SLPC info Vinay Belgaumkar
2021-07-21 18:05 ` Michal Wajdeczko
2021-07-23 19:49 ` Belgaumkar, Vinay
2021-07-22 1:29 ` kernel test robot
2021-07-24 0:31 ` kernel test robot
2021-07-24 0:31 ` [Intel-gfx] [RFC PATCH] drm/i915/guc/slpc: intel_eval_slpc_support() can be static kernel test robot
2021-07-25 2:57 ` [Intel-gfx] [PATCH 09/14] drm/i915/guc/slpc: Add debugfs for SLPC info kernel test robot
2021-07-21 16:11 ` [Intel-gfx] [PATCH 10/14] drm/i915/guc/slpc: Enable ARAT timer interrupt Vinay Belgaumkar
2021-07-21 16:11 ` [Intel-gfx] [PATCH 11/14] drm/i915/guc/slpc: Cache platform frequency limits Vinay Belgaumkar
2021-07-21 18:09 ` Michal Wajdeczko
2021-07-23 22:25 ` Belgaumkar, Vinay
2021-07-21 16:11 ` [Intel-gfx] [PATCH 12/14] drm/i915/guc/slpc: Sysfs hooks for SLPC Vinay Belgaumkar
2021-07-21 18:13 ` Michal Wajdeczko
2021-07-23 22:28 ` Belgaumkar, Vinay
2021-07-21 16:11 ` [Intel-gfx] [PATCH 13/14] drm/i915/guc/slpc: Add SLPC selftest Vinay Belgaumkar
2021-07-21 16:11 ` [Intel-gfx] [PATCH 14/14] drm/i915/guc/rc: Setup and enable GUCRC feature Vinay Belgaumkar
2021-07-21 18:21 ` Michal Wajdeczko
2021-07-23 22:29 ` Belgaumkar, Vinay
2021-07-21 20:12 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/guc: Enable GuC based power management features Patchwork
2021-07-21 20:14 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-07-21 20:42 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-07-22 1:37 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86aa07c9-92bb-4239-a3ae-77f035ac001d@intel.com \
--to=vinay.belgaumkar@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=michal.wajdeczko@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).