Add support for querying hw info that UMDs need
Subsystems (3)
cover Add support for querying hw info that UMDs need
From: John Harrison <[email protected]>
Various UMDs require hardware configuration information about the current platform. A bunch of static information is available in a fixed table that can be retrieved from the GuC.
Test-with: [email protected]
UMD: https://github.com/intel/compute-runtime/pull/432/files
John Harrison (1):
drm/i915/guc: Add fetch of hwconfig table
Rodrigo Vivi (1):
drm/i915/uapi: Add query for hwconfig table
drivers/gpu/drm/i915/Makefile | 1 + .../gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 1 + .../gpu/drm/i915/gt/uc/abi/guc_errors_abi.h | 4 + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 3 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 + .../gpu/drm/i915/gt/uc/intel_guc_hwconfig.c | 156 ++++++++++++++++++ .../gpu/drm/i915/gt/uc/intel_guc_hwconfig.h | 19 +++ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 6 + drivers/gpu/drm/i915/i915_query.c | 23 +++ include/uapi/drm/i915_drm.h | 1 + 10 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.h
Signature · 1 line
2.25.1
PATCH 1/2 drm/i915/guc: Add fetch of hwconfig table
From: John Harrison <[email protected]>
Implement support for fetching the hardware description table from the GuC. The call is made twice - once without a destination buffer to query the size and then a second time to fill in the buffer.
Note that the table is only available on ADL-P and later platforms.
--- drivers/gpu/drm/i915/Makefile | 1 + .../gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 1 + .../gpu/drm/i915/gt/uc/abi/guc_errors_abi.h | 4 + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 3 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 + .../gpu/drm/i915/gt/uc/intel_guc_hwconfig.c | 156 ++++++++++++++++++ .../gpu/drm/i915/gt/uc/intel_guc_hwconfig.h | 19 +++ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 6 + 8 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -189,6 +189,7 @@ i915-y += gt/uc/intel_uc.o \ gt/uc/intel_guc_log.o \ gt/uc/intel_guc_log_debugfs.o \ gt/uc/intel_guc_submission.o \ + gt/uc/intel_guc_hwconfig.o \ gt/uc/intel_huc.o \ gt/uc/intel_huc_debugfs.o \ gt/uc/intel_huc_fw.o
drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h +1 -0
@@ -126,6 +126,7 @@ enum intel_guc_action {INTEL_GUC_ACTION_EXIT_S_STATE =0x502 ,INTEL_GUC_ACTION_SLPC_REQUEST =0x3003 ,INTEL_GUC_ACTION_AUTHENTICATE_HUC =0x4000 , +INTEL_GUC_ACTION_GET_HWCONFIG =0x4100 ,INTEL_GUC_ACTION_REGISTER_COMMAND_TRANSPORT_BUFFER =0x4505 ,INTEL_GUC_ACTION_DEREGISTER_COMMAND_TRANSPORT_BUFFER =0x4506 ,INTEL_GUC_ACTION_LIMIT
drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h +4 -0
@@ -8,6 +8,10 @@enum intel_guc_response_status {INTEL_GUC_RESPONSE_STATUS_SUCCESS =0x0 , +INTEL_GUC_RESPONSE_NOT_SUPPORTED =0x20 , +INTEL_GUC_RESPONSE_NO_ATTRIBUTE_TABLE =0x201 , +INTEL_GUC_RESPONSE_NO_DECRYPTION_KEY =0x202 , +INTEL_GUC_RESPONSE_DECRYPTION_FAILED =0x204 ,INTEL_GUC_RESPONSE_STATUS_GENERIC_FAIL =0xF000 , };
drivers/gpu/drm/i915/gt/uc/intel_guc.c +2 -1
@@ -400,13 +400,14 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *request, u32 len,/* * No GuC command should ever take longer than 10ms. * Fast commands should still complete in 10us. +* Except for the hwconfig table query, which takes ~50ms. */ ret =__intel_wait_for_register_fw (uncore,guc_send_reg (guc,0 ),GUC_HXG_MSG_0_ORIGIN ,FIELD_PREP (GUC_HXG_MSG_0_ORIGIN ,GUC_HXG_ORIGIN_GUC ), -10 ,10 , &header); +10 ,100 , &header);if (unlikely (ret)) { timeout: drm_err(&i915->drm, "mmio request %#x: no reply %x\n",
drivers/gpu/drm/i915/gt/uc/intel_guc.h +2 -0
@@ -12,6 +12,7 @@#include "intel_guc_ct.h" #include "intel_guc_log.h" #include "intel_guc_reg.h" +#include "intel_guc_hwconfig.h" #include "intel_uc_fw.h" #include "i915_utils.h" #include "i915_vma.h"
@@ -27,6 +28,7 @@ struct intel_guc {struct intel_uc_fw fw;struct intel_guc_log log;struct intel_guc_ct ct; +struct intel_guc_hwconfig hwconfig;/* intel_guc_recv interrupt related state */ spinlock_t irq_lock;
drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c new file +156 -0
156 lines not on this page · raw message
drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.h new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2021 Intel Corporation +*/ + +#ifndef _INTEL_GUC_HWCONFIG_H_ +#define _INTEL_GUC_HWCONFIG_H_ + +#include <linux/types.h> + +struct intel_guc_hwconfig { +u32 size; +void *ptr; +}; + +int intel_guc_hwconfig_init (struct intel_guc_hwconfig *hwconfig); +void intel_guc_hwconfig_fini (struct intel_guc_hwconfig *hwconfig); + +#endif /* _INTEL_GUC_HWCONFIG_H_ */
drivers/gpu/drm/i915/gt/uc/intel_uc.c +6 -0
@@ -496,6 +496,10 @@ static int __uc_init_hw(struct intel_uc *uc)if (ret) goto err_log_capture; + ret =intel_guc_hwconfig_init (&guc->hwconfig); +if (ret) +drm_err (&i915->drm,"Failed to retrieve hwconfig table: %d\n" , ret); + ret =guc_enable_communication (guc);if (ret) goto err_log_capture;
@@ -552,6 +556,8 @@ static void __uc_fini_hw(struct intel_uc *uc)if (intel_uc_uses_guc_submission (uc))intel_guc_submission_disable (guc); +intel_guc_hwconfig_fini (&guc->hwconfig); +__uc_sanitize (uc); }
Signature · 6 lines
2.25.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/uapi: Add query for hwconfig table
In reply to [email protected]From: Rodrigo Vivi <[email protected]>
GuC contains a consolidated table with a bunch of information about the current device.
Previously, this information was spread and hardcoded to all the components including GuC, i915 and various UMDs. The goal here is to consolidate the data into GuC in a way that all interested components can grab the very latest and synchronized information using a simple query.
As per most of the other queries, this one can be called twice. Once with item.length=0 to determine the exact buffer size, then allocate the user memory and call it again for to retrieve the table data. For example:
struct drm_i915_query_item item = {
.query_id = DRM_I915_QUERY_HWCONCFIG_TABLE; };
query.items_ptr = (int64_t) &item;
query.num_items = 1;
ioctl(fd, DRM_IOCTL_I915_QUERY, query, sizeof(query));
if (item.length <= 0)
return -ENOENT;
data = malloc(item.length); item.data_ptr = (int64_t) &data; ioctl(fd, DRM_IOCTL_I915_QUERY, query, sizeof(query));
// Parse the data as appropriate...
The returned array is a simple and flexible KLV (Key/Length/Value) formatted table. For example, it could be just:
enum device_attr {
ATTR_SOME_VALUE = 0,
ATTR_SOME_MASK = 1,
};
static const u32 hwconfig[] = {
ATTR_SOME_VALUE,
1, // Value Length in DWords
8, // Value ATTR_SOME_MASK,
3,
0x00FFFFFFFF, 0xFFFFFFFF, 0xFF000000,};
The attribute ids are defined in a hardware spec.
--- drivers/gpu/drm/i915/i915_query.c | 23 +++++++++++++++++++++++ include/uapi/drm/i915_drm.h | 1 + 2 files changed, 24 insertions(+)
drivers/gpu/drm/i915/i915_query.c +23 -0
@@ -480,12 +480,35 @@ static int query_memregion_info(struct drm_i915_private *i915,return total_length; } +static int query_hwconfig_table (struct drm_i915_private *i915, +struct drm_i915_query_item *query_item) +{ +struct intel_gt *gt = &i915->gt; +struct intel_guc_hwconfig *hwconfig = >->uc.guc.hwconfig; + +if (!hwconfig->size || !hwconfig->ptr) +return -ENODEV ; + +if (query_item->length ==0 ) +return hwconfig->size; + +if (query_item->length < hwconfig->size) +return -EINVAL ; + +if (copy_to_user (u64_to_user_ptr (query_item->data_ptr), + hwconfig->ptr, hwconfig->size)) +return -EFAULT ; + +return hwconfig->size; +} +static int (*const i915_query_funcs[])(struct drm_i915_private *dev_priv,struct drm_i915_query_item *query_item) = { query_topology_info, query_engine_info, query_perf_config, query_memregion_info, + query_hwconfig_table, };int i915_query_ioctl (struct drm_device *dev,void *data,struct drm_file *file)
include/uapi/drm/i915_drm.h +1 -0
@@ -2328,6 +2328,7 @@ struct drm_i915_query_item {#define DRM_I915_QUERY_ENGINE_INFO 2#define DRM_I915_QUERY_PERF_CONFIG 3#define DRM_I915_QUERY_MEMORY_REGIONS 4 +#define DRM_I915_QUERY_HWCONFIG_TABLE 5/* Must be kept compact -- no holes and well documented */ /**
Signature · 1 line
2.25.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for Add support for querying hw info that UMDs need
In reply to [email protected]== Series Details ==
== Series Details ==
Series: Add support for querying hw info that UMDs need
URL : https://patchwork.freedesktop.org/series/93044/
State : failure
== Summary ==
Applying: drm/i915/guc: Add fetch of hwconfig table
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/Makefile).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915/guc: Add fetch of hwconfig table When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx