* [Intel-gfx] [PATCH v3 0/7] drm/i915: HuC loading and authentication for MTL
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
0 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: Alan Previn, dri-devel
The HuC loading and authentication flow is once again changing and a new
"clear-media only" authentication step is introduced. The flow is as
follows:
1) The HuC is loaded via DMA - same as all non-GSC HuC binaries.
2) The HuC is authenticated by the GuC - this is the same step as
performed for all non-GSC HuC binaries and re-uses the same code, but
it is now resulting in a partial authentication that only allows
clear-media workloads.
3) The HuC is fully authenticated for all workloads by the GSC - this
is done via a new PXP command, submitted via the GSCCS.
The advantage of this new flow is that we can start processing
clear-media workloads without having to wait for the GSC to be ready,
which can take several seconds.
As part of this change, the HuC status getparam has been updated with a
new value to indicate a partial authentication. Note tha the media
driver is checking for value > 0 for clear media workloads, so no
changes are required in userspace for that to work.
v2: fix HuC auth status check for DG2.
v3: addrss review feedback, stop using the "meu" tag for the naming of
the headers, better comments
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Acked-by: Tony Ye <tony.ye@intel.com>
Daniele Ceraolo Spurio (7):
drm/i915/uc: perma-pin firmwares
drm/i915/huc: Parse the GSC-enabled HuC binary
drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
drm/i915/mtl/huc: auth HuC via GSC
drm/i915/mtl/huc: Use the media gt for the HuC getparam
drm/i915/huc: define HuC FW version for MTL
drivers/gpu/drm/i915/gt/intel_ggtt.c | 3 +
.../drm/i915/gt/uc/intel_gsc_binary_headers.h | 74 ++++++
drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 34 ++-
.../i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 201 ++++++++++-----
drivers/gpu/drm/i915/gt/uc/intel_huc.h | 26 +-
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 233 +++++++++++++++++-
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 6 +-
drivers/gpu/drm/i915/gt/uc/intel_huc_print.h | 21 ++
drivers/gpu/drm/i915/gt/uc/intel_uc.c | 10 +-
drivers/gpu/drm/i915/gt/uc/intel_uc.h | 2 +
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 132 +++++-----
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 26 +-
drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 6 -
drivers/gpu/drm/i915/i915_getparam.c | 6 +-
drivers/gpu/drm/i915/i915_reg.h | 3 +
.../drm/i915/pxp/intel_pxp_cmd_interface_43.h | 14 +-
drivers/gpu/drm/i915/pxp/intel_pxp_huc.c | 2 +-
include/uapi/drm/i915_drm.h | 3 +-
20 files changed, 654 insertions(+), 152 deletions(-)
create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
--
2.40.0
^ permalink raw reply [flat|nested] 52+ messages in thread* [PATCH v3 1/7] drm/i915/uc: perma-pin firmwares
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
-1 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: John Harrison, Daniele Ceraolo Spurio, Alan Previn, dri-devel
Now that each FW has its own reserved area, we can keep them always
pinned and skip the pin/unpin dance on reset. This will make things
easier for the 2-step HuC authentication, which requires the FW to be
pinned in GGTT after the xfer is completed.
Since the vma is now valid for a long time and not just for the quick
pin-load-unpin dance, the name "dummy" is no longer appropriare and has
been replaced with vma_res. All the functions have also been updated to
operate on vma_res for consistency.
Given that we pin the vma behind the allocator's back (which is ok
because we do the pinning in an area that was previously reserved for
thus purpose), we do need to explicitly re-pin on resume because the
automated helper won't cover us.
v2: better comments and commit message, s/dummy/vma_res/
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
---
drivers/gpu/drm/i915/gt/intel_ggtt.c | 3 ++
drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 7 +++-
drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_uc.c | 8 ++++
drivers/gpu/drm/i915/gt/uc/intel_uc.h | 2 +
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 50 ++++++++++++++++-------
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 22 ++++++----
8 files changed, 71 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 2a7942fac798..f4e8aa8246e8 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -1326,6 +1326,9 @@ void i915_ggtt_resume(struct i915_ggtt *ggtt)
ggtt->vm.scratch_range(&ggtt->vm, ggtt->error_capture.start,
ggtt->error_capture.size);
+ list_for_each_entry(gt, &ggtt->gt_list, ggtt_link)
+ intel_uc_resume_mappings(>->uc);
+
ggtt->invalidate(ggtt);
if (flush)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
index fb0984f875f9..b26f493f86fa 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
@@ -90,7 +90,12 @@ void intel_gsc_uc_init_early(struct intel_gsc_uc *gsc)
{
struct intel_gt *gt = gsc_uc_to_gt(gsc);
- intel_uc_fw_init_early(&gsc->fw, INTEL_UC_FW_TYPE_GSC);
+ /*
+ * GSC FW needs to be copied to a dedicated memory allocations for
+ * loading (see gsc->local), so we don't need to GGTT map the FW image
+ * itself into GGTT.
+ */
+ intel_uc_fw_init_early(&gsc->fw, INTEL_UC_FW_TYPE_GSC, false);
INIT_WORK(&gsc->work, gsc_work);
/* we can arrive here from i915_driver_early_probe for primary
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
index c9f20385f6a0..2eb891b270ae 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
@@ -164,7 +164,7 @@ void intel_guc_init_early(struct intel_guc *guc)
struct intel_gt *gt = guc_to_gt(guc);
struct drm_i915_private *i915 = gt->i915;
- intel_uc_fw_init_early(&guc->fw, INTEL_UC_FW_TYPE_GUC);
+ intel_uc_fw_init_early(&guc->fw, INTEL_UC_FW_TYPE_GUC, true);
intel_guc_ct_init_early(&guc->ct);
intel_guc_log_init_early(&guc->log);
intel_guc_submission_init_early(guc);
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 04724ff56ded..268e036f8f28 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -276,7 +276,7 @@ void intel_huc_init_early(struct intel_huc *huc)
struct drm_i915_private *i915 = huc_to_gt(huc)->i915;
struct intel_gt *gt = huc_to_gt(huc);
- intel_uc_fw_init_early(&huc->fw, INTEL_UC_FW_TYPE_HUC);
+ intel_uc_fw_init_early(&huc->fw, INTEL_UC_FW_TYPE_HUC, true);
/*
* we always init the fence as already completed, even if HuC is not
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index c8b9cbb7ba3a..1e7f5cc9d550 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -700,6 +700,12 @@ void intel_uc_suspend(struct intel_uc *uc)
}
}
+static void __uc_resume_mappings(struct intel_uc *uc)
+{
+ intel_uc_fw_resume_mapping(&uc->guc.fw);
+ intel_uc_fw_resume_mapping(&uc->huc.fw);
+}
+
static int __uc_resume(struct intel_uc *uc, bool enable_communication)
{
struct intel_guc *guc = &uc->guc;
@@ -767,4 +773,6 @@ static const struct intel_uc_ops uc_ops_on = {
.init_hw = __uc_init_hw,
.fini_hw = __uc_fini_hw,
+
+ .resume_mappings = __uc_resume_mappings,
};
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h b/drivers/gpu/drm/i915/gt/uc/intel_uc.h
index d585524d94de..014bb7d83689 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.h
@@ -24,6 +24,7 @@ struct intel_uc_ops {
void (*fini)(struct intel_uc *uc);
int (*init_hw)(struct intel_uc *uc);
void (*fini_hw)(struct intel_uc *uc);
+ void (*resume_mappings)(struct intel_uc *uc);
};
struct intel_uc {
@@ -114,6 +115,7 @@ intel_uc_ops_function(init, init, int, 0);
intel_uc_ops_function(fini, fini, void, );
intel_uc_ops_function(init_hw, init_hw, int, 0);
intel_uc_ops_function(fini_hw, fini_hw, void, );
+intel_uc_ops_function(resume_mappings, resume_mappings, void, );
#undef intel_uc_ops_function
#endif
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index dc5c96c503a9..31776c279f32 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -471,12 +471,14 @@ static void __uc_fw_user_override(struct drm_i915_private *i915, struct intel_uc
* intel_uc_fw_init_early - initialize the uC object and select the firmware
* @uc_fw: uC firmware
* @type: type of uC
+ * @needs_ggtt_mapping: whether the FW needs to be GGTT mapped for loading
*
* Initialize the state of our uC object and relevant tracking and select the
* firmware to fetch and load.
*/
void intel_uc_fw_init_early(struct intel_uc_fw *uc_fw,
- enum intel_uc_fw_type type)
+ enum intel_uc_fw_type type,
+ bool needs_ggtt_mapping)
{
struct intel_gt *gt = ____uc_fw_to_gt(uc_fw, type);
struct drm_i915_private *i915 = gt->i915;
@@ -490,6 +492,7 @@ void intel_uc_fw_init_early(struct intel_uc_fw *uc_fw,
GEM_BUG_ON(uc_fw->file_selected.path);
uc_fw->type = type;
+ uc_fw->needs_ggtt_mapping = needs_ggtt_mapping;
if (HAS_GT_UC(i915)) {
if (!validate_fw_table_type(i915, type)) {
@@ -755,7 +758,7 @@ static int try_firmware_load(struct intel_uc_fw *uc_fw, const struct firmware **
if (err)
return err;
- if ((*fw)->size > INTEL_UC_RSVD_GGTT_PER_FW) {
+ if (uc_fw->needs_ggtt_mapping && (*fw)->size > INTEL_UC_RSVD_GGTT_PER_FW) {
gt_err(gt, "%s firmware %s: size (%zuKB) exceeds max supported size (%uKB)\n",
intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
(*fw)->size / SZ_1K, INTEL_UC_RSVD_GGTT_PER_FW / SZ_1K);
@@ -940,29 +943,32 @@ static void uc_fw_bind_ggtt(struct intel_uc_fw *uc_fw)
{
struct drm_i915_gem_object *obj = uc_fw->obj;
struct i915_ggtt *ggtt = __uc_fw_to_gt(uc_fw)->ggtt;
- struct i915_vma_resource *dummy = &uc_fw->dummy;
+ struct i915_vma_resource *vma_res = &uc_fw->vma_res;
u32 pte_flags = 0;
- dummy->start = uc_fw_ggtt_offset(uc_fw);
- dummy->node_size = obj->base.size;
- dummy->bi.pages = obj->mm.pages;
+ if (!uc_fw->needs_ggtt_mapping)
+ return;
+
+ vma_res->start = uc_fw_ggtt_offset(uc_fw);
+ vma_res->node_size = obj->base.size;
+ vma_res->bi.pages = obj->mm.pages;
GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
/* uc_fw->obj cache domains were not controlled across suspend */
if (i915_gem_object_has_struct_page(obj))
- drm_clflush_sg(dummy->bi.pages);
+ drm_clflush_sg(vma_res->bi.pages);
if (i915_gem_object_is_lmem(obj))
pte_flags |= PTE_LM;
if (ggtt->vm.raw_insert_entries)
- ggtt->vm.raw_insert_entries(&ggtt->vm, dummy,
+ ggtt->vm.raw_insert_entries(&ggtt->vm, vma_res,
i915_gem_get_pat_index(ggtt->vm.i915,
I915_CACHE_NONE),
pte_flags);
else
- ggtt->vm.insert_entries(&ggtt->vm, dummy,
+ ggtt->vm.insert_entries(&ggtt->vm, vma_res,
i915_gem_get_pat_index(ggtt->vm.i915,
I915_CACHE_NONE),
pte_flags);
@@ -970,11 +976,13 @@ static void uc_fw_bind_ggtt(struct intel_uc_fw *uc_fw)
static void uc_fw_unbind_ggtt(struct intel_uc_fw *uc_fw)
{
- struct drm_i915_gem_object *obj = uc_fw->obj;
struct i915_ggtt *ggtt = __uc_fw_to_gt(uc_fw)->ggtt;
- u64 start = uc_fw_ggtt_offset(uc_fw);
+ struct i915_vma_resource *vma_res = &uc_fw->vma_res;
+
+ if (!vma_res->node_size)
+ return;
- ggtt->vm.clear_range(&ggtt->vm, start, obj->base.size);
+ ggtt->vm.clear_range(&ggtt->vm, vma_res->start, vma_res->node_size);
}
static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
@@ -991,7 +999,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
/* Set the source address for the uCode */
- offset = uc_fw_ggtt_offset(uc_fw);
+ offset = uc_fw->vma_res.start;
GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW, lower_32_bits(offset));
intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH, upper_32_bits(offset));
@@ -1065,9 +1073,7 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
return -ENOEXEC;
/* Call custom loader */
- uc_fw_bind_ggtt(uc_fw);
err = uc_fw_xfer(uc_fw, dst_offset, dma_flags);
- uc_fw_unbind_ggtt(uc_fw);
if (err)
goto fail;
@@ -1171,6 +1177,8 @@ int intel_uc_fw_init(struct intel_uc_fw *uc_fw)
goto out_unpin;
}
+ uc_fw_bind_ggtt(uc_fw);
+
return 0;
out_unpin:
@@ -1181,6 +1189,7 @@ int intel_uc_fw_init(struct intel_uc_fw *uc_fw)
void intel_uc_fw_fini(struct intel_uc_fw *uc_fw)
{
+ uc_fw_unbind_ggtt(uc_fw);
uc_fw_rsa_data_destroy(uc_fw);
if (i915_gem_object_has_pinned_pages(uc_fw->obj))
@@ -1189,6 +1198,17 @@ void intel_uc_fw_fini(struct intel_uc_fw *uc_fw)
intel_uc_fw_change_status(uc_fw, INTEL_UC_FIRMWARE_AVAILABLE);
}
+void intel_uc_fw_resume_mapping(struct intel_uc_fw *uc_fw)
+{
+ if (!intel_uc_fw_is_available(uc_fw))
+ return;
+
+ if (!i915_gem_object_has_pinned_pages(uc_fw->obj))
+ return;
+
+ uc_fw_bind_ggtt(uc_fw);
+}
+
/**
* intel_uc_fw_cleanup_fetch - cleanup uC firmware
* @uc_fw: uC firmware
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
index 6ba00e6b3975..2be9470eb712 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
@@ -99,13 +99,19 @@ struct intel_uc_fw {
struct drm_i915_gem_object *obj;
/**
- * @dummy: A vma used in binding the uc fw to ggtt. We can't define this
- * vma on the stack as it can lead to a stack overflow, so we define it
- * here. Safe to have 1 copy per uc fw because the binding is single
- * threaded as it done during driver load (inherently single threaded)
- * or during a GT reset (mutex guarantees single threaded).
+ * @needs_ggtt_mapping: indicates whether the fw object needs to be
+ * pinned to ggtt. If true, the fw is pinned at init time and unpinned
+ * during driver unload.
*/
- struct i915_vma_resource dummy;
+ bool needs_ggtt_mapping;
+
+ /**
+ * @vma_res: A vma resource used in binding the uc fw to ggtt. The fw is
+ * pinned in a reserved area of the ggtt (above the maximum address
+ * usable by GuC); therefore, we can't use the normal vma functions to
+ * do the pinning and we instead use this resource to do so.
+ */
+ struct i915_vma_resource vma_res;
struct i915_vma *rsa_data;
u32 rsa_size;
@@ -282,12 +288,14 @@ static inline u32 intel_uc_fw_get_upload_size(struct intel_uc_fw *uc_fw)
}
void intel_uc_fw_init_early(struct intel_uc_fw *uc_fw,
- enum intel_uc_fw_type type);
+ enum intel_uc_fw_type type,
+ bool needs_ggtt_mapping);
int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw);
void intel_uc_fw_cleanup_fetch(struct intel_uc_fw *uc_fw);
int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, u32 offset, u32 dma_flags);
int intel_uc_fw_init(struct intel_uc_fw *uc_fw);
void intel_uc_fw_fini(struct intel_uc_fw *uc_fw);
+void intel_uc_fw_resume_mapping(struct intel_uc_fw *uc_fw);
size_t intel_uc_fw_copy_rsa(struct intel_uc_fw *uc_fw, void *dst, u32 max_len);
int intel_uc_fw_mark_load_failed(struct intel_uc_fw *uc_fw, int err);
void intel_uc_fw_dump(const struct intel_uc_fw *uc_fw, struct drm_printer *p);
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread* [Intel-gfx] [PATCH v3 1/7] drm/i915/uc: perma-pin firmwares
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
0 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: Alan Previn, dri-devel
Now that each FW has its own reserved area, we can keep them always
pinned and skip the pin/unpin dance on reset. This will make things
easier for the 2-step HuC authentication, which requires the FW to be
pinned in GGTT after the xfer is completed.
Since the vma is now valid for a long time and not just for the quick
pin-load-unpin dance, the name "dummy" is no longer appropriare and has
been replaced with vma_res. All the functions have also been updated to
operate on vma_res for consistency.
Given that we pin the vma behind the allocator's back (which is ok
because we do the pinning in an area that was previously reserved for
thus purpose), we do need to explicitly re-pin on resume because the
automated helper won't cover us.
v2: better comments and commit message, s/dummy/vma_res/
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
---
drivers/gpu/drm/i915/gt/intel_ggtt.c | 3 ++
drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 7 +++-
drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_uc.c | 8 ++++
drivers/gpu/drm/i915/gt/uc/intel_uc.h | 2 +
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 50 ++++++++++++++++-------
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 22 ++++++----
8 files changed, 71 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 2a7942fac798..f4e8aa8246e8 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -1326,6 +1326,9 @@ void i915_ggtt_resume(struct i915_ggtt *ggtt)
ggtt->vm.scratch_range(&ggtt->vm, ggtt->error_capture.start,
ggtt->error_capture.size);
+ list_for_each_entry(gt, &ggtt->gt_list, ggtt_link)
+ intel_uc_resume_mappings(>->uc);
+
ggtt->invalidate(ggtt);
if (flush)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
index fb0984f875f9..b26f493f86fa 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
@@ -90,7 +90,12 @@ void intel_gsc_uc_init_early(struct intel_gsc_uc *gsc)
{
struct intel_gt *gt = gsc_uc_to_gt(gsc);
- intel_uc_fw_init_early(&gsc->fw, INTEL_UC_FW_TYPE_GSC);
+ /*
+ * GSC FW needs to be copied to a dedicated memory allocations for
+ * loading (see gsc->local), so we don't need to GGTT map the FW image
+ * itself into GGTT.
+ */
+ intel_uc_fw_init_early(&gsc->fw, INTEL_UC_FW_TYPE_GSC, false);
INIT_WORK(&gsc->work, gsc_work);
/* we can arrive here from i915_driver_early_probe for primary
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
index c9f20385f6a0..2eb891b270ae 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
@@ -164,7 +164,7 @@ void intel_guc_init_early(struct intel_guc *guc)
struct intel_gt *gt = guc_to_gt(guc);
struct drm_i915_private *i915 = gt->i915;
- intel_uc_fw_init_early(&guc->fw, INTEL_UC_FW_TYPE_GUC);
+ intel_uc_fw_init_early(&guc->fw, INTEL_UC_FW_TYPE_GUC, true);
intel_guc_ct_init_early(&guc->ct);
intel_guc_log_init_early(&guc->log);
intel_guc_submission_init_early(guc);
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 04724ff56ded..268e036f8f28 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -276,7 +276,7 @@ void intel_huc_init_early(struct intel_huc *huc)
struct drm_i915_private *i915 = huc_to_gt(huc)->i915;
struct intel_gt *gt = huc_to_gt(huc);
- intel_uc_fw_init_early(&huc->fw, INTEL_UC_FW_TYPE_HUC);
+ intel_uc_fw_init_early(&huc->fw, INTEL_UC_FW_TYPE_HUC, true);
/*
* we always init the fence as already completed, even if HuC is not
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index c8b9cbb7ba3a..1e7f5cc9d550 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -700,6 +700,12 @@ void intel_uc_suspend(struct intel_uc *uc)
}
}
+static void __uc_resume_mappings(struct intel_uc *uc)
+{
+ intel_uc_fw_resume_mapping(&uc->guc.fw);
+ intel_uc_fw_resume_mapping(&uc->huc.fw);
+}
+
static int __uc_resume(struct intel_uc *uc, bool enable_communication)
{
struct intel_guc *guc = &uc->guc;
@@ -767,4 +773,6 @@ static const struct intel_uc_ops uc_ops_on = {
.init_hw = __uc_init_hw,
.fini_hw = __uc_fini_hw,
+
+ .resume_mappings = __uc_resume_mappings,
};
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h b/drivers/gpu/drm/i915/gt/uc/intel_uc.h
index d585524d94de..014bb7d83689 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.h
@@ -24,6 +24,7 @@ struct intel_uc_ops {
void (*fini)(struct intel_uc *uc);
int (*init_hw)(struct intel_uc *uc);
void (*fini_hw)(struct intel_uc *uc);
+ void (*resume_mappings)(struct intel_uc *uc);
};
struct intel_uc {
@@ -114,6 +115,7 @@ intel_uc_ops_function(init, init, int, 0);
intel_uc_ops_function(fini, fini, void, );
intel_uc_ops_function(init_hw, init_hw, int, 0);
intel_uc_ops_function(fini_hw, fini_hw, void, );
+intel_uc_ops_function(resume_mappings, resume_mappings, void, );
#undef intel_uc_ops_function
#endif
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index dc5c96c503a9..31776c279f32 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -471,12 +471,14 @@ static void __uc_fw_user_override(struct drm_i915_private *i915, struct intel_uc
* intel_uc_fw_init_early - initialize the uC object and select the firmware
* @uc_fw: uC firmware
* @type: type of uC
+ * @needs_ggtt_mapping: whether the FW needs to be GGTT mapped for loading
*
* Initialize the state of our uC object and relevant tracking and select the
* firmware to fetch and load.
*/
void intel_uc_fw_init_early(struct intel_uc_fw *uc_fw,
- enum intel_uc_fw_type type)
+ enum intel_uc_fw_type type,
+ bool needs_ggtt_mapping)
{
struct intel_gt *gt = ____uc_fw_to_gt(uc_fw, type);
struct drm_i915_private *i915 = gt->i915;
@@ -490,6 +492,7 @@ void intel_uc_fw_init_early(struct intel_uc_fw *uc_fw,
GEM_BUG_ON(uc_fw->file_selected.path);
uc_fw->type = type;
+ uc_fw->needs_ggtt_mapping = needs_ggtt_mapping;
if (HAS_GT_UC(i915)) {
if (!validate_fw_table_type(i915, type)) {
@@ -755,7 +758,7 @@ static int try_firmware_load(struct intel_uc_fw *uc_fw, const struct firmware **
if (err)
return err;
- if ((*fw)->size > INTEL_UC_RSVD_GGTT_PER_FW) {
+ if (uc_fw->needs_ggtt_mapping && (*fw)->size > INTEL_UC_RSVD_GGTT_PER_FW) {
gt_err(gt, "%s firmware %s: size (%zuKB) exceeds max supported size (%uKB)\n",
intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
(*fw)->size / SZ_1K, INTEL_UC_RSVD_GGTT_PER_FW / SZ_1K);
@@ -940,29 +943,32 @@ static void uc_fw_bind_ggtt(struct intel_uc_fw *uc_fw)
{
struct drm_i915_gem_object *obj = uc_fw->obj;
struct i915_ggtt *ggtt = __uc_fw_to_gt(uc_fw)->ggtt;
- struct i915_vma_resource *dummy = &uc_fw->dummy;
+ struct i915_vma_resource *vma_res = &uc_fw->vma_res;
u32 pte_flags = 0;
- dummy->start = uc_fw_ggtt_offset(uc_fw);
- dummy->node_size = obj->base.size;
- dummy->bi.pages = obj->mm.pages;
+ if (!uc_fw->needs_ggtt_mapping)
+ return;
+
+ vma_res->start = uc_fw_ggtt_offset(uc_fw);
+ vma_res->node_size = obj->base.size;
+ vma_res->bi.pages = obj->mm.pages;
GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
/* uc_fw->obj cache domains were not controlled across suspend */
if (i915_gem_object_has_struct_page(obj))
- drm_clflush_sg(dummy->bi.pages);
+ drm_clflush_sg(vma_res->bi.pages);
if (i915_gem_object_is_lmem(obj))
pte_flags |= PTE_LM;
if (ggtt->vm.raw_insert_entries)
- ggtt->vm.raw_insert_entries(&ggtt->vm, dummy,
+ ggtt->vm.raw_insert_entries(&ggtt->vm, vma_res,
i915_gem_get_pat_index(ggtt->vm.i915,
I915_CACHE_NONE),
pte_flags);
else
- ggtt->vm.insert_entries(&ggtt->vm, dummy,
+ ggtt->vm.insert_entries(&ggtt->vm, vma_res,
i915_gem_get_pat_index(ggtt->vm.i915,
I915_CACHE_NONE),
pte_flags);
@@ -970,11 +976,13 @@ static void uc_fw_bind_ggtt(struct intel_uc_fw *uc_fw)
static void uc_fw_unbind_ggtt(struct intel_uc_fw *uc_fw)
{
- struct drm_i915_gem_object *obj = uc_fw->obj;
struct i915_ggtt *ggtt = __uc_fw_to_gt(uc_fw)->ggtt;
- u64 start = uc_fw_ggtt_offset(uc_fw);
+ struct i915_vma_resource *vma_res = &uc_fw->vma_res;
+
+ if (!vma_res->node_size)
+ return;
- ggtt->vm.clear_range(&ggtt->vm, start, obj->base.size);
+ ggtt->vm.clear_range(&ggtt->vm, vma_res->start, vma_res->node_size);
}
static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
@@ -991,7 +999,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
/* Set the source address for the uCode */
- offset = uc_fw_ggtt_offset(uc_fw);
+ offset = uc_fw->vma_res.start;
GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW, lower_32_bits(offset));
intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH, upper_32_bits(offset));
@@ -1065,9 +1073,7 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
return -ENOEXEC;
/* Call custom loader */
- uc_fw_bind_ggtt(uc_fw);
err = uc_fw_xfer(uc_fw, dst_offset, dma_flags);
- uc_fw_unbind_ggtt(uc_fw);
if (err)
goto fail;
@@ -1171,6 +1177,8 @@ int intel_uc_fw_init(struct intel_uc_fw *uc_fw)
goto out_unpin;
}
+ uc_fw_bind_ggtt(uc_fw);
+
return 0;
out_unpin:
@@ -1181,6 +1189,7 @@ int intel_uc_fw_init(struct intel_uc_fw *uc_fw)
void intel_uc_fw_fini(struct intel_uc_fw *uc_fw)
{
+ uc_fw_unbind_ggtt(uc_fw);
uc_fw_rsa_data_destroy(uc_fw);
if (i915_gem_object_has_pinned_pages(uc_fw->obj))
@@ -1189,6 +1198,17 @@ void intel_uc_fw_fini(struct intel_uc_fw *uc_fw)
intel_uc_fw_change_status(uc_fw, INTEL_UC_FIRMWARE_AVAILABLE);
}
+void intel_uc_fw_resume_mapping(struct intel_uc_fw *uc_fw)
+{
+ if (!intel_uc_fw_is_available(uc_fw))
+ return;
+
+ if (!i915_gem_object_has_pinned_pages(uc_fw->obj))
+ return;
+
+ uc_fw_bind_ggtt(uc_fw);
+}
+
/**
* intel_uc_fw_cleanup_fetch - cleanup uC firmware
* @uc_fw: uC firmware
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
index 6ba00e6b3975..2be9470eb712 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
@@ -99,13 +99,19 @@ struct intel_uc_fw {
struct drm_i915_gem_object *obj;
/**
- * @dummy: A vma used in binding the uc fw to ggtt. We can't define this
- * vma on the stack as it can lead to a stack overflow, so we define it
- * here. Safe to have 1 copy per uc fw because the binding is single
- * threaded as it done during driver load (inherently single threaded)
- * or during a GT reset (mutex guarantees single threaded).
+ * @needs_ggtt_mapping: indicates whether the fw object needs to be
+ * pinned to ggtt. If true, the fw is pinned at init time and unpinned
+ * during driver unload.
*/
- struct i915_vma_resource dummy;
+ bool needs_ggtt_mapping;
+
+ /**
+ * @vma_res: A vma resource used in binding the uc fw to ggtt. The fw is
+ * pinned in a reserved area of the ggtt (above the maximum address
+ * usable by GuC); therefore, we can't use the normal vma functions to
+ * do the pinning and we instead use this resource to do so.
+ */
+ struct i915_vma_resource vma_res;
struct i915_vma *rsa_data;
u32 rsa_size;
@@ -282,12 +288,14 @@ static inline u32 intel_uc_fw_get_upload_size(struct intel_uc_fw *uc_fw)
}
void intel_uc_fw_init_early(struct intel_uc_fw *uc_fw,
- enum intel_uc_fw_type type);
+ enum intel_uc_fw_type type,
+ bool needs_ggtt_mapping);
int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw);
void intel_uc_fw_cleanup_fetch(struct intel_uc_fw *uc_fw);
int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, u32 offset, u32 dma_flags);
int intel_uc_fw_init(struct intel_uc_fw *uc_fw);
void intel_uc_fw_fini(struct intel_uc_fw *uc_fw);
+void intel_uc_fw_resume_mapping(struct intel_uc_fw *uc_fw);
size_t intel_uc_fw_copy_rsa(struct intel_uc_fw *uc_fw, void *dst, u32 max_len);
int intel_uc_fw_mark_load_failed(struct intel_uc_fw *uc_fw, int err);
void intel_uc_fw_dump(const struct intel_uc_fw *uc_fw, struct drm_printer *p);
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCH v3 1/7] drm/i915/uc: perma-pin firmwares
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
@ 2023-05-30 22:52 ` John Harrison
-1 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-30 22:52 UTC (permalink / raw)
To: Daniele Ceraolo Spurio, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
> Now that each FW has its own reserved area, we can keep them always
> pinned and skip the pin/unpin dance on reset. This will make things
> easier for the 2-step HuC authentication, which requires the FW to be
> pinned in GGTT after the xfer is completed.
> Since the vma is now valid for a long time and not just for the quick
> pin-load-unpin dance, the name "dummy" is no longer appropriare and has
> been replaced with vma_res. All the functions have also been updated to
> operate on vma_res for consistency.
> Given that we pin the vma behind the allocator's back (which is ok
> because we do the pinning in an area that was previously reserved for
> thus purpose), we do need to explicitly re-pin on resume because the
> automated helper won't cover us.
>
> v2: better comments and commit message, s/dummy/vma_res/
>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
> Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_ggtt.c | 3 ++
> drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 7 +++-
> drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 2 +-
> drivers/gpu/drm/i915/gt/uc/intel_uc.c | 8 ++++
> drivers/gpu/drm/i915/gt/uc/intel_uc.h | 2 +
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 50 ++++++++++++++++-------
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 22 ++++++----
> 8 files changed, 71 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
> index 2a7942fac798..f4e8aa8246e8 100644
> --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
> +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
> @@ -1326,6 +1326,9 @@ void i915_ggtt_resume(struct i915_ggtt *ggtt)
> ggtt->vm.scratch_range(&ggtt->vm, ggtt->error_capture.start,
> ggtt->error_capture.size);
>
> + list_for_each_entry(gt, &ggtt->gt_list, ggtt_link)
> + intel_uc_resume_mappings(>->uc);
> +
> ggtt->invalidate(ggtt);
>
> if (flush)
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
> index fb0984f875f9..b26f493f86fa 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
> @@ -90,7 +90,12 @@ void intel_gsc_uc_init_early(struct intel_gsc_uc *gsc)
> {
> struct intel_gt *gt = gsc_uc_to_gt(gsc);
>
> - intel_uc_fw_init_early(&gsc->fw, INTEL_UC_FW_TYPE_GSC);
> + /*
> + * GSC FW needs to be copied to a dedicated memory allocations for
> + * loading (see gsc->local), so we don't need to GGTT map the FW image
> + * itself into GGTT.
> + */
> + intel_uc_fw_init_early(&gsc->fw, INTEL_UC_FW_TYPE_GSC, false);
> INIT_WORK(&gsc->work, gsc_work);
>
> /* we can arrive here from i915_driver_early_probe for primary
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> index c9f20385f6a0..2eb891b270ae 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> @@ -164,7 +164,7 @@ void intel_guc_init_early(struct intel_guc *guc)
> struct intel_gt *gt = guc_to_gt(guc);
> struct drm_i915_private *i915 = gt->i915;
>
> - intel_uc_fw_init_early(&guc->fw, INTEL_UC_FW_TYPE_GUC);
> + intel_uc_fw_init_early(&guc->fw, INTEL_UC_FW_TYPE_GUC, true);
> intel_guc_ct_init_early(&guc->ct);
> intel_guc_log_init_early(&guc->log);
> intel_guc_submission_init_early(guc);
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> index 04724ff56ded..268e036f8f28 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> @@ -276,7 +276,7 @@ void intel_huc_init_early(struct intel_huc *huc)
> struct drm_i915_private *i915 = huc_to_gt(huc)->i915;
> struct intel_gt *gt = huc_to_gt(huc);
>
> - intel_uc_fw_init_early(&huc->fw, INTEL_UC_FW_TYPE_HUC);
> + intel_uc_fw_init_early(&huc->fw, INTEL_UC_FW_TYPE_HUC, true);
>
> /*
> * we always init the fence as already completed, even if HuC is not
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
> index c8b9cbb7ba3a..1e7f5cc9d550 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
> @@ -700,6 +700,12 @@ void intel_uc_suspend(struct intel_uc *uc)
> }
> }
>
> +static void __uc_resume_mappings(struct intel_uc *uc)
> +{
> + intel_uc_fw_resume_mapping(&uc->guc.fw);
> + intel_uc_fw_resume_mapping(&uc->huc.fw);
> +}
> +
> static int __uc_resume(struct intel_uc *uc, bool enable_communication)
> {
> struct intel_guc *guc = &uc->guc;
> @@ -767,4 +773,6 @@ static const struct intel_uc_ops uc_ops_on = {
>
> .init_hw = __uc_init_hw,
> .fini_hw = __uc_fini_hw,
> +
> + .resume_mappings = __uc_resume_mappings,
> };
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h b/drivers/gpu/drm/i915/gt/uc/intel_uc.h
> index d585524d94de..014bb7d83689 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.h
> @@ -24,6 +24,7 @@ struct intel_uc_ops {
> void (*fini)(struct intel_uc *uc);
> int (*init_hw)(struct intel_uc *uc);
> void (*fini_hw)(struct intel_uc *uc);
> + void (*resume_mappings)(struct intel_uc *uc);
> };
>
> struct intel_uc {
> @@ -114,6 +115,7 @@ intel_uc_ops_function(init, init, int, 0);
> intel_uc_ops_function(fini, fini, void, );
> intel_uc_ops_function(init_hw, init_hw, int, 0);
> intel_uc_ops_function(fini_hw, fini_hw, void, );
> +intel_uc_ops_function(resume_mappings, resume_mappings, void, );
> #undef intel_uc_ops_function
>
> #endif
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> index dc5c96c503a9..31776c279f32 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -471,12 +471,14 @@ static void __uc_fw_user_override(struct drm_i915_private *i915, struct intel_uc
> * intel_uc_fw_init_early - initialize the uC object and select the firmware
> * @uc_fw: uC firmware
> * @type: type of uC
> + * @needs_ggtt_mapping: whether the FW needs to be GGTT mapped for loading
> *
> * Initialize the state of our uC object and relevant tracking and select the
> * firmware to fetch and load.
> */
> void intel_uc_fw_init_early(struct intel_uc_fw *uc_fw,
> - enum intel_uc_fw_type type)
> + enum intel_uc_fw_type type,
> + bool needs_ggtt_mapping)
> {
> struct intel_gt *gt = ____uc_fw_to_gt(uc_fw, type);
> struct drm_i915_private *i915 = gt->i915;
> @@ -490,6 +492,7 @@ void intel_uc_fw_init_early(struct intel_uc_fw *uc_fw,
> GEM_BUG_ON(uc_fw->file_selected.path);
>
> uc_fw->type = type;
> + uc_fw->needs_ggtt_mapping = needs_ggtt_mapping;
>
> if (HAS_GT_UC(i915)) {
> if (!validate_fw_table_type(i915, type)) {
> @@ -755,7 +758,7 @@ static int try_firmware_load(struct intel_uc_fw *uc_fw, const struct firmware **
> if (err)
> return err;
>
> - if ((*fw)->size > INTEL_UC_RSVD_GGTT_PER_FW) {
> + if (uc_fw->needs_ggtt_mapping && (*fw)->size > INTEL_UC_RSVD_GGTT_PER_FW) {
> gt_err(gt, "%s firmware %s: size (%zuKB) exceeds max supported size (%uKB)\n",
> intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
> (*fw)->size / SZ_1K, INTEL_UC_RSVD_GGTT_PER_FW / SZ_1K);
> @@ -940,29 +943,32 @@ static void uc_fw_bind_ggtt(struct intel_uc_fw *uc_fw)
> {
> struct drm_i915_gem_object *obj = uc_fw->obj;
> struct i915_ggtt *ggtt = __uc_fw_to_gt(uc_fw)->ggtt;
> - struct i915_vma_resource *dummy = &uc_fw->dummy;
> + struct i915_vma_resource *vma_res = &uc_fw->vma_res;
> u32 pte_flags = 0;
>
> - dummy->start = uc_fw_ggtt_offset(uc_fw);
> - dummy->node_size = obj->base.size;
> - dummy->bi.pages = obj->mm.pages;
> + if (!uc_fw->needs_ggtt_mapping)
> + return;
> +
> + vma_res->start = uc_fw_ggtt_offset(uc_fw);
> + vma_res->node_size = obj->base.size;
> + vma_res->bi.pages = obj->mm.pages;
>
> GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
>
> /* uc_fw->obj cache domains were not controlled across suspend */
> if (i915_gem_object_has_struct_page(obj))
> - drm_clflush_sg(dummy->bi.pages);
> + drm_clflush_sg(vma_res->bi.pages);
>
> if (i915_gem_object_is_lmem(obj))
> pte_flags |= PTE_LM;
>
> if (ggtt->vm.raw_insert_entries)
> - ggtt->vm.raw_insert_entries(&ggtt->vm, dummy,
> + ggtt->vm.raw_insert_entries(&ggtt->vm, vma_res,
> i915_gem_get_pat_index(ggtt->vm.i915,
> I915_CACHE_NONE),
> pte_flags);
> else
> - ggtt->vm.insert_entries(&ggtt->vm, dummy,
> + ggtt->vm.insert_entries(&ggtt->vm, vma_res,
> i915_gem_get_pat_index(ggtt->vm.i915,
> I915_CACHE_NONE),
> pte_flags);
> @@ -970,11 +976,13 @@ static void uc_fw_bind_ggtt(struct intel_uc_fw *uc_fw)
>
> static void uc_fw_unbind_ggtt(struct intel_uc_fw *uc_fw)
> {
> - struct drm_i915_gem_object *obj = uc_fw->obj;
> struct i915_ggtt *ggtt = __uc_fw_to_gt(uc_fw)->ggtt;
> - u64 start = uc_fw_ggtt_offset(uc_fw);
> + struct i915_vma_resource *vma_res = &uc_fw->vma_res;
> +
> + if (!vma_res->node_size)
> + return;
>
> - ggtt->vm.clear_range(&ggtt->vm, start, obj->base.size);
> + ggtt->vm.clear_range(&ggtt->vm, vma_res->start, vma_res->node_size);
> }
>
> static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
> @@ -991,7 +999,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
> intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
>
> /* Set the source address for the uCode */
> - offset = uc_fw_ggtt_offset(uc_fw);
> + offset = uc_fw->vma_res.start;
> GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
> intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW, lower_32_bits(offset));
> intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH, upper_32_bits(offset));
> @@ -1065,9 +1073,7 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
> return -ENOEXEC;
>
> /* Call custom loader */
> - uc_fw_bind_ggtt(uc_fw);
> err = uc_fw_xfer(uc_fw, dst_offset, dma_flags);
> - uc_fw_unbind_ggtt(uc_fw);
> if (err)
> goto fail;
>
> @@ -1171,6 +1177,8 @@ int intel_uc_fw_init(struct intel_uc_fw *uc_fw)
> goto out_unpin;
> }
>
> + uc_fw_bind_ggtt(uc_fw);
> +
> return 0;
>
> out_unpin:
> @@ -1181,6 +1189,7 @@ int intel_uc_fw_init(struct intel_uc_fw *uc_fw)
>
> void intel_uc_fw_fini(struct intel_uc_fw *uc_fw)
> {
> + uc_fw_unbind_ggtt(uc_fw);
> uc_fw_rsa_data_destroy(uc_fw);
>
> if (i915_gem_object_has_pinned_pages(uc_fw->obj))
> @@ -1189,6 +1198,17 @@ void intel_uc_fw_fini(struct intel_uc_fw *uc_fw)
> intel_uc_fw_change_status(uc_fw, INTEL_UC_FIRMWARE_AVAILABLE);
> }
>
> +void intel_uc_fw_resume_mapping(struct intel_uc_fw *uc_fw)
> +{
> + if (!intel_uc_fw_is_available(uc_fw))
> + return;
> +
> + if (!i915_gem_object_has_pinned_pages(uc_fw->obj))
> + return;
> +
> + uc_fw_bind_ggtt(uc_fw);
> +}
> +
> /**
> * intel_uc_fw_cleanup_fetch - cleanup uC firmware
> * @uc_fw: uC firmware
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> index 6ba00e6b3975..2be9470eb712 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> @@ -99,13 +99,19 @@ struct intel_uc_fw {
> struct drm_i915_gem_object *obj;
>
> /**
> - * @dummy: A vma used in binding the uc fw to ggtt. We can't define this
> - * vma on the stack as it can lead to a stack overflow, so we define it
> - * here. Safe to have 1 copy per uc fw because the binding is single
> - * threaded as it done during driver load (inherently single threaded)
> - * or during a GT reset (mutex guarantees single threaded).
> + * @needs_ggtt_mapping: indicates whether the fw object needs to be
> + * pinned to ggtt. If true, the fw is pinned at init time and unpinned
> + * during driver unload.
> */
> - struct i915_vma_resource dummy;
> + bool needs_ggtt_mapping;
> +
> + /**
> + * @vma_res: A vma resource used in binding the uc fw to ggtt. The fw is
> + * pinned in a reserved area of the ggtt (above the maximum address
> + * usable by GuC); therefore, we can't use the normal vma functions to
> + * do the pinning and we instead use this resource to do so.
> + */
> + struct i915_vma_resource vma_res;
> struct i915_vma *rsa_data;
>
> u32 rsa_size;
> @@ -282,12 +288,14 @@ static inline u32 intel_uc_fw_get_upload_size(struct intel_uc_fw *uc_fw)
> }
>
> void intel_uc_fw_init_early(struct intel_uc_fw *uc_fw,
> - enum intel_uc_fw_type type);
> + enum intel_uc_fw_type type,
> + bool needs_ggtt_mapping);
> int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw);
> void intel_uc_fw_cleanup_fetch(struct intel_uc_fw *uc_fw);
> int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, u32 offset, u32 dma_flags);
> int intel_uc_fw_init(struct intel_uc_fw *uc_fw);
> void intel_uc_fw_fini(struct intel_uc_fw *uc_fw);
> +void intel_uc_fw_resume_mapping(struct intel_uc_fw *uc_fw);
> size_t intel_uc_fw_copy_rsa(struct intel_uc_fw *uc_fw, void *dst, u32 max_len);
> int intel_uc_fw_mark_load_failed(struct intel_uc_fw *uc_fw, int err);
> void intel_uc_fw_dump(const struct intel_uc_fw *uc_fw, struct drm_printer *p);
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [Intel-gfx] [PATCH v3 1/7] drm/i915/uc: perma-pin firmwares
@ 2023-05-30 22:52 ` John Harrison
0 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-30 22:52 UTC (permalink / raw)
To: Daniele Ceraolo Spurio, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
> Now that each FW has its own reserved area, we can keep them always
> pinned and skip the pin/unpin dance on reset. This will make things
> easier for the 2-step HuC authentication, which requires the FW to be
> pinned in GGTT after the xfer is completed.
> Since the vma is now valid for a long time and not just for the quick
> pin-load-unpin dance, the name "dummy" is no longer appropriare and has
> been replaced with vma_res. All the functions have also been updated to
> operate on vma_res for consistency.
> Given that we pin the vma behind the allocator's back (which is ok
> because we do the pinning in an area that was previously reserved for
> thus purpose), we do need to explicitly re-pin on resume because the
> automated helper won't cover us.
>
> v2: better comments and commit message, s/dummy/vma_res/
>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
> Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_ggtt.c | 3 ++
> drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 7 +++-
> drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 2 +-
> drivers/gpu/drm/i915/gt/uc/intel_uc.c | 8 ++++
> drivers/gpu/drm/i915/gt/uc/intel_uc.h | 2 +
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 50 ++++++++++++++++-------
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 22 ++++++----
> 8 files changed, 71 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
> index 2a7942fac798..f4e8aa8246e8 100644
> --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
> +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
> @@ -1326,6 +1326,9 @@ void i915_ggtt_resume(struct i915_ggtt *ggtt)
> ggtt->vm.scratch_range(&ggtt->vm, ggtt->error_capture.start,
> ggtt->error_capture.size);
>
> + list_for_each_entry(gt, &ggtt->gt_list, ggtt_link)
> + intel_uc_resume_mappings(>->uc);
> +
> ggtt->invalidate(ggtt);
>
> if (flush)
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
> index fb0984f875f9..b26f493f86fa 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
> @@ -90,7 +90,12 @@ void intel_gsc_uc_init_early(struct intel_gsc_uc *gsc)
> {
> struct intel_gt *gt = gsc_uc_to_gt(gsc);
>
> - intel_uc_fw_init_early(&gsc->fw, INTEL_UC_FW_TYPE_GSC);
> + /*
> + * GSC FW needs to be copied to a dedicated memory allocations for
> + * loading (see gsc->local), so we don't need to GGTT map the FW image
> + * itself into GGTT.
> + */
> + intel_uc_fw_init_early(&gsc->fw, INTEL_UC_FW_TYPE_GSC, false);
> INIT_WORK(&gsc->work, gsc_work);
>
> /* we can arrive here from i915_driver_early_probe for primary
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> index c9f20385f6a0..2eb891b270ae 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> @@ -164,7 +164,7 @@ void intel_guc_init_early(struct intel_guc *guc)
> struct intel_gt *gt = guc_to_gt(guc);
> struct drm_i915_private *i915 = gt->i915;
>
> - intel_uc_fw_init_early(&guc->fw, INTEL_UC_FW_TYPE_GUC);
> + intel_uc_fw_init_early(&guc->fw, INTEL_UC_FW_TYPE_GUC, true);
> intel_guc_ct_init_early(&guc->ct);
> intel_guc_log_init_early(&guc->log);
> intel_guc_submission_init_early(guc);
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> index 04724ff56ded..268e036f8f28 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> @@ -276,7 +276,7 @@ void intel_huc_init_early(struct intel_huc *huc)
> struct drm_i915_private *i915 = huc_to_gt(huc)->i915;
> struct intel_gt *gt = huc_to_gt(huc);
>
> - intel_uc_fw_init_early(&huc->fw, INTEL_UC_FW_TYPE_HUC);
> + intel_uc_fw_init_early(&huc->fw, INTEL_UC_FW_TYPE_HUC, true);
>
> /*
> * we always init the fence as already completed, even if HuC is not
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
> index c8b9cbb7ba3a..1e7f5cc9d550 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
> @@ -700,6 +700,12 @@ void intel_uc_suspend(struct intel_uc *uc)
> }
> }
>
> +static void __uc_resume_mappings(struct intel_uc *uc)
> +{
> + intel_uc_fw_resume_mapping(&uc->guc.fw);
> + intel_uc_fw_resume_mapping(&uc->huc.fw);
> +}
> +
> static int __uc_resume(struct intel_uc *uc, bool enable_communication)
> {
> struct intel_guc *guc = &uc->guc;
> @@ -767,4 +773,6 @@ static const struct intel_uc_ops uc_ops_on = {
>
> .init_hw = __uc_init_hw,
> .fini_hw = __uc_fini_hw,
> +
> + .resume_mappings = __uc_resume_mappings,
> };
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h b/drivers/gpu/drm/i915/gt/uc/intel_uc.h
> index d585524d94de..014bb7d83689 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.h
> @@ -24,6 +24,7 @@ struct intel_uc_ops {
> void (*fini)(struct intel_uc *uc);
> int (*init_hw)(struct intel_uc *uc);
> void (*fini_hw)(struct intel_uc *uc);
> + void (*resume_mappings)(struct intel_uc *uc);
> };
>
> struct intel_uc {
> @@ -114,6 +115,7 @@ intel_uc_ops_function(init, init, int, 0);
> intel_uc_ops_function(fini, fini, void, );
> intel_uc_ops_function(init_hw, init_hw, int, 0);
> intel_uc_ops_function(fini_hw, fini_hw, void, );
> +intel_uc_ops_function(resume_mappings, resume_mappings, void, );
> #undef intel_uc_ops_function
>
> #endif
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> index dc5c96c503a9..31776c279f32 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -471,12 +471,14 @@ static void __uc_fw_user_override(struct drm_i915_private *i915, struct intel_uc
> * intel_uc_fw_init_early - initialize the uC object and select the firmware
> * @uc_fw: uC firmware
> * @type: type of uC
> + * @needs_ggtt_mapping: whether the FW needs to be GGTT mapped for loading
> *
> * Initialize the state of our uC object and relevant tracking and select the
> * firmware to fetch and load.
> */
> void intel_uc_fw_init_early(struct intel_uc_fw *uc_fw,
> - enum intel_uc_fw_type type)
> + enum intel_uc_fw_type type,
> + bool needs_ggtt_mapping)
> {
> struct intel_gt *gt = ____uc_fw_to_gt(uc_fw, type);
> struct drm_i915_private *i915 = gt->i915;
> @@ -490,6 +492,7 @@ void intel_uc_fw_init_early(struct intel_uc_fw *uc_fw,
> GEM_BUG_ON(uc_fw->file_selected.path);
>
> uc_fw->type = type;
> + uc_fw->needs_ggtt_mapping = needs_ggtt_mapping;
>
> if (HAS_GT_UC(i915)) {
> if (!validate_fw_table_type(i915, type)) {
> @@ -755,7 +758,7 @@ static int try_firmware_load(struct intel_uc_fw *uc_fw, const struct firmware **
> if (err)
> return err;
>
> - if ((*fw)->size > INTEL_UC_RSVD_GGTT_PER_FW) {
> + if (uc_fw->needs_ggtt_mapping && (*fw)->size > INTEL_UC_RSVD_GGTT_PER_FW) {
> gt_err(gt, "%s firmware %s: size (%zuKB) exceeds max supported size (%uKB)\n",
> intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
> (*fw)->size / SZ_1K, INTEL_UC_RSVD_GGTT_PER_FW / SZ_1K);
> @@ -940,29 +943,32 @@ static void uc_fw_bind_ggtt(struct intel_uc_fw *uc_fw)
> {
> struct drm_i915_gem_object *obj = uc_fw->obj;
> struct i915_ggtt *ggtt = __uc_fw_to_gt(uc_fw)->ggtt;
> - struct i915_vma_resource *dummy = &uc_fw->dummy;
> + struct i915_vma_resource *vma_res = &uc_fw->vma_res;
> u32 pte_flags = 0;
>
> - dummy->start = uc_fw_ggtt_offset(uc_fw);
> - dummy->node_size = obj->base.size;
> - dummy->bi.pages = obj->mm.pages;
> + if (!uc_fw->needs_ggtt_mapping)
> + return;
> +
> + vma_res->start = uc_fw_ggtt_offset(uc_fw);
> + vma_res->node_size = obj->base.size;
> + vma_res->bi.pages = obj->mm.pages;
>
> GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
>
> /* uc_fw->obj cache domains were not controlled across suspend */
> if (i915_gem_object_has_struct_page(obj))
> - drm_clflush_sg(dummy->bi.pages);
> + drm_clflush_sg(vma_res->bi.pages);
>
> if (i915_gem_object_is_lmem(obj))
> pte_flags |= PTE_LM;
>
> if (ggtt->vm.raw_insert_entries)
> - ggtt->vm.raw_insert_entries(&ggtt->vm, dummy,
> + ggtt->vm.raw_insert_entries(&ggtt->vm, vma_res,
> i915_gem_get_pat_index(ggtt->vm.i915,
> I915_CACHE_NONE),
> pte_flags);
> else
> - ggtt->vm.insert_entries(&ggtt->vm, dummy,
> + ggtt->vm.insert_entries(&ggtt->vm, vma_res,
> i915_gem_get_pat_index(ggtt->vm.i915,
> I915_CACHE_NONE),
> pte_flags);
> @@ -970,11 +976,13 @@ static void uc_fw_bind_ggtt(struct intel_uc_fw *uc_fw)
>
> static void uc_fw_unbind_ggtt(struct intel_uc_fw *uc_fw)
> {
> - struct drm_i915_gem_object *obj = uc_fw->obj;
> struct i915_ggtt *ggtt = __uc_fw_to_gt(uc_fw)->ggtt;
> - u64 start = uc_fw_ggtt_offset(uc_fw);
> + struct i915_vma_resource *vma_res = &uc_fw->vma_res;
> +
> + if (!vma_res->node_size)
> + return;
>
> - ggtt->vm.clear_range(&ggtt->vm, start, obj->base.size);
> + ggtt->vm.clear_range(&ggtt->vm, vma_res->start, vma_res->node_size);
> }
>
> static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
> @@ -991,7 +999,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
> intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
>
> /* Set the source address for the uCode */
> - offset = uc_fw_ggtt_offset(uc_fw);
> + offset = uc_fw->vma_res.start;
> GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
> intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW, lower_32_bits(offset));
> intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH, upper_32_bits(offset));
> @@ -1065,9 +1073,7 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
> return -ENOEXEC;
>
> /* Call custom loader */
> - uc_fw_bind_ggtt(uc_fw);
> err = uc_fw_xfer(uc_fw, dst_offset, dma_flags);
> - uc_fw_unbind_ggtt(uc_fw);
> if (err)
> goto fail;
>
> @@ -1171,6 +1177,8 @@ int intel_uc_fw_init(struct intel_uc_fw *uc_fw)
> goto out_unpin;
> }
>
> + uc_fw_bind_ggtt(uc_fw);
> +
> return 0;
>
> out_unpin:
> @@ -1181,6 +1189,7 @@ int intel_uc_fw_init(struct intel_uc_fw *uc_fw)
>
> void intel_uc_fw_fini(struct intel_uc_fw *uc_fw)
> {
> + uc_fw_unbind_ggtt(uc_fw);
> uc_fw_rsa_data_destroy(uc_fw);
>
> if (i915_gem_object_has_pinned_pages(uc_fw->obj))
> @@ -1189,6 +1198,17 @@ void intel_uc_fw_fini(struct intel_uc_fw *uc_fw)
> intel_uc_fw_change_status(uc_fw, INTEL_UC_FIRMWARE_AVAILABLE);
> }
>
> +void intel_uc_fw_resume_mapping(struct intel_uc_fw *uc_fw)
> +{
> + if (!intel_uc_fw_is_available(uc_fw))
> + return;
> +
> + if (!i915_gem_object_has_pinned_pages(uc_fw->obj))
> + return;
> +
> + uc_fw_bind_ggtt(uc_fw);
> +}
> +
> /**
> * intel_uc_fw_cleanup_fetch - cleanup uC firmware
> * @uc_fw: uC firmware
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> index 6ba00e6b3975..2be9470eb712 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> @@ -99,13 +99,19 @@ struct intel_uc_fw {
> struct drm_i915_gem_object *obj;
>
> /**
> - * @dummy: A vma used in binding the uc fw to ggtt. We can't define this
> - * vma on the stack as it can lead to a stack overflow, so we define it
> - * here. Safe to have 1 copy per uc fw because the binding is single
> - * threaded as it done during driver load (inherently single threaded)
> - * or during a GT reset (mutex guarantees single threaded).
> + * @needs_ggtt_mapping: indicates whether the fw object needs to be
> + * pinned to ggtt. If true, the fw is pinned at init time and unpinned
> + * during driver unload.
> */
> - struct i915_vma_resource dummy;
> + bool needs_ggtt_mapping;
> +
> + /**
> + * @vma_res: A vma resource used in binding the uc fw to ggtt. The fw is
> + * pinned in a reserved area of the ggtt (above the maximum address
> + * usable by GuC); therefore, we can't use the normal vma functions to
> + * do the pinning and we instead use this resource to do so.
> + */
> + struct i915_vma_resource vma_res;
> struct i915_vma *rsa_data;
>
> u32 rsa_size;
> @@ -282,12 +288,14 @@ static inline u32 intel_uc_fw_get_upload_size(struct intel_uc_fw *uc_fw)
> }
>
> void intel_uc_fw_init_early(struct intel_uc_fw *uc_fw,
> - enum intel_uc_fw_type type);
> + enum intel_uc_fw_type type,
> + bool needs_ggtt_mapping);
> int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw);
> void intel_uc_fw_cleanup_fetch(struct intel_uc_fw *uc_fw);
> int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, u32 offset, u32 dma_flags);
> int intel_uc_fw_init(struct intel_uc_fw *uc_fw);
> void intel_uc_fw_fini(struct intel_uc_fw *uc_fw);
> +void intel_uc_fw_resume_mapping(struct intel_uc_fw *uc_fw);
> size_t intel_uc_fw_copy_rsa(struct intel_uc_fw *uc_fw, void *dst, u32 max_len);
> int intel_uc_fw_mark_load_failed(struct intel_uc_fw *uc_fw, int err);
> void intel_uc_fw_dump(const struct intel_uc_fw *uc_fw, struct drm_printer *p);
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 2/7] drm/i915/huc: Parse the GSC-enabled HuC binary
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
-1 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: John Harrison, Daniele Ceraolo Spurio, Alan Previn, dri-devel
The new binaries that support the 2-step authentication contain the
legacy-style binary, which we can use for loading the HuC via DMA. To
find out where this is located in the image, we need to parse the
manifest of the GSC-enabled HuC binary. The manifest consist of a
partition header followed by entries, one of which contains the offset
we're looking for.
Note that the DG2 GSC binary contains entries with the same names, but
it doesn't contain a full legacy binary, so we need to skip assigning
the dma offset in that case (which we can do by checking the ccs).
Also, since we're now parsing the entries, we can extract the HuC
version that way instead of using hardcoded offsets.
Note that the GSC binary uses the same structures in its binary header,
so they've been added in their own header file.
v2: fix structure names to match meu defines (s/CPT/CPD/), update commit
message, check ccs validity, drop old version location defines.
v3: drop references to the MEU tool to reduce confusion, fix log (John)
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
---
| 74 ++++++++++
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 11 +-
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 135 ++++++++++++++++++
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 5 +-
drivers/gpu/drm/i915/gt/uc/intel_huc_print.h | 21 +++
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 71 +++++----
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +
drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 6 -
8 files changed, 272 insertions(+), 53 deletions(-)
create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
--git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
new file mode 100644
index 000000000000..714f0c256118
--- /dev/null
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
@@ -0,0 +1,74 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef _INTEL_GSC_BINARY_HEADERS_H_
+#define _INTEL_GSC_BINARY_HEADERS_H_
+
+#include <linux/types.h>
+
+/* Code partition directory (CPD) structures */
+struct intel_gsc_cpd_header_v2 {
+ u32 header_marker;
+#define INTEL_GSC_CPD_HEADER_MARKER 0x44504324
+
+ u32 num_of_entries;
+ u8 header_version;
+ u8 entry_version;
+ u8 header_length; /* in bytes */
+ u8 flags;
+ u32 partition_name;
+ u32 crc32;
+} __packed;
+
+struct intel_gsc_cpd_entry {
+ u8 name[12];
+
+ /*
+ * Bits 0-24: offset from the beginning of the code partition
+ * Bit 25: huffman compressed
+ * Bits 26-31: reserved
+ */
+ u32 offset;
+#define INTEL_GSC_CPD_ENTRY_OFFSET_MASK GENMASK(24, 0)
+#define INTEL_GSC_CPD_ENTRY_HUFFMAN_COMP BIT(25)
+
+ /*
+ * Module/Item length, in bytes. For Huffman-compressed modules, this
+ * refers to the uncompressed size. For software-compressed modules,
+ * this refers to the compressed size.
+ */
+ u32 length;
+
+ u8 reserved[4];
+} __packed;
+
+struct intel_gsc_version {
+ u16 major;
+ u16 minor;
+ u16 hotfix;
+ u16 build;
+} __packed;
+
+struct intel_gsc_manifest_header {
+ u32 header_type; /* 0x4 for manifest type */
+ u32 header_length; /* in dwords */
+ u32 header_version;
+ u32 flags;
+ u32 vendor;
+ u32 date;
+ u32 size; /* In dwords, size of entire manifest (header + extensions) */
+ u32 header_id;
+ u32 internal_data;
+ struct intel_gsc_version fw_version;
+ u32 security_version;
+ struct intel_gsc_version meu_kit_version;
+ u32 meu_manifest_version;
+ u8 general_data[4];
+ u8 reserved3[56];
+ u32 modulus_size; /* in dwords */
+ u32 exponent_size; /* in dwords */
+} __packed;
+
+#endif
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 268e036f8f28..6d795438b3e4 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -6,23 +6,14 @@
#include <linux/types.h>
#include "gt/intel_gt.h"
-#include "gt/intel_gt_print.h"
#include "intel_guc_reg.h"
#include "intel_huc.h"
+#include "intel_huc_print.h"
#include "i915_drv.h"
#include <linux/device/bus.h>
#include <linux/mei_aux.h>
-#define huc_printk(_huc, _level, _fmt, ...) \
- gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
-#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt, ##__VA_ARGS__)
-#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt, ##__VA_ARGS__)
-#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice, _fmt, ##__VA_ARGS__)
-#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt, ##__VA_ARGS__)
-#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt, ##__VA_ARGS__)
-#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc), probe_error, _fmt, ##__VA_ARGS__)
-
/**
* DOC: HuC
*
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
index 534b0aa43316..037d2ad4879d 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
@@ -5,11 +5,146 @@
#include "gt/intel_gsc.h"
#include "gt/intel_gt.h"
+#include "intel_gsc_binary_headers.h"
#include "intel_huc.h"
#include "intel_huc_fw.h"
+#include "intel_huc_print.h"
#include "i915_drv.h"
#include "pxp/intel_pxp_huc.h"
+static void get_version_from_gsc_manifest(struct intel_uc_fw_ver *ver, const void *data)
+{
+ const struct intel_gsc_manifest_header *manifest = data;
+
+ ver->major = manifest->fw_version.major;
+ ver->minor = manifest->fw_version.minor;
+ ver->patch = manifest->fw_version.hotfix;
+}
+
+static bool css_valid(const void *data, size_t size)
+{
+ const struct uc_css_header *css = data;
+
+ if (unlikely(size < sizeof(struct uc_css_header)))
+ return false;
+
+ if (css->module_type != 0x6)
+ return false;
+
+ if (css->module_vendor != PCI_VENDOR_ID_INTEL)
+ return false;
+
+ return true;
+}
+
+static inline u32 entry_offset(const struct intel_gsc_cpd_entry *entry)
+{
+ return entry->offset & INTEL_GSC_CPD_ENTRY_OFFSET_MASK;
+}
+
+int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, size_t size)
+{
+ struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
+ const struct intel_gsc_cpd_header_v2 *header = data;
+ const struct intel_gsc_cpd_entry *entry;
+ size_t min_size = sizeof(*header);
+ int i;
+
+ if (!huc_fw->loaded_via_gsc) {
+ huc_err(huc, "Invalid FW type GSC header parsing!\n");
+ return -EINVAL;
+ }
+
+ if (size < sizeof(*header)) {
+ huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
+ return -ENODATA;
+ }
+
+ /*
+ * The GSC-enabled HuC binary starts with a directory header, followed
+ * by a series of entries. Each entry is identified by a name and
+ * points to a specific section of the binary containing the relevant
+ * data. The entries we're interested in are:
+ * - "HUCP.man": points to the GSC manifest header for the HuC, which
+ * contains the version info.
+ * - "huc_fw": points to the legacy-style binary that can be used for
+ * load via the DMA. This entry only contains a valid CSS
+ * on binaries for platforms that support 2-step HuC load
+ * via dma and auth via GSC (like MTL).
+ *
+ * --------------------------------------------------
+ * [ intel_gsc_cpd_header_v2 ]
+ * --------------------------------------------------
+ * [ intel_gsc_cpd_entry[] ]
+ * [ entry1 ]
+ * [ ... ]
+ * [ entryX ]
+ * [ "HUCP.man" ]
+ * [ ... ]
+ * [ offset >----------------------------]------o
+ * [ ... ] |
+ * [ entryY ] |
+ * [ "huc_fw" ] |
+ * [ ... ] |
+ * [ offset >----------------------------]----------o
+ * -------------------------------------------------- | |
+ * | |
+ * -------------------------------------------------- | |
+ * [ intel_gsc_manifest_header ]<-----o |
+ * [ ... ] |
+ * [ intel_gsc_version fw_version ] |
+ * [ ... ] |
+ * -------------------------------------------------- |
+ * |
+ * -------------------------------------------------- |
+ * [ data[] ]<---------o
+ * [ ... ]
+ * [ ... ]
+ * --------------------------------------------------
+ */
+
+ if (header->header_marker != INTEL_GSC_CPD_HEADER_MARKER) {
+ huc_err(huc, "invalid marker for CPD header: 0x%08x!\n",
+ header->header_marker);
+ return -EINVAL;
+ }
+
+ /* we only have binaries with header v2 and entry v1 for now */
+ if (header->header_version != 2 || header->entry_version != 1) {
+ huc_err(huc, "invalid CPD header/entry version %u:%u!\n",
+ header->header_version, header->entry_version);
+ return -EINVAL;
+ }
+
+ if (header->header_length < sizeof(struct intel_gsc_cpd_header_v2)) {
+ huc_err(huc, "invalid CPD header length %u!\n",
+ header->header_length);
+ return -EINVAL;
+ }
+
+ min_size = header->header_length + sizeof(*entry) * header->num_of_entries;
+ if (size < min_size) {
+ huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
+ return -ENODATA;
+ }
+
+ entry = data + header->header_length;
+
+ for (i = 0; i < header->num_of_entries; i++, entry++) {
+ if (strcmp(entry->name, "HUCP.man") == 0)
+ get_version_from_gsc_manifest(&huc_fw->file_selected.ver,
+ data + entry_offset(entry));
+
+ if (strcmp(entry->name, "huc_fw") == 0) {
+ u32 offset = entry_offset(entry);
+ if (offset < size && css_valid(data + offset, size - offset))
+ huc_fw->dma_start_offset = offset;
+ }
+ }
+
+ return 0;
+}
+
int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
{
int ret;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
index db42e238b45f..0999ffe6f962 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
@@ -7,8 +7,11 @@
#define _INTEL_HUC_FW_H_
struct intel_huc;
+struct intel_uc_fw;
+
+#include <linux/types.h>
int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc);
int intel_huc_fw_upload(struct intel_huc *huc);
-
+int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, size_t size);
#endif
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
new file mode 100644
index 000000000000..915d310ee1df
--- /dev/null
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef __INTEL_HUC_PRINT__
+#define __INTEL_HUC_PRINT__
+
+#include "gt/intel_gt.h"
+#include "gt/intel_gt_print.h"
+
+#define huc_printk(_huc, _level, _fmt, ...) \
+ gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
+#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt, ##__VA_ARGS__)
+#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt, ##__VA_ARGS__)
+#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice, _fmt, ##__VA_ARGS__)
+#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt, ##__VA_ARGS__)
+#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt, ##__VA_ARGS__)
+#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc), probe_error, _fmt, ##__VA_ARGS__)
+
+#endif /* __INTEL_HUC_PRINT__ */
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 31776c279f32..9ced8dbf1253 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -548,33 +548,6 @@ static void __force_fw_fetch_failures(struct intel_uc_fw *uc_fw, int e)
}
}
-static int check_gsc_manifest(struct intel_gt *gt,
- const struct firmware *fw,
- struct intel_uc_fw *uc_fw)
-{
- u32 *dw = (u32 *)fw->data;
- u32 version_hi, version_lo;
- size_t min_size;
-
- /* Check the size of the blob before examining buffer contents */
- min_size = sizeof(u32) * (HUC_GSC_VERSION_LO_DW + 1);
- if (unlikely(fw->size < min_size)) {
- gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
- intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
- fw->size, min_size);
- return -ENODATA;
- }
-
- version_hi = dw[HUC_GSC_VERSION_HI_DW];
- version_lo = dw[HUC_GSC_VERSION_LO_DW];
-
- uc_fw->file_selected.ver.major = FIELD_GET(HUC_GSC_MAJOR_VER_HI_MASK, version_hi);
- uc_fw->file_selected.ver.minor = FIELD_GET(HUC_GSC_MINOR_VER_HI_MASK, version_hi);
- uc_fw->file_selected.ver.patch = FIELD_GET(HUC_GSC_PATCH_VER_LO_MASK, version_lo);
-
- return 0;
-}
-
static void uc_unpack_css_version(struct intel_uc_fw_ver *ver, u32 css_value)
{
/* Get version numbers from the CSS header */
@@ -631,22 +604,22 @@ static void guc_read_css_info(struct intel_uc_fw *uc_fw, struct uc_css_header *c
uc_fw->private_data_size = css->private_data_size;
}
-static int check_ccs_header(struct intel_gt *gt,
- const struct firmware *fw,
- struct intel_uc_fw *uc_fw)
+static int __check_ccs_header(struct intel_gt *gt,
+ const void *fw_data, size_t fw_size,
+ struct intel_uc_fw *uc_fw)
{
struct uc_css_header *css;
size_t size;
/* Check the size of the blob before examining buffer contents */
- if (unlikely(fw->size < sizeof(struct uc_css_header))) {
+ if (unlikely(fw_size < sizeof(struct uc_css_header))) {
gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
- fw->size, sizeof(struct uc_css_header));
+ fw_size, sizeof(struct uc_css_header));
return -ENODATA;
}
- css = (struct uc_css_header *)fw->data;
+ css = (struct uc_css_header *)fw_data;
/* Check integrity of size values inside CSS header */
size = (css->header_size_dw - css->key_size_dw - css->modulus_size_dw -
@@ -654,7 +627,7 @@ static int check_ccs_header(struct intel_gt *gt,
if (unlikely(size != sizeof(struct uc_css_header))) {
gt_warn(gt, "%s firmware %s: unexpected header size: %zu != %zu\n",
intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
- fw->size, sizeof(struct uc_css_header));
+ fw_size, sizeof(struct uc_css_header));
return -EPROTO;
}
@@ -666,10 +639,10 @@ static int check_ccs_header(struct intel_gt *gt,
/* At least, it should have header, uCode and RSA. Size of all three. */
size = sizeof(struct uc_css_header) + uc_fw->ucode_size + uc_fw->rsa_size;
- if (unlikely(fw->size < size)) {
+ if (unlikely(fw_size < size)) {
gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
- fw->size, size);
+ fw_size, size);
return -ENOEXEC;
}
@@ -690,6 +663,32 @@ static int check_ccs_header(struct intel_gt *gt,
return 0;
}
+static int check_gsc_manifest(struct intel_gt *gt,
+ const struct firmware *fw,
+ struct intel_uc_fw *uc_fw)
+{
+ if (uc_fw->type != INTEL_UC_FW_TYPE_HUC) {
+ gt_err(gt, "trying to GSC-parse a non-HuC binary");
+ return -EINVAL;
+ }
+
+ intel_huc_fw_get_binary_info(uc_fw, fw->data, fw->size);
+
+ if (uc_fw->dma_start_offset) {
+ u32 delta = uc_fw->dma_start_offset;
+ __check_ccs_header(gt, fw->data + delta, fw->size - delta, uc_fw);
+ }
+
+ return 0;
+}
+
+static int check_ccs_header(struct intel_gt *gt,
+ const struct firmware *fw,
+ struct intel_uc_fw *uc_fw)
+{
+ return __check_ccs_header(gt, fw->data, fw->size, uc_fw);
+}
+
static bool is_ver_8bit(struct intel_uc_fw_ver *ver)
{
return ver->major < 0xFF && ver->minor < 0xFF && ver->patch < 0xFF;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
index 2be9470eb712..b3daba9526eb 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
@@ -118,6 +118,8 @@ struct intel_uc_fw {
u32 ucode_size;
u32 private_data_size;
+ u32 dma_start_offset;
+
bool loaded_via_gsc;
};
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
index 646fa8aa6cf1..7fe405126249 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
@@ -84,10 +84,4 @@ struct uc_css_header {
} __packed;
static_assert(sizeof(struct uc_css_header) == 128);
-#define HUC_GSC_VERSION_HI_DW 44
-#define HUC_GSC_MAJOR_VER_HI_MASK (0xFF << 0)
-#define HUC_GSC_MINOR_VER_HI_MASK (0xFF << 16)
-#define HUC_GSC_VERSION_LO_DW 45
-#define HUC_GSC_PATCH_VER_LO_MASK (0xFF << 0)
-
#endif /* _INTEL_UC_FW_ABI_H */
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread* [Intel-gfx] [PATCH v3 2/7] drm/i915/huc: Parse the GSC-enabled HuC binary
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
0 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: Alan Previn, dri-devel
The new binaries that support the 2-step authentication contain the
legacy-style binary, which we can use for loading the HuC via DMA. To
find out where this is located in the image, we need to parse the
manifest of the GSC-enabled HuC binary. The manifest consist of a
partition header followed by entries, one of which contains the offset
we're looking for.
Note that the DG2 GSC binary contains entries with the same names, but
it doesn't contain a full legacy binary, so we need to skip assigning
the dma offset in that case (which we can do by checking the ccs).
Also, since we're now parsing the entries, we can extract the HuC
version that way instead of using hardcoded offsets.
Note that the GSC binary uses the same structures in its binary header,
so they've been added in their own header file.
v2: fix structure names to match meu defines (s/CPT/CPD/), update commit
message, check ccs validity, drop old version location defines.
v3: drop references to the MEU tool to reduce confusion, fix log (John)
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
---
| 74 ++++++++++
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 11 +-
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 135 ++++++++++++++++++
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 5 +-
drivers/gpu/drm/i915/gt/uc/intel_huc_print.h | 21 +++
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 71 +++++----
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +
drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 6 -
8 files changed, 272 insertions(+), 53 deletions(-)
create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
--git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
new file mode 100644
index 000000000000..714f0c256118
--- /dev/null
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
@@ -0,0 +1,74 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef _INTEL_GSC_BINARY_HEADERS_H_
+#define _INTEL_GSC_BINARY_HEADERS_H_
+
+#include <linux/types.h>
+
+/* Code partition directory (CPD) structures */
+struct intel_gsc_cpd_header_v2 {
+ u32 header_marker;
+#define INTEL_GSC_CPD_HEADER_MARKER 0x44504324
+
+ u32 num_of_entries;
+ u8 header_version;
+ u8 entry_version;
+ u8 header_length; /* in bytes */
+ u8 flags;
+ u32 partition_name;
+ u32 crc32;
+} __packed;
+
+struct intel_gsc_cpd_entry {
+ u8 name[12];
+
+ /*
+ * Bits 0-24: offset from the beginning of the code partition
+ * Bit 25: huffman compressed
+ * Bits 26-31: reserved
+ */
+ u32 offset;
+#define INTEL_GSC_CPD_ENTRY_OFFSET_MASK GENMASK(24, 0)
+#define INTEL_GSC_CPD_ENTRY_HUFFMAN_COMP BIT(25)
+
+ /*
+ * Module/Item length, in bytes. For Huffman-compressed modules, this
+ * refers to the uncompressed size. For software-compressed modules,
+ * this refers to the compressed size.
+ */
+ u32 length;
+
+ u8 reserved[4];
+} __packed;
+
+struct intel_gsc_version {
+ u16 major;
+ u16 minor;
+ u16 hotfix;
+ u16 build;
+} __packed;
+
+struct intel_gsc_manifest_header {
+ u32 header_type; /* 0x4 for manifest type */
+ u32 header_length; /* in dwords */
+ u32 header_version;
+ u32 flags;
+ u32 vendor;
+ u32 date;
+ u32 size; /* In dwords, size of entire manifest (header + extensions) */
+ u32 header_id;
+ u32 internal_data;
+ struct intel_gsc_version fw_version;
+ u32 security_version;
+ struct intel_gsc_version meu_kit_version;
+ u32 meu_manifest_version;
+ u8 general_data[4];
+ u8 reserved3[56];
+ u32 modulus_size; /* in dwords */
+ u32 exponent_size; /* in dwords */
+} __packed;
+
+#endif
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 268e036f8f28..6d795438b3e4 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -6,23 +6,14 @@
#include <linux/types.h>
#include "gt/intel_gt.h"
-#include "gt/intel_gt_print.h"
#include "intel_guc_reg.h"
#include "intel_huc.h"
+#include "intel_huc_print.h"
#include "i915_drv.h"
#include <linux/device/bus.h>
#include <linux/mei_aux.h>
-#define huc_printk(_huc, _level, _fmt, ...) \
- gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
-#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt, ##__VA_ARGS__)
-#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt, ##__VA_ARGS__)
-#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice, _fmt, ##__VA_ARGS__)
-#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt, ##__VA_ARGS__)
-#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt, ##__VA_ARGS__)
-#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc), probe_error, _fmt, ##__VA_ARGS__)
-
/**
* DOC: HuC
*
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
index 534b0aa43316..037d2ad4879d 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
@@ -5,11 +5,146 @@
#include "gt/intel_gsc.h"
#include "gt/intel_gt.h"
+#include "intel_gsc_binary_headers.h"
#include "intel_huc.h"
#include "intel_huc_fw.h"
+#include "intel_huc_print.h"
#include "i915_drv.h"
#include "pxp/intel_pxp_huc.h"
+static void get_version_from_gsc_manifest(struct intel_uc_fw_ver *ver, const void *data)
+{
+ const struct intel_gsc_manifest_header *manifest = data;
+
+ ver->major = manifest->fw_version.major;
+ ver->minor = manifest->fw_version.minor;
+ ver->patch = manifest->fw_version.hotfix;
+}
+
+static bool css_valid(const void *data, size_t size)
+{
+ const struct uc_css_header *css = data;
+
+ if (unlikely(size < sizeof(struct uc_css_header)))
+ return false;
+
+ if (css->module_type != 0x6)
+ return false;
+
+ if (css->module_vendor != PCI_VENDOR_ID_INTEL)
+ return false;
+
+ return true;
+}
+
+static inline u32 entry_offset(const struct intel_gsc_cpd_entry *entry)
+{
+ return entry->offset & INTEL_GSC_CPD_ENTRY_OFFSET_MASK;
+}
+
+int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, size_t size)
+{
+ struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
+ const struct intel_gsc_cpd_header_v2 *header = data;
+ const struct intel_gsc_cpd_entry *entry;
+ size_t min_size = sizeof(*header);
+ int i;
+
+ if (!huc_fw->loaded_via_gsc) {
+ huc_err(huc, "Invalid FW type GSC header parsing!\n");
+ return -EINVAL;
+ }
+
+ if (size < sizeof(*header)) {
+ huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
+ return -ENODATA;
+ }
+
+ /*
+ * The GSC-enabled HuC binary starts with a directory header, followed
+ * by a series of entries. Each entry is identified by a name and
+ * points to a specific section of the binary containing the relevant
+ * data. The entries we're interested in are:
+ * - "HUCP.man": points to the GSC manifest header for the HuC, which
+ * contains the version info.
+ * - "huc_fw": points to the legacy-style binary that can be used for
+ * load via the DMA. This entry only contains a valid CSS
+ * on binaries for platforms that support 2-step HuC load
+ * via dma and auth via GSC (like MTL).
+ *
+ * --------------------------------------------------
+ * [ intel_gsc_cpd_header_v2 ]
+ * --------------------------------------------------
+ * [ intel_gsc_cpd_entry[] ]
+ * [ entry1 ]
+ * [ ... ]
+ * [ entryX ]
+ * [ "HUCP.man" ]
+ * [ ... ]
+ * [ offset >----------------------------]------o
+ * [ ... ] |
+ * [ entryY ] |
+ * [ "huc_fw" ] |
+ * [ ... ] |
+ * [ offset >----------------------------]----------o
+ * -------------------------------------------------- | |
+ * | |
+ * -------------------------------------------------- | |
+ * [ intel_gsc_manifest_header ]<-----o |
+ * [ ... ] |
+ * [ intel_gsc_version fw_version ] |
+ * [ ... ] |
+ * -------------------------------------------------- |
+ * |
+ * -------------------------------------------------- |
+ * [ data[] ]<---------o
+ * [ ... ]
+ * [ ... ]
+ * --------------------------------------------------
+ */
+
+ if (header->header_marker != INTEL_GSC_CPD_HEADER_MARKER) {
+ huc_err(huc, "invalid marker for CPD header: 0x%08x!\n",
+ header->header_marker);
+ return -EINVAL;
+ }
+
+ /* we only have binaries with header v2 and entry v1 for now */
+ if (header->header_version != 2 || header->entry_version != 1) {
+ huc_err(huc, "invalid CPD header/entry version %u:%u!\n",
+ header->header_version, header->entry_version);
+ return -EINVAL;
+ }
+
+ if (header->header_length < sizeof(struct intel_gsc_cpd_header_v2)) {
+ huc_err(huc, "invalid CPD header length %u!\n",
+ header->header_length);
+ return -EINVAL;
+ }
+
+ min_size = header->header_length + sizeof(*entry) * header->num_of_entries;
+ if (size < min_size) {
+ huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
+ return -ENODATA;
+ }
+
+ entry = data + header->header_length;
+
+ for (i = 0; i < header->num_of_entries; i++, entry++) {
+ if (strcmp(entry->name, "HUCP.man") == 0)
+ get_version_from_gsc_manifest(&huc_fw->file_selected.ver,
+ data + entry_offset(entry));
+
+ if (strcmp(entry->name, "huc_fw") == 0) {
+ u32 offset = entry_offset(entry);
+ if (offset < size && css_valid(data + offset, size - offset))
+ huc_fw->dma_start_offset = offset;
+ }
+ }
+
+ return 0;
+}
+
int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
{
int ret;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
index db42e238b45f..0999ffe6f962 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
@@ -7,8 +7,11 @@
#define _INTEL_HUC_FW_H_
struct intel_huc;
+struct intel_uc_fw;
+
+#include <linux/types.h>
int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc);
int intel_huc_fw_upload(struct intel_huc *huc);
-
+int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, size_t size);
#endif
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
new file mode 100644
index 000000000000..915d310ee1df
--- /dev/null
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef __INTEL_HUC_PRINT__
+#define __INTEL_HUC_PRINT__
+
+#include "gt/intel_gt.h"
+#include "gt/intel_gt_print.h"
+
+#define huc_printk(_huc, _level, _fmt, ...) \
+ gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
+#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt, ##__VA_ARGS__)
+#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt, ##__VA_ARGS__)
+#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice, _fmt, ##__VA_ARGS__)
+#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt, ##__VA_ARGS__)
+#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt, ##__VA_ARGS__)
+#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc), probe_error, _fmt, ##__VA_ARGS__)
+
+#endif /* __INTEL_HUC_PRINT__ */
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 31776c279f32..9ced8dbf1253 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -548,33 +548,6 @@ static void __force_fw_fetch_failures(struct intel_uc_fw *uc_fw, int e)
}
}
-static int check_gsc_manifest(struct intel_gt *gt,
- const struct firmware *fw,
- struct intel_uc_fw *uc_fw)
-{
- u32 *dw = (u32 *)fw->data;
- u32 version_hi, version_lo;
- size_t min_size;
-
- /* Check the size of the blob before examining buffer contents */
- min_size = sizeof(u32) * (HUC_GSC_VERSION_LO_DW + 1);
- if (unlikely(fw->size < min_size)) {
- gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
- intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
- fw->size, min_size);
- return -ENODATA;
- }
-
- version_hi = dw[HUC_GSC_VERSION_HI_DW];
- version_lo = dw[HUC_GSC_VERSION_LO_DW];
-
- uc_fw->file_selected.ver.major = FIELD_GET(HUC_GSC_MAJOR_VER_HI_MASK, version_hi);
- uc_fw->file_selected.ver.minor = FIELD_GET(HUC_GSC_MINOR_VER_HI_MASK, version_hi);
- uc_fw->file_selected.ver.patch = FIELD_GET(HUC_GSC_PATCH_VER_LO_MASK, version_lo);
-
- return 0;
-}
-
static void uc_unpack_css_version(struct intel_uc_fw_ver *ver, u32 css_value)
{
/* Get version numbers from the CSS header */
@@ -631,22 +604,22 @@ static void guc_read_css_info(struct intel_uc_fw *uc_fw, struct uc_css_header *c
uc_fw->private_data_size = css->private_data_size;
}
-static int check_ccs_header(struct intel_gt *gt,
- const struct firmware *fw,
- struct intel_uc_fw *uc_fw)
+static int __check_ccs_header(struct intel_gt *gt,
+ const void *fw_data, size_t fw_size,
+ struct intel_uc_fw *uc_fw)
{
struct uc_css_header *css;
size_t size;
/* Check the size of the blob before examining buffer contents */
- if (unlikely(fw->size < sizeof(struct uc_css_header))) {
+ if (unlikely(fw_size < sizeof(struct uc_css_header))) {
gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
- fw->size, sizeof(struct uc_css_header));
+ fw_size, sizeof(struct uc_css_header));
return -ENODATA;
}
- css = (struct uc_css_header *)fw->data;
+ css = (struct uc_css_header *)fw_data;
/* Check integrity of size values inside CSS header */
size = (css->header_size_dw - css->key_size_dw - css->modulus_size_dw -
@@ -654,7 +627,7 @@ static int check_ccs_header(struct intel_gt *gt,
if (unlikely(size != sizeof(struct uc_css_header))) {
gt_warn(gt, "%s firmware %s: unexpected header size: %zu != %zu\n",
intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
- fw->size, sizeof(struct uc_css_header));
+ fw_size, sizeof(struct uc_css_header));
return -EPROTO;
}
@@ -666,10 +639,10 @@ static int check_ccs_header(struct intel_gt *gt,
/* At least, it should have header, uCode and RSA. Size of all three. */
size = sizeof(struct uc_css_header) + uc_fw->ucode_size + uc_fw->rsa_size;
- if (unlikely(fw->size < size)) {
+ if (unlikely(fw_size < size)) {
gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
- fw->size, size);
+ fw_size, size);
return -ENOEXEC;
}
@@ -690,6 +663,32 @@ static int check_ccs_header(struct intel_gt *gt,
return 0;
}
+static int check_gsc_manifest(struct intel_gt *gt,
+ const struct firmware *fw,
+ struct intel_uc_fw *uc_fw)
+{
+ if (uc_fw->type != INTEL_UC_FW_TYPE_HUC) {
+ gt_err(gt, "trying to GSC-parse a non-HuC binary");
+ return -EINVAL;
+ }
+
+ intel_huc_fw_get_binary_info(uc_fw, fw->data, fw->size);
+
+ if (uc_fw->dma_start_offset) {
+ u32 delta = uc_fw->dma_start_offset;
+ __check_ccs_header(gt, fw->data + delta, fw->size - delta, uc_fw);
+ }
+
+ return 0;
+}
+
+static int check_ccs_header(struct intel_gt *gt,
+ const struct firmware *fw,
+ struct intel_uc_fw *uc_fw)
+{
+ return __check_ccs_header(gt, fw->data, fw->size, uc_fw);
+}
+
static bool is_ver_8bit(struct intel_uc_fw_ver *ver)
{
return ver->major < 0xFF && ver->minor < 0xFF && ver->patch < 0xFF;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
index 2be9470eb712..b3daba9526eb 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
@@ -118,6 +118,8 @@ struct intel_uc_fw {
u32 ucode_size;
u32 private_data_size;
+ u32 dma_start_offset;
+
bool loaded_via_gsc;
};
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
index 646fa8aa6cf1..7fe405126249 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
@@ -84,10 +84,4 @@ struct uc_css_header {
} __packed;
static_assert(sizeof(struct uc_css_header) == 128);
-#define HUC_GSC_VERSION_HI_DW 44
-#define HUC_GSC_MAJOR_VER_HI_MASK (0xFF << 0)
-#define HUC_GSC_MINOR_VER_HI_MASK (0xFF << 16)
-#define HUC_GSC_VERSION_LO_DW 45
-#define HUC_GSC_PATCH_VER_LO_MASK (0xFF << 0)
-
#endif /* _INTEL_UC_FW_ABI_H */
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCH v3 2/7] drm/i915/huc: Parse the GSC-enabled HuC binary
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
@ 2023-05-30 23:30 ` John Harrison
-1 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-30 23:30 UTC (permalink / raw)
To: Daniele Ceraolo Spurio, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
> The new binaries that support the 2-step authentication contain the
> legacy-style binary, which we can use for loading the HuC via DMA. To
> find out where this is located in the image, we need to parse the
> manifest of the GSC-enabled HuC binary. The manifest consist of a
> partition header followed by entries, one of which contains the offset
> we're looking for.
> Note that the DG2 GSC binary contains entries with the same names, but
> it doesn't contain a full legacy binary, so we need to skip assigning
> the dma offset in that case (which we can do by checking the ccs).
> Also, since we're now parsing the entries, we can extract the HuC
> version that way instead of using hardcoded offsets.
>
> Note that the GSC binary uses the same structures in its binary header,
> so they've been added in their own header file.
>
> v2: fix structure names to match meu defines (s/CPT/CPD/), update commit
> message, check ccs validity, drop old version location defines.
>
> v3: drop references to the MEU tool to reduce confusion, fix log (John)
>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
> Cc: John Harrison <John.C.Harrison@Intel.com>
> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
> ---
> .../drm/i915/gt/uc/intel_gsc_binary_headers.h | 74 ++++++++++
> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 11 +-
> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 135 ++++++++++++++++++
> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 5 +-
> drivers/gpu/drm/i915/gt/uc/intel_huc_print.h | 21 +++
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 71 +++++----
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 6 -
> 8 files changed, 272 insertions(+), 53 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
> create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
> new file mode 100644
> index 000000000000..714f0c256118
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
> @@ -0,0 +1,74 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2023 Intel Corporation
> + */
> +
> +#ifndef _INTEL_GSC_BINARY_HEADERS_H_
> +#define _INTEL_GSC_BINARY_HEADERS_H_
> +
> +#include <linux/types.h>
> +
> +/* Code partition directory (CPD) structures */
> +struct intel_gsc_cpd_header_v2 {
> + u32 header_marker;
> +#define INTEL_GSC_CPD_HEADER_MARKER 0x44504324
> +
> + u32 num_of_entries;
> + u8 header_version;
> + u8 entry_version;
> + u8 header_length; /* in bytes */
> + u8 flags;
> + u32 partition_name;
> + u32 crc32;
> +} __packed;
> +
> +struct intel_gsc_cpd_entry {
> + u8 name[12];
> +
> + /*
> + * Bits 0-24: offset from the beginning of the code partition
> + * Bit 25: huffman compressed
> + * Bits 26-31: reserved
> + */
> + u32 offset;
> +#define INTEL_GSC_CPD_ENTRY_OFFSET_MASK GENMASK(24, 0)
> +#define INTEL_GSC_CPD_ENTRY_HUFFMAN_COMP BIT(25)
> +
> + /*
> + * Module/Item length, in bytes. For Huffman-compressed modules, this
> + * refers to the uncompressed size. For software-compressed modules,
> + * this refers to the compressed size.
> + */
> + u32 length;
> +
> + u8 reserved[4];
> +} __packed;
> +
> +struct intel_gsc_version {
> + u16 major;
> + u16 minor;
> + u16 hotfix;
> + u16 build;
> +} __packed;
> +
> +struct intel_gsc_manifest_header {
> + u32 header_type; /* 0x4 for manifest type */
> + u32 header_length; /* in dwords */
> + u32 header_version;
> + u32 flags;
> + u32 vendor;
> + u32 date;
> + u32 size; /* In dwords, size of entire manifest (header + extensions) */
> + u32 header_id;
> + u32 internal_data;
> + struct intel_gsc_version fw_version;
> + u32 security_version;
> + struct intel_gsc_version meu_kit_version;
> + u32 meu_manifest_version;
> + u8 general_data[4];
> + u8 reserved3[56];
> + u32 modulus_size; /* in dwords */
> + u32 exponent_size; /* in dwords */
> +} __packed;
> +
> +#endif
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> index 268e036f8f28..6d795438b3e4 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> @@ -6,23 +6,14 @@
> #include <linux/types.h>
>
> #include "gt/intel_gt.h"
> -#include "gt/intel_gt_print.h"
> #include "intel_guc_reg.h"
> #include "intel_huc.h"
> +#include "intel_huc_print.h"
> #include "i915_drv.h"
>
> #include <linux/device/bus.h>
> #include <linux/mei_aux.h>
>
> -#define huc_printk(_huc, _level, _fmt, ...) \
> - gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
> -#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt, ##__VA_ARGS__)
> -#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt, ##__VA_ARGS__)
> -#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice, _fmt, ##__VA_ARGS__)
> -#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt, ##__VA_ARGS__)
> -#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt, ##__VA_ARGS__)
> -#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc), probe_error, _fmt, ##__VA_ARGS__)
> -
> /**
> * DOC: HuC
> *
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> index 534b0aa43316..037d2ad4879d 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> @@ -5,11 +5,146 @@
>
> #include "gt/intel_gsc.h"
> #include "gt/intel_gt.h"
> +#include "intel_gsc_binary_headers.h"
> #include "intel_huc.h"
> #include "intel_huc_fw.h"
> +#include "intel_huc_print.h"
> #include "i915_drv.h"
> #include "pxp/intel_pxp_huc.h"
>
> +static void get_version_from_gsc_manifest(struct intel_uc_fw_ver *ver, const void *data)
> +{
> + const struct intel_gsc_manifest_header *manifest = data;
> +
> + ver->major = manifest->fw_version.major;
> + ver->minor = manifest->fw_version.minor;
> + ver->patch = manifest->fw_version.hotfix;
> +}
> +
> +static bool css_valid(const void *data, size_t size)
> +{
> + const struct uc_css_header *css = data;
> +
> + if (unlikely(size < sizeof(struct uc_css_header)))
> + return false;
> +
> + if (css->module_type != 0x6)
> + return false;
> +
> + if (css->module_vendor != PCI_VENDOR_ID_INTEL)
> + return false;
> +
> + return true;
> +}
> +
> +static inline u32 entry_offset(const struct intel_gsc_cpd_entry *entry)
> +{
> + return entry->offset & INTEL_GSC_CPD_ENTRY_OFFSET_MASK;
> +}
> +
> +int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, size_t size)
> +{
> + struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
> + const struct intel_gsc_cpd_header_v2 *header = data;
> + const struct intel_gsc_cpd_entry *entry;
> + size_t min_size = sizeof(*header);
> + int i;
> +
> + if (!huc_fw->loaded_via_gsc) {
> + huc_err(huc, "Invalid FW type GSC header parsing!\n");
I'm still not understanding what this error means. Is it meant to say
'Invalid FW type *for* GSC header parsing'?
'fw->loaded_via_gsc' is set from the blob table, yes? And
intel_huc_fw_get_binary_info() is only called from check_gsc_manifest()
which is called from check_fw_header() iff fw->loaded_via_gsc is set. So
it should be impossible for this test to ever fail, yes?
John.
> + return -EINVAL;
> + }
> +
> + if (size < sizeof(*header)) {
> + huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
> + return -ENODATA;
> + }
> +
> + /*
> + * The GSC-enabled HuC binary starts with a directory header, followed
> + * by a series of entries. Each entry is identified by a name and
> + * points to a specific section of the binary containing the relevant
> + * data. The entries we're interested in are:
> + * - "HUCP.man": points to the GSC manifest header for the HuC, which
> + * contains the version info.
> + * - "huc_fw": points to the legacy-style binary that can be used for
> + * load via the DMA. This entry only contains a valid CSS
> + * on binaries for platforms that support 2-step HuC load
> + * via dma and auth via GSC (like MTL).
> + *
> + * --------------------------------------------------
> + * [ intel_gsc_cpd_header_v2 ]
> + * --------------------------------------------------
> + * [ intel_gsc_cpd_entry[] ]
> + * [ entry1 ]
> + * [ ... ]
> + * [ entryX ]
> + * [ "HUCP.man" ]
> + * [ ... ]
> + * [ offset >----------------------------]------o
> + * [ ... ] |
> + * [ entryY ] |
> + * [ "huc_fw" ] |
> + * [ ... ] |
> + * [ offset >----------------------------]----------o
> + * -------------------------------------------------- | |
> + * | |
> + * -------------------------------------------------- | |
> + * [ intel_gsc_manifest_header ]<-----o |
> + * [ ... ] |
> + * [ intel_gsc_version fw_version ] |
> + * [ ... ] |
> + * -------------------------------------------------- |
> + * |
> + * -------------------------------------------------- |
> + * [ data[] ]<---------o
> + * [ ... ]
> + * [ ... ]
> + * --------------------------------------------------
> + */
> +
> + if (header->header_marker != INTEL_GSC_CPD_HEADER_MARKER) {
> + huc_err(huc, "invalid marker for CPD header: 0x%08x!\n",
> + header->header_marker);
> + return -EINVAL;
> + }
> +
> + /* we only have binaries with header v2 and entry v1 for now */
> + if (header->header_version != 2 || header->entry_version != 1) {
> + huc_err(huc, "invalid CPD header/entry version %u:%u!\n",
> + header->header_version, header->entry_version);
> + return -EINVAL;
> + }
> +
> + if (header->header_length < sizeof(struct intel_gsc_cpd_header_v2)) {
> + huc_err(huc, "invalid CPD header length %u!\n",
> + header->header_length);
> + return -EINVAL;
> + }
> +
> + min_size = header->header_length + sizeof(*entry) * header->num_of_entries;
> + if (size < min_size) {
> + huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
> + return -ENODATA;
> + }
> +
> + entry = data + header->header_length;
> +
> + for (i = 0; i < header->num_of_entries; i++, entry++) {
> + if (strcmp(entry->name, "HUCP.man") == 0)
> + get_version_from_gsc_manifest(&huc_fw->file_selected.ver,
> + data + entry_offset(entry));
> +
> + if (strcmp(entry->name, "huc_fw") == 0) {
> + u32 offset = entry_offset(entry);
> + if (offset < size && css_valid(data + offset, size - offset))
> + huc_fw->dma_start_offset = offset;
> + }
> + }
> +
> + return 0;
> +}
> +
> int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
> {
> int ret;
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
> index db42e238b45f..0999ffe6f962 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
> @@ -7,8 +7,11 @@
> #define _INTEL_HUC_FW_H_
>
> struct intel_huc;
> +struct intel_uc_fw;
> +
> +#include <linux/types.h>
>
> int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc);
> int intel_huc_fw_upload(struct intel_huc *huc);
> -
> +int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, size_t size);
> #endif
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
> new file mode 100644
> index 000000000000..915d310ee1df
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
> @@ -0,0 +1,21 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2023 Intel Corporation
> + */
> +
> +#ifndef __INTEL_HUC_PRINT__
> +#define __INTEL_HUC_PRINT__
> +
> +#include "gt/intel_gt.h"
> +#include "gt/intel_gt_print.h"
> +
> +#define huc_printk(_huc, _level, _fmt, ...) \
> + gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
> +#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt, ##__VA_ARGS__)
> +#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt, ##__VA_ARGS__)
> +#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice, _fmt, ##__VA_ARGS__)
> +#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt, ##__VA_ARGS__)
> +#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt, ##__VA_ARGS__)
> +#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc), probe_error, _fmt, ##__VA_ARGS__)
> +
> +#endif /* __INTEL_HUC_PRINT__ */
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> index 31776c279f32..9ced8dbf1253 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -548,33 +548,6 @@ static void __force_fw_fetch_failures(struct intel_uc_fw *uc_fw, int e)
> }
> }
>
> -static int check_gsc_manifest(struct intel_gt *gt,
> - const struct firmware *fw,
> - struct intel_uc_fw *uc_fw)
> -{
> - u32 *dw = (u32 *)fw->data;
> - u32 version_hi, version_lo;
> - size_t min_size;
> -
> - /* Check the size of the blob before examining buffer contents */
> - min_size = sizeof(u32) * (HUC_GSC_VERSION_LO_DW + 1);
> - if (unlikely(fw->size < min_size)) {
> - gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
> - intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
> - fw->size, min_size);
> - return -ENODATA;
> - }
> -
> - version_hi = dw[HUC_GSC_VERSION_HI_DW];
> - version_lo = dw[HUC_GSC_VERSION_LO_DW];
> -
> - uc_fw->file_selected.ver.major = FIELD_GET(HUC_GSC_MAJOR_VER_HI_MASK, version_hi);
> - uc_fw->file_selected.ver.minor = FIELD_GET(HUC_GSC_MINOR_VER_HI_MASK, version_hi);
> - uc_fw->file_selected.ver.patch = FIELD_GET(HUC_GSC_PATCH_VER_LO_MASK, version_lo);
> -
> - return 0;
> -}
> -
> static void uc_unpack_css_version(struct intel_uc_fw_ver *ver, u32 css_value)
> {
> /* Get version numbers from the CSS header */
> @@ -631,22 +604,22 @@ static void guc_read_css_info(struct intel_uc_fw *uc_fw, struct uc_css_header *c
> uc_fw->private_data_size = css->private_data_size;
> }
>
> -static int check_ccs_header(struct intel_gt *gt,
> - const struct firmware *fw,
> - struct intel_uc_fw *uc_fw)
> +static int __check_ccs_header(struct intel_gt *gt,
> + const void *fw_data, size_t fw_size,
> + struct intel_uc_fw *uc_fw)
> {
> struct uc_css_header *css;
> size_t size;
>
> /* Check the size of the blob before examining buffer contents */
> - if (unlikely(fw->size < sizeof(struct uc_css_header))) {
> + if (unlikely(fw_size < sizeof(struct uc_css_header))) {
> gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
> intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
> - fw->size, sizeof(struct uc_css_header));
> + fw_size, sizeof(struct uc_css_header));
> return -ENODATA;
> }
>
> - css = (struct uc_css_header *)fw->data;
> + css = (struct uc_css_header *)fw_data;
>
> /* Check integrity of size values inside CSS header */
> size = (css->header_size_dw - css->key_size_dw - css->modulus_size_dw -
> @@ -654,7 +627,7 @@ static int check_ccs_header(struct intel_gt *gt,
> if (unlikely(size != sizeof(struct uc_css_header))) {
> gt_warn(gt, "%s firmware %s: unexpected header size: %zu != %zu\n",
> intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
> - fw->size, sizeof(struct uc_css_header));
> + fw_size, sizeof(struct uc_css_header));
> return -EPROTO;
> }
>
> @@ -666,10 +639,10 @@ static int check_ccs_header(struct intel_gt *gt,
>
> /* At least, it should have header, uCode and RSA. Size of all three. */
> size = sizeof(struct uc_css_header) + uc_fw->ucode_size + uc_fw->rsa_size;
> - if (unlikely(fw->size < size)) {
> + if (unlikely(fw_size < size)) {
> gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
> intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
> - fw->size, size);
> + fw_size, size);
> return -ENOEXEC;
> }
>
> @@ -690,6 +663,32 @@ static int check_ccs_header(struct intel_gt *gt,
> return 0;
> }
>
> +static int check_gsc_manifest(struct intel_gt *gt,
> + const struct firmware *fw,
> + struct intel_uc_fw *uc_fw)
> +{
> + if (uc_fw->type != INTEL_UC_FW_TYPE_HUC) {
> + gt_err(gt, "trying to GSC-parse a non-HuC binary");
> + return -EINVAL;
> + }
> +
> + intel_huc_fw_get_binary_info(uc_fw, fw->data, fw->size);
> +
> + if (uc_fw->dma_start_offset) {
> + u32 delta = uc_fw->dma_start_offset;
> + __check_ccs_header(gt, fw->data + delta, fw->size - delta, uc_fw);
> + }
> +
> + return 0;
> +}
> +
> +static int check_ccs_header(struct intel_gt *gt,
> + const struct firmware *fw,
> + struct intel_uc_fw *uc_fw)
> +{
> + return __check_ccs_header(gt, fw->data, fw->size, uc_fw);
> +}
> +
> static bool is_ver_8bit(struct intel_uc_fw_ver *ver)
> {
> return ver->major < 0xFF && ver->minor < 0xFF && ver->patch < 0xFF;
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> index 2be9470eb712..b3daba9526eb 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> @@ -118,6 +118,8 @@ struct intel_uc_fw {
> u32 ucode_size;
> u32 private_data_size;
>
> + u32 dma_start_offset;
> +
> bool loaded_via_gsc;
> };
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
> index 646fa8aa6cf1..7fe405126249 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
> @@ -84,10 +84,4 @@ struct uc_css_header {
> } __packed;
> static_assert(sizeof(struct uc_css_header) == 128);
>
> -#define HUC_GSC_VERSION_HI_DW 44
> -#define HUC_GSC_MAJOR_VER_HI_MASK (0xFF << 0)
> -#define HUC_GSC_MINOR_VER_HI_MASK (0xFF << 16)
> -#define HUC_GSC_VERSION_LO_DW 45
> -#define HUC_GSC_PATCH_VER_LO_MASK (0xFF << 0)
> -
> #endif /* _INTEL_UC_FW_ABI_H */
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [Intel-gfx] [PATCH v3 2/7] drm/i915/huc: Parse the GSC-enabled HuC binary
@ 2023-05-30 23:30 ` John Harrison
0 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-30 23:30 UTC (permalink / raw)
To: Daniele Ceraolo Spurio, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
> The new binaries that support the 2-step authentication contain the
> legacy-style binary, which we can use for loading the HuC via DMA. To
> find out where this is located in the image, we need to parse the
> manifest of the GSC-enabled HuC binary. The manifest consist of a
> partition header followed by entries, one of which contains the offset
> we're looking for.
> Note that the DG2 GSC binary contains entries with the same names, but
> it doesn't contain a full legacy binary, so we need to skip assigning
> the dma offset in that case (which we can do by checking the ccs).
> Also, since we're now parsing the entries, we can extract the HuC
> version that way instead of using hardcoded offsets.
>
> Note that the GSC binary uses the same structures in its binary header,
> so they've been added in their own header file.
>
> v2: fix structure names to match meu defines (s/CPT/CPD/), update commit
> message, check ccs validity, drop old version location defines.
>
> v3: drop references to the MEU tool to reduce confusion, fix log (John)
>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
> Cc: John Harrison <John.C.Harrison@Intel.com>
> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
> ---
> .../drm/i915/gt/uc/intel_gsc_binary_headers.h | 74 ++++++++++
> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 11 +-
> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 135 ++++++++++++++++++
> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 5 +-
> drivers/gpu/drm/i915/gt/uc/intel_huc_print.h | 21 +++
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 71 +++++----
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 6 -
> 8 files changed, 272 insertions(+), 53 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
> create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
> new file mode 100644
> index 000000000000..714f0c256118
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
> @@ -0,0 +1,74 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2023 Intel Corporation
> + */
> +
> +#ifndef _INTEL_GSC_BINARY_HEADERS_H_
> +#define _INTEL_GSC_BINARY_HEADERS_H_
> +
> +#include <linux/types.h>
> +
> +/* Code partition directory (CPD) structures */
> +struct intel_gsc_cpd_header_v2 {
> + u32 header_marker;
> +#define INTEL_GSC_CPD_HEADER_MARKER 0x44504324
> +
> + u32 num_of_entries;
> + u8 header_version;
> + u8 entry_version;
> + u8 header_length; /* in bytes */
> + u8 flags;
> + u32 partition_name;
> + u32 crc32;
> +} __packed;
> +
> +struct intel_gsc_cpd_entry {
> + u8 name[12];
> +
> + /*
> + * Bits 0-24: offset from the beginning of the code partition
> + * Bit 25: huffman compressed
> + * Bits 26-31: reserved
> + */
> + u32 offset;
> +#define INTEL_GSC_CPD_ENTRY_OFFSET_MASK GENMASK(24, 0)
> +#define INTEL_GSC_CPD_ENTRY_HUFFMAN_COMP BIT(25)
> +
> + /*
> + * Module/Item length, in bytes. For Huffman-compressed modules, this
> + * refers to the uncompressed size. For software-compressed modules,
> + * this refers to the compressed size.
> + */
> + u32 length;
> +
> + u8 reserved[4];
> +} __packed;
> +
> +struct intel_gsc_version {
> + u16 major;
> + u16 minor;
> + u16 hotfix;
> + u16 build;
> +} __packed;
> +
> +struct intel_gsc_manifest_header {
> + u32 header_type; /* 0x4 for manifest type */
> + u32 header_length; /* in dwords */
> + u32 header_version;
> + u32 flags;
> + u32 vendor;
> + u32 date;
> + u32 size; /* In dwords, size of entire manifest (header + extensions) */
> + u32 header_id;
> + u32 internal_data;
> + struct intel_gsc_version fw_version;
> + u32 security_version;
> + struct intel_gsc_version meu_kit_version;
> + u32 meu_manifest_version;
> + u8 general_data[4];
> + u8 reserved3[56];
> + u32 modulus_size; /* in dwords */
> + u32 exponent_size; /* in dwords */
> +} __packed;
> +
> +#endif
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> index 268e036f8f28..6d795438b3e4 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> @@ -6,23 +6,14 @@
> #include <linux/types.h>
>
> #include "gt/intel_gt.h"
> -#include "gt/intel_gt_print.h"
> #include "intel_guc_reg.h"
> #include "intel_huc.h"
> +#include "intel_huc_print.h"
> #include "i915_drv.h"
>
> #include <linux/device/bus.h>
> #include <linux/mei_aux.h>
>
> -#define huc_printk(_huc, _level, _fmt, ...) \
> - gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
> -#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt, ##__VA_ARGS__)
> -#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt, ##__VA_ARGS__)
> -#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice, _fmt, ##__VA_ARGS__)
> -#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt, ##__VA_ARGS__)
> -#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt, ##__VA_ARGS__)
> -#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc), probe_error, _fmt, ##__VA_ARGS__)
> -
> /**
> * DOC: HuC
> *
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> index 534b0aa43316..037d2ad4879d 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> @@ -5,11 +5,146 @@
>
> #include "gt/intel_gsc.h"
> #include "gt/intel_gt.h"
> +#include "intel_gsc_binary_headers.h"
> #include "intel_huc.h"
> #include "intel_huc_fw.h"
> +#include "intel_huc_print.h"
> #include "i915_drv.h"
> #include "pxp/intel_pxp_huc.h"
>
> +static void get_version_from_gsc_manifest(struct intel_uc_fw_ver *ver, const void *data)
> +{
> + const struct intel_gsc_manifest_header *manifest = data;
> +
> + ver->major = manifest->fw_version.major;
> + ver->minor = manifest->fw_version.minor;
> + ver->patch = manifest->fw_version.hotfix;
> +}
> +
> +static bool css_valid(const void *data, size_t size)
> +{
> + const struct uc_css_header *css = data;
> +
> + if (unlikely(size < sizeof(struct uc_css_header)))
> + return false;
> +
> + if (css->module_type != 0x6)
> + return false;
> +
> + if (css->module_vendor != PCI_VENDOR_ID_INTEL)
> + return false;
> +
> + return true;
> +}
> +
> +static inline u32 entry_offset(const struct intel_gsc_cpd_entry *entry)
> +{
> + return entry->offset & INTEL_GSC_CPD_ENTRY_OFFSET_MASK;
> +}
> +
> +int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, size_t size)
> +{
> + struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
> + const struct intel_gsc_cpd_header_v2 *header = data;
> + const struct intel_gsc_cpd_entry *entry;
> + size_t min_size = sizeof(*header);
> + int i;
> +
> + if (!huc_fw->loaded_via_gsc) {
> + huc_err(huc, "Invalid FW type GSC header parsing!\n");
I'm still not understanding what this error means. Is it meant to say
'Invalid FW type *for* GSC header parsing'?
'fw->loaded_via_gsc' is set from the blob table, yes? And
intel_huc_fw_get_binary_info() is only called from check_gsc_manifest()
which is called from check_fw_header() iff fw->loaded_via_gsc is set. So
it should be impossible for this test to ever fail, yes?
John.
> + return -EINVAL;
> + }
> +
> + if (size < sizeof(*header)) {
> + huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
> + return -ENODATA;
> + }
> +
> + /*
> + * The GSC-enabled HuC binary starts with a directory header, followed
> + * by a series of entries. Each entry is identified by a name and
> + * points to a specific section of the binary containing the relevant
> + * data. The entries we're interested in are:
> + * - "HUCP.man": points to the GSC manifest header for the HuC, which
> + * contains the version info.
> + * - "huc_fw": points to the legacy-style binary that can be used for
> + * load via the DMA. This entry only contains a valid CSS
> + * on binaries for platforms that support 2-step HuC load
> + * via dma and auth via GSC (like MTL).
> + *
> + * --------------------------------------------------
> + * [ intel_gsc_cpd_header_v2 ]
> + * --------------------------------------------------
> + * [ intel_gsc_cpd_entry[] ]
> + * [ entry1 ]
> + * [ ... ]
> + * [ entryX ]
> + * [ "HUCP.man" ]
> + * [ ... ]
> + * [ offset >----------------------------]------o
> + * [ ... ] |
> + * [ entryY ] |
> + * [ "huc_fw" ] |
> + * [ ... ] |
> + * [ offset >----------------------------]----------o
> + * -------------------------------------------------- | |
> + * | |
> + * -------------------------------------------------- | |
> + * [ intel_gsc_manifest_header ]<-----o |
> + * [ ... ] |
> + * [ intel_gsc_version fw_version ] |
> + * [ ... ] |
> + * -------------------------------------------------- |
> + * |
> + * -------------------------------------------------- |
> + * [ data[] ]<---------o
> + * [ ... ]
> + * [ ... ]
> + * --------------------------------------------------
> + */
> +
> + if (header->header_marker != INTEL_GSC_CPD_HEADER_MARKER) {
> + huc_err(huc, "invalid marker for CPD header: 0x%08x!\n",
> + header->header_marker);
> + return -EINVAL;
> + }
> +
> + /* we only have binaries with header v2 and entry v1 for now */
> + if (header->header_version != 2 || header->entry_version != 1) {
> + huc_err(huc, "invalid CPD header/entry version %u:%u!\n",
> + header->header_version, header->entry_version);
> + return -EINVAL;
> + }
> +
> + if (header->header_length < sizeof(struct intel_gsc_cpd_header_v2)) {
> + huc_err(huc, "invalid CPD header length %u!\n",
> + header->header_length);
> + return -EINVAL;
> + }
> +
> + min_size = header->header_length + sizeof(*entry) * header->num_of_entries;
> + if (size < min_size) {
> + huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
> + return -ENODATA;
> + }
> +
> + entry = data + header->header_length;
> +
> + for (i = 0; i < header->num_of_entries; i++, entry++) {
> + if (strcmp(entry->name, "HUCP.man") == 0)
> + get_version_from_gsc_manifest(&huc_fw->file_selected.ver,
> + data + entry_offset(entry));
> +
> + if (strcmp(entry->name, "huc_fw") == 0) {
> + u32 offset = entry_offset(entry);
> + if (offset < size && css_valid(data + offset, size - offset))
> + huc_fw->dma_start_offset = offset;
> + }
> + }
> +
> + return 0;
> +}
> +
> int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
> {
> int ret;
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
> index db42e238b45f..0999ffe6f962 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
> @@ -7,8 +7,11 @@
> #define _INTEL_HUC_FW_H_
>
> struct intel_huc;
> +struct intel_uc_fw;
> +
> +#include <linux/types.h>
>
> int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc);
> int intel_huc_fw_upload(struct intel_huc *huc);
> -
> +int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, size_t size);
> #endif
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
> new file mode 100644
> index 000000000000..915d310ee1df
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
> @@ -0,0 +1,21 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2023 Intel Corporation
> + */
> +
> +#ifndef __INTEL_HUC_PRINT__
> +#define __INTEL_HUC_PRINT__
> +
> +#include "gt/intel_gt.h"
> +#include "gt/intel_gt_print.h"
> +
> +#define huc_printk(_huc, _level, _fmt, ...) \
> + gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
> +#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt, ##__VA_ARGS__)
> +#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt, ##__VA_ARGS__)
> +#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice, _fmt, ##__VA_ARGS__)
> +#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt, ##__VA_ARGS__)
> +#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt, ##__VA_ARGS__)
> +#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc), probe_error, _fmt, ##__VA_ARGS__)
> +
> +#endif /* __INTEL_HUC_PRINT__ */
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> index 31776c279f32..9ced8dbf1253 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -548,33 +548,6 @@ static void __force_fw_fetch_failures(struct intel_uc_fw *uc_fw, int e)
> }
> }
>
> -static int check_gsc_manifest(struct intel_gt *gt,
> - const struct firmware *fw,
> - struct intel_uc_fw *uc_fw)
> -{
> - u32 *dw = (u32 *)fw->data;
> - u32 version_hi, version_lo;
> - size_t min_size;
> -
> - /* Check the size of the blob before examining buffer contents */
> - min_size = sizeof(u32) * (HUC_GSC_VERSION_LO_DW + 1);
> - if (unlikely(fw->size < min_size)) {
> - gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
> - intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
> - fw->size, min_size);
> - return -ENODATA;
> - }
> -
> - version_hi = dw[HUC_GSC_VERSION_HI_DW];
> - version_lo = dw[HUC_GSC_VERSION_LO_DW];
> -
> - uc_fw->file_selected.ver.major = FIELD_GET(HUC_GSC_MAJOR_VER_HI_MASK, version_hi);
> - uc_fw->file_selected.ver.minor = FIELD_GET(HUC_GSC_MINOR_VER_HI_MASK, version_hi);
> - uc_fw->file_selected.ver.patch = FIELD_GET(HUC_GSC_PATCH_VER_LO_MASK, version_lo);
> -
> - return 0;
> -}
> -
> static void uc_unpack_css_version(struct intel_uc_fw_ver *ver, u32 css_value)
> {
> /* Get version numbers from the CSS header */
> @@ -631,22 +604,22 @@ static void guc_read_css_info(struct intel_uc_fw *uc_fw, struct uc_css_header *c
> uc_fw->private_data_size = css->private_data_size;
> }
>
> -static int check_ccs_header(struct intel_gt *gt,
> - const struct firmware *fw,
> - struct intel_uc_fw *uc_fw)
> +static int __check_ccs_header(struct intel_gt *gt,
> + const void *fw_data, size_t fw_size,
> + struct intel_uc_fw *uc_fw)
> {
> struct uc_css_header *css;
> size_t size;
>
> /* Check the size of the blob before examining buffer contents */
> - if (unlikely(fw->size < sizeof(struct uc_css_header))) {
> + if (unlikely(fw_size < sizeof(struct uc_css_header))) {
> gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
> intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
> - fw->size, sizeof(struct uc_css_header));
> + fw_size, sizeof(struct uc_css_header));
> return -ENODATA;
> }
>
> - css = (struct uc_css_header *)fw->data;
> + css = (struct uc_css_header *)fw_data;
>
> /* Check integrity of size values inside CSS header */
> size = (css->header_size_dw - css->key_size_dw - css->modulus_size_dw -
> @@ -654,7 +627,7 @@ static int check_ccs_header(struct intel_gt *gt,
> if (unlikely(size != sizeof(struct uc_css_header))) {
> gt_warn(gt, "%s firmware %s: unexpected header size: %zu != %zu\n",
> intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
> - fw->size, sizeof(struct uc_css_header));
> + fw_size, sizeof(struct uc_css_header));
> return -EPROTO;
> }
>
> @@ -666,10 +639,10 @@ static int check_ccs_header(struct intel_gt *gt,
>
> /* At least, it should have header, uCode and RSA. Size of all three. */
> size = sizeof(struct uc_css_header) + uc_fw->ucode_size + uc_fw->rsa_size;
> - if (unlikely(fw->size < size)) {
> + if (unlikely(fw_size < size)) {
> gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
> intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
> - fw->size, size);
> + fw_size, size);
> return -ENOEXEC;
> }
>
> @@ -690,6 +663,32 @@ static int check_ccs_header(struct intel_gt *gt,
> return 0;
> }
>
> +static int check_gsc_manifest(struct intel_gt *gt,
> + const struct firmware *fw,
> + struct intel_uc_fw *uc_fw)
> +{
> + if (uc_fw->type != INTEL_UC_FW_TYPE_HUC) {
> + gt_err(gt, "trying to GSC-parse a non-HuC binary");
> + return -EINVAL;
> + }
> +
> + intel_huc_fw_get_binary_info(uc_fw, fw->data, fw->size);
> +
> + if (uc_fw->dma_start_offset) {
> + u32 delta = uc_fw->dma_start_offset;
> + __check_ccs_header(gt, fw->data + delta, fw->size - delta, uc_fw);
> + }
> +
> + return 0;
> +}
> +
> +static int check_ccs_header(struct intel_gt *gt,
> + const struct firmware *fw,
> + struct intel_uc_fw *uc_fw)
> +{
> + return __check_ccs_header(gt, fw->data, fw->size, uc_fw);
> +}
> +
> static bool is_ver_8bit(struct intel_uc_fw_ver *ver)
> {
> return ver->major < 0xFF && ver->minor < 0xFF && ver->patch < 0xFF;
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> index 2be9470eb712..b3daba9526eb 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> @@ -118,6 +118,8 @@ struct intel_uc_fw {
> u32 ucode_size;
> u32 private_data_size;
>
> + u32 dma_start_offset;
> +
> bool loaded_via_gsc;
> };
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
> index 646fa8aa6cf1..7fe405126249 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
> @@ -84,10 +84,4 @@ struct uc_css_header {
> } __packed;
> static_assert(sizeof(struct uc_css_header) == 128);
>
> -#define HUC_GSC_VERSION_HI_DW 44
> -#define HUC_GSC_MAJOR_VER_HI_MASK (0xFF << 0)
> -#define HUC_GSC_MINOR_VER_HI_MASK (0xFF << 16)
> -#define HUC_GSC_VERSION_LO_DW 45
> -#define HUC_GSC_PATCH_VER_LO_MASK (0xFF << 0)
> -
> #endif /* _INTEL_UC_FW_ABI_H */
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCH v3 2/7] drm/i915/huc: Parse the GSC-enabled HuC binary
2023-05-30 23:30 ` [Intel-gfx] " John Harrison
@ 2023-05-31 0:06 ` Ceraolo Spurio, Daniele
-1 siblings, 0 replies; 52+ messages in thread
From: Ceraolo Spurio, Daniele @ 2023-05-31 0:06 UTC (permalink / raw)
To: John Harrison, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 4:30 PM, John Harrison wrote:
> On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
>> The new binaries that support the 2-step authentication contain the
>> legacy-style binary, which we can use for loading the HuC via DMA. To
>> find out where this is located in the image, we need to parse the
>> manifest of the GSC-enabled HuC binary. The manifest consist of a
>> partition header followed by entries, one of which contains the offset
>> we're looking for.
>> Note that the DG2 GSC binary contains entries with the same names, but
>> it doesn't contain a full legacy binary, so we need to skip assigning
>> the dma offset in that case (which we can do by checking the ccs).
>> Also, since we're now parsing the entries, we can extract the HuC
>> version that way instead of using hardcoded offsets.
>>
>> Note that the GSC binary uses the same structures in its binary header,
>> so they've been added in their own header file.
>>
>> v2: fix structure names to match meu defines (s/CPT/CPD/), update commit
>> message, check ccs validity, drop old version location defines.
>>
>> v3: drop references to the MEU tool to reduce confusion, fix log (John)
>>
>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>> Cc: John Harrison <John.C.Harrison@Intel.com>
>> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
>> ---
>> .../drm/i915/gt/uc/intel_gsc_binary_headers.h | 74 ++++++++++
>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 11 +-
>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 135 ++++++++++++++++++
>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 5 +-
>> drivers/gpu/drm/i915/gt/uc/intel_huc_print.h | 21 +++
>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 71 +++++----
>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +
>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 6 -
>> 8 files changed, 272 insertions(+), 53 deletions(-)
>> create mode 100644
>> drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>> create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>>
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>> new file mode 100644
>> index 000000000000..714f0c256118
>> --- /dev/null
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>> @@ -0,0 +1,74 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright © 2023 Intel Corporation
>> + */
>> +
>> +#ifndef _INTEL_GSC_BINARY_HEADERS_H_
>> +#define _INTEL_GSC_BINARY_HEADERS_H_
>> +
>> +#include <linux/types.h>
>> +
>> +/* Code partition directory (CPD) structures */
>> +struct intel_gsc_cpd_header_v2 {
>> + u32 header_marker;
>> +#define INTEL_GSC_CPD_HEADER_MARKER 0x44504324
>> +
>> + u32 num_of_entries;
>> + u8 header_version;
>> + u8 entry_version;
>> + u8 header_length; /* in bytes */
>> + u8 flags;
>> + u32 partition_name;
>> + u32 crc32;
>> +} __packed;
>> +
>> +struct intel_gsc_cpd_entry {
>> + u8 name[12];
>> +
>> + /*
>> + * Bits 0-24: offset from the beginning of the code partition
>> + * Bit 25: huffman compressed
>> + * Bits 26-31: reserved
>> + */
>> + u32 offset;
>> +#define INTEL_GSC_CPD_ENTRY_OFFSET_MASK GENMASK(24, 0)
>> +#define INTEL_GSC_CPD_ENTRY_HUFFMAN_COMP BIT(25)
>> +
>> + /*
>> + * Module/Item length, in bytes. For Huffman-compressed modules,
>> this
>> + * refers to the uncompressed size. For software-compressed
>> modules,
>> + * this refers to the compressed size.
>> + */
>> + u32 length;
>> +
>> + u8 reserved[4];
>> +} __packed;
>> +
>> +struct intel_gsc_version {
>> + u16 major;
>> + u16 minor;
>> + u16 hotfix;
>> + u16 build;
>> +} __packed;
>> +
>> +struct intel_gsc_manifest_header {
>> + u32 header_type; /* 0x4 for manifest type */
>> + u32 header_length; /* in dwords */
>> + u32 header_version;
>> + u32 flags;
>> + u32 vendor;
>> + u32 date;
>> + u32 size; /* In dwords, size of entire manifest (header +
>> extensions) */
>> + u32 header_id;
>> + u32 internal_data;
>> + struct intel_gsc_version fw_version;
>> + u32 security_version;
>> + struct intel_gsc_version meu_kit_version;
>> + u32 meu_manifest_version;
>> + u8 general_data[4];
>> + u8 reserved3[56];
>> + u32 modulus_size; /* in dwords */
>> + u32 exponent_size; /* in dwords */
>> +} __packed;
>> +
>> +#endif
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> index 268e036f8f28..6d795438b3e4 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> @@ -6,23 +6,14 @@
>> #include <linux/types.h>
>> #include "gt/intel_gt.h"
>> -#include "gt/intel_gt_print.h"
>> #include "intel_guc_reg.h"
>> #include "intel_huc.h"
>> +#include "intel_huc_print.h"
>> #include "i915_drv.h"
>> #include <linux/device/bus.h>
>> #include <linux/mei_aux.h>
>> -#define huc_printk(_huc, _level, _fmt, ...) \
>> - gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
>> -#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt,
>> ##__VA_ARGS__)
>> -#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt,
>> ##__VA_ARGS__)
>> -#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice,
>> _fmt, ##__VA_ARGS__)
>> -#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt,
>> ##__VA_ARGS__)
>> -#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt,
>> ##__VA_ARGS__)
>> -#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc),
>> probe_error, _fmt, ##__VA_ARGS__)
>> -
>> /**
>> * DOC: HuC
>> *
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> index 534b0aa43316..037d2ad4879d 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> @@ -5,11 +5,146 @@
>> #include "gt/intel_gsc.h"
>> #include "gt/intel_gt.h"
>> +#include "intel_gsc_binary_headers.h"
>> #include "intel_huc.h"
>> #include "intel_huc_fw.h"
>> +#include "intel_huc_print.h"
>> #include "i915_drv.h"
>> #include "pxp/intel_pxp_huc.h"
>> +static void get_version_from_gsc_manifest(struct intel_uc_fw_ver
>> *ver, const void *data)
>> +{
>> + const struct intel_gsc_manifest_header *manifest = data;
>> +
>> + ver->major = manifest->fw_version.major;
>> + ver->minor = manifest->fw_version.minor;
>> + ver->patch = manifest->fw_version.hotfix;
>> +}
>> +
>> +static bool css_valid(const void *data, size_t size)
>> +{
>> + const struct uc_css_header *css = data;
>> +
>> + if (unlikely(size < sizeof(struct uc_css_header)))
>> + return false;
>> +
>> + if (css->module_type != 0x6)
>> + return false;
>> +
>> + if (css->module_vendor != PCI_VENDOR_ID_INTEL)
>> + return false;
>> +
>> + return true;
>> +}
>> +
>> +static inline u32 entry_offset(const struct intel_gsc_cpd_entry *entry)
>> +{
>> + return entry->offset & INTEL_GSC_CPD_ENTRY_OFFSET_MASK;
>> +}
>> +
>> +int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const
>> void *data, size_t size)
>> +{
>> + struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
>> + const struct intel_gsc_cpd_header_v2 *header = data;
>> + const struct intel_gsc_cpd_entry *entry;
>> + size_t min_size = sizeof(*header);
>> + int i;
>> +
>> + if (!huc_fw->loaded_via_gsc) {
>> + huc_err(huc, "Invalid FW type GSC header parsing!\n");
> I'm still not understanding what this error means. Is it meant to say
> 'Invalid FW type *for* GSC header parsing'?
yes, sorry that was the idea. I'll add the "for"
>
> 'fw->loaded_via_gsc' is set from the blob table, yes? And
> intel_huc_fw_get_binary_info() is only called from
> check_gsc_manifest() which is called from check_fw_header() iff
> fw->loaded_via_gsc is set. So it should be impossible for this test to
> ever fail, yes?
Yes, this should never fail, but with GSC FW the code changes again so I
wanted to make sure I had a check in there in case I got things wrong.
There would be other failures anyway (because the parsing wouldn't work,
so I can drop this check if you think it is redundant.
Daniele
>
> John.
>
>> + return -EINVAL;
>> + }
>> +
>> + if (size < sizeof(*header)) {
>> + huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
>> + return -ENODATA;
>> + }
>> +
>> + /*
>> + * The GSC-enabled HuC binary starts with a directory header,
>> followed
>> + * by a series of entries. Each entry is identified by a name and
>> + * points to a specific section of the binary containing the
>> relevant
>> + * data. The entries we're interested in are:
>> + * - "HUCP.man": points to the GSC manifest header for the HuC,
>> which
>> + * contains the version info.
>> + * - "huc_fw": points to the legacy-style binary that can be
>> used for
>> + * load via the DMA. This entry only contains a
>> valid CSS
>> + * on binaries for platforms that support 2-step HuC
>> load
>> + * via dma and auth via GSC (like MTL).
>> + *
>> + * --------------------------------------------------
>> + * [ intel_gsc_cpd_header_v2 ]
>> + * --------------------------------------------------
>> + * [ intel_gsc_cpd_entry[] ]
>> + * [ entry1 ]
>> + * [ ... ]
>> + * [ entryX ]
>> + * [ "HUCP.man" ]
>> + * [ ... ]
>> + * [ offset >----------------------------]------o
>> + * [ ... ] |
>> + * [ entryY ] |
>> + * [ "huc_fw" ] |
>> + * [ ... ] |
>> + * [ offset >----------------------------]----------o
>> + * -------------------------------------------------- | |
>> + * | |
>> + * -------------------------------------------------- | |
>> + * [ intel_gsc_manifest_header ]<-----o |
>> + * [ ... ] |
>> + * [ intel_gsc_version fw_version ] |
>> + * [ ... ] |
>> + * -------------------------------------------------- |
>> + * |
>> + * -------------------------------------------------- |
>> + * [ data[] ]<---------o
>> + * [ ... ]
>> + * [ ... ]
>> + * --------------------------------------------------
>> + */
>> +
>> + if (header->header_marker != INTEL_GSC_CPD_HEADER_MARKER) {
>> + huc_err(huc, "invalid marker for CPD header: 0x%08x!\n",
>> + header->header_marker);
>> + return -EINVAL;
>> + }
>> +
>> + /* we only have binaries with header v2 and entry v1 for now */
>> + if (header->header_version != 2 || header->entry_version != 1) {
>> + huc_err(huc, "invalid CPD header/entry version %u:%u!\n",
>> + header->header_version, header->entry_version);
>> + return -EINVAL;
>> + }
>> +
>> + if (header->header_length < sizeof(struct
>> intel_gsc_cpd_header_v2)) {
>> + huc_err(huc, "invalid CPD header length %u!\n",
>> + header->header_length);
>> + return -EINVAL;
>> + }
>> +
>> + min_size = header->header_length + sizeof(*entry) *
>> header->num_of_entries;
>> + if (size < min_size) {
>> + huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
>> + return -ENODATA;
>> + }
>> +
>> + entry = data + header->header_length;
>> +
>> + for (i = 0; i < header->num_of_entries; i++, entry++) {
>> + if (strcmp(entry->name, "HUCP.man") == 0)
>> + get_version_from_gsc_manifest(&huc_fw->file_selected.ver,
>> + data + entry_offset(entry));
>> +
>> + if (strcmp(entry->name, "huc_fw") == 0) {
>> + u32 offset = entry_offset(entry);
>> + if (offset < size && css_valid(data + offset, size -
>> offset))
>> + huc_fw->dma_start_offset = offset;
>> + }
>> + }
>> +
>> + return 0;
>> +}
>> +
>> int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
>> {
>> int ret;
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>> index db42e238b45f..0999ffe6f962 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>> @@ -7,8 +7,11 @@
>> #define _INTEL_HUC_FW_H_
>> struct intel_huc;
>> +struct intel_uc_fw;
>> +
>> +#include <linux/types.h>
>> int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc);
>> int intel_huc_fw_upload(struct intel_huc *huc);
>> -
>> +int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const
>> void *data, size_t size);
>> #endif
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>> new file mode 100644
>> index 000000000000..915d310ee1df
>> --- /dev/null
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>> @@ -0,0 +1,21 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright © 2023 Intel Corporation
>> + */
>> +
>> +#ifndef __INTEL_HUC_PRINT__
>> +#define __INTEL_HUC_PRINT__
>> +
>> +#include "gt/intel_gt.h"
>> +#include "gt/intel_gt_print.h"
>> +
>> +#define huc_printk(_huc, _level, _fmt, ...) \
>> + gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
>> +#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt,
>> ##__VA_ARGS__)
>> +#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt,
>> ##__VA_ARGS__)
>> +#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice,
>> _fmt, ##__VA_ARGS__)
>> +#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt,
>> ##__VA_ARGS__)
>> +#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt,
>> ##__VA_ARGS__)
>> +#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc),
>> probe_error, _fmt, ##__VA_ARGS__)
>> +
>> +#endif /* __INTEL_HUC_PRINT__ */
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> index 31776c279f32..9ced8dbf1253 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> @@ -548,33 +548,6 @@ static void __force_fw_fetch_failures(struct
>> intel_uc_fw *uc_fw, int e)
>> }
>> }
>> -static int check_gsc_manifest(struct intel_gt *gt,
>> - const struct firmware *fw,
>> - struct intel_uc_fw *uc_fw)
>> -{
>> - u32 *dw = (u32 *)fw->data;
>> - u32 version_hi, version_lo;
>> - size_t min_size;
>> -
>> - /* Check the size of the blob before examining buffer contents */
>> - min_size = sizeof(u32) * (HUC_GSC_VERSION_LO_DW + 1);
>> - if (unlikely(fw->size < min_size)) {
>> - gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
>> - intel_uc_fw_type_repr(uc_fw->type),
>> uc_fw->file_selected.path,
>> - fw->size, min_size);
>> - return -ENODATA;
>> - }
>> -
>> - version_hi = dw[HUC_GSC_VERSION_HI_DW];
>> - version_lo = dw[HUC_GSC_VERSION_LO_DW];
>> -
>> - uc_fw->file_selected.ver.major =
>> FIELD_GET(HUC_GSC_MAJOR_VER_HI_MASK, version_hi);
>> - uc_fw->file_selected.ver.minor =
>> FIELD_GET(HUC_GSC_MINOR_VER_HI_MASK, version_hi);
>> - uc_fw->file_selected.ver.patch =
>> FIELD_GET(HUC_GSC_PATCH_VER_LO_MASK, version_lo);
>> -
>> - return 0;
>> -}
>> -
>> static void uc_unpack_css_version(struct intel_uc_fw_ver *ver, u32
>> css_value)
>> {
>> /* Get version numbers from the CSS header */
>> @@ -631,22 +604,22 @@ static void guc_read_css_info(struct
>> intel_uc_fw *uc_fw, struct uc_css_header *c
>> uc_fw->private_data_size = css->private_data_size;
>> }
>> -static int check_ccs_header(struct intel_gt *gt,
>> - const struct firmware *fw,
>> - struct intel_uc_fw *uc_fw)
>> +static int __check_ccs_header(struct intel_gt *gt,
>> + const void *fw_data, size_t fw_size,
>> + struct intel_uc_fw *uc_fw)
>> {
>> struct uc_css_header *css;
>> size_t size;
>> /* Check the size of the blob before examining buffer
>> contents */
>> - if (unlikely(fw->size < sizeof(struct uc_css_header))) {
>> + if (unlikely(fw_size < sizeof(struct uc_css_header))) {
>> gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
>> intel_uc_fw_type_repr(uc_fw->type),
>> uc_fw->file_selected.path,
>> - fw->size, sizeof(struct uc_css_header));
>> + fw_size, sizeof(struct uc_css_header));
>> return -ENODATA;
>> }
>> - css = (struct uc_css_header *)fw->data;
>> + css = (struct uc_css_header *)fw_data;
>> /* Check integrity of size values inside CSS header */
>> size = (css->header_size_dw - css->key_size_dw -
>> css->modulus_size_dw -
>> @@ -654,7 +627,7 @@ static int check_ccs_header(struct intel_gt *gt,
>> if (unlikely(size != sizeof(struct uc_css_header))) {
>> gt_warn(gt, "%s firmware %s: unexpected header size: %zu !=
>> %zu\n",
>> intel_uc_fw_type_repr(uc_fw->type),
>> uc_fw->file_selected.path,
>> - fw->size, sizeof(struct uc_css_header));
>> + fw_size, sizeof(struct uc_css_header));
>> return -EPROTO;
>> }
>> @@ -666,10 +639,10 @@ static int check_ccs_header(struct intel_gt *gt,
>> /* At least, it should have header, uCode and RSA. Size of
>> all three. */
>> size = sizeof(struct uc_css_header) + uc_fw->ucode_size +
>> uc_fw->rsa_size;
>> - if (unlikely(fw->size < size)) {
>> + if (unlikely(fw_size < size)) {
>> gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
>> intel_uc_fw_type_repr(uc_fw->type),
>> uc_fw->file_selected.path,
>> - fw->size, size);
>> + fw_size, size);
>> return -ENOEXEC;
>> }
>> @@ -690,6 +663,32 @@ static int check_ccs_header(struct intel_gt *gt,
>> return 0;
>> }
>> +static int check_gsc_manifest(struct intel_gt *gt,
>> + const struct firmware *fw,
>> + struct intel_uc_fw *uc_fw)
>> +{
>> + if (uc_fw->type != INTEL_UC_FW_TYPE_HUC) {
>> + gt_err(gt, "trying to GSC-parse a non-HuC binary");
>> + return -EINVAL;
>> + }
>> +
>> + intel_huc_fw_get_binary_info(uc_fw, fw->data, fw->size);
>> +
>> + if (uc_fw->dma_start_offset) {
>> + u32 delta = uc_fw->dma_start_offset;
>> + __check_ccs_header(gt, fw->data + delta, fw->size - delta,
>> uc_fw);
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int check_ccs_header(struct intel_gt *gt,
>> + const struct firmware *fw,
>> + struct intel_uc_fw *uc_fw)
>> +{
>> + return __check_ccs_header(gt, fw->data, fw->size, uc_fw);
>> +}
>> +
>> static bool is_ver_8bit(struct intel_uc_fw_ver *ver)
>> {
>> return ver->major < 0xFF && ver->minor < 0xFF && ver->patch <
>> 0xFF;
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> index 2be9470eb712..b3daba9526eb 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> @@ -118,6 +118,8 @@ struct intel_uc_fw {
>> u32 ucode_size;
>> u32 private_data_size;
>> + u32 dma_start_offset;
>> +
>> bool loaded_via_gsc;
>> };
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>> index 646fa8aa6cf1..7fe405126249 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>> @@ -84,10 +84,4 @@ struct uc_css_header {
>> } __packed;
>> static_assert(sizeof(struct uc_css_header) == 128);
>> -#define HUC_GSC_VERSION_HI_DW 44
>> -#define HUC_GSC_MAJOR_VER_HI_MASK (0xFF << 0)
>> -#define HUC_GSC_MINOR_VER_HI_MASK (0xFF << 16)
>> -#define HUC_GSC_VERSION_LO_DW 45
>> -#define HUC_GSC_PATCH_VER_LO_MASK (0xFF << 0)
>> -
>> #endif /* _INTEL_UC_FW_ABI_H */
>
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [Intel-gfx] [PATCH v3 2/7] drm/i915/huc: Parse the GSC-enabled HuC binary
@ 2023-05-31 0:06 ` Ceraolo Spurio, Daniele
0 siblings, 0 replies; 52+ messages in thread
From: Ceraolo Spurio, Daniele @ 2023-05-31 0:06 UTC (permalink / raw)
To: John Harrison, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 4:30 PM, John Harrison wrote:
> On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
>> The new binaries that support the 2-step authentication contain the
>> legacy-style binary, which we can use for loading the HuC via DMA. To
>> find out where this is located in the image, we need to parse the
>> manifest of the GSC-enabled HuC binary. The manifest consist of a
>> partition header followed by entries, one of which contains the offset
>> we're looking for.
>> Note that the DG2 GSC binary contains entries with the same names, but
>> it doesn't contain a full legacy binary, so we need to skip assigning
>> the dma offset in that case (which we can do by checking the ccs).
>> Also, since we're now parsing the entries, we can extract the HuC
>> version that way instead of using hardcoded offsets.
>>
>> Note that the GSC binary uses the same structures in its binary header,
>> so they've been added in their own header file.
>>
>> v2: fix structure names to match meu defines (s/CPT/CPD/), update commit
>> message, check ccs validity, drop old version location defines.
>>
>> v3: drop references to the MEU tool to reduce confusion, fix log (John)
>>
>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>> Cc: John Harrison <John.C.Harrison@Intel.com>
>> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
>> ---
>> .../drm/i915/gt/uc/intel_gsc_binary_headers.h | 74 ++++++++++
>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 11 +-
>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 135 ++++++++++++++++++
>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 5 +-
>> drivers/gpu/drm/i915/gt/uc/intel_huc_print.h | 21 +++
>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 71 +++++----
>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +
>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 6 -
>> 8 files changed, 272 insertions(+), 53 deletions(-)
>> create mode 100644
>> drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>> create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>>
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>> new file mode 100644
>> index 000000000000..714f0c256118
>> --- /dev/null
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>> @@ -0,0 +1,74 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright © 2023 Intel Corporation
>> + */
>> +
>> +#ifndef _INTEL_GSC_BINARY_HEADERS_H_
>> +#define _INTEL_GSC_BINARY_HEADERS_H_
>> +
>> +#include <linux/types.h>
>> +
>> +/* Code partition directory (CPD) structures */
>> +struct intel_gsc_cpd_header_v2 {
>> + u32 header_marker;
>> +#define INTEL_GSC_CPD_HEADER_MARKER 0x44504324
>> +
>> + u32 num_of_entries;
>> + u8 header_version;
>> + u8 entry_version;
>> + u8 header_length; /* in bytes */
>> + u8 flags;
>> + u32 partition_name;
>> + u32 crc32;
>> +} __packed;
>> +
>> +struct intel_gsc_cpd_entry {
>> + u8 name[12];
>> +
>> + /*
>> + * Bits 0-24: offset from the beginning of the code partition
>> + * Bit 25: huffman compressed
>> + * Bits 26-31: reserved
>> + */
>> + u32 offset;
>> +#define INTEL_GSC_CPD_ENTRY_OFFSET_MASK GENMASK(24, 0)
>> +#define INTEL_GSC_CPD_ENTRY_HUFFMAN_COMP BIT(25)
>> +
>> + /*
>> + * Module/Item length, in bytes. For Huffman-compressed modules,
>> this
>> + * refers to the uncompressed size. For software-compressed
>> modules,
>> + * this refers to the compressed size.
>> + */
>> + u32 length;
>> +
>> + u8 reserved[4];
>> +} __packed;
>> +
>> +struct intel_gsc_version {
>> + u16 major;
>> + u16 minor;
>> + u16 hotfix;
>> + u16 build;
>> +} __packed;
>> +
>> +struct intel_gsc_manifest_header {
>> + u32 header_type; /* 0x4 for manifest type */
>> + u32 header_length; /* in dwords */
>> + u32 header_version;
>> + u32 flags;
>> + u32 vendor;
>> + u32 date;
>> + u32 size; /* In dwords, size of entire manifest (header +
>> extensions) */
>> + u32 header_id;
>> + u32 internal_data;
>> + struct intel_gsc_version fw_version;
>> + u32 security_version;
>> + struct intel_gsc_version meu_kit_version;
>> + u32 meu_manifest_version;
>> + u8 general_data[4];
>> + u8 reserved3[56];
>> + u32 modulus_size; /* in dwords */
>> + u32 exponent_size; /* in dwords */
>> +} __packed;
>> +
>> +#endif
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> index 268e036f8f28..6d795438b3e4 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> @@ -6,23 +6,14 @@
>> #include <linux/types.h>
>> #include "gt/intel_gt.h"
>> -#include "gt/intel_gt_print.h"
>> #include "intel_guc_reg.h"
>> #include "intel_huc.h"
>> +#include "intel_huc_print.h"
>> #include "i915_drv.h"
>> #include <linux/device/bus.h>
>> #include <linux/mei_aux.h>
>> -#define huc_printk(_huc, _level, _fmt, ...) \
>> - gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
>> -#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt,
>> ##__VA_ARGS__)
>> -#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt,
>> ##__VA_ARGS__)
>> -#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice,
>> _fmt, ##__VA_ARGS__)
>> -#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt,
>> ##__VA_ARGS__)
>> -#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt,
>> ##__VA_ARGS__)
>> -#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc),
>> probe_error, _fmt, ##__VA_ARGS__)
>> -
>> /**
>> * DOC: HuC
>> *
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> index 534b0aa43316..037d2ad4879d 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> @@ -5,11 +5,146 @@
>> #include "gt/intel_gsc.h"
>> #include "gt/intel_gt.h"
>> +#include "intel_gsc_binary_headers.h"
>> #include "intel_huc.h"
>> #include "intel_huc_fw.h"
>> +#include "intel_huc_print.h"
>> #include "i915_drv.h"
>> #include "pxp/intel_pxp_huc.h"
>> +static void get_version_from_gsc_manifest(struct intel_uc_fw_ver
>> *ver, const void *data)
>> +{
>> + const struct intel_gsc_manifest_header *manifest = data;
>> +
>> + ver->major = manifest->fw_version.major;
>> + ver->minor = manifest->fw_version.minor;
>> + ver->patch = manifest->fw_version.hotfix;
>> +}
>> +
>> +static bool css_valid(const void *data, size_t size)
>> +{
>> + const struct uc_css_header *css = data;
>> +
>> + if (unlikely(size < sizeof(struct uc_css_header)))
>> + return false;
>> +
>> + if (css->module_type != 0x6)
>> + return false;
>> +
>> + if (css->module_vendor != PCI_VENDOR_ID_INTEL)
>> + return false;
>> +
>> + return true;
>> +}
>> +
>> +static inline u32 entry_offset(const struct intel_gsc_cpd_entry *entry)
>> +{
>> + return entry->offset & INTEL_GSC_CPD_ENTRY_OFFSET_MASK;
>> +}
>> +
>> +int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const
>> void *data, size_t size)
>> +{
>> + struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
>> + const struct intel_gsc_cpd_header_v2 *header = data;
>> + const struct intel_gsc_cpd_entry *entry;
>> + size_t min_size = sizeof(*header);
>> + int i;
>> +
>> + if (!huc_fw->loaded_via_gsc) {
>> + huc_err(huc, "Invalid FW type GSC header parsing!\n");
> I'm still not understanding what this error means. Is it meant to say
> 'Invalid FW type *for* GSC header parsing'?
yes, sorry that was the idea. I'll add the "for"
>
> 'fw->loaded_via_gsc' is set from the blob table, yes? And
> intel_huc_fw_get_binary_info() is only called from
> check_gsc_manifest() which is called from check_fw_header() iff
> fw->loaded_via_gsc is set. So it should be impossible for this test to
> ever fail, yes?
Yes, this should never fail, but with GSC FW the code changes again so I
wanted to make sure I had a check in there in case I got things wrong.
There would be other failures anyway (because the parsing wouldn't work,
so I can drop this check if you think it is redundant.
Daniele
>
> John.
>
>> + return -EINVAL;
>> + }
>> +
>> + if (size < sizeof(*header)) {
>> + huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
>> + return -ENODATA;
>> + }
>> +
>> + /*
>> + * The GSC-enabled HuC binary starts with a directory header,
>> followed
>> + * by a series of entries. Each entry is identified by a name and
>> + * points to a specific section of the binary containing the
>> relevant
>> + * data. The entries we're interested in are:
>> + * - "HUCP.man": points to the GSC manifest header for the HuC,
>> which
>> + * contains the version info.
>> + * - "huc_fw": points to the legacy-style binary that can be
>> used for
>> + * load via the DMA. This entry only contains a
>> valid CSS
>> + * on binaries for platforms that support 2-step HuC
>> load
>> + * via dma and auth via GSC (like MTL).
>> + *
>> + * --------------------------------------------------
>> + * [ intel_gsc_cpd_header_v2 ]
>> + * --------------------------------------------------
>> + * [ intel_gsc_cpd_entry[] ]
>> + * [ entry1 ]
>> + * [ ... ]
>> + * [ entryX ]
>> + * [ "HUCP.man" ]
>> + * [ ... ]
>> + * [ offset >----------------------------]------o
>> + * [ ... ] |
>> + * [ entryY ] |
>> + * [ "huc_fw" ] |
>> + * [ ... ] |
>> + * [ offset >----------------------------]----------o
>> + * -------------------------------------------------- | |
>> + * | |
>> + * -------------------------------------------------- | |
>> + * [ intel_gsc_manifest_header ]<-----o |
>> + * [ ... ] |
>> + * [ intel_gsc_version fw_version ] |
>> + * [ ... ] |
>> + * -------------------------------------------------- |
>> + * |
>> + * -------------------------------------------------- |
>> + * [ data[] ]<---------o
>> + * [ ... ]
>> + * [ ... ]
>> + * --------------------------------------------------
>> + */
>> +
>> + if (header->header_marker != INTEL_GSC_CPD_HEADER_MARKER) {
>> + huc_err(huc, "invalid marker for CPD header: 0x%08x!\n",
>> + header->header_marker);
>> + return -EINVAL;
>> + }
>> +
>> + /* we only have binaries with header v2 and entry v1 for now */
>> + if (header->header_version != 2 || header->entry_version != 1) {
>> + huc_err(huc, "invalid CPD header/entry version %u:%u!\n",
>> + header->header_version, header->entry_version);
>> + return -EINVAL;
>> + }
>> +
>> + if (header->header_length < sizeof(struct
>> intel_gsc_cpd_header_v2)) {
>> + huc_err(huc, "invalid CPD header length %u!\n",
>> + header->header_length);
>> + return -EINVAL;
>> + }
>> +
>> + min_size = header->header_length + sizeof(*entry) *
>> header->num_of_entries;
>> + if (size < min_size) {
>> + huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
>> + return -ENODATA;
>> + }
>> +
>> + entry = data + header->header_length;
>> +
>> + for (i = 0; i < header->num_of_entries; i++, entry++) {
>> + if (strcmp(entry->name, "HUCP.man") == 0)
>> + get_version_from_gsc_manifest(&huc_fw->file_selected.ver,
>> + data + entry_offset(entry));
>> +
>> + if (strcmp(entry->name, "huc_fw") == 0) {
>> + u32 offset = entry_offset(entry);
>> + if (offset < size && css_valid(data + offset, size -
>> offset))
>> + huc_fw->dma_start_offset = offset;
>> + }
>> + }
>> +
>> + return 0;
>> +}
>> +
>> int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
>> {
>> int ret;
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>> index db42e238b45f..0999ffe6f962 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>> @@ -7,8 +7,11 @@
>> #define _INTEL_HUC_FW_H_
>> struct intel_huc;
>> +struct intel_uc_fw;
>> +
>> +#include <linux/types.h>
>> int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc);
>> int intel_huc_fw_upload(struct intel_huc *huc);
>> -
>> +int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const
>> void *data, size_t size);
>> #endif
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>> new file mode 100644
>> index 000000000000..915d310ee1df
>> --- /dev/null
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>> @@ -0,0 +1,21 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright © 2023 Intel Corporation
>> + */
>> +
>> +#ifndef __INTEL_HUC_PRINT__
>> +#define __INTEL_HUC_PRINT__
>> +
>> +#include "gt/intel_gt.h"
>> +#include "gt/intel_gt_print.h"
>> +
>> +#define huc_printk(_huc, _level, _fmt, ...) \
>> + gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
>> +#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt,
>> ##__VA_ARGS__)
>> +#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt,
>> ##__VA_ARGS__)
>> +#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice,
>> _fmt, ##__VA_ARGS__)
>> +#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt,
>> ##__VA_ARGS__)
>> +#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt,
>> ##__VA_ARGS__)
>> +#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc),
>> probe_error, _fmt, ##__VA_ARGS__)
>> +
>> +#endif /* __INTEL_HUC_PRINT__ */
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> index 31776c279f32..9ced8dbf1253 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> @@ -548,33 +548,6 @@ static void __force_fw_fetch_failures(struct
>> intel_uc_fw *uc_fw, int e)
>> }
>> }
>> -static int check_gsc_manifest(struct intel_gt *gt,
>> - const struct firmware *fw,
>> - struct intel_uc_fw *uc_fw)
>> -{
>> - u32 *dw = (u32 *)fw->data;
>> - u32 version_hi, version_lo;
>> - size_t min_size;
>> -
>> - /* Check the size of the blob before examining buffer contents */
>> - min_size = sizeof(u32) * (HUC_GSC_VERSION_LO_DW + 1);
>> - if (unlikely(fw->size < min_size)) {
>> - gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
>> - intel_uc_fw_type_repr(uc_fw->type),
>> uc_fw->file_selected.path,
>> - fw->size, min_size);
>> - return -ENODATA;
>> - }
>> -
>> - version_hi = dw[HUC_GSC_VERSION_HI_DW];
>> - version_lo = dw[HUC_GSC_VERSION_LO_DW];
>> -
>> - uc_fw->file_selected.ver.major =
>> FIELD_GET(HUC_GSC_MAJOR_VER_HI_MASK, version_hi);
>> - uc_fw->file_selected.ver.minor =
>> FIELD_GET(HUC_GSC_MINOR_VER_HI_MASK, version_hi);
>> - uc_fw->file_selected.ver.patch =
>> FIELD_GET(HUC_GSC_PATCH_VER_LO_MASK, version_lo);
>> -
>> - return 0;
>> -}
>> -
>> static void uc_unpack_css_version(struct intel_uc_fw_ver *ver, u32
>> css_value)
>> {
>> /* Get version numbers from the CSS header */
>> @@ -631,22 +604,22 @@ static void guc_read_css_info(struct
>> intel_uc_fw *uc_fw, struct uc_css_header *c
>> uc_fw->private_data_size = css->private_data_size;
>> }
>> -static int check_ccs_header(struct intel_gt *gt,
>> - const struct firmware *fw,
>> - struct intel_uc_fw *uc_fw)
>> +static int __check_ccs_header(struct intel_gt *gt,
>> + const void *fw_data, size_t fw_size,
>> + struct intel_uc_fw *uc_fw)
>> {
>> struct uc_css_header *css;
>> size_t size;
>> /* Check the size of the blob before examining buffer
>> contents */
>> - if (unlikely(fw->size < sizeof(struct uc_css_header))) {
>> + if (unlikely(fw_size < sizeof(struct uc_css_header))) {
>> gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
>> intel_uc_fw_type_repr(uc_fw->type),
>> uc_fw->file_selected.path,
>> - fw->size, sizeof(struct uc_css_header));
>> + fw_size, sizeof(struct uc_css_header));
>> return -ENODATA;
>> }
>> - css = (struct uc_css_header *)fw->data;
>> + css = (struct uc_css_header *)fw_data;
>> /* Check integrity of size values inside CSS header */
>> size = (css->header_size_dw - css->key_size_dw -
>> css->modulus_size_dw -
>> @@ -654,7 +627,7 @@ static int check_ccs_header(struct intel_gt *gt,
>> if (unlikely(size != sizeof(struct uc_css_header))) {
>> gt_warn(gt, "%s firmware %s: unexpected header size: %zu !=
>> %zu\n",
>> intel_uc_fw_type_repr(uc_fw->type),
>> uc_fw->file_selected.path,
>> - fw->size, sizeof(struct uc_css_header));
>> + fw_size, sizeof(struct uc_css_header));
>> return -EPROTO;
>> }
>> @@ -666,10 +639,10 @@ static int check_ccs_header(struct intel_gt *gt,
>> /* At least, it should have header, uCode and RSA. Size of
>> all three. */
>> size = sizeof(struct uc_css_header) + uc_fw->ucode_size +
>> uc_fw->rsa_size;
>> - if (unlikely(fw->size < size)) {
>> + if (unlikely(fw_size < size)) {
>> gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
>> intel_uc_fw_type_repr(uc_fw->type),
>> uc_fw->file_selected.path,
>> - fw->size, size);
>> + fw_size, size);
>> return -ENOEXEC;
>> }
>> @@ -690,6 +663,32 @@ static int check_ccs_header(struct intel_gt *gt,
>> return 0;
>> }
>> +static int check_gsc_manifest(struct intel_gt *gt,
>> + const struct firmware *fw,
>> + struct intel_uc_fw *uc_fw)
>> +{
>> + if (uc_fw->type != INTEL_UC_FW_TYPE_HUC) {
>> + gt_err(gt, "trying to GSC-parse a non-HuC binary");
>> + return -EINVAL;
>> + }
>> +
>> + intel_huc_fw_get_binary_info(uc_fw, fw->data, fw->size);
>> +
>> + if (uc_fw->dma_start_offset) {
>> + u32 delta = uc_fw->dma_start_offset;
>> + __check_ccs_header(gt, fw->data + delta, fw->size - delta,
>> uc_fw);
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int check_ccs_header(struct intel_gt *gt,
>> + const struct firmware *fw,
>> + struct intel_uc_fw *uc_fw)
>> +{
>> + return __check_ccs_header(gt, fw->data, fw->size, uc_fw);
>> +}
>> +
>> static bool is_ver_8bit(struct intel_uc_fw_ver *ver)
>> {
>> return ver->major < 0xFF && ver->minor < 0xFF && ver->patch <
>> 0xFF;
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> index 2be9470eb712..b3daba9526eb 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> @@ -118,6 +118,8 @@ struct intel_uc_fw {
>> u32 ucode_size;
>> u32 private_data_size;
>> + u32 dma_start_offset;
>> +
>> bool loaded_via_gsc;
>> };
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>> index 646fa8aa6cf1..7fe405126249 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>> @@ -84,10 +84,4 @@ struct uc_css_header {
>> } __packed;
>> static_assert(sizeof(struct uc_css_header) == 128);
>> -#define HUC_GSC_VERSION_HI_DW 44
>> -#define HUC_GSC_MAJOR_VER_HI_MASK (0xFF << 0)
>> -#define HUC_GSC_MINOR_VER_HI_MASK (0xFF << 16)
>> -#define HUC_GSC_VERSION_LO_DW 45
>> -#define HUC_GSC_PATCH_VER_LO_MASK (0xFF << 0)
>> -
>> #endif /* _INTEL_UC_FW_ABI_H */
>
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCH v3 2/7] drm/i915/huc: Parse the GSC-enabled HuC binary
2023-05-31 0:06 ` [Intel-gfx] " Ceraolo Spurio, Daniele
@ 2023-05-31 0:11 ` John Harrison
-1 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-31 0:11 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 17:06, Ceraolo Spurio, Daniele wrote:
> On 5/30/2023 4:30 PM, John Harrison wrote:
>> On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
>>> The new binaries that support the 2-step authentication contain the
>>> legacy-style binary, which we can use for loading the HuC via DMA. To
>>> find out where this is located in the image, we need to parse the
>>> manifest of the GSC-enabled HuC binary. The manifest consist of a
>>> partition header followed by entries, one of which contains the offset
>>> we're looking for.
>>> Note that the DG2 GSC binary contains entries with the same names, but
>>> it doesn't contain a full legacy binary, so we need to skip assigning
>>> the dma offset in that case (which we can do by checking the ccs).
>>> Also, since we're now parsing the entries, we can extract the HuC
>>> version that way instead of using hardcoded offsets.
>>>
>>> Note that the GSC binary uses the same structures in its binary header,
>>> so they've been added in their own header file.
>>>
>>> v2: fix structure names to match meu defines (s/CPT/CPD/), update
>>> commit
>>> message, check ccs validity, drop old version location defines.
>>>
>>> v3: drop references to the MEU tool to reduce confusion, fix log (John)
>>>
>>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>>> Cc: John Harrison <John.C.Harrison@Intel.com>
>>> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
>>> ---
>>> .../drm/i915/gt/uc/intel_gsc_binary_headers.h | 74 ++++++++++
>>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 11 +-
>>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 135
>>> ++++++++++++++++++
>>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 5 +-
>>> drivers/gpu/drm/i915/gt/uc/intel_huc_print.h | 21 +++
>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 71 +++++----
>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +
>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 6 -
>>> 8 files changed, 272 insertions(+), 53 deletions(-)
>>> create mode 100644
>>> drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>>> create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>>>
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>>> new file mode 100644
>>> index 000000000000..714f0c256118
>>> --- /dev/null
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>>> @@ -0,0 +1,74 @@
>>> +/* SPDX-License-Identifier: MIT */
>>> +/*
>>> + * Copyright © 2023 Intel Corporation
>>> + */
>>> +
>>> +#ifndef _INTEL_GSC_BINARY_HEADERS_H_
>>> +#define _INTEL_GSC_BINARY_HEADERS_H_
>>> +
>>> +#include <linux/types.h>
>>> +
>>> +/* Code partition directory (CPD) structures */
>>> +struct intel_gsc_cpd_header_v2 {
>>> + u32 header_marker;
>>> +#define INTEL_GSC_CPD_HEADER_MARKER 0x44504324
>>> +
>>> + u32 num_of_entries;
>>> + u8 header_version;
>>> + u8 entry_version;
>>> + u8 header_length; /* in bytes */
>>> + u8 flags;
>>> + u32 partition_name;
>>> + u32 crc32;
>>> +} __packed;
>>> +
>>> +struct intel_gsc_cpd_entry {
>>> + u8 name[12];
>>> +
>>> + /*
>>> + * Bits 0-24: offset from the beginning of the code partition
>>> + * Bit 25: huffman compressed
>>> + * Bits 26-31: reserved
>>> + */
>>> + u32 offset;
>>> +#define INTEL_GSC_CPD_ENTRY_OFFSET_MASK GENMASK(24, 0)
>>> +#define INTEL_GSC_CPD_ENTRY_HUFFMAN_COMP BIT(25)
>>> +
>>> + /*
>>> + * Module/Item length, in bytes. For Huffman-compressed
>>> modules, this
>>> + * refers to the uncompressed size. For software-compressed
>>> modules,
>>> + * this refers to the compressed size.
>>> + */
>>> + u32 length;
>>> +
>>> + u8 reserved[4];
>>> +} __packed;
>>> +
>>> +struct intel_gsc_version {
>>> + u16 major;
>>> + u16 minor;
>>> + u16 hotfix;
>>> + u16 build;
>>> +} __packed;
>>> +
>>> +struct intel_gsc_manifest_header {
>>> + u32 header_type; /* 0x4 for manifest type */
>>> + u32 header_length; /* in dwords */
>>> + u32 header_version;
>>> + u32 flags;
>>> + u32 vendor;
>>> + u32 date;
>>> + u32 size; /* In dwords, size of entire manifest (header +
>>> extensions) */
>>> + u32 header_id;
>>> + u32 internal_data;
>>> + struct intel_gsc_version fw_version;
>>> + u32 security_version;
>>> + struct intel_gsc_version meu_kit_version;
>>> + u32 meu_manifest_version;
>>> + u8 general_data[4];
>>> + u8 reserved3[56];
>>> + u32 modulus_size; /* in dwords */
>>> + u32 exponent_size; /* in dwords */
>>> +} __packed;
>>> +
>>> +#endif
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> index 268e036f8f28..6d795438b3e4 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> @@ -6,23 +6,14 @@
>>> #include <linux/types.h>
>>> #include "gt/intel_gt.h"
>>> -#include "gt/intel_gt_print.h"
>>> #include "intel_guc_reg.h"
>>> #include "intel_huc.h"
>>> +#include "intel_huc_print.h"
>>> #include "i915_drv.h"
>>> #include <linux/device/bus.h>
>>> #include <linux/mei_aux.h>
>>> -#define huc_printk(_huc, _level, _fmt, ...) \
>>> - gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
>>> -#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt,
>>> ##__VA_ARGS__)
>>> -#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt,
>>> ##__VA_ARGS__)
>>> -#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice,
>>> _fmt, ##__VA_ARGS__)
>>> -#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt,
>>> ##__VA_ARGS__)
>>> -#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt,
>>> ##__VA_ARGS__)
>>> -#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc),
>>> probe_error, _fmt, ##__VA_ARGS__)
>>> -
>>> /**
>>> * DOC: HuC
>>> *
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> index 534b0aa43316..037d2ad4879d 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> @@ -5,11 +5,146 @@
>>> #include "gt/intel_gsc.h"
>>> #include "gt/intel_gt.h"
>>> +#include "intel_gsc_binary_headers.h"
>>> #include "intel_huc.h"
>>> #include "intel_huc_fw.h"
>>> +#include "intel_huc_print.h"
>>> #include "i915_drv.h"
>>> #include "pxp/intel_pxp_huc.h"
>>> +static void get_version_from_gsc_manifest(struct intel_uc_fw_ver
>>> *ver, const void *data)
>>> +{
>>> + const struct intel_gsc_manifest_header *manifest = data;
>>> +
>>> + ver->major = manifest->fw_version.major;
>>> + ver->minor = manifest->fw_version.minor;
>>> + ver->patch = manifest->fw_version.hotfix;
>>> +}
>>> +
>>> +static bool css_valid(const void *data, size_t size)
>>> +{
>>> + const struct uc_css_header *css = data;
>>> +
>>> + if (unlikely(size < sizeof(struct uc_css_header)))
>>> + return false;
>>> +
>>> + if (css->module_type != 0x6)
>>> + return false;
>>> +
>>> + if (css->module_vendor != PCI_VENDOR_ID_INTEL)
>>> + return false;
>>> +
>>> + return true;
>>> +}
>>> +
>>> +static inline u32 entry_offset(const struct intel_gsc_cpd_entry
>>> *entry)
>>> +{
>>> + return entry->offset & INTEL_GSC_CPD_ENTRY_OFFSET_MASK;
>>> +}
>>> +
>>> +int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const
>>> void *data, size_t size)
>>> +{
>>> + struct intel_huc *huc = container_of(huc_fw, struct intel_huc,
>>> fw);
>>> + const struct intel_gsc_cpd_header_v2 *header = data;
>>> + const struct intel_gsc_cpd_entry *entry;
>>> + size_t min_size = sizeof(*header);
>>> + int i;
>>> +
>>> + if (!huc_fw->loaded_via_gsc) {
>>> + huc_err(huc, "Invalid FW type GSC header parsing!\n");
>> I'm still not understanding what this error means. Is it meant to say
>> 'Invalid FW type *for* GSC header parsing'?
>
> yes, sorry that was the idea. I'll add the "for"
:)
>
>>
>> 'fw->loaded_via_gsc' is set from the blob table, yes? And
>> intel_huc_fw_get_binary_info() is only called from
>> check_gsc_manifest() which is called from check_fw_header() iff
>> fw->loaded_via_gsc is set. So it should be impossible for this test
>> to ever fail, yes?
>
> Yes, this should never fail, but with GSC FW the code changes again so
> I wanted to make sure I had a check in there in case I got things
> wrong. There would be other failures anyway (because the parsing
> wouldn't work, so I can drop this check if you think it is redundant.
Was more just wanting to verify my understanding and maybe wondering if
it should be a BUG rather than just a if. But yeah, the code paths above
change even within this patch set. So keeping the test as is seems sensible.
John.
>
> Daniele
>
>>
>> John.
>>
>>> + return -EINVAL;
>>> + }
>>> +
>>> + if (size < sizeof(*header)) {
>>> + huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
>>> + return -ENODATA;
>>> + }
>>> +
>>> + /*
>>> + * The GSC-enabled HuC binary starts with a directory header,
>>> followed
>>> + * by a series of entries. Each entry is identified by a name and
>>> + * points to a specific section of the binary containing the
>>> relevant
>>> + * data. The entries we're interested in are:
>>> + * - "HUCP.man": points to the GSC manifest header for the HuC,
>>> which
>>> + * contains the version info.
>>> + * - "huc_fw": points to the legacy-style binary that can be
>>> used for
>>> + * load via the DMA. This entry only contains a
>>> valid CSS
>>> + * on binaries for platforms that support 2-step
>>> HuC load
>>> + * via dma and auth via GSC (like MTL).
>>> + *
>>> + * --------------------------------------------------
>>> + * [ intel_gsc_cpd_header_v2 ]
>>> + * --------------------------------------------------
>>> + * [ intel_gsc_cpd_entry[] ]
>>> + * [ entry1 ]
>>> + * [ ... ]
>>> + * [ entryX ]
>>> + * [ "HUCP.man" ]
>>> + * [ ... ]
>>> + * [ offset >----------------------------]------o
>>> + * [ ... ] |
>>> + * [ entryY ] |
>>> + * [ "huc_fw" ] |
>>> + * [ ... ] |
>>> + * [ offset >----------------------------]----------o
>>> + * -------------------------------------------------- | |
>>> + * | |
>>> + * -------------------------------------------------- | |
>>> + * [ intel_gsc_manifest_header ]<-----o |
>>> + * [ ... ] |
>>> + * [ intel_gsc_version fw_version ] |
>>> + * [ ... ] |
>>> + * -------------------------------------------------- |
>>> + * |
>>> + * -------------------------------------------------- |
>>> + * [ data[] ]<---------o
>>> + * [ ... ]
>>> + * [ ... ]
>>> + * --------------------------------------------------
>>> + */
>>> +
>>> + if (header->header_marker != INTEL_GSC_CPD_HEADER_MARKER) {
>>> + huc_err(huc, "invalid marker for CPD header: 0x%08x!\n",
>>> + header->header_marker);
>>> + return -EINVAL;
>>> + }
>>> +
>>> + /* we only have binaries with header v2 and entry v1 for now */
>>> + if (header->header_version != 2 || header->entry_version != 1) {
>>> + huc_err(huc, "invalid CPD header/entry version %u:%u!\n",
>>> + header->header_version, header->entry_version);
>>> + return -EINVAL;
>>> + }
>>> +
>>> + if (header->header_length < sizeof(struct
>>> intel_gsc_cpd_header_v2)) {
>>> + huc_err(huc, "invalid CPD header length %u!\n",
>>> + header->header_length);
>>> + return -EINVAL;
>>> + }
>>> +
>>> + min_size = header->header_length + sizeof(*entry) *
>>> header->num_of_entries;
>>> + if (size < min_size) {
>>> + huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
>>> + return -ENODATA;
>>> + }
>>> +
>>> + entry = data + header->header_length;
>>> +
>>> + for (i = 0; i < header->num_of_entries; i++, entry++) {
>>> + if (strcmp(entry->name, "HUCP.man") == 0)
>>> + get_version_from_gsc_manifest(&huc_fw->file_selected.ver,
>>> + data + entry_offset(entry));
>>> +
>>> + if (strcmp(entry->name, "huc_fw") == 0) {
>>> + u32 offset = entry_offset(entry);
>>> + if (offset < size && css_valid(data + offset, size -
>>> offset))
>>> + huc_fw->dma_start_offset = offset;
>>> + }
>>> + }
>>> +
>>> + return 0;
>>> +}
>>> +
>>> int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
>>> {
>>> int ret;
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>>> index db42e238b45f..0999ffe6f962 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>>> @@ -7,8 +7,11 @@
>>> #define _INTEL_HUC_FW_H_
>>> struct intel_huc;
>>> +struct intel_uc_fw;
>>> +
>>> +#include <linux/types.h>
>>> int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc);
>>> int intel_huc_fw_upload(struct intel_huc *huc);
>>> -
>>> +int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const
>>> void *data, size_t size);
>>> #endif
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>>> new file mode 100644
>>> index 000000000000..915d310ee1df
>>> --- /dev/null
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>>> @@ -0,0 +1,21 @@
>>> +/* SPDX-License-Identifier: MIT */
>>> +/*
>>> + * Copyright © 2023 Intel Corporation
>>> + */
>>> +
>>> +#ifndef __INTEL_HUC_PRINT__
>>> +#define __INTEL_HUC_PRINT__
>>> +
>>> +#include "gt/intel_gt.h"
>>> +#include "gt/intel_gt_print.h"
>>> +
>>> +#define huc_printk(_huc, _level, _fmt, ...) \
>>> + gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
>>> +#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt,
>>> ##__VA_ARGS__)
>>> +#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt,
>>> ##__VA_ARGS__)
>>> +#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice,
>>> _fmt, ##__VA_ARGS__)
>>> +#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt,
>>> ##__VA_ARGS__)
>>> +#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt,
>>> ##__VA_ARGS__)
>>> +#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc),
>>> probe_error, _fmt, ##__VA_ARGS__)
>>> +
>>> +#endif /* __INTEL_HUC_PRINT__ */
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> index 31776c279f32..9ced8dbf1253 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> @@ -548,33 +548,6 @@ static void __force_fw_fetch_failures(struct
>>> intel_uc_fw *uc_fw, int e)
>>> }
>>> }
>>> -static int check_gsc_manifest(struct intel_gt *gt,
>>> - const struct firmware *fw,
>>> - struct intel_uc_fw *uc_fw)
>>> -{
>>> - u32 *dw = (u32 *)fw->data;
>>> - u32 version_hi, version_lo;
>>> - size_t min_size;
>>> -
>>> - /* Check the size of the blob before examining buffer contents */
>>> - min_size = sizeof(u32) * (HUC_GSC_VERSION_LO_DW + 1);
>>> - if (unlikely(fw->size < min_size)) {
>>> - gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
>>> - intel_uc_fw_type_repr(uc_fw->type),
>>> uc_fw->file_selected.path,
>>> - fw->size, min_size);
>>> - return -ENODATA;
>>> - }
>>> -
>>> - version_hi = dw[HUC_GSC_VERSION_HI_DW];
>>> - version_lo = dw[HUC_GSC_VERSION_LO_DW];
>>> -
>>> - uc_fw->file_selected.ver.major =
>>> FIELD_GET(HUC_GSC_MAJOR_VER_HI_MASK, version_hi);
>>> - uc_fw->file_selected.ver.minor =
>>> FIELD_GET(HUC_GSC_MINOR_VER_HI_MASK, version_hi);
>>> - uc_fw->file_selected.ver.patch =
>>> FIELD_GET(HUC_GSC_PATCH_VER_LO_MASK, version_lo);
>>> -
>>> - return 0;
>>> -}
>>> -
>>> static void uc_unpack_css_version(struct intel_uc_fw_ver *ver, u32
>>> css_value)
>>> {
>>> /* Get version numbers from the CSS header */
>>> @@ -631,22 +604,22 @@ static void guc_read_css_info(struct
>>> intel_uc_fw *uc_fw, struct uc_css_header *c
>>> uc_fw->private_data_size = css->private_data_size;
>>> }
>>> -static int check_ccs_header(struct intel_gt *gt,
>>> - const struct firmware *fw,
>>> - struct intel_uc_fw *uc_fw)
>>> +static int __check_ccs_header(struct intel_gt *gt,
>>> + const void *fw_data, size_t fw_size,
>>> + struct intel_uc_fw *uc_fw)
>>> {
>>> struct uc_css_header *css;
>>> size_t size;
>>> /* Check the size of the blob before examining buffer
>>> contents */
>>> - if (unlikely(fw->size < sizeof(struct uc_css_header))) {
>>> + if (unlikely(fw_size < sizeof(struct uc_css_header))) {
>>> gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
>>> intel_uc_fw_type_repr(uc_fw->type),
>>> uc_fw->file_selected.path,
>>> - fw->size, sizeof(struct uc_css_header));
>>> + fw_size, sizeof(struct uc_css_header));
>>> return -ENODATA;
>>> }
>>> - css = (struct uc_css_header *)fw->data;
>>> + css = (struct uc_css_header *)fw_data;
>>> /* Check integrity of size values inside CSS header */
>>> size = (css->header_size_dw - css->key_size_dw -
>>> css->modulus_size_dw -
>>> @@ -654,7 +627,7 @@ static int check_ccs_header(struct intel_gt *gt,
>>> if (unlikely(size != sizeof(struct uc_css_header))) {
>>> gt_warn(gt, "%s firmware %s: unexpected header size: %zu
>>> != %zu\n",
>>> intel_uc_fw_type_repr(uc_fw->type),
>>> uc_fw->file_selected.path,
>>> - fw->size, sizeof(struct uc_css_header));
>>> + fw_size, sizeof(struct uc_css_header));
>>> return -EPROTO;
>>> }
>>> @@ -666,10 +639,10 @@ static int check_ccs_header(struct intel_gt
>>> *gt,
>>> /* At least, it should have header, uCode and RSA. Size of
>>> all three. */
>>> size = sizeof(struct uc_css_header) + uc_fw->ucode_size +
>>> uc_fw->rsa_size;
>>> - if (unlikely(fw->size < size)) {
>>> + if (unlikely(fw_size < size)) {
>>> gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
>>> intel_uc_fw_type_repr(uc_fw->type),
>>> uc_fw->file_selected.path,
>>> - fw->size, size);
>>> + fw_size, size);
>>> return -ENOEXEC;
>>> }
>>> @@ -690,6 +663,32 @@ static int check_ccs_header(struct intel_gt *gt,
>>> return 0;
>>> }
>>> +static int check_gsc_manifest(struct intel_gt *gt,
>>> + const struct firmware *fw,
>>> + struct intel_uc_fw *uc_fw)
>>> +{
>>> + if (uc_fw->type != INTEL_UC_FW_TYPE_HUC) {
>>> + gt_err(gt, "trying to GSC-parse a non-HuC binary");
>>> + return -EINVAL;
>>> + }
>>> +
>>> + intel_huc_fw_get_binary_info(uc_fw, fw->data, fw->size);
>>> +
>>> + if (uc_fw->dma_start_offset) {
>>> + u32 delta = uc_fw->dma_start_offset;
>>> + __check_ccs_header(gt, fw->data + delta, fw->size - delta,
>>> uc_fw);
>>> + }
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static int check_ccs_header(struct intel_gt *gt,
>>> + const struct firmware *fw,
>>> + struct intel_uc_fw *uc_fw)
>>> +{
>>> + return __check_ccs_header(gt, fw->data, fw->size, uc_fw);
>>> +}
>>> +
>>> static bool is_ver_8bit(struct intel_uc_fw_ver *ver)
>>> {
>>> return ver->major < 0xFF && ver->minor < 0xFF && ver->patch <
>>> 0xFF;
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> index 2be9470eb712..b3daba9526eb 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> @@ -118,6 +118,8 @@ struct intel_uc_fw {
>>> u32 ucode_size;
>>> u32 private_data_size;
>>> + u32 dma_start_offset;
>>> +
>>> bool loaded_via_gsc;
>>> };
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>> index 646fa8aa6cf1..7fe405126249 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>> @@ -84,10 +84,4 @@ struct uc_css_header {
>>> } __packed;
>>> static_assert(sizeof(struct uc_css_header) == 128);
>>> -#define HUC_GSC_VERSION_HI_DW 44
>>> -#define HUC_GSC_MAJOR_VER_HI_MASK (0xFF << 0)
>>> -#define HUC_GSC_MINOR_VER_HI_MASK (0xFF << 16)
>>> -#define HUC_GSC_VERSION_LO_DW 45
>>> -#define HUC_GSC_PATCH_VER_LO_MASK (0xFF << 0)
>>> -
>>> #endif /* _INTEL_UC_FW_ABI_H */
>>
>
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [Intel-gfx] [PATCH v3 2/7] drm/i915/huc: Parse the GSC-enabled HuC binary
@ 2023-05-31 0:11 ` John Harrison
0 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-31 0:11 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 17:06, Ceraolo Spurio, Daniele wrote:
> On 5/30/2023 4:30 PM, John Harrison wrote:
>> On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
>>> The new binaries that support the 2-step authentication contain the
>>> legacy-style binary, which we can use for loading the HuC via DMA. To
>>> find out where this is located in the image, we need to parse the
>>> manifest of the GSC-enabled HuC binary. The manifest consist of a
>>> partition header followed by entries, one of which contains the offset
>>> we're looking for.
>>> Note that the DG2 GSC binary contains entries with the same names, but
>>> it doesn't contain a full legacy binary, so we need to skip assigning
>>> the dma offset in that case (which we can do by checking the ccs).
>>> Also, since we're now parsing the entries, we can extract the HuC
>>> version that way instead of using hardcoded offsets.
>>>
>>> Note that the GSC binary uses the same structures in its binary header,
>>> so they've been added in their own header file.
>>>
>>> v2: fix structure names to match meu defines (s/CPT/CPD/), update
>>> commit
>>> message, check ccs validity, drop old version location defines.
>>>
>>> v3: drop references to the MEU tool to reduce confusion, fix log (John)
>>>
>>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>>> Cc: John Harrison <John.C.Harrison@Intel.com>
>>> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
>>> ---
>>> .../drm/i915/gt/uc/intel_gsc_binary_headers.h | 74 ++++++++++
>>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 11 +-
>>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 135
>>> ++++++++++++++++++
>>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 5 +-
>>> drivers/gpu/drm/i915/gt/uc/intel_huc_print.h | 21 +++
>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 71 +++++----
>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +
>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 6 -
>>> 8 files changed, 272 insertions(+), 53 deletions(-)
>>> create mode 100644
>>> drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>>> create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>>>
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>>> new file mode 100644
>>> index 000000000000..714f0c256118
>>> --- /dev/null
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
>>> @@ -0,0 +1,74 @@
>>> +/* SPDX-License-Identifier: MIT */
>>> +/*
>>> + * Copyright © 2023 Intel Corporation
>>> + */
>>> +
>>> +#ifndef _INTEL_GSC_BINARY_HEADERS_H_
>>> +#define _INTEL_GSC_BINARY_HEADERS_H_
>>> +
>>> +#include <linux/types.h>
>>> +
>>> +/* Code partition directory (CPD) structures */
>>> +struct intel_gsc_cpd_header_v2 {
>>> + u32 header_marker;
>>> +#define INTEL_GSC_CPD_HEADER_MARKER 0x44504324
>>> +
>>> + u32 num_of_entries;
>>> + u8 header_version;
>>> + u8 entry_version;
>>> + u8 header_length; /* in bytes */
>>> + u8 flags;
>>> + u32 partition_name;
>>> + u32 crc32;
>>> +} __packed;
>>> +
>>> +struct intel_gsc_cpd_entry {
>>> + u8 name[12];
>>> +
>>> + /*
>>> + * Bits 0-24: offset from the beginning of the code partition
>>> + * Bit 25: huffman compressed
>>> + * Bits 26-31: reserved
>>> + */
>>> + u32 offset;
>>> +#define INTEL_GSC_CPD_ENTRY_OFFSET_MASK GENMASK(24, 0)
>>> +#define INTEL_GSC_CPD_ENTRY_HUFFMAN_COMP BIT(25)
>>> +
>>> + /*
>>> + * Module/Item length, in bytes. For Huffman-compressed
>>> modules, this
>>> + * refers to the uncompressed size. For software-compressed
>>> modules,
>>> + * this refers to the compressed size.
>>> + */
>>> + u32 length;
>>> +
>>> + u8 reserved[4];
>>> +} __packed;
>>> +
>>> +struct intel_gsc_version {
>>> + u16 major;
>>> + u16 minor;
>>> + u16 hotfix;
>>> + u16 build;
>>> +} __packed;
>>> +
>>> +struct intel_gsc_manifest_header {
>>> + u32 header_type; /* 0x4 for manifest type */
>>> + u32 header_length; /* in dwords */
>>> + u32 header_version;
>>> + u32 flags;
>>> + u32 vendor;
>>> + u32 date;
>>> + u32 size; /* In dwords, size of entire manifest (header +
>>> extensions) */
>>> + u32 header_id;
>>> + u32 internal_data;
>>> + struct intel_gsc_version fw_version;
>>> + u32 security_version;
>>> + struct intel_gsc_version meu_kit_version;
>>> + u32 meu_manifest_version;
>>> + u8 general_data[4];
>>> + u8 reserved3[56];
>>> + u32 modulus_size; /* in dwords */
>>> + u32 exponent_size; /* in dwords */
>>> +} __packed;
>>> +
>>> +#endif
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> index 268e036f8f28..6d795438b3e4 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> @@ -6,23 +6,14 @@
>>> #include <linux/types.h>
>>> #include "gt/intel_gt.h"
>>> -#include "gt/intel_gt_print.h"
>>> #include "intel_guc_reg.h"
>>> #include "intel_huc.h"
>>> +#include "intel_huc_print.h"
>>> #include "i915_drv.h"
>>> #include <linux/device/bus.h>
>>> #include <linux/mei_aux.h>
>>> -#define huc_printk(_huc, _level, _fmt, ...) \
>>> - gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
>>> -#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt,
>>> ##__VA_ARGS__)
>>> -#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt,
>>> ##__VA_ARGS__)
>>> -#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice,
>>> _fmt, ##__VA_ARGS__)
>>> -#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt,
>>> ##__VA_ARGS__)
>>> -#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt,
>>> ##__VA_ARGS__)
>>> -#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc),
>>> probe_error, _fmt, ##__VA_ARGS__)
>>> -
>>> /**
>>> * DOC: HuC
>>> *
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> index 534b0aa43316..037d2ad4879d 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> @@ -5,11 +5,146 @@
>>> #include "gt/intel_gsc.h"
>>> #include "gt/intel_gt.h"
>>> +#include "intel_gsc_binary_headers.h"
>>> #include "intel_huc.h"
>>> #include "intel_huc_fw.h"
>>> +#include "intel_huc_print.h"
>>> #include "i915_drv.h"
>>> #include "pxp/intel_pxp_huc.h"
>>> +static void get_version_from_gsc_manifest(struct intel_uc_fw_ver
>>> *ver, const void *data)
>>> +{
>>> + const struct intel_gsc_manifest_header *manifest = data;
>>> +
>>> + ver->major = manifest->fw_version.major;
>>> + ver->minor = manifest->fw_version.minor;
>>> + ver->patch = manifest->fw_version.hotfix;
>>> +}
>>> +
>>> +static bool css_valid(const void *data, size_t size)
>>> +{
>>> + const struct uc_css_header *css = data;
>>> +
>>> + if (unlikely(size < sizeof(struct uc_css_header)))
>>> + return false;
>>> +
>>> + if (css->module_type != 0x6)
>>> + return false;
>>> +
>>> + if (css->module_vendor != PCI_VENDOR_ID_INTEL)
>>> + return false;
>>> +
>>> + return true;
>>> +}
>>> +
>>> +static inline u32 entry_offset(const struct intel_gsc_cpd_entry
>>> *entry)
>>> +{
>>> + return entry->offset & INTEL_GSC_CPD_ENTRY_OFFSET_MASK;
>>> +}
>>> +
>>> +int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const
>>> void *data, size_t size)
>>> +{
>>> + struct intel_huc *huc = container_of(huc_fw, struct intel_huc,
>>> fw);
>>> + const struct intel_gsc_cpd_header_v2 *header = data;
>>> + const struct intel_gsc_cpd_entry *entry;
>>> + size_t min_size = sizeof(*header);
>>> + int i;
>>> +
>>> + if (!huc_fw->loaded_via_gsc) {
>>> + huc_err(huc, "Invalid FW type GSC header parsing!\n");
>> I'm still not understanding what this error means. Is it meant to say
>> 'Invalid FW type *for* GSC header parsing'?
>
> yes, sorry that was the idea. I'll add the "for"
:)
>
>>
>> 'fw->loaded_via_gsc' is set from the blob table, yes? And
>> intel_huc_fw_get_binary_info() is only called from
>> check_gsc_manifest() which is called from check_fw_header() iff
>> fw->loaded_via_gsc is set. So it should be impossible for this test
>> to ever fail, yes?
>
> Yes, this should never fail, but with GSC FW the code changes again so
> I wanted to make sure I had a check in there in case I got things
> wrong. There would be other failures anyway (because the parsing
> wouldn't work, so I can drop this check if you think it is redundant.
Was more just wanting to verify my understanding and maybe wondering if
it should be a BUG rather than just a if. But yeah, the code paths above
change even within this patch set. So keeping the test as is seems sensible.
John.
>
> Daniele
>
>>
>> John.
>>
>>> + return -EINVAL;
>>> + }
>>> +
>>> + if (size < sizeof(*header)) {
>>> + huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
>>> + return -ENODATA;
>>> + }
>>> +
>>> + /*
>>> + * The GSC-enabled HuC binary starts with a directory header,
>>> followed
>>> + * by a series of entries. Each entry is identified by a name and
>>> + * points to a specific section of the binary containing the
>>> relevant
>>> + * data. The entries we're interested in are:
>>> + * - "HUCP.man": points to the GSC manifest header for the HuC,
>>> which
>>> + * contains the version info.
>>> + * - "huc_fw": points to the legacy-style binary that can be
>>> used for
>>> + * load via the DMA. This entry only contains a
>>> valid CSS
>>> + * on binaries for platforms that support 2-step
>>> HuC load
>>> + * via dma and auth via GSC (like MTL).
>>> + *
>>> + * --------------------------------------------------
>>> + * [ intel_gsc_cpd_header_v2 ]
>>> + * --------------------------------------------------
>>> + * [ intel_gsc_cpd_entry[] ]
>>> + * [ entry1 ]
>>> + * [ ... ]
>>> + * [ entryX ]
>>> + * [ "HUCP.man" ]
>>> + * [ ... ]
>>> + * [ offset >----------------------------]------o
>>> + * [ ... ] |
>>> + * [ entryY ] |
>>> + * [ "huc_fw" ] |
>>> + * [ ... ] |
>>> + * [ offset >----------------------------]----------o
>>> + * -------------------------------------------------- | |
>>> + * | |
>>> + * -------------------------------------------------- | |
>>> + * [ intel_gsc_manifest_header ]<-----o |
>>> + * [ ... ] |
>>> + * [ intel_gsc_version fw_version ] |
>>> + * [ ... ] |
>>> + * -------------------------------------------------- |
>>> + * |
>>> + * -------------------------------------------------- |
>>> + * [ data[] ]<---------o
>>> + * [ ... ]
>>> + * [ ... ]
>>> + * --------------------------------------------------
>>> + */
>>> +
>>> + if (header->header_marker != INTEL_GSC_CPD_HEADER_MARKER) {
>>> + huc_err(huc, "invalid marker for CPD header: 0x%08x!\n",
>>> + header->header_marker);
>>> + return -EINVAL;
>>> + }
>>> +
>>> + /* we only have binaries with header v2 and entry v1 for now */
>>> + if (header->header_version != 2 || header->entry_version != 1) {
>>> + huc_err(huc, "invalid CPD header/entry version %u:%u!\n",
>>> + header->header_version, header->entry_version);
>>> + return -EINVAL;
>>> + }
>>> +
>>> + if (header->header_length < sizeof(struct
>>> intel_gsc_cpd_header_v2)) {
>>> + huc_err(huc, "invalid CPD header length %u!\n",
>>> + header->header_length);
>>> + return -EINVAL;
>>> + }
>>> +
>>> + min_size = header->header_length + sizeof(*entry) *
>>> header->num_of_entries;
>>> + if (size < min_size) {
>>> + huc_err(huc, "FW too small! %zu < %zu\n", size, min_size);
>>> + return -ENODATA;
>>> + }
>>> +
>>> + entry = data + header->header_length;
>>> +
>>> + for (i = 0; i < header->num_of_entries; i++, entry++) {
>>> + if (strcmp(entry->name, "HUCP.man") == 0)
>>> + get_version_from_gsc_manifest(&huc_fw->file_selected.ver,
>>> + data + entry_offset(entry));
>>> +
>>> + if (strcmp(entry->name, "huc_fw") == 0) {
>>> + u32 offset = entry_offset(entry);
>>> + if (offset < size && css_valid(data + offset, size -
>>> offset))
>>> + huc_fw->dma_start_offset = offset;
>>> + }
>>> + }
>>> +
>>> + return 0;
>>> +}
>>> +
>>> int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
>>> {
>>> int ret;
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>>> index db42e238b45f..0999ffe6f962 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
>>> @@ -7,8 +7,11 @@
>>> #define _INTEL_HUC_FW_H_
>>> struct intel_huc;
>>> +struct intel_uc_fw;
>>> +
>>> +#include <linux/types.h>
>>> int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc);
>>> int intel_huc_fw_upload(struct intel_huc *huc);
>>> -
>>> +int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const
>>> void *data, size_t size);
>>> #endif
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>>> new file mode 100644
>>> index 000000000000..915d310ee1df
>>> --- /dev/null
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
>>> @@ -0,0 +1,21 @@
>>> +/* SPDX-License-Identifier: MIT */
>>> +/*
>>> + * Copyright © 2023 Intel Corporation
>>> + */
>>> +
>>> +#ifndef __INTEL_HUC_PRINT__
>>> +#define __INTEL_HUC_PRINT__
>>> +
>>> +#include "gt/intel_gt.h"
>>> +#include "gt/intel_gt_print.h"
>>> +
>>> +#define huc_printk(_huc, _level, _fmt, ...) \
>>> + gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
>>> +#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt,
>>> ##__VA_ARGS__)
>>> +#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt,
>>> ##__VA_ARGS__)
>>> +#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice,
>>> _fmt, ##__VA_ARGS__)
>>> +#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt,
>>> ##__VA_ARGS__)
>>> +#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt,
>>> ##__VA_ARGS__)
>>> +#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc),
>>> probe_error, _fmt, ##__VA_ARGS__)
>>> +
>>> +#endif /* __INTEL_HUC_PRINT__ */
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> index 31776c279f32..9ced8dbf1253 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> @@ -548,33 +548,6 @@ static void __force_fw_fetch_failures(struct
>>> intel_uc_fw *uc_fw, int e)
>>> }
>>> }
>>> -static int check_gsc_manifest(struct intel_gt *gt,
>>> - const struct firmware *fw,
>>> - struct intel_uc_fw *uc_fw)
>>> -{
>>> - u32 *dw = (u32 *)fw->data;
>>> - u32 version_hi, version_lo;
>>> - size_t min_size;
>>> -
>>> - /* Check the size of the blob before examining buffer contents */
>>> - min_size = sizeof(u32) * (HUC_GSC_VERSION_LO_DW + 1);
>>> - if (unlikely(fw->size < min_size)) {
>>> - gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
>>> - intel_uc_fw_type_repr(uc_fw->type),
>>> uc_fw->file_selected.path,
>>> - fw->size, min_size);
>>> - return -ENODATA;
>>> - }
>>> -
>>> - version_hi = dw[HUC_GSC_VERSION_HI_DW];
>>> - version_lo = dw[HUC_GSC_VERSION_LO_DW];
>>> -
>>> - uc_fw->file_selected.ver.major =
>>> FIELD_GET(HUC_GSC_MAJOR_VER_HI_MASK, version_hi);
>>> - uc_fw->file_selected.ver.minor =
>>> FIELD_GET(HUC_GSC_MINOR_VER_HI_MASK, version_hi);
>>> - uc_fw->file_selected.ver.patch =
>>> FIELD_GET(HUC_GSC_PATCH_VER_LO_MASK, version_lo);
>>> -
>>> - return 0;
>>> -}
>>> -
>>> static void uc_unpack_css_version(struct intel_uc_fw_ver *ver, u32
>>> css_value)
>>> {
>>> /* Get version numbers from the CSS header */
>>> @@ -631,22 +604,22 @@ static void guc_read_css_info(struct
>>> intel_uc_fw *uc_fw, struct uc_css_header *c
>>> uc_fw->private_data_size = css->private_data_size;
>>> }
>>> -static int check_ccs_header(struct intel_gt *gt,
>>> - const struct firmware *fw,
>>> - struct intel_uc_fw *uc_fw)
>>> +static int __check_ccs_header(struct intel_gt *gt,
>>> + const void *fw_data, size_t fw_size,
>>> + struct intel_uc_fw *uc_fw)
>>> {
>>> struct uc_css_header *css;
>>> size_t size;
>>> /* Check the size of the blob before examining buffer
>>> contents */
>>> - if (unlikely(fw->size < sizeof(struct uc_css_header))) {
>>> + if (unlikely(fw_size < sizeof(struct uc_css_header))) {
>>> gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
>>> intel_uc_fw_type_repr(uc_fw->type),
>>> uc_fw->file_selected.path,
>>> - fw->size, sizeof(struct uc_css_header));
>>> + fw_size, sizeof(struct uc_css_header));
>>> return -ENODATA;
>>> }
>>> - css = (struct uc_css_header *)fw->data;
>>> + css = (struct uc_css_header *)fw_data;
>>> /* Check integrity of size values inside CSS header */
>>> size = (css->header_size_dw - css->key_size_dw -
>>> css->modulus_size_dw -
>>> @@ -654,7 +627,7 @@ static int check_ccs_header(struct intel_gt *gt,
>>> if (unlikely(size != sizeof(struct uc_css_header))) {
>>> gt_warn(gt, "%s firmware %s: unexpected header size: %zu
>>> != %zu\n",
>>> intel_uc_fw_type_repr(uc_fw->type),
>>> uc_fw->file_selected.path,
>>> - fw->size, sizeof(struct uc_css_header));
>>> + fw_size, sizeof(struct uc_css_header));
>>> return -EPROTO;
>>> }
>>> @@ -666,10 +639,10 @@ static int check_ccs_header(struct intel_gt
>>> *gt,
>>> /* At least, it should have header, uCode and RSA. Size of
>>> all three. */
>>> size = sizeof(struct uc_css_header) + uc_fw->ucode_size +
>>> uc_fw->rsa_size;
>>> - if (unlikely(fw->size < size)) {
>>> + if (unlikely(fw_size < size)) {
>>> gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",
>>> intel_uc_fw_type_repr(uc_fw->type),
>>> uc_fw->file_selected.path,
>>> - fw->size, size);
>>> + fw_size, size);
>>> return -ENOEXEC;
>>> }
>>> @@ -690,6 +663,32 @@ static int check_ccs_header(struct intel_gt *gt,
>>> return 0;
>>> }
>>> +static int check_gsc_manifest(struct intel_gt *gt,
>>> + const struct firmware *fw,
>>> + struct intel_uc_fw *uc_fw)
>>> +{
>>> + if (uc_fw->type != INTEL_UC_FW_TYPE_HUC) {
>>> + gt_err(gt, "trying to GSC-parse a non-HuC binary");
>>> + return -EINVAL;
>>> + }
>>> +
>>> + intel_huc_fw_get_binary_info(uc_fw, fw->data, fw->size);
>>> +
>>> + if (uc_fw->dma_start_offset) {
>>> + u32 delta = uc_fw->dma_start_offset;
>>> + __check_ccs_header(gt, fw->data + delta, fw->size - delta,
>>> uc_fw);
>>> + }
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static int check_ccs_header(struct intel_gt *gt,
>>> + const struct firmware *fw,
>>> + struct intel_uc_fw *uc_fw)
>>> +{
>>> + return __check_ccs_header(gt, fw->data, fw->size, uc_fw);
>>> +}
>>> +
>>> static bool is_ver_8bit(struct intel_uc_fw_ver *ver)
>>> {
>>> return ver->major < 0xFF && ver->minor < 0xFF && ver->patch <
>>> 0xFF;
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> index 2be9470eb712..b3daba9526eb 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> @@ -118,6 +118,8 @@ struct intel_uc_fw {
>>> u32 ucode_size;
>>> u32 private_data_size;
>>> + u32 dma_start_offset;
>>> +
>>> bool loaded_via_gsc;
>>> };
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>> index 646fa8aa6cf1..7fe405126249 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>> @@ -84,10 +84,4 @@ struct uc_css_header {
>>> } __packed;
>>> static_assert(sizeof(struct uc_css_header) == 128);
>>> -#define HUC_GSC_VERSION_HI_DW 44
>>> -#define HUC_GSC_MAJOR_VER_HI_MASK (0xFF << 0)
>>> -#define HUC_GSC_MINOR_VER_HI_MASK (0xFF << 16)
>>> -#define HUC_GSC_VERSION_LO_DW 45
>>> -#define HUC_GSC_PATCH_VER_LO_MASK (0xFF << 0)
>>> -
>>> #endif /* _INTEL_UC_FW_ABI_H */
>>
>
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 3/7] drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
-1 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: John Harrison, Daniele Ceraolo Spurio, Alan Previn, dri-devel
In the previous patch we extracted the offset of the legacy-style HuC
binary located within the GSC-enabled blob, so now we can use that to
load the HuC via DMA if the fuse is set that way.
Note that we now need to differentiate between "GSC-enabled binary" and
"loaded by GSC", so the former case has been renamed to "has GSC headers"
for clarity, while the latter is now based on the fuse instead of the
binary format. This way, all the legacy load paths are automatically
taken (including the auth by GuC) without having to implement further
code changes.
v2: s/is_meu_binary/has_gsc_headers/, clearer logs (John)
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 29 ++++++++++++++---------
drivers/gpu/drm/i915/gt/uc/intel_huc.h | 4 +++-
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 12 +++++-----
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +-
5 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 6d795438b3e4..37c6a8ca5c71 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -298,31 +298,38 @@ void intel_huc_init_early(struct intel_huc *huc)
static int check_huc_loading_mode(struct intel_huc *huc)
{
struct intel_gt *gt = huc_to_gt(huc);
- bool fw_needs_gsc = intel_huc_is_loaded_by_gsc(huc);
- bool hw_uses_gsc = false;
+ bool gsc_enabled = huc->fw.has_gsc_headers;
/*
* The fuse for HuC load via GSC is only valid on platforms that have
* GuC deprivilege.
*/
if (HAS_GUC_DEPRIVILEGE(gt->i915))
- hw_uses_gsc = intel_uncore_read(gt->uncore, GUC_SHIM_CONTROL2) &
- GSC_LOADS_HUC;
+ huc->loaded_via_gsc = intel_uncore_read(gt->uncore, GUC_SHIM_CONTROL2) &
+ GSC_LOADS_HUC;
- if (fw_needs_gsc != hw_uses_gsc) {
- huc_err(huc, "mismatch between FW (%s) and HW (%s) load modes\n",
- HUC_LOAD_MODE_STRING(fw_needs_gsc), HUC_LOAD_MODE_STRING(hw_uses_gsc));
+ if (huc->loaded_via_gsc && !gsc_enabled) {
+ huc_err(huc, "HW requires a GSC-enabled blob, but we found a legacy one\n");
return -ENOEXEC;
}
- /* make sure we can access the GSC via the mei driver if we need it */
+ /*
+ * Newer GSC_enabled blobs contain the old FW structure inside. If we
+ * found that, we can use it to load the legacy way.
+ */
+ if (!huc->loaded_via_gsc && gsc_enabled && !huc->fw.dma_start_offset) {
+ huc_err(huc,"HW in DMA mode, but we have an incompatible GSC-enabled blob\n");
+ return -ENOEXEC;
+ }
+
+ /* make sure we can access the GSC if we need it */
if (!(IS_ENABLED(CONFIG_INTEL_MEI_PXP) && IS_ENABLED(CONFIG_INTEL_MEI_GSC)) &&
- fw_needs_gsc) {
- huc_info(huc, "can't load due to missing MEI modules\n");
+ !HAS_ENGINE(gt, GSC0) && huc->loaded_via_gsc) {
+ huc_info(huc, "can't load due to missing mei modules or GSCCS\n");
return -EIO;
}
- huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(fw_needs_gsc));
+ huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(huc->loaded_via_gsc));
return 0;
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
index 0789184d81a2..112f0dce4702 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
@@ -39,6 +39,8 @@ struct intel_huc {
struct notifier_block nb;
enum intel_huc_delayed_load_status status;
} delayed_load;
+
+ bool loaded_via_gsc;
};
int intel_huc_sanitize(struct intel_huc *huc);
@@ -73,7 +75,7 @@ static inline bool intel_huc_is_used(struct intel_huc *huc)
static inline bool intel_huc_is_loaded_by_gsc(const struct intel_huc *huc)
{
- return huc->fw.loaded_via_gsc;
+ return huc->loaded_via_gsc;
}
static inline bool intel_huc_wait_required(struct intel_huc *huc)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
index 037d2ad4879d..3355dc1e2bc6 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
@@ -50,7 +50,7 @@ int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, s
size_t min_size = sizeof(*header);
int i;
- if (!huc_fw->loaded_via_gsc) {
+ if (!huc_fw->has_gsc_headers) {
huc_err(huc, "Invalid FW type GSC header parsing!\n");
return -EINVAL;
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 9ced8dbf1253..b752a7f1ed99 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -186,7 +186,7 @@ struct __packed uc_fw_blob {
u8 major;
u8 minor;
u8 patch;
- bool loaded_via_gsc;
+ bool has_gsc_headers;
};
#define UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
@@ -197,7 +197,7 @@ struct __packed uc_fw_blob {
#define UC_FW_BLOB_NEW(major_, minor_, patch_, gsc_, path_) \
{ UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
- .legacy = false, .loaded_via_gsc = gsc_ }
+ .legacy = false, .has_gsc_headers = gsc_ }
#define UC_FW_BLOB_OLD(major_, minor_, patch_, path_) \
{ UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
@@ -310,7 +310,7 @@ __uc_fw_auto_select(struct drm_i915_private *i915, struct intel_uc_fw *uc_fw)
uc_fw->file_wanted.ver.major = blob->major;
uc_fw->file_wanted.ver.minor = blob->minor;
uc_fw->file_wanted.ver.patch = blob->patch;
- uc_fw->loaded_via_gsc = blob->loaded_via_gsc;
+ uc_fw->has_gsc_headers = blob->has_gsc_headers;
found = true;
break;
}
@@ -736,7 +736,7 @@ static int check_fw_header(struct intel_gt *gt,
if (uc_fw->type == INTEL_UC_FW_TYPE_GSC)
return 0;
- if (uc_fw->loaded_via_gsc)
+ if (uc_fw->has_gsc_headers)
err = check_gsc_manifest(gt, fw, uc_fw);
else
err = check_ccs_header(gt, fw, uc_fw);
@@ -998,7 +998,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
/* Set the source address for the uCode */
- offset = uc_fw->vma_res.start;
+ offset = uc_fw->vma_res.start + uc_fw->dma_start_offset;
GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW, lower_32_bits(offset));
intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH, upper_32_bits(offset));
@@ -1237,7 +1237,7 @@ size_t intel_uc_fw_copy_rsa(struct intel_uc_fw *uc_fw, void *dst, u32 max_len)
{
struct intel_memory_region *mr = uc_fw->obj->mm.region;
u32 size = min_t(u32, uc_fw->rsa_size, max_len);
- u32 offset = sizeof(struct uc_css_header) + uc_fw->ucode_size;
+ u32 offset = uc_fw->dma_start_offset + sizeof(struct uc_css_header) + uc_fw->ucode_size;
struct sgt_iter iter;
size_t count = 0;
int idx;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
index b3daba9526eb..054f02811971 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
@@ -120,7 +120,7 @@ struct intel_uc_fw {
u32 dma_start_offset;
- bool loaded_via_gsc;
+ bool has_gsc_headers;
};
/*
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread* [Intel-gfx] [PATCH v3 3/7] drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
0 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: Alan Previn, dri-devel
In the previous patch we extracted the offset of the legacy-style HuC
binary located within the GSC-enabled blob, so now we can use that to
load the HuC via DMA if the fuse is set that way.
Note that we now need to differentiate between "GSC-enabled binary" and
"loaded by GSC", so the former case has been renamed to "has GSC headers"
for clarity, while the latter is now based on the fuse instead of the
binary format. This way, all the legacy load paths are automatically
taken (including the auth by GuC) without having to implement further
code changes.
v2: s/is_meu_binary/has_gsc_headers/, clearer logs (John)
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 29 ++++++++++++++---------
drivers/gpu/drm/i915/gt/uc/intel_huc.h | 4 +++-
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 12 +++++-----
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +-
5 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 6d795438b3e4..37c6a8ca5c71 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -298,31 +298,38 @@ void intel_huc_init_early(struct intel_huc *huc)
static int check_huc_loading_mode(struct intel_huc *huc)
{
struct intel_gt *gt = huc_to_gt(huc);
- bool fw_needs_gsc = intel_huc_is_loaded_by_gsc(huc);
- bool hw_uses_gsc = false;
+ bool gsc_enabled = huc->fw.has_gsc_headers;
/*
* The fuse for HuC load via GSC is only valid on platforms that have
* GuC deprivilege.
*/
if (HAS_GUC_DEPRIVILEGE(gt->i915))
- hw_uses_gsc = intel_uncore_read(gt->uncore, GUC_SHIM_CONTROL2) &
- GSC_LOADS_HUC;
+ huc->loaded_via_gsc = intel_uncore_read(gt->uncore, GUC_SHIM_CONTROL2) &
+ GSC_LOADS_HUC;
- if (fw_needs_gsc != hw_uses_gsc) {
- huc_err(huc, "mismatch between FW (%s) and HW (%s) load modes\n",
- HUC_LOAD_MODE_STRING(fw_needs_gsc), HUC_LOAD_MODE_STRING(hw_uses_gsc));
+ if (huc->loaded_via_gsc && !gsc_enabled) {
+ huc_err(huc, "HW requires a GSC-enabled blob, but we found a legacy one\n");
return -ENOEXEC;
}
- /* make sure we can access the GSC via the mei driver if we need it */
+ /*
+ * Newer GSC_enabled blobs contain the old FW structure inside. If we
+ * found that, we can use it to load the legacy way.
+ */
+ if (!huc->loaded_via_gsc && gsc_enabled && !huc->fw.dma_start_offset) {
+ huc_err(huc,"HW in DMA mode, but we have an incompatible GSC-enabled blob\n");
+ return -ENOEXEC;
+ }
+
+ /* make sure we can access the GSC if we need it */
if (!(IS_ENABLED(CONFIG_INTEL_MEI_PXP) && IS_ENABLED(CONFIG_INTEL_MEI_GSC)) &&
- fw_needs_gsc) {
- huc_info(huc, "can't load due to missing MEI modules\n");
+ !HAS_ENGINE(gt, GSC0) && huc->loaded_via_gsc) {
+ huc_info(huc, "can't load due to missing mei modules or GSCCS\n");
return -EIO;
}
- huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(fw_needs_gsc));
+ huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(huc->loaded_via_gsc));
return 0;
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
index 0789184d81a2..112f0dce4702 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
@@ -39,6 +39,8 @@ struct intel_huc {
struct notifier_block nb;
enum intel_huc_delayed_load_status status;
} delayed_load;
+
+ bool loaded_via_gsc;
};
int intel_huc_sanitize(struct intel_huc *huc);
@@ -73,7 +75,7 @@ static inline bool intel_huc_is_used(struct intel_huc *huc)
static inline bool intel_huc_is_loaded_by_gsc(const struct intel_huc *huc)
{
- return huc->fw.loaded_via_gsc;
+ return huc->loaded_via_gsc;
}
static inline bool intel_huc_wait_required(struct intel_huc *huc)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
index 037d2ad4879d..3355dc1e2bc6 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
@@ -50,7 +50,7 @@ int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, s
size_t min_size = sizeof(*header);
int i;
- if (!huc_fw->loaded_via_gsc) {
+ if (!huc_fw->has_gsc_headers) {
huc_err(huc, "Invalid FW type GSC header parsing!\n");
return -EINVAL;
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 9ced8dbf1253..b752a7f1ed99 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -186,7 +186,7 @@ struct __packed uc_fw_blob {
u8 major;
u8 minor;
u8 patch;
- bool loaded_via_gsc;
+ bool has_gsc_headers;
};
#define UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
@@ -197,7 +197,7 @@ struct __packed uc_fw_blob {
#define UC_FW_BLOB_NEW(major_, minor_, patch_, gsc_, path_) \
{ UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
- .legacy = false, .loaded_via_gsc = gsc_ }
+ .legacy = false, .has_gsc_headers = gsc_ }
#define UC_FW_BLOB_OLD(major_, minor_, patch_, path_) \
{ UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
@@ -310,7 +310,7 @@ __uc_fw_auto_select(struct drm_i915_private *i915, struct intel_uc_fw *uc_fw)
uc_fw->file_wanted.ver.major = blob->major;
uc_fw->file_wanted.ver.minor = blob->minor;
uc_fw->file_wanted.ver.patch = blob->patch;
- uc_fw->loaded_via_gsc = blob->loaded_via_gsc;
+ uc_fw->has_gsc_headers = blob->has_gsc_headers;
found = true;
break;
}
@@ -736,7 +736,7 @@ static int check_fw_header(struct intel_gt *gt,
if (uc_fw->type == INTEL_UC_FW_TYPE_GSC)
return 0;
- if (uc_fw->loaded_via_gsc)
+ if (uc_fw->has_gsc_headers)
err = check_gsc_manifest(gt, fw, uc_fw);
else
err = check_ccs_header(gt, fw, uc_fw);
@@ -998,7 +998,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
/* Set the source address for the uCode */
- offset = uc_fw->vma_res.start;
+ offset = uc_fw->vma_res.start + uc_fw->dma_start_offset;
GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW, lower_32_bits(offset));
intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH, upper_32_bits(offset));
@@ -1237,7 +1237,7 @@ size_t intel_uc_fw_copy_rsa(struct intel_uc_fw *uc_fw, void *dst, u32 max_len)
{
struct intel_memory_region *mr = uc_fw->obj->mm.region;
u32 size = min_t(u32, uc_fw->rsa_size, max_len);
- u32 offset = sizeof(struct uc_css_header) + uc_fw->ucode_size;
+ u32 offset = uc_fw->dma_start_offset + sizeof(struct uc_css_header) + uc_fw->ucode_size;
struct sgt_iter iter;
size_t count = 0;
int idx;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
index b3daba9526eb..054f02811971 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
@@ -120,7 +120,7 @@ struct intel_uc_fw {
u32 dma_start_offset;
- bool loaded_via_gsc;
+ bool has_gsc_headers;
};
/*
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCH v3 3/7] drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
@ 2023-05-30 23:51 ` John Harrison
-1 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-30 23:51 UTC (permalink / raw)
To: Daniele Ceraolo Spurio, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
> In the previous patch we extracted the offset of the legacy-style HuC
> binary located within the GSC-enabled blob, so now we can use that to
> load the HuC via DMA if the fuse is set that way.
> Note that we now need to differentiate between "GSC-enabled binary" and
> "loaded by GSC", so the former case has been renamed to "has GSC headers"
> for clarity, while the latter is now based on the fuse instead of the
> binary format. This way, all the legacy load paths are automatically
> taken (including the auth by GuC) without having to implement further
> code changes.
>
> v2: s/is_meu_binary/has_gsc_headers/, clearer logs (John)
>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
> Cc: John Harrison <John.C.Harrison@Intel.com>
> ---
> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 29 ++++++++++++++---------
> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 4 +++-
> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +-
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 12 +++++-----
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +-
> 5 files changed, 29 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> index 6d795438b3e4..37c6a8ca5c71 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> @@ -298,31 +298,38 @@ void intel_huc_init_early(struct intel_huc *huc)
> static int check_huc_loading_mode(struct intel_huc *huc)
> {
> struct intel_gt *gt = huc_to_gt(huc);
> - bool fw_needs_gsc = intel_huc_is_loaded_by_gsc(huc);
> - bool hw_uses_gsc = false;
> + bool gsc_enabled = huc->fw.has_gsc_headers;
>
> /*
> * The fuse for HuC load via GSC is only valid on platforms that have
> * GuC deprivilege.
> */
> if (HAS_GUC_DEPRIVILEGE(gt->i915))
> - hw_uses_gsc = intel_uncore_read(gt->uncore, GUC_SHIM_CONTROL2) &
> - GSC_LOADS_HUC;
> + huc->loaded_via_gsc = intel_uncore_read(gt->uncore, GUC_SHIM_CONTROL2) &
> + GSC_LOADS_HUC;
>
> - if (fw_needs_gsc != hw_uses_gsc) {
> - huc_err(huc, "mismatch between FW (%s) and HW (%s) load modes\n",
> - HUC_LOAD_MODE_STRING(fw_needs_gsc), HUC_LOAD_MODE_STRING(hw_uses_gsc));
> + if (huc->loaded_via_gsc && !gsc_enabled) {
> + huc_err(huc, "HW requires a GSC-enabled blob, but we found a legacy one\n");
> return -ENOEXEC;
> }
>
> - /* make sure we can access the GSC via the mei driver if we need it */
> + /*
> + * Newer GSC_enabled blobs contain the old FW structure inside. If we
> + * found that, we can use it to load the legacy way.
> + */
> + if (!huc->loaded_via_gsc && gsc_enabled && !huc->fw.dma_start_offset) {
> + huc_err(huc,"HW in DMA mode, but we have an incompatible GSC-enabled blob\n");
> + return -ENOEXEC;
> + }
The comment above doesn't seem to match the check. The comment says 'we
can load the old way if possible' whereas the check is more 'can we load
the old way if we need to'.
> +
> + /* make sure we can access the GSC if we need it */
> if (!(IS_ENABLED(CONFIG_INTEL_MEI_PXP) && IS_ENABLED(CONFIG_INTEL_MEI_GSC)) &&
> - fw_needs_gsc) {
> - huc_info(huc, "can't load due to missing MEI modules\n");
> + !HAS_ENGINE(gt, GSC0) && huc->loaded_via_gsc) {
This test still looks wrong when you read it. I think it needs a more
detailed comment. Some kind of explanation that the modules only apply
to one platform and the engine to a different platform. Or even breaking
into two separate tests with an 'if(DG2)' between them? It certainly
confuses me every time I look at it.
John.
> + huc_info(huc, "can't load due to missing mei modules or GSCCS\n");
> return -EIO;
> }
>
> - huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(fw_needs_gsc));
> + huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(huc->loaded_via_gsc));
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> index 0789184d81a2..112f0dce4702 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> @@ -39,6 +39,8 @@ struct intel_huc {
> struct notifier_block nb;
> enum intel_huc_delayed_load_status status;
> } delayed_load;
> +
> + bool loaded_via_gsc;
> };
>
> int intel_huc_sanitize(struct intel_huc *huc);
> @@ -73,7 +75,7 @@ static inline bool intel_huc_is_used(struct intel_huc *huc)
>
> static inline bool intel_huc_is_loaded_by_gsc(const struct intel_huc *huc)
> {
> - return huc->fw.loaded_via_gsc;
> + return huc->loaded_via_gsc;
> }
>
> static inline bool intel_huc_wait_required(struct intel_huc *huc)
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> index 037d2ad4879d..3355dc1e2bc6 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> @@ -50,7 +50,7 @@ int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, s
> size_t min_size = sizeof(*header);
> int i;
>
> - if (!huc_fw->loaded_via_gsc) {
> + if (!huc_fw->has_gsc_headers) {
> huc_err(huc, "Invalid FW type GSC header parsing!\n");
> return -EINVAL;
> }
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> index 9ced8dbf1253..b752a7f1ed99 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -186,7 +186,7 @@ struct __packed uc_fw_blob {
> u8 major;
> u8 minor;
> u8 patch;
> - bool loaded_via_gsc;
> + bool has_gsc_headers;
> };
>
> #define UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
> @@ -197,7 +197,7 @@ struct __packed uc_fw_blob {
>
> #define UC_FW_BLOB_NEW(major_, minor_, patch_, gsc_, path_) \
> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
> - .legacy = false, .loaded_via_gsc = gsc_ }
> + .legacy = false, .has_gsc_headers = gsc_ }
>
> #define UC_FW_BLOB_OLD(major_, minor_, patch_, path_) \
> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
> @@ -310,7 +310,7 @@ __uc_fw_auto_select(struct drm_i915_private *i915, struct intel_uc_fw *uc_fw)
> uc_fw->file_wanted.ver.major = blob->major;
> uc_fw->file_wanted.ver.minor = blob->minor;
> uc_fw->file_wanted.ver.patch = blob->patch;
> - uc_fw->loaded_via_gsc = blob->loaded_via_gsc;
> + uc_fw->has_gsc_headers = blob->has_gsc_headers;
> found = true;
> break;
> }
> @@ -736,7 +736,7 @@ static int check_fw_header(struct intel_gt *gt,
> if (uc_fw->type == INTEL_UC_FW_TYPE_GSC)
> return 0;
>
> - if (uc_fw->loaded_via_gsc)
> + if (uc_fw->has_gsc_headers)
> err = check_gsc_manifest(gt, fw, uc_fw);
> else
> err = check_ccs_header(gt, fw, uc_fw);
> @@ -998,7 +998,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
> intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
>
> /* Set the source address for the uCode */
> - offset = uc_fw->vma_res.start;
> + offset = uc_fw->vma_res.start + uc_fw->dma_start_offset;
> GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
> intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW, lower_32_bits(offset));
> intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH, upper_32_bits(offset));
> @@ -1237,7 +1237,7 @@ size_t intel_uc_fw_copy_rsa(struct intel_uc_fw *uc_fw, void *dst, u32 max_len)
> {
> struct intel_memory_region *mr = uc_fw->obj->mm.region;
> u32 size = min_t(u32, uc_fw->rsa_size, max_len);
> - u32 offset = sizeof(struct uc_css_header) + uc_fw->ucode_size;
> + u32 offset = uc_fw->dma_start_offset + sizeof(struct uc_css_header) + uc_fw->ucode_size;
> struct sgt_iter iter;
> size_t count = 0;
> int idx;
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> index b3daba9526eb..054f02811971 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> @@ -120,7 +120,7 @@ struct intel_uc_fw {
>
> u32 dma_start_offset;
>
> - bool loaded_via_gsc;
> + bool has_gsc_headers;
> };
>
> /*
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [Intel-gfx] [PATCH v3 3/7] drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
@ 2023-05-30 23:51 ` John Harrison
0 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-30 23:51 UTC (permalink / raw)
To: Daniele Ceraolo Spurio, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
> In the previous patch we extracted the offset of the legacy-style HuC
> binary located within the GSC-enabled blob, so now we can use that to
> load the HuC via DMA if the fuse is set that way.
> Note that we now need to differentiate between "GSC-enabled binary" and
> "loaded by GSC", so the former case has been renamed to "has GSC headers"
> for clarity, while the latter is now based on the fuse instead of the
> binary format. This way, all the legacy load paths are automatically
> taken (including the auth by GuC) without having to implement further
> code changes.
>
> v2: s/is_meu_binary/has_gsc_headers/, clearer logs (John)
>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
> Cc: John Harrison <John.C.Harrison@Intel.com>
> ---
> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 29 ++++++++++++++---------
> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 4 +++-
> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +-
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 12 +++++-----
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +-
> 5 files changed, 29 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> index 6d795438b3e4..37c6a8ca5c71 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> @@ -298,31 +298,38 @@ void intel_huc_init_early(struct intel_huc *huc)
> static int check_huc_loading_mode(struct intel_huc *huc)
> {
> struct intel_gt *gt = huc_to_gt(huc);
> - bool fw_needs_gsc = intel_huc_is_loaded_by_gsc(huc);
> - bool hw_uses_gsc = false;
> + bool gsc_enabled = huc->fw.has_gsc_headers;
>
> /*
> * The fuse for HuC load via GSC is only valid on platforms that have
> * GuC deprivilege.
> */
> if (HAS_GUC_DEPRIVILEGE(gt->i915))
> - hw_uses_gsc = intel_uncore_read(gt->uncore, GUC_SHIM_CONTROL2) &
> - GSC_LOADS_HUC;
> + huc->loaded_via_gsc = intel_uncore_read(gt->uncore, GUC_SHIM_CONTROL2) &
> + GSC_LOADS_HUC;
>
> - if (fw_needs_gsc != hw_uses_gsc) {
> - huc_err(huc, "mismatch between FW (%s) and HW (%s) load modes\n",
> - HUC_LOAD_MODE_STRING(fw_needs_gsc), HUC_LOAD_MODE_STRING(hw_uses_gsc));
> + if (huc->loaded_via_gsc && !gsc_enabled) {
> + huc_err(huc, "HW requires a GSC-enabled blob, but we found a legacy one\n");
> return -ENOEXEC;
> }
>
> - /* make sure we can access the GSC via the mei driver if we need it */
> + /*
> + * Newer GSC_enabled blobs contain the old FW structure inside. If we
> + * found that, we can use it to load the legacy way.
> + */
> + if (!huc->loaded_via_gsc && gsc_enabled && !huc->fw.dma_start_offset) {
> + huc_err(huc,"HW in DMA mode, but we have an incompatible GSC-enabled blob\n");
> + return -ENOEXEC;
> + }
The comment above doesn't seem to match the check. The comment says 'we
can load the old way if possible' whereas the check is more 'can we load
the old way if we need to'.
> +
> + /* make sure we can access the GSC if we need it */
> if (!(IS_ENABLED(CONFIG_INTEL_MEI_PXP) && IS_ENABLED(CONFIG_INTEL_MEI_GSC)) &&
> - fw_needs_gsc) {
> - huc_info(huc, "can't load due to missing MEI modules\n");
> + !HAS_ENGINE(gt, GSC0) && huc->loaded_via_gsc) {
This test still looks wrong when you read it. I think it needs a more
detailed comment. Some kind of explanation that the modules only apply
to one platform and the engine to a different platform. Or even breaking
into two separate tests with an 'if(DG2)' between them? It certainly
confuses me every time I look at it.
John.
> + huc_info(huc, "can't load due to missing mei modules or GSCCS\n");
> return -EIO;
> }
>
> - huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(fw_needs_gsc));
> + huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(huc->loaded_via_gsc));
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> index 0789184d81a2..112f0dce4702 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> @@ -39,6 +39,8 @@ struct intel_huc {
> struct notifier_block nb;
> enum intel_huc_delayed_load_status status;
> } delayed_load;
> +
> + bool loaded_via_gsc;
> };
>
> int intel_huc_sanitize(struct intel_huc *huc);
> @@ -73,7 +75,7 @@ static inline bool intel_huc_is_used(struct intel_huc *huc)
>
> static inline bool intel_huc_is_loaded_by_gsc(const struct intel_huc *huc)
> {
> - return huc->fw.loaded_via_gsc;
> + return huc->loaded_via_gsc;
> }
>
> static inline bool intel_huc_wait_required(struct intel_huc *huc)
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> index 037d2ad4879d..3355dc1e2bc6 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> @@ -50,7 +50,7 @@ int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, s
> size_t min_size = sizeof(*header);
> int i;
>
> - if (!huc_fw->loaded_via_gsc) {
> + if (!huc_fw->has_gsc_headers) {
> huc_err(huc, "Invalid FW type GSC header parsing!\n");
> return -EINVAL;
> }
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> index 9ced8dbf1253..b752a7f1ed99 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -186,7 +186,7 @@ struct __packed uc_fw_blob {
> u8 major;
> u8 minor;
> u8 patch;
> - bool loaded_via_gsc;
> + bool has_gsc_headers;
> };
>
> #define UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
> @@ -197,7 +197,7 @@ struct __packed uc_fw_blob {
>
> #define UC_FW_BLOB_NEW(major_, minor_, patch_, gsc_, path_) \
> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
> - .legacy = false, .loaded_via_gsc = gsc_ }
> + .legacy = false, .has_gsc_headers = gsc_ }
>
> #define UC_FW_BLOB_OLD(major_, minor_, patch_, path_) \
> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
> @@ -310,7 +310,7 @@ __uc_fw_auto_select(struct drm_i915_private *i915, struct intel_uc_fw *uc_fw)
> uc_fw->file_wanted.ver.major = blob->major;
> uc_fw->file_wanted.ver.minor = blob->minor;
> uc_fw->file_wanted.ver.patch = blob->patch;
> - uc_fw->loaded_via_gsc = blob->loaded_via_gsc;
> + uc_fw->has_gsc_headers = blob->has_gsc_headers;
> found = true;
> break;
> }
> @@ -736,7 +736,7 @@ static int check_fw_header(struct intel_gt *gt,
> if (uc_fw->type == INTEL_UC_FW_TYPE_GSC)
> return 0;
>
> - if (uc_fw->loaded_via_gsc)
> + if (uc_fw->has_gsc_headers)
> err = check_gsc_manifest(gt, fw, uc_fw);
> else
> err = check_ccs_header(gt, fw, uc_fw);
> @@ -998,7 +998,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)
> intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
>
> /* Set the source address for the uCode */
> - offset = uc_fw->vma_res.start;
> + offset = uc_fw->vma_res.start + uc_fw->dma_start_offset;
> GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
> intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW, lower_32_bits(offset));
> intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH, upper_32_bits(offset));
> @@ -1237,7 +1237,7 @@ size_t intel_uc_fw_copy_rsa(struct intel_uc_fw *uc_fw, void *dst, u32 max_len)
> {
> struct intel_memory_region *mr = uc_fw->obj->mm.region;
> u32 size = min_t(u32, uc_fw->rsa_size, max_len);
> - u32 offset = sizeof(struct uc_css_header) + uc_fw->ucode_size;
> + u32 offset = uc_fw->dma_start_offset + sizeof(struct uc_css_header) + uc_fw->ucode_size;
> struct sgt_iter iter;
> size_t count = 0;
> int idx;
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> index b3daba9526eb..054f02811971 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> @@ -120,7 +120,7 @@ struct intel_uc_fw {
>
> u32 dma_start_offset;
>
> - bool loaded_via_gsc;
> + bool has_gsc_headers;
> };
>
> /*
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCH v3 3/7] drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
2023-05-30 23:51 ` [Intel-gfx] " John Harrison
@ 2023-05-31 0:11 ` Ceraolo Spurio, Daniele
-1 siblings, 0 replies; 52+ messages in thread
From: Ceraolo Spurio, Daniele @ 2023-05-31 0:11 UTC (permalink / raw)
To: John Harrison, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 4:51 PM, John Harrison wrote:
> On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
>> In the previous patch we extracted the offset of the legacy-style HuC
>> binary located within the GSC-enabled blob, so now we can use that to
>> load the HuC via DMA if the fuse is set that way.
>> Note that we now need to differentiate between "GSC-enabled binary" and
>> "loaded by GSC", so the former case has been renamed to "has GSC
>> headers"
>> for clarity, while the latter is now based on the fuse instead of the
>> binary format. This way, all the legacy load paths are automatically
>> taken (including the auth by GuC) without having to implement further
>> code changes.
>>
>> v2: s/is_meu_binary/has_gsc_headers/, clearer logs (John)
>>
>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>> Cc: John Harrison <John.C.Harrison@Intel.com>
>> ---
>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 29 ++++++++++++++---------
>> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 4 +++-
>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +-
>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 12 +++++-----
>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +-
>> 5 files changed, 29 insertions(+), 20 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> index 6d795438b3e4..37c6a8ca5c71 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> @@ -298,31 +298,38 @@ void intel_huc_init_early(struct intel_huc *huc)
>> static int check_huc_loading_mode(struct intel_huc *huc)
>> {
>> struct intel_gt *gt = huc_to_gt(huc);
>> - bool fw_needs_gsc = intel_huc_is_loaded_by_gsc(huc);
>> - bool hw_uses_gsc = false;
>> + bool gsc_enabled = huc->fw.has_gsc_headers;
>> /*
>> * The fuse for HuC load via GSC is only valid on platforms
>> that have
>> * GuC deprivilege.
>> */
>> if (HAS_GUC_DEPRIVILEGE(gt->i915))
>> - hw_uses_gsc = intel_uncore_read(gt->uncore,
>> GUC_SHIM_CONTROL2) &
>> - GSC_LOADS_HUC;
>> + huc->loaded_via_gsc = intel_uncore_read(gt->uncore,
>> GUC_SHIM_CONTROL2) &
>> + GSC_LOADS_HUC;
>> - if (fw_needs_gsc != hw_uses_gsc) {
>> - huc_err(huc, "mismatch between FW (%s) and HW (%s) load
>> modes\n",
>> - HUC_LOAD_MODE_STRING(fw_needs_gsc),
>> HUC_LOAD_MODE_STRING(hw_uses_gsc));
>> + if (huc->loaded_via_gsc && !gsc_enabled) {
>> + huc_err(huc, "HW requires a GSC-enabled blob, but we found a
>> legacy one\n");
>> return -ENOEXEC;
>> }
>> - /* make sure we can access the GSC via the mei driver if we
>> need it */
>> + /*
>> + * Newer GSC_enabled blobs contain the old FW structure inside.
>> If we
>> + * found that, we can use it to load the legacy way.
>> + */
>> + if (!huc->loaded_via_gsc && gsc_enabled &&
>> !huc->fw.dma_start_offset) {
>> + huc_err(huc,"HW in DMA mode, but we have an incompatible
>> GSC-enabled blob\n");
>> + return -ENOEXEC;
>> + }
> The comment above doesn't seem to match the check. The comment says
> 'we can load the old way if possible' whereas the check is more 'can
> we load the old way if we need to'.
I'll reword it.
>
>> +
>> + /* make sure we can access the GSC if we need it */
>> if (!(IS_ENABLED(CONFIG_INTEL_MEI_PXP) &&
>> IS_ENABLED(CONFIG_INTEL_MEI_GSC)) &&
>> - fw_needs_gsc) {
>> - huc_info(huc, "can't load due to missing MEI modules\n");
>> + !HAS_ENGINE(gt, GSC0) && huc->loaded_via_gsc) {
> This test still looks wrong when you read it. I think it needs a more
> detailed comment. Some kind of explanation that the modules only apply
> to one platform and the engine to a different platform. Or even
> breaking into two separate tests with an 'if(DG2)' between them? It
> certainly confuses me every time I look at it.
Is it clearer if I split it like this?
/*
* if the FW is loaded via GSC and we're not on a platform that
* has the GSC CS, we need the mei modules to access the GSC.
*/
if (huc->loaded_via_gsc && !HAS_ENGINE(gt, GSC0)) {
if (!IS_ENABLED(MEI_PXP) || !IS_ENABLED(MEI_GSC)
// error
}
Daniele
>
> John.
>
>> + huc_info(huc, "can't load due to missing mei modules or
>> GSCCS\n");
>> return -EIO;
>> }
>> - huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(fw_needs_gsc));
>> + huc_dbg(huc, "loaded by GSC = %s\n",
>> str_yes_no(huc->loaded_via_gsc));
>> return 0;
>> }
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> index 0789184d81a2..112f0dce4702 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> @@ -39,6 +39,8 @@ struct intel_huc {
>> struct notifier_block nb;
>> enum intel_huc_delayed_load_status status;
>> } delayed_load;
>> +
>> + bool loaded_via_gsc;
>> };
>> int intel_huc_sanitize(struct intel_huc *huc);
>> @@ -73,7 +75,7 @@ static inline bool intel_huc_is_used(struct
>> intel_huc *huc)
>> static inline bool intel_huc_is_loaded_by_gsc(const struct
>> intel_huc *huc)
>> {
>> - return huc->fw.loaded_via_gsc;
>> + return huc->loaded_via_gsc;
>> }
>> static inline bool intel_huc_wait_required(struct intel_huc *huc)
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> index 037d2ad4879d..3355dc1e2bc6 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> @@ -50,7 +50,7 @@ int intel_huc_fw_get_binary_info(struct intel_uc_fw
>> *huc_fw, const void *data, s
>> size_t min_size = sizeof(*header);
>> int i;
>> - if (!huc_fw->loaded_via_gsc) {
>> + if (!huc_fw->has_gsc_headers) {
>> huc_err(huc, "Invalid FW type GSC header parsing!\n");
>> return -EINVAL;
>> }
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> index 9ced8dbf1253..b752a7f1ed99 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> @@ -186,7 +186,7 @@ struct __packed uc_fw_blob {
>> u8 major;
>> u8 minor;
>> u8 patch;
>> - bool loaded_via_gsc;
>> + bool has_gsc_headers;
>> };
>> #define UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>> @@ -197,7 +197,7 @@ struct __packed uc_fw_blob {
>> #define UC_FW_BLOB_NEW(major_, minor_, patch_, gsc_, path_) \
>> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>> - .legacy = false, .loaded_via_gsc = gsc_ }
>> + .legacy = false, .has_gsc_headers = gsc_ }
>> #define UC_FW_BLOB_OLD(major_, minor_, patch_, path_) \
>> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>> @@ -310,7 +310,7 @@ __uc_fw_auto_select(struct drm_i915_private
>> *i915, struct intel_uc_fw *uc_fw)
>> uc_fw->file_wanted.ver.major = blob->major;
>> uc_fw->file_wanted.ver.minor = blob->minor;
>> uc_fw->file_wanted.ver.patch = blob->patch;
>> - uc_fw->loaded_via_gsc = blob->loaded_via_gsc;
>> + uc_fw->has_gsc_headers = blob->has_gsc_headers;
>> found = true;
>> break;
>> }
>> @@ -736,7 +736,7 @@ static int check_fw_header(struct intel_gt *gt,
>> if (uc_fw->type == INTEL_UC_FW_TYPE_GSC)
>> return 0;
>> - if (uc_fw->loaded_via_gsc)
>> + if (uc_fw->has_gsc_headers)
>> err = check_gsc_manifest(gt, fw, uc_fw);
>> else
>> err = check_ccs_header(gt, fw, uc_fw);
>> @@ -998,7 +998,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw,
>> u32 dst_offset, u32 dma_flags)
>> intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
>> /* Set the source address for the uCode */
>> - offset = uc_fw->vma_res.start;
>> + offset = uc_fw->vma_res.start + uc_fw->dma_start_offset;
>> GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
>> intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW,
>> lower_32_bits(offset));
>> intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH,
>> upper_32_bits(offset));
>> @@ -1237,7 +1237,7 @@ size_t intel_uc_fw_copy_rsa(struct intel_uc_fw
>> *uc_fw, void *dst, u32 max_len)
>> {
>> struct intel_memory_region *mr = uc_fw->obj->mm.region;
>> u32 size = min_t(u32, uc_fw->rsa_size, max_len);
>> - u32 offset = sizeof(struct uc_css_header) + uc_fw->ucode_size;
>> + u32 offset = uc_fw->dma_start_offset + sizeof(struct
>> uc_css_header) + uc_fw->ucode_size;
>> struct sgt_iter iter;
>> size_t count = 0;
>> int idx;
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> index b3daba9526eb..054f02811971 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> @@ -120,7 +120,7 @@ struct intel_uc_fw {
>> u32 dma_start_offset;
>> - bool loaded_via_gsc;
>> + bool has_gsc_headers;
>> };
>> /*
>
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [Intel-gfx] [PATCH v3 3/7] drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
@ 2023-05-31 0:11 ` Ceraolo Spurio, Daniele
0 siblings, 0 replies; 52+ messages in thread
From: Ceraolo Spurio, Daniele @ 2023-05-31 0:11 UTC (permalink / raw)
To: John Harrison, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 4:51 PM, John Harrison wrote:
> On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
>> In the previous patch we extracted the offset of the legacy-style HuC
>> binary located within the GSC-enabled blob, so now we can use that to
>> load the HuC via DMA if the fuse is set that way.
>> Note that we now need to differentiate between "GSC-enabled binary" and
>> "loaded by GSC", so the former case has been renamed to "has GSC
>> headers"
>> for clarity, while the latter is now based on the fuse instead of the
>> binary format. This way, all the legacy load paths are automatically
>> taken (including the auth by GuC) without having to implement further
>> code changes.
>>
>> v2: s/is_meu_binary/has_gsc_headers/, clearer logs (John)
>>
>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>> Cc: John Harrison <John.C.Harrison@Intel.com>
>> ---
>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 29 ++++++++++++++---------
>> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 4 +++-
>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +-
>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 12 +++++-----
>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +-
>> 5 files changed, 29 insertions(+), 20 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> index 6d795438b3e4..37c6a8ca5c71 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> @@ -298,31 +298,38 @@ void intel_huc_init_early(struct intel_huc *huc)
>> static int check_huc_loading_mode(struct intel_huc *huc)
>> {
>> struct intel_gt *gt = huc_to_gt(huc);
>> - bool fw_needs_gsc = intel_huc_is_loaded_by_gsc(huc);
>> - bool hw_uses_gsc = false;
>> + bool gsc_enabled = huc->fw.has_gsc_headers;
>> /*
>> * The fuse for HuC load via GSC is only valid on platforms
>> that have
>> * GuC deprivilege.
>> */
>> if (HAS_GUC_DEPRIVILEGE(gt->i915))
>> - hw_uses_gsc = intel_uncore_read(gt->uncore,
>> GUC_SHIM_CONTROL2) &
>> - GSC_LOADS_HUC;
>> + huc->loaded_via_gsc = intel_uncore_read(gt->uncore,
>> GUC_SHIM_CONTROL2) &
>> + GSC_LOADS_HUC;
>> - if (fw_needs_gsc != hw_uses_gsc) {
>> - huc_err(huc, "mismatch between FW (%s) and HW (%s) load
>> modes\n",
>> - HUC_LOAD_MODE_STRING(fw_needs_gsc),
>> HUC_LOAD_MODE_STRING(hw_uses_gsc));
>> + if (huc->loaded_via_gsc && !gsc_enabled) {
>> + huc_err(huc, "HW requires a GSC-enabled blob, but we found a
>> legacy one\n");
>> return -ENOEXEC;
>> }
>> - /* make sure we can access the GSC via the mei driver if we
>> need it */
>> + /*
>> + * Newer GSC_enabled blobs contain the old FW structure inside.
>> If we
>> + * found that, we can use it to load the legacy way.
>> + */
>> + if (!huc->loaded_via_gsc && gsc_enabled &&
>> !huc->fw.dma_start_offset) {
>> + huc_err(huc,"HW in DMA mode, but we have an incompatible
>> GSC-enabled blob\n");
>> + return -ENOEXEC;
>> + }
> The comment above doesn't seem to match the check. The comment says
> 'we can load the old way if possible' whereas the check is more 'can
> we load the old way if we need to'.
I'll reword it.
>
>> +
>> + /* make sure we can access the GSC if we need it */
>> if (!(IS_ENABLED(CONFIG_INTEL_MEI_PXP) &&
>> IS_ENABLED(CONFIG_INTEL_MEI_GSC)) &&
>> - fw_needs_gsc) {
>> - huc_info(huc, "can't load due to missing MEI modules\n");
>> + !HAS_ENGINE(gt, GSC0) && huc->loaded_via_gsc) {
> This test still looks wrong when you read it. I think it needs a more
> detailed comment. Some kind of explanation that the modules only apply
> to one platform and the engine to a different platform. Or even
> breaking into two separate tests with an 'if(DG2)' between them? It
> certainly confuses me every time I look at it.
Is it clearer if I split it like this?
/*
* if the FW is loaded via GSC and we're not on a platform that
* has the GSC CS, we need the mei modules to access the GSC.
*/
if (huc->loaded_via_gsc && !HAS_ENGINE(gt, GSC0)) {
if (!IS_ENABLED(MEI_PXP) || !IS_ENABLED(MEI_GSC)
// error
}
Daniele
>
> John.
>
>> + huc_info(huc, "can't load due to missing mei modules or
>> GSCCS\n");
>> return -EIO;
>> }
>> - huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(fw_needs_gsc));
>> + huc_dbg(huc, "loaded by GSC = %s\n",
>> str_yes_no(huc->loaded_via_gsc));
>> return 0;
>> }
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> index 0789184d81a2..112f0dce4702 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> @@ -39,6 +39,8 @@ struct intel_huc {
>> struct notifier_block nb;
>> enum intel_huc_delayed_load_status status;
>> } delayed_load;
>> +
>> + bool loaded_via_gsc;
>> };
>> int intel_huc_sanitize(struct intel_huc *huc);
>> @@ -73,7 +75,7 @@ static inline bool intel_huc_is_used(struct
>> intel_huc *huc)
>> static inline bool intel_huc_is_loaded_by_gsc(const struct
>> intel_huc *huc)
>> {
>> - return huc->fw.loaded_via_gsc;
>> + return huc->loaded_via_gsc;
>> }
>> static inline bool intel_huc_wait_required(struct intel_huc *huc)
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> index 037d2ad4879d..3355dc1e2bc6 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> @@ -50,7 +50,7 @@ int intel_huc_fw_get_binary_info(struct intel_uc_fw
>> *huc_fw, const void *data, s
>> size_t min_size = sizeof(*header);
>> int i;
>> - if (!huc_fw->loaded_via_gsc) {
>> + if (!huc_fw->has_gsc_headers) {
>> huc_err(huc, "Invalid FW type GSC header parsing!\n");
>> return -EINVAL;
>> }
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> index 9ced8dbf1253..b752a7f1ed99 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> @@ -186,7 +186,7 @@ struct __packed uc_fw_blob {
>> u8 major;
>> u8 minor;
>> u8 patch;
>> - bool loaded_via_gsc;
>> + bool has_gsc_headers;
>> };
>> #define UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>> @@ -197,7 +197,7 @@ struct __packed uc_fw_blob {
>> #define UC_FW_BLOB_NEW(major_, minor_, patch_, gsc_, path_) \
>> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>> - .legacy = false, .loaded_via_gsc = gsc_ }
>> + .legacy = false, .has_gsc_headers = gsc_ }
>> #define UC_FW_BLOB_OLD(major_, minor_, patch_, path_) \
>> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>> @@ -310,7 +310,7 @@ __uc_fw_auto_select(struct drm_i915_private
>> *i915, struct intel_uc_fw *uc_fw)
>> uc_fw->file_wanted.ver.major = blob->major;
>> uc_fw->file_wanted.ver.minor = blob->minor;
>> uc_fw->file_wanted.ver.patch = blob->patch;
>> - uc_fw->loaded_via_gsc = blob->loaded_via_gsc;
>> + uc_fw->has_gsc_headers = blob->has_gsc_headers;
>> found = true;
>> break;
>> }
>> @@ -736,7 +736,7 @@ static int check_fw_header(struct intel_gt *gt,
>> if (uc_fw->type == INTEL_UC_FW_TYPE_GSC)
>> return 0;
>> - if (uc_fw->loaded_via_gsc)
>> + if (uc_fw->has_gsc_headers)
>> err = check_gsc_manifest(gt, fw, uc_fw);
>> else
>> err = check_ccs_header(gt, fw, uc_fw);
>> @@ -998,7 +998,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw,
>> u32 dst_offset, u32 dma_flags)
>> intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
>> /* Set the source address for the uCode */
>> - offset = uc_fw->vma_res.start;
>> + offset = uc_fw->vma_res.start + uc_fw->dma_start_offset;
>> GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
>> intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW,
>> lower_32_bits(offset));
>> intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH,
>> upper_32_bits(offset));
>> @@ -1237,7 +1237,7 @@ size_t intel_uc_fw_copy_rsa(struct intel_uc_fw
>> *uc_fw, void *dst, u32 max_len)
>> {
>> struct intel_memory_region *mr = uc_fw->obj->mm.region;
>> u32 size = min_t(u32, uc_fw->rsa_size, max_len);
>> - u32 offset = sizeof(struct uc_css_header) + uc_fw->ucode_size;
>> + u32 offset = uc_fw->dma_start_offset + sizeof(struct
>> uc_css_header) + uc_fw->ucode_size;
>> struct sgt_iter iter;
>> size_t count = 0;
>> int idx;
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> index b3daba9526eb..054f02811971 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>> @@ -120,7 +120,7 @@ struct intel_uc_fw {
>> u32 dma_start_offset;
>> - bool loaded_via_gsc;
>> + bool has_gsc_headers;
>> };
>> /*
>
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCH v3 3/7] drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
2023-05-31 0:11 ` [Intel-gfx] " Ceraolo Spurio, Daniele
@ 2023-05-31 0:20 ` John Harrison
-1 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-31 0:20 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 17:11, Ceraolo Spurio, Daniele wrote:
> On 5/30/2023 4:51 PM, John Harrison wrote:
>> On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
>>> In the previous patch we extracted the offset of the legacy-style HuC
>>> binary located within the GSC-enabled blob, so now we can use that to
>>> load the HuC via DMA if the fuse is set that way.
>>> Note that we now need to differentiate between "GSC-enabled binary" and
>>> "loaded by GSC", so the former case has been renamed to "has GSC
>>> headers"
>>> for clarity, while the latter is now based on the fuse instead of the
>>> binary format. This way, all the legacy load paths are automatically
>>> taken (including the auth by GuC) without having to implement further
>>> code changes.
>>>
>>> v2: s/is_meu_binary/has_gsc_headers/, clearer logs (John)
>>>
>>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>>> Cc: John Harrison <John.C.Harrison@Intel.com>
>>> ---
>>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 29
>>> ++++++++++++++---------
>>> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 4 +++-
>>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +-
>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 12 +++++-----
>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +-
>>> 5 files changed, 29 insertions(+), 20 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> index 6d795438b3e4..37c6a8ca5c71 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> @@ -298,31 +298,38 @@ void intel_huc_init_early(struct intel_huc *huc)
>>> static int check_huc_loading_mode(struct intel_huc *huc)
>>> {
>>> struct intel_gt *gt = huc_to_gt(huc);
>>> - bool fw_needs_gsc = intel_huc_is_loaded_by_gsc(huc);
>>> - bool hw_uses_gsc = false;
>>> + bool gsc_enabled = huc->fw.has_gsc_headers;
>>> /*
>>> * The fuse for HuC load via GSC is only valid on platforms
>>> that have
>>> * GuC deprivilege.
>>> */
>>> if (HAS_GUC_DEPRIVILEGE(gt->i915))
>>> - hw_uses_gsc = intel_uncore_read(gt->uncore,
>>> GUC_SHIM_CONTROL2) &
>>> - GSC_LOADS_HUC;
>>> + huc->loaded_via_gsc = intel_uncore_read(gt->uncore,
>>> GUC_SHIM_CONTROL2) &
>>> + GSC_LOADS_HUC;
>>> - if (fw_needs_gsc != hw_uses_gsc) {
>>> - huc_err(huc, "mismatch between FW (%s) and HW (%s) load
>>> modes\n",
>>> - HUC_LOAD_MODE_STRING(fw_needs_gsc),
>>> HUC_LOAD_MODE_STRING(hw_uses_gsc));
>>> + if (huc->loaded_via_gsc && !gsc_enabled) {
>>> + huc_err(huc, "HW requires a GSC-enabled blob, but we found
>>> a legacy one\n");
>>> return -ENOEXEC;
>>> }
>>> - /* make sure we can access the GSC via the mei driver if we
>>> need it */
>>> + /*
>>> + * Newer GSC_enabled blobs contain the old FW structure inside.
>>> If we
>>> + * found that, we can use it to load the legacy way.
>>> + */
>>> + if (!huc->loaded_via_gsc && gsc_enabled &&
>>> !huc->fw.dma_start_offset) {
>>> + huc_err(huc,"HW in DMA mode, but we have an incompatible
>>> GSC-enabled blob\n");
>>> + return -ENOEXEC;
>>> + }
>> The comment above doesn't seem to match the check. The comment says
>> 'we can load the old way if possible' whereas the check is more 'can
>> we load the old way if we need to'.
>
> I'll reword it.
>
>>
>>> +
>>> + /* make sure we can access the GSC if we need it */
>>> if (!(IS_ENABLED(CONFIG_INTEL_MEI_PXP) &&
>>> IS_ENABLED(CONFIG_INTEL_MEI_GSC)) &&
>>> - fw_needs_gsc) {
>>> - huc_info(huc, "can't load due to missing MEI modules\n");
>>> + !HAS_ENGINE(gt, GSC0) && huc->loaded_via_gsc) {
>> This test still looks wrong when you read it. I think it needs a more
>> detailed comment. Some kind of explanation that the modules only
>> apply to one platform and the engine to a different platform. Or even
>> breaking into two separate tests with an 'if(DG2)' between them? It
>> certainly confuses me every time I look at it.
>
> Is it clearer if I split it like this?
>
> /*
> * if the FW is loaded via GSC and we're not on a platform that
> * has the GSC CS, we need the mei modules to access the GSC.
> */
> if (huc->loaded_via_gsc && !HAS_ENGINE(gt, GSC0)) {
> if (!IS_ENABLED(MEI_PXP) || !IS_ENABLED(MEI_GSC)
> // error
> }
>
It is guaranteed that if the GSC engine is present then no modules are
required? And that if the GSC engine is not present, then the modules
are all that is required?
What happens if the GSC engine has been fused off? Or disabled by some
future module override, workaround, etc.?
I thinking it would be both clearer and safer to say 'if (DG2) {check
DG2 specific stuff} else {check other stuff}'.
John.
> Daniele
>
>>
>> John.
>>
>>> + huc_info(huc, "can't load due to missing mei modules or
>>> GSCCS\n");
>>> return -EIO;
>>> }
>>> - huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(fw_needs_gsc));
>>> + huc_dbg(huc, "loaded by GSC = %s\n",
>>> str_yes_no(huc->loaded_via_gsc));
>>> return 0;
>>> }
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> index 0789184d81a2..112f0dce4702 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> @@ -39,6 +39,8 @@ struct intel_huc {
>>> struct notifier_block nb;
>>> enum intel_huc_delayed_load_status status;
>>> } delayed_load;
>>> +
>>> + bool loaded_via_gsc;
>>> };
>>> int intel_huc_sanitize(struct intel_huc *huc);
>>> @@ -73,7 +75,7 @@ static inline bool intel_huc_is_used(struct
>>> intel_huc *huc)
>>> static inline bool intel_huc_is_loaded_by_gsc(const struct
>>> intel_huc *huc)
>>> {
>>> - return huc->fw.loaded_via_gsc;
>>> + return huc->loaded_via_gsc;
>>> }
>>> static inline bool intel_huc_wait_required(struct intel_huc *huc)
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> index 037d2ad4879d..3355dc1e2bc6 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> @@ -50,7 +50,7 @@ int intel_huc_fw_get_binary_info(struct
>>> intel_uc_fw *huc_fw, const void *data, s
>>> size_t min_size = sizeof(*header);
>>> int i;
>>> - if (!huc_fw->loaded_via_gsc) {
>>> + if (!huc_fw->has_gsc_headers) {
>>> huc_err(huc, "Invalid FW type GSC header parsing!\n");
>>> return -EINVAL;
>>> }
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> index 9ced8dbf1253..b752a7f1ed99 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> @@ -186,7 +186,7 @@ struct __packed uc_fw_blob {
>>> u8 major;
>>> u8 minor;
>>> u8 patch;
>>> - bool loaded_via_gsc;
>>> + bool has_gsc_headers;
>>> };
>>> #define UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>>> @@ -197,7 +197,7 @@ struct __packed uc_fw_blob {
>>> #define UC_FW_BLOB_NEW(major_, minor_, patch_, gsc_, path_) \
>>> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>>> - .legacy = false, .loaded_via_gsc = gsc_ }
>>> + .legacy = false, .has_gsc_headers = gsc_ }
>>> #define UC_FW_BLOB_OLD(major_, minor_, patch_, path_) \
>>> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>>> @@ -310,7 +310,7 @@ __uc_fw_auto_select(struct drm_i915_private
>>> *i915, struct intel_uc_fw *uc_fw)
>>> uc_fw->file_wanted.ver.major = blob->major;
>>> uc_fw->file_wanted.ver.minor = blob->minor;
>>> uc_fw->file_wanted.ver.patch = blob->patch;
>>> - uc_fw->loaded_via_gsc = blob->loaded_via_gsc;
>>> + uc_fw->has_gsc_headers = blob->has_gsc_headers;
>>> found = true;
>>> break;
>>> }
>>> @@ -736,7 +736,7 @@ static int check_fw_header(struct intel_gt *gt,
>>> if (uc_fw->type == INTEL_UC_FW_TYPE_GSC)
>>> return 0;
>>> - if (uc_fw->loaded_via_gsc)
>>> + if (uc_fw->has_gsc_headers)
>>> err = check_gsc_manifest(gt, fw, uc_fw);
>>> else
>>> err = check_ccs_header(gt, fw, uc_fw);
>>> @@ -998,7 +998,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw,
>>> u32 dst_offset, u32 dma_flags)
>>> intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
>>> /* Set the source address for the uCode */
>>> - offset = uc_fw->vma_res.start;
>>> + offset = uc_fw->vma_res.start + uc_fw->dma_start_offset;
>>> GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
>>> intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW,
>>> lower_32_bits(offset));
>>> intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH,
>>> upper_32_bits(offset));
>>> @@ -1237,7 +1237,7 @@ size_t intel_uc_fw_copy_rsa(struct intel_uc_fw
>>> *uc_fw, void *dst, u32 max_len)
>>> {
>>> struct intel_memory_region *mr = uc_fw->obj->mm.region;
>>> u32 size = min_t(u32, uc_fw->rsa_size, max_len);
>>> - u32 offset = sizeof(struct uc_css_header) + uc_fw->ucode_size;
>>> + u32 offset = uc_fw->dma_start_offset + sizeof(struct
>>> uc_css_header) + uc_fw->ucode_size;
>>> struct sgt_iter iter;
>>> size_t count = 0;
>>> int idx;
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> index b3daba9526eb..054f02811971 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> @@ -120,7 +120,7 @@ struct intel_uc_fw {
>>> u32 dma_start_offset;
>>> - bool loaded_via_gsc;
>>> + bool has_gsc_headers;
>>> };
>>> /*
>>
>
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [Intel-gfx] [PATCH v3 3/7] drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
@ 2023-05-31 0:20 ` John Harrison
0 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-31 0:20 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 17:11, Ceraolo Spurio, Daniele wrote:
> On 5/30/2023 4:51 PM, John Harrison wrote:
>> On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
>>> In the previous patch we extracted the offset of the legacy-style HuC
>>> binary located within the GSC-enabled blob, so now we can use that to
>>> load the HuC via DMA if the fuse is set that way.
>>> Note that we now need to differentiate between "GSC-enabled binary" and
>>> "loaded by GSC", so the former case has been renamed to "has GSC
>>> headers"
>>> for clarity, while the latter is now based on the fuse instead of the
>>> binary format. This way, all the legacy load paths are automatically
>>> taken (including the auth by GuC) without having to implement further
>>> code changes.
>>>
>>> v2: s/is_meu_binary/has_gsc_headers/, clearer logs (John)
>>>
>>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>>> Cc: John Harrison <John.C.Harrison@Intel.com>
>>> ---
>>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 29
>>> ++++++++++++++---------
>>> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 4 +++-
>>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +-
>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 12 +++++-----
>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +-
>>> 5 files changed, 29 insertions(+), 20 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> index 6d795438b3e4..37c6a8ca5c71 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> @@ -298,31 +298,38 @@ void intel_huc_init_early(struct intel_huc *huc)
>>> static int check_huc_loading_mode(struct intel_huc *huc)
>>> {
>>> struct intel_gt *gt = huc_to_gt(huc);
>>> - bool fw_needs_gsc = intel_huc_is_loaded_by_gsc(huc);
>>> - bool hw_uses_gsc = false;
>>> + bool gsc_enabled = huc->fw.has_gsc_headers;
>>> /*
>>> * The fuse for HuC load via GSC is only valid on platforms
>>> that have
>>> * GuC deprivilege.
>>> */
>>> if (HAS_GUC_DEPRIVILEGE(gt->i915))
>>> - hw_uses_gsc = intel_uncore_read(gt->uncore,
>>> GUC_SHIM_CONTROL2) &
>>> - GSC_LOADS_HUC;
>>> + huc->loaded_via_gsc = intel_uncore_read(gt->uncore,
>>> GUC_SHIM_CONTROL2) &
>>> + GSC_LOADS_HUC;
>>> - if (fw_needs_gsc != hw_uses_gsc) {
>>> - huc_err(huc, "mismatch between FW (%s) and HW (%s) load
>>> modes\n",
>>> - HUC_LOAD_MODE_STRING(fw_needs_gsc),
>>> HUC_LOAD_MODE_STRING(hw_uses_gsc));
>>> + if (huc->loaded_via_gsc && !gsc_enabled) {
>>> + huc_err(huc, "HW requires a GSC-enabled blob, but we found
>>> a legacy one\n");
>>> return -ENOEXEC;
>>> }
>>> - /* make sure we can access the GSC via the mei driver if we
>>> need it */
>>> + /*
>>> + * Newer GSC_enabled blobs contain the old FW structure inside.
>>> If we
>>> + * found that, we can use it to load the legacy way.
>>> + */
>>> + if (!huc->loaded_via_gsc && gsc_enabled &&
>>> !huc->fw.dma_start_offset) {
>>> + huc_err(huc,"HW in DMA mode, but we have an incompatible
>>> GSC-enabled blob\n");
>>> + return -ENOEXEC;
>>> + }
>> The comment above doesn't seem to match the check. The comment says
>> 'we can load the old way if possible' whereas the check is more 'can
>> we load the old way if we need to'.
>
> I'll reword it.
>
>>
>>> +
>>> + /* make sure we can access the GSC if we need it */
>>> if (!(IS_ENABLED(CONFIG_INTEL_MEI_PXP) &&
>>> IS_ENABLED(CONFIG_INTEL_MEI_GSC)) &&
>>> - fw_needs_gsc) {
>>> - huc_info(huc, "can't load due to missing MEI modules\n");
>>> + !HAS_ENGINE(gt, GSC0) && huc->loaded_via_gsc) {
>> This test still looks wrong when you read it. I think it needs a more
>> detailed comment. Some kind of explanation that the modules only
>> apply to one platform and the engine to a different platform. Or even
>> breaking into two separate tests with an 'if(DG2)' between them? It
>> certainly confuses me every time I look at it.
>
> Is it clearer if I split it like this?
>
> /*
> * if the FW is loaded via GSC and we're not on a platform that
> * has the GSC CS, we need the mei modules to access the GSC.
> */
> if (huc->loaded_via_gsc && !HAS_ENGINE(gt, GSC0)) {
> if (!IS_ENABLED(MEI_PXP) || !IS_ENABLED(MEI_GSC)
> // error
> }
>
It is guaranteed that if the GSC engine is present then no modules are
required? And that if the GSC engine is not present, then the modules
are all that is required?
What happens if the GSC engine has been fused off? Or disabled by some
future module override, workaround, etc.?
I thinking it would be both clearer and safer to say 'if (DG2) {check
DG2 specific stuff} else {check other stuff}'.
John.
> Daniele
>
>>
>> John.
>>
>>> + huc_info(huc, "can't load due to missing mei modules or
>>> GSCCS\n");
>>> return -EIO;
>>> }
>>> - huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(fw_needs_gsc));
>>> + huc_dbg(huc, "loaded by GSC = %s\n",
>>> str_yes_no(huc->loaded_via_gsc));
>>> return 0;
>>> }
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> index 0789184d81a2..112f0dce4702 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> @@ -39,6 +39,8 @@ struct intel_huc {
>>> struct notifier_block nb;
>>> enum intel_huc_delayed_load_status status;
>>> } delayed_load;
>>> +
>>> + bool loaded_via_gsc;
>>> };
>>> int intel_huc_sanitize(struct intel_huc *huc);
>>> @@ -73,7 +75,7 @@ static inline bool intel_huc_is_used(struct
>>> intel_huc *huc)
>>> static inline bool intel_huc_is_loaded_by_gsc(const struct
>>> intel_huc *huc)
>>> {
>>> - return huc->fw.loaded_via_gsc;
>>> + return huc->loaded_via_gsc;
>>> }
>>> static inline bool intel_huc_wait_required(struct intel_huc *huc)
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> index 037d2ad4879d..3355dc1e2bc6 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> @@ -50,7 +50,7 @@ int intel_huc_fw_get_binary_info(struct
>>> intel_uc_fw *huc_fw, const void *data, s
>>> size_t min_size = sizeof(*header);
>>> int i;
>>> - if (!huc_fw->loaded_via_gsc) {
>>> + if (!huc_fw->has_gsc_headers) {
>>> huc_err(huc, "Invalid FW type GSC header parsing!\n");
>>> return -EINVAL;
>>> }
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> index 9ced8dbf1253..b752a7f1ed99 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> @@ -186,7 +186,7 @@ struct __packed uc_fw_blob {
>>> u8 major;
>>> u8 minor;
>>> u8 patch;
>>> - bool loaded_via_gsc;
>>> + bool has_gsc_headers;
>>> };
>>> #define UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>>> @@ -197,7 +197,7 @@ struct __packed uc_fw_blob {
>>> #define UC_FW_BLOB_NEW(major_, minor_, patch_, gsc_, path_) \
>>> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>>> - .legacy = false, .loaded_via_gsc = gsc_ }
>>> + .legacy = false, .has_gsc_headers = gsc_ }
>>> #define UC_FW_BLOB_OLD(major_, minor_, patch_, path_) \
>>> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>>> @@ -310,7 +310,7 @@ __uc_fw_auto_select(struct drm_i915_private
>>> *i915, struct intel_uc_fw *uc_fw)
>>> uc_fw->file_wanted.ver.major = blob->major;
>>> uc_fw->file_wanted.ver.minor = blob->minor;
>>> uc_fw->file_wanted.ver.patch = blob->patch;
>>> - uc_fw->loaded_via_gsc = blob->loaded_via_gsc;
>>> + uc_fw->has_gsc_headers = blob->has_gsc_headers;
>>> found = true;
>>> break;
>>> }
>>> @@ -736,7 +736,7 @@ static int check_fw_header(struct intel_gt *gt,
>>> if (uc_fw->type == INTEL_UC_FW_TYPE_GSC)
>>> return 0;
>>> - if (uc_fw->loaded_via_gsc)
>>> + if (uc_fw->has_gsc_headers)
>>> err = check_gsc_manifest(gt, fw, uc_fw);
>>> else
>>> err = check_ccs_header(gt, fw, uc_fw);
>>> @@ -998,7 +998,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw,
>>> u32 dst_offset, u32 dma_flags)
>>> intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
>>> /* Set the source address for the uCode */
>>> - offset = uc_fw->vma_res.start;
>>> + offset = uc_fw->vma_res.start + uc_fw->dma_start_offset;
>>> GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
>>> intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW,
>>> lower_32_bits(offset));
>>> intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH,
>>> upper_32_bits(offset));
>>> @@ -1237,7 +1237,7 @@ size_t intel_uc_fw_copy_rsa(struct intel_uc_fw
>>> *uc_fw, void *dst, u32 max_len)
>>> {
>>> struct intel_memory_region *mr = uc_fw->obj->mm.region;
>>> u32 size = min_t(u32, uc_fw->rsa_size, max_len);
>>> - u32 offset = sizeof(struct uc_css_header) + uc_fw->ucode_size;
>>> + u32 offset = uc_fw->dma_start_offset + sizeof(struct
>>> uc_css_header) + uc_fw->ucode_size;
>>> struct sgt_iter iter;
>>> size_t count = 0;
>>> int idx;
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> index b3daba9526eb..054f02811971 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>> @@ -120,7 +120,7 @@ struct intel_uc_fw {
>>> u32 dma_start_offset;
>>> - bool loaded_via_gsc;
>>> + bool has_gsc_headers;
>>> };
>>> /*
>>
>
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCH v3 3/7] drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
2023-05-31 0:20 ` [Intel-gfx] " John Harrison
@ 2023-05-31 0:26 ` Ceraolo Spurio, Daniele
-1 siblings, 0 replies; 52+ messages in thread
From: Ceraolo Spurio, Daniele @ 2023-05-31 0:26 UTC (permalink / raw)
To: John Harrison, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 5:20 PM, John Harrison wrote:
> On 5/30/2023 17:11, Ceraolo Spurio, Daniele wrote:
>> On 5/30/2023 4:51 PM, John Harrison wrote:
>>> On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
>>>> In the previous patch we extracted the offset of the legacy-style HuC
>>>> binary located within the GSC-enabled blob, so now we can use that to
>>>> load the HuC via DMA if the fuse is set that way.
>>>> Note that we now need to differentiate between "GSC-enabled binary"
>>>> and
>>>> "loaded by GSC", so the former case has been renamed to "has GSC
>>>> headers"
>>>> for clarity, while the latter is now based on the fuse instead of the
>>>> binary format. This way, all the legacy load paths are automatically
>>>> taken (including the auth by GuC) without having to implement further
>>>> code changes.
>>>>
>>>> v2: s/is_meu_binary/has_gsc_headers/, clearer logs (John)
>>>>
>>>> Signed-off-by: Daniele Ceraolo Spurio
>>>> <daniele.ceraolospurio@intel.com>
>>>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>>>> Cc: John Harrison <John.C.Harrison@Intel.com>
>>>> ---
>>>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 29
>>>> ++++++++++++++---------
>>>> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 4 +++-
>>>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +-
>>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 12 +++++-----
>>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +-
>>>> 5 files changed, 29 insertions(+), 20 deletions(-)
>>>>
>>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>>> index 6d795438b3e4..37c6a8ca5c71 100644
>>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>>> @@ -298,31 +298,38 @@ void intel_huc_init_early(struct intel_huc *huc)
>>>> static int check_huc_loading_mode(struct intel_huc *huc)
>>>> {
>>>> struct intel_gt *gt = huc_to_gt(huc);
>>>> - bool fw_needs_gsc = intel_huc_is_loaded_by_gsc(huc);
>>>> - bool hw_uses_gsc = false;
>>>> + bool gsc_enabled = huc->fw.has_gsc_headers;
>>>> /*
>>>> * The fuse for HuC load via GSC is only valid on platforms
>>>> that have
>>>> * GuC deprivilege.
>>>> */
>>>> if (HAS_GUC_DEPRIVILEGE(gt->i915))
>>>> - hw_uses_gsc = intel_uncore_read(gt->uncore,
>>>> GUC_SHIM_CONTROL2) &
>>>> - GSC_LOADS_HUC;
>>>> + huc->loaded_via_gsc = intel_uncore_read(gt->uncore,
>>>> GUC_SHIM_CONTROL2) &
>>>> + GSC_LOADS_HUC;
>>>> - if (fw_needs_gsc != hw_uses_gsc) {
>>>> - huc_err(huc, "mismatch between FW (%s) and HW (%s) load
>>>> modes\n",
>>>> - HUC_LOAD_MODE_STRING(fw_needs_gsc),
>>>> HUC_LOAD_MODE_STRING(hw_uses_gsc));
>>>> + if (huc->loaded_via_gsc && !gsc_enabled) {
>>>> + huc_err(huc, "HW requires a GSC-enabled blob, but we found
>>>> a legacy one\n");
>>>> return -ENOEXEC;
>>>> }
>>>> - /* make sure we can access the GSC via the mei driver if we
>>>> need it */
>>>> + /*
>>>> + * Newer GSC_enabled blobs contain the old FW structure
>>>> inside. If we
>>>> + * found that, we can use it to load the legacy way.
>>>> + */
>>>> + if (!huc->loaded_via_gsc && gsc_enabled &&
>>>> !huc->fw.dma_start_offset) {
>>>> + huc_err(huc,"HW in DMA mode, but we have an incompatible
>>>> GSC-enabled blob\n");
>>>> + return -ENOEXEC;
>>>> + }
>>> The comment above doesn't seem to match the check. The comment says
>>> 'we can load the old way if possible' whereas the check is more 'can
>>> we load the old way if we need to'.
>>
>> I'll reword it.
>>
>>>
>>>> +
>>>> + /* make sure we can access the GSC if we need it */
>>>> if (!(IS_ENABLED(CONFIG_INTEL_MEI_PXP) &&
>>>> IS_ENABLED(CONFIG_INTEL_MEI_GSC)) &&
>>>> - fw_needs_gsc) {
>>>> - huc_info(huc, "can't load due to missing MEI modules\n");
>>>> + !HAS_ENGINE(gt, GSC0) && huc->loaded_via_gsc) {
>>> This test still looks wrong when you read it. I think it needs a
>>> more detailed comment. Some kind of explanation that the modules
>>> only apply to one platform and the engine to a different platform.
>>> Or even breaking into two separate tests with an 'if(DG2)' between
>>> them? It certainly confuses me every time I look at it.
>>
>> Is it clearer if I split it like this?
>>
>> /*
>> * if the FW is loaded via GSC and we're not on a platform that
>> * has the GSC CS, we need the mei modules to access the GSC.
>> */
>> if (huc->loaded_via_gsc && !HAS_ENGINE(gt, GSC0)) {
>> if (!IS_ENABLED(MEI_PXP) || !IS_ENABLED(MEI_GSC)
>> // error
>> }
>>
> It is guaranteed that if the GSC engine is present then no modules are
> required? And that if the GSC engine is not present, then the modules
> are all that is required?
>
> What happens if the GSC engine has been fused off? Or disabled by some
> future module override, workaround, etc.?
>
> I thinking it would be both clearer and safer to say 'if (DG2) {check
> DG2 specific stuff} else {check other stuff}'.
ok, will do.
Daniele
>
> John.
>
>
>> Daniele
>>
>>>
>>> John.
>>>
>>>> + huc_info(huc, "can't load due to missing mei modules or
>>>> GSCCS\n");
>>>> return -EIO;
>>>> }
>>>> - huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(fw_needs_gsc));
>>>> + huc_dbg(huc, "loaded by GSC = %s\n",
>>>> str_yes_no(huc->loaded_via_gsc));
>>>> return 0;
>>>> }
>>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>>> index 0789184d81a2..112f0dce4702 100644
>>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>>> @@ -39,6 +39,8 @@ struct intel_huc {
>>>> struct notifier_block nb;
>>>> enum intel_huc_delayed_load_status status;
>>>> } delayed_load;
>>>> +
>>>> + bool loaded_via_gsc;
>>>> };
>>>> int intel_huc_sanitize(struct intel_huc *huc);
>>>> @@ -73,7 +75,7 @@ static inline bool intel_huc_is_used(struct
>>>> intel_huc *huc)
>>>> static inline bool intel_huc_is_loaded_by_gsc(const struct
>>>> intel_huc *huc)
>>>> {
>>>> - return huc->fw.loaded_via_gsc;
>>>> + return huc->loaded_via_gsc;
>>>> }
>>>> static inline bool intel_huc_wait_required(struct intel_huc *huc)
>>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>>> index 037d2ad4879d..3355dc1e2bc6 100644
>>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>>> @@ -50,7 +50,7 @@ int intel_huc_fw_get_binary_info(struct
>>>> intel_uc_fw *huc_fw, const void *data, s
>>>> size_t min_size = sizeof(*header);
>>>> int i;
>>>> - if (!huc_fw->loaded_via_gsc) {
>>>> + if (!huc_fw->has_gsc_headers) {
>>>> huc_err(huc, "Invalid FW type GSC header parsing!\n");
>>>> return -EINVAL;
>>>> }
>>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>> index 9ced8dbf1253..b752a7f1ed99 100644
>>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>> @@ -186,7 +186,7 @@ struct __packed uc_fw_blob {
>>>> u8 major;
>>>> u8 minor;
>>>> u8 patch;
>>>> - bool loaded_via_gsc;
>>>> + bool has_gsc_headers;
>>>> };
>>>> #define UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>>>> @@ -197,7 +197,7 @@ struct __packed uc_fw_blob {
>>>> #define UC_FW_BLOB_NEW(major_, minor_, patch_, gsc_, path_) \
>>>> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>>>> - .legacy = false, .loaded_via_gsc = gsc_ }
>>>> + .legacy = false, .has_gsc_headers = gsc_ }
>>>> #define UC_FW_BLOB_OLD(major_, minor_, patch_, path_) \
>>>> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>>>> @@ -310,7 +310,7 @@ __uc_fw_auto_select(struct drm_i915_private
>>>> *i915, struct intel_uc_fw *uc_fw)
>>>> uc_fw->file_wanted.ver.major = blob->major;
>>>> uc_fw->file_wanted.ver.minor = blob->minor;
>>>> uc_fw->file_wanted.ver.patch = blob->patch;
>>>> - uc_fw->loaded_via_gsc = blob->loaded_via_gsc;
>>>> + uc_fw->has_gsc_headers = blob->has_gsc_headers;
>>>> found = true;
>>>> break;
>>>> }
>>>> @@ -736,7 +736,7 @@ static int check_fw_header(struct intel_gt *gt,
>>>> if (uc_fw->type == INTEL_UC_FW_TYPE_GSC)
>>>> return 0;
>>>> - if (uc_fw->loaded_via_gsc)
>>>> + if (uc_fw->has_gsc_headers)
>>>> err = check_gsc_manifest(gt, fw, uc_fw);
>>>> else
>>>> err = check_ccs_header(gt, fw, uc_fw);
>>>> @@ -998,7 +998,7 @@ static int uc_fw_xfer(struct intel_uc_fw
>>>> *uc_fw, u32 dst_offset, u32 dma_flags)
>>>> intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
>>>> /* Set the source address for the uCode */
>>>> - offset = uc_fw->vma_res.start;
>>>> + offset = uc_fw->vma_res.start + uc_fw->dma_start_offset;
>>>> GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
>>>> intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW,
>>>> lower_32_bits(offset));
>>>> intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH,
>>>> upper_32_bits(offset));
>>>> @@ -1237,7 +1237,7 @@ size_t intel_uc_fw_copy_rsa(struct
>>>> intel_uc_fw *uc_fw, void *dst, u32 max_len)
>>>> {
>>>> struct intel_memory_region *mr = uc_fw->obj->mm.region;
>>>> u32 size = min_t(u32, uc_fw->rsa_size, max_len);
>>>> - u32 offset = sizeof(struct uc_css_header) + uc_fw->ucode_size;
>>>> + u32 offset = uc_fw->dma_start_offset + sizeof(struct
>>>> uc_css_header) + uc_fw->ucode_size;
>>>> struct sgt_iter iter;
>>>> size_t count = 0;
>>>> int idx;
>>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>>> index b3daba9526eb..054f02811971 100644
>>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>>> @@ -120,7 +120,7 @@ struct intel_uc_fw {
>>>> u32 dma_start_offset;
>>>> - bool loaded_via_gsc;
>>>> + bool has_gsc_headers;
>>>> };
>>>> /*
>>>
>>
>
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [Intel-gfx] [PATCH v3 3/7] drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
@ 2023-05-31 0:26 ` Ceraolo Spurio, Daniele
0 siblings, 0 replies; 52+ messages in thread
From: Ceraolo Spurio, Daniele @ 2023-05-31 0:26 UTC (permalink / raw)
To: John Harrison, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 5:20 PM, John Harrison wrote:
> On 5/30/2023 17:11, Ceraolo Spurio, Daniele wrote:
>> On 5/30/2023 4:51 PM, John Harrison wrote:
>>> On 5/26/2023 17:52, Daniele Ceraolo Spurio wrote:
>>>> In the previous patch we extracted the offset of the legacy-style HuC
>>>> binary located within the GSC-enabled blob, so now we can use that to
>>>> load the HuC via DMA if the fuse is set that way.
>>>> Note that we now need to differentiate between "GSC-enabled binary"
>>>> and
>>>> "loaded by GSC", so the former case has been renamed to "has GSC
>>>> headers"
>>>> for clarity, while the latter is now based on the fuse instead of the
>>>> binary format. This way, all the legacy load paths are automatically
>>>> taken (including the auth by GuC) without having to implement further
>>>> code changes.
>>>>
>>>> v2: s/is_meu_binary/has_gsc_headers/, clearer logs (John)
>>>>
>>>> Signed-off-by: Daniele Ceraolo Spurio
>>>> <daniele.ceraolospurio@intel.com>
>>>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>>>> Cc: John Harrison <John.C.Harrison@Intel.com>
>>>> ---
>>>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 29
>>>> ++++++++++++++---------
>>>> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 4 +++-
>>>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +-
>>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 12 +++++-----
>>>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +-
>>>> 5 files changed, 29 insertions(+), 20 deletions(-)
>>>>
>>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>>> index 6d795438b3e4..37c6a8ca5c71 100644
>>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>>> @@ -298,31 +298,38 @@ void intel_huc_init_early(struct intel_huc *huc)
>>>> static int check_huc_loading_mode(struct intel_huc *huc)
>>>> {
>>>> struct intel_gt *gt = huc_to_gt(huc);
>>>> - bool fw_needs_gsc = intel_huc_is_loaded_by_gsc(huc);
>>>> - bool hw_uses_gsc = false;
>>>> + bool gsc_enabled = huc->fw.has_gsc_headers;
>>>> /*
>>>> * The fuse for HuC load via GSC is only valid on platforms
>>>> that have
>>>> * GuC deprivilege.
>>>> */
>>>> if (HAS_GUC_DEPRIVILEGE(gt->i915))
>>>> - hw_uses_gsc = intel_uncore_read(gt->uncore,
>>>> GUC_SHIM_CONTROL2) &
>>>> - GSC_LOADS_HUC;
>>>> + huc->loaded_via_gsc = intel_uncore_read(gt->uncore,
>>>> GUC_SHIM_CONTROL2) &
>>>> + GSC_LOADS_HUC;
>>>> - if (fw_needs_gsc != hw_uses_gsc) {
>>>> - huc_err(huc, "mismatch between FW (%s) and HW (%s) load
>>>> modes\n",
>>>> - HUC_LOAD_MODE_STRING(fw_needs_gsc),
>>>> HUC_LOAD_MODE_STRING(hw_uses_gsc));
>>>> + if (huc->loaded_via_gsc && !gsc_enabled) {
>>>> + huc_err(huc, "HW requires a GSC-enabled blob, but we found
>>>> a legacy one\n");
>>>> return -ENOEXEC;
>>>> }
>>>> - /* make sure we can access the GSC via the mei driver if we
>>>> need it */
>>>> + /*
>>>> + * Newer GSC_enabled blobs contain the old FW structure
>>>> inside. If we
>>>> + * found that, we can use it to load the legacy way.
>>>> + */
>>>> + if (!huc->loaded_via_gsc && gsc_enabled &&
>>>> !huc->fw.dma_start_offset) {
>>>> + huc_err(huc,"HW in DMA mode, but we have an incompatible
>>>> GSC-enabled blob\n");
>>>> + return -ENOEXEC;
>>>> + }
>>> The comment above doesn't seem to match the check. The comment says
>>> 'we can load the old way if possible' whereas the check is more 'can
>>> we load the old way if we need to'.
>>
>> I'll reword it.
>>
>>>
>>>> +
>>>> + /* make sure we can access the GSC if we need it */
>>>> if (!(IS_ENABLED(CONFIG_INTEL_MEI_PXP) &&
>>>> IS_ENABLED(CONFIG_INTEL_MEI_GSC)) &&
>>>> - fw_needs_gsc) {
>>>> - huc_info(huc, "can't load due to missing MEI modules\n");
>>>> + !HAS_ENGINE(gt, GSC0) && huc->loaded_via_gsc) {
>>> This test still looks wrong when you read it. I think it needs a
>>> more detailed comment. Some kind of explanation that the modules
>>> only apply to one platform and the engine to a different platform.
>>> Or even breaking into two separate tests with an 'if(DG2)' between
>>> them? It certainly confuses me every time I look at it.
>>
>> Is it clearer if I split it like this?
>>
>> /*
>> * if the FW is loaded via GSC and we're not on a platform that
>> * has the GSC CS, we need the mei modules to access the GSC.
>> */
>> if (huc->loaded_via_gsc && !HAS_ENGINE(gt, GSC0)) {
>> if (!IS_ENABLED(MEI_PXP) || !IS_ENABLED(MEI_GSC)
>> // error
>> }
>>
> It is guaranteed that if the GSC engine is present then no modules are
> required? And that if the GSC engine is not present, then the modules
> are all that is required?
>
> What happens if the GSC engine has been fused off? Or disabled by some
> future module override, workaround, etc.?
>
> I thinking it would be both clearer and safer to say 'if (DG2) {check
> DG2 specific stuff} else {check other stuff}'.
ok, will do.
Daniele
>
> John.
>
>
>> Daniele
>>
>>>
>>> John.
>>>
>>>> + huc_info(huc, "can't load due to missing mei modules or
>>>> GSCCS\n");
>>>> return -EIO;
>>>> }
>>>> - huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(fw_needs_gsc));
>>>> + huc_dbg(huc, "loaded by GSC = %s\n",
>>>> str_yes_no(huc->loaded_via_gsc));
>>>> return 0;
>>>> }
>>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>>> index 0789184d81a2..112f0dce4702 100644
>>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>>> @@ -39,6 +39,8 @@ struct intel_huc {
>>>> struct notifier_block nb;
>>>> enum intel_huc_delayed_load_status status;
>>>> } delayed_load;
>>>> +
>>>> + bool loaded_via_gsc;
>>>> };
>>>> int intel_huc_sanitize(struct intel_huc *huc);
>>>> @@ -73,7 +75,7 @@ static inline bool intel_huc_is_used(struct
>>>> intel_huc *huc)
>>>> static inline bool intel_huc_is_loaded_by_gsc(const struct
>>>> intel_huc *huc)
>>>> {
>>>> - return huc->fw.loaded_via_gsc;
>>>> + return huc->loaded_via_gsc;
>>>> }
>>>> static inline bool intel_huc_wait_required(struct intel_huc *huc)
>>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>>> index 037d2ad4879d..3355dc1e2bc6 100644
>>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>>> @@ -50,7 +50,7 @@ int intel_huc_fw_get_binary_info(struct
>>>> intel_uc_fw *huc_fw, const void *data, s
>>>> size_t min_size = sizeof(*header);
>>>> int i;
>>>> - if (!huc_fw->loaded_via_gsc) {
>>>> + if (!huc_fw->has_gsc_headers) {
>>>> huc_err(huc, "Invalid FW type GSC header parsing!\n");
>>>> return -EINVAL;
>>>> }
>>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>> index 9ced8dbf1253..b752a7f1ed99 100644
>>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>> @@ -186,7 +186,7 @@ struct __packed uc_fw_blob {
>>>> u8 major;
>>>> u8 minor;
>>>> u8 patch;
>>>> - bool loaded_via_gsc;
>>>> + bool has_gsc_headers;
>>>> };
>>>> #define UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>>>> @@ -197,7 +197,7 @@ struct __packed uc_fw_blob {
>>>> #define UC_FW_BLOB_NEW(major_, minor_, patch_, gsc_, path_) \
>>>> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>>>> - .legacy = false, .loaded_via_gsc = gsc_ }
>>>> + .legacy = false, .has_gsc_headers = gsc_ }
>>>> #define UC_FW_BLOB_OLD(major_, minor_, patch_, path_) \
>>>> { UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
>>>> @@ -310,7 +310,7 @@ __uc_fw_auto_select(struct drm_i915_private
>>>> *i915, struct intel_uc_fw *uc_fw)
>>>> uc_fw->file_wanted.ver.major = blob->major;
>>>> uc_fw->file_wanted.ver.minor = blob->minor;
>>>> uc_fw->file_wanted.ver.patch = blob->patch;
>>>> - uc_fw->loaded_via_gsc = blob->loaded_via_gsc;
>>>> + uc_fw->has_gsc_headers = blob->has_gsc_headers;
>>>> found = true;
>>>> break;
>>>> }
>>>> @@ -736,7 +736,7 @@ static int check_fw_header(struct intel_gt *gt,
>>>> if (uc_fw->type == INTEL_UC_FW_TYPE_GSC)
>>>> return 0;
>>>> - if (uc_fw->loaded_via_gsc)
>>>> + if (uc_fw->has_gsc_headers)
>>>> err = check_gsc_manifest(gt, fw, uc_fw);
>>>> else
>>>> err = check_ccs_header(gt, fw, uc_fw);
>>>> @@ -998,7 +998,7 @@ static int uc_fw_xfer(struct intel_uc_fw
>>>> *uc_fw, u32 dst_offset, u32 dma_flags)
>>>> intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
>>>> /* Set the source address for the uCode */
>>>> - offset = uc_fw->vma_res.start;
>>>> + offset = uc_fw->vma_res.start + uc_fw->dma_start_offset;
>>>> GEM_BUG_ON(upper_32_bits(offset) & 0xFFFF0000);
>>>> intel_uncore_write_fw(uncore, DMA_ADDR_0_LOW,
>>>> lower_32_bits(offset));
>>>> intel_uncore_write_fw(uncore, DMA_ADDR_0_HIGH,
>>>> upper_32_bits(offset));
>>>> @@ -1237,7 +1237,7 @@ size_t intel_uc_fw_copy_rsa(struct
>>>> intel_uc_fw *uc_fw, void *dst, u32 max_len)
>>>> {
>>>> struct intel_memory_region *mr = uc_fw->obj->mm.region;
>>>> u32 size = min_t(u32, uc_fw->rsa_size, max_len);
>>>> - u32 offset = sizeof(struct uc_css_header) + uc_fw->ucode_size;
>>>> + u32 offset = uc_fw->dma_start_offset + sizeof(struct
>>>> uc_css_header) + uc_fw->ucode_size;
>>>> struct sgt_iter iter;
>>>> size_t count = 0;
>>>> int idx;
>>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>>> index b3daba9526eb..054f02811971 100644
>>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
>>>> @@ -120,7 +120,7 @@ struct intel_uc_fw {
>>>> u32 dma_start_offset;
>>>> - bool loaded_via_gsc;
>>>> + bool has_gsc_headers;
>>>> };
>>>> /*
>>>
>>
>
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 4/7] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
-1 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: John Harrison, Daniele Ceraolo Spurio, Alan Previn, dri-devel
Before we add the second step of the MTL HuC auth (via GSC), we need to
have the ability to differentiate between them. To do so, the huc
authentication check is duplicated for GuC and GSC auth, with meu
binaries being considered fully authenticated only after the GSC auth
step.
To report the difference between the 2 auth steps, a new case is added
to the HuC getparam. This way, the clear media driver can start
submitting before full auth, as partial auth is enough for those
workloads.
v2: fix authentication status check for DG2
v3: add a better comment at the top of the HuC file to explain the
different approaches to load and auth (John)
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
---
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 111 ++++++++++++++++------
drivers/gpu/drm/i915/gt/uc/intel_huc.h | 16 +++-
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 4 +-
drivers/gpu/drm/i915/i915_reg.h | 3 +
include/uapi/drm/i915_drm.h | 3 +-
5 files changed, 103 insertions(+), 34 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 37c6a8ca5c71..ab5246ae3979 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -10,6 +10,7 @@
#include "intel_huc.h"
#include "intel_huc_print.h"
#include "i915_drv.h"
+#include "i915_reg.h"
#include <linux/device/bus.h>
#include <linux/mei_aux.h>
@@ -22,15 +23,23 @@
* capabilities by adding HuC specific commands to batch buffers.
*
* The kernel driver is only responsible for loading the HuC firmware and
- * triggering its security authentication, which is performed by the GuC on
- * older platforms and by the GSC on newer ones. For the GuC to correctly
- * perform the authentication, the HuC binary must be loaded before the GuC one.
+ * triggering its security authentication. This is done differently depending
+ * on the platform:
+ * - older platforms (from Gen9 to most Gen12s): the load is performed via DMA
+ * and the authentication via GuC
+ * - DG2: load and authentication are both performed via GSC.
+ * - MTL and newer platforms: the load is performed via DMA (same as with
+ * not-DG2 older platforms), while the authentication is done in 2-steps,
+ * a first auth for clear-media workloads via GuC and a second one for all
+ * workloads via GSC.
+ * On platforms where the GuC does the authentication, to correctly do so the
+ * HuC binary must be loaded before the GuC one.
* Loading the HuC is optional; however, not using the HuC might negatively
* impact power usage and/or performance of media workloads, depending on the
* use-cases.
* HuC must be reloaded on events that cause the WOPCM to lose its contents
- * (S3/S4, FLR); GuC-authenticated HuC must also be reloaded on GuC/GT reset,
- * while GSC-managed HuC will survive that.
+ * (S3/S4, FLR); on older platforms the HuC must also be reloaded on GuC/GT
+ * reset, while on newer ones it will survive that.
*
* See https://github.com/intel/media-driver for the latest details on HuC
* functionality.
@@ -106,7 +115,7 @@ static enum hrtimer_restart huc_delayed_load_timer_callback(struct hrtimer *hrti
{
struct intel_huc *huc = container_of(hrtimer, struct intel_huc, delayed_load.timer);
- if (!intel_huc_is_authenticated(huc)) {
+ if (!intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_GSC)
huc_notice(huc, "timed out waiting for MEI GSC\n");
else if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_PXP)
@@ -124,7 +133,7 @@ static void huc_delayed_load_start(struct intel_huc *huc)
{
ktime_t delay;
- GEM_BUG_ON(intel_huc_is_authenticated(huc));
+ GEM_BUG_ON(intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC));
/*
* On resume we don't have to wait for MEI-GSC to be re-probed, but we
@@ -284,13 +293,23 @@ void intel_huc_init_early(struct intel_huc *huc)
}
if (GRAPHICS_VER(i915) >= 11) {
- huc->status.reg = GEN11_HUC_KERNEL_LOAD_INFO;
- huc->status.mask = HUC_LOAD_SUCCESSFUL;
- huc->status.value = HUC_LOAD_SUCCESSFUL;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].reg = GEN11_HUC_KERNEL_LOAD_INFO;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_LOAD_SUCCESSFUL;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_LOAD_SUCCESSFUL;
} else {
- huc->status.reg = HUC_STATUS2;
- huc->status.mask = HUC_FW_VERIFIED;
- huc->status.value = HUC_FW_VERIFIED;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].reg = HUC_STATUS2;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_FW_VERIFIED;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_FW_VERIFIED;
+ }
+
+ if (IS_DG2(i915)) {
+ huc->status[INTEL_HUC_AUTH_BY_GSC].reg = GEN11_HUC_KERNEL_LOAD_INFO;
+ huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HUC_LOAD_SUCCESSFUL;
+ huc->status[INTEL_HUC_AUTH_BY_GSC].value = HUC_LOAD_SUCCESSFUL;
+ } else {
+ huc->status[INTEL_HUC_AUTH_BY_GSC].reg = HECI_FWSTS5(MTL_GSC_HECI1_BASE);
+ huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HECI_FWSTS5_HUC_AUTH_DONE;
+ huc->status[INTEL_HUC_AUTH_BY_GSC].value = HECI_FWSTS5_HUC_AUTH_DONE;
}
}
@@ -381,28 +400,38 @@ void intel_huc_suspend(struct intel_huc *huc)
delayed_huc_load_complete(huc);
}
-int intel_huc_wait_for_auth_complete(struct intel_huc *huc)
+static const char *auth_mode_string(struct intel_huc *huc,
+ enum intel_huc_authentication_type type)
+{
+ bool partial = huc->fw.has_gsc_headers && type == INTEL_HUC_AUTH_BY_GUC;
+
+ return partial ? "clear media" : "all workloads";
+}
+
+int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
+ enum intel_huc_authentication_type type)
{
struct intel_gt *gt = huc_to_gt(huc);
int ret;
ret = __intel_wait_for_register(gt->uncore,
- huc->status.reg,
- huc->status.mask,
- huc->status.value,
+ huc->status[type].reg,
+ huc->status[type].mask,
+ huc->status[type].value,
2, 50, NULL);
/* mark the load process as complete even if the wait failed */
delayed_huc_load_complete(huc);
if (ret) {
- huc_err(huc, "firmware not verified %pe\n", ERR_PTR(ret));
+ huc_err(huc, "firmware not verified for %s: %pe\n",
+ auth_mode_string(huc, type), ERR_PTR(ret));
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_LOAD_FAIL);
return ret;
}
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
- huc_info(huc, "authenticated!\n");
+ huc_info(huc, "authenticated for %s!\n", auth_mode_string(huc, type));
return 0;
}
@@ -442,7 +471,7 @@ int intel_huc_auth(struct intel_huc *huc)
}
/* Check authentication status, it should be done by now */
- ret = intel_huc_wait_for_auth_complete(huc);
+ ret = intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GUC);
if (ret)
goto fail;
@@ -453,16 +482,29 @@ int intel_huc_auth(struct intel_huc *huc)
return ret;
}
-bool intel_huc_is_authenticated(struct intel_huc *huc)
+bool intel_huc_is_authenticated(struct intel_huc *huc,
+ enum intel_huc_authentication_type type)
{
struct intel_gt *gt = huc_to_gt(huc);
intel_wakeref_t wakeref;
u32 status = 0;
with_intel_runtime_pm(gt->uncore->rpm, wakeref)
- status = intel_uncore_read(gt->uncore, huc->status.reg);
+ status = intel_uncore_read(gt->uncore, huc->status[type].reg);
- return (status & huc->status.mask) == huc->status.value;
+ return (status & huc->status[type].mask) == huc->status[type].value;
+}
+
+static bool huc_is_fully_authenticated(struct intel_huc *huc)
+{
+ struct intel_uc_fw *huc_fw = &huc->fw;
+
+ if (!huc_fw->has_gsc_headers)
+ return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC);
+ else if (intel_huc_is_loaded_by_gsc(huc) || HAS_ENGINE(huc_to_gt(huc), GSC0))
+ return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
+ else
+ return false;
}
/**
@@ -477,7 +519,9 @@ bool intel_huc_is_authenticated(struct intel_huc *huc)
*/
int intel_huc_check_status(struct intel_huc *huc)
{
- switch (__intel_uc_fw_status(&huc->fw)) {
+ struct intel_uc_fw *huc_fw = &huc->fw;
+
+ switch (__intel_uc_fw_status(huc_fw)) {
case INTEL_UC_FIRMWARE_NOT_SUPPORTED:
return -ENODEV;
case INTEL_UC_FIRMWARE_DISABLED:
@@ -494,7 +538,17 @@ int intel_huc_check_status(struct intel_huc *huc)
break;
}
- return intel_huc_is_authenticated(huc);
+ /*
+ * meu binaries loaded by GuC are first partially authenticated by GuC
+ * and then fully authenticated by GSC
+ */
+ if (huc_is_fully_authenticated(huc))
+ return 1; /* full auth */
+ else if (huc_fw->has_gsc_headers && !intel_huc_is_loaded_by_gsc(huc) &&
+ intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC))
+ return 2; /* clear media only */
+ else
+ return 0;
}
static bool huc_has_delayed_load(struct intel_huc *huc)
@@ -508,7 +562,10 @@ void intel_huc_update_auth_status(struct intel_huc *huc)
if (!intel_uc_fw_is_loadable(&huc->fw))
return;
- if (intel_huc_is_authenticated(huc))
+ if (!huc->fw.has_gsc_headers)
+ return;
+
+ if (huc_is_fully_authenticated(huc))
intel_uc_fw_change_status(&huc->fw,
INTEL_UC_FIRMWARE_RUNNING);
else if (huc_has_delayed_load(huc))
@@ -541,5 +598,5 @@ void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p)
with_intel_runtime_pm(gt->uncore->rpm, wakeref)
drm_printf(p, "HuC status: 0x%08x\n",
- intel_uncore_read(gt->uncore, huc->status.reg));
+ intel_uncore_read(gt->uncore, huc->status[INTEL_HUC_AUTH_BY_GUC].reg));
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
index 112f0dce4702..3f6aa7c37abc 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
@@ -22,6 +22,12 @@ enum intel_huc_delayed_load_status {
INTEL_HUC_DELAYED_LOAD_ERROR,
};
+enum intel_huc_authentication_type {
+ INTEL_HUC_AUTH_BY_GUC = 0,
+ INTEL_HUC_AUTH_BY_GSC,
+ INTEL_HUC_AUTH_MAX_MODES
+};
+
struct intel_huc {
/* Generic uC firmware management */
struct intel_uc_fw fw;
@@ -31,7 +37,7 @@ struct intel_huc {
i915_reg_t reg;
u32 mask;
u32 value;
- } status;
+ } status[INTEL_HUC_AUTH_MAX_MODES];
struct {
struct i915_sw_fence fence;
@@ -49,10 +55,12 @@ int intel_huc_init(struct intel_huc *huc);
void intel_huc_fini(struct intel_huc *huc);
void intel_huc_suspend(struct intel_huc *huc);
int intel_huc_auth(struct intel_huc *huc);
-int intel_huc_wait_for_auth_complete(struct intel_huc *huc);
+int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
+ enum intel_huc_authentication_type type);
+bool intel_huc_is_authenticated(struct intel_huc *huc,
+ enum intel_huc_authentication_type type);
int intel_huc_check_status(struct intel_huc *huc);
void intel_huc_update_auth_status(struct intel_huc *huc);
-bool intel_huc_is_authenticated(struct intel_huc *huc);
void intel_huc_register_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus);
void intel_huc_unregister_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus);
@@ -81,7 +89,7 @@ static inline bool intel_huc_is_loaded_by_gsc(const struct intel_huc *huc)
static inline bool intel_huc_wait_required(struct intel_huc *huc)
{
return intel_huc_is_used(huc) && intel_huc_is_loaded_by_gsc(huc) &&
- !intel_huc_is_authenticated(huc);
+ !intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
}
void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p);
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
index 3355dc1e2bc6..d2b4176c81d6 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
@@ -160,7 +160,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
* component gets re-bound and this function called again. If so, just
* mark the HuC as loaded.
*/
- if (intel_huc_is_authenticated(huc)) {
+ if (intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
return 0;
}
@@ -173,7 +173,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_TRANSFERRED);
- return intel_huc_wait_for_auth_complete(huc);
+ return intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GSC);
}
/**
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 0523418129c5..c14433795c91 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -941,6 +941,9 @@
#define HECI_H_GS1(base) _MMIO((base) + 0xc4c)
#define HECI_H_GS1_ER_PREP REG_BIT(0)
+#define HECI_FWSTS5(base) _MMIO(base + 0xc68)
+#define HECI_FWSTS5_HUC_AUTH_DONE (1 << 19)
+
#define HSW_GTT_CACHE_EN _MMIO(0x4024)
#define GTT_CACHE_EN_ALL 0xF0007FFF
#define GEN7_WR_WATERMARK _MMIO(0x4028)
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index f31dfacde601..a1848e806059 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -674,7 +674,8 @@ typedef struct drm_i915_irq_wait {
* If the IOCTL is successful, the returned parameter will be set to one of the
* following values:
* * 0 if HuC firmware load is not complete,
- * * 1 if HuC firmware is authenticated and running.
+ * * 1 if HuC firmware is loaded and fully authenticated,
+ * * 2 if HuC firmware is loaded and authenticated for clear media only
*/
#define I915_PARAM_HUC_STATUS 42
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread* [Intel-gfx] [PATCH v3 4/7] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
0 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: Alan Previn, dri-devel
Before we add the second step of the MTL HuC auth (via GSC), we need to
have the ability to differentiate between them. To do so, the huc
authentication check is duplicated for GuC and GSC auth, with meu
binaries being considered fully authenticated only after the GSC auth
step.
To report the difference between the 2 auth steps, a new case is added
to the HuC getparam. This way, the clear media driver can start
submitting before full auth, as partial auth is enough for those
workloads.
v2: fix authentication status check for DG2
v3: add a better comment at the top of the HuC file to explain the
different approaches to load and auth (John)
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
---
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 111 ++++++++++++++++------
drivers/gpu/drm/i915/gt/uc/intel_huc.h | 16 +++-
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 4 +-
drivers/gpu/drm/i915/i915_reg.h | 3 +
include/uapi/drm/i915_drm.h | 3 +-
5 files changed, 103 insertions(+), 34 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 37c6a8ca5c71..ab5246ae3979 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -10,6 +10,7 @@
#include "intel_huc.h"
#include "intel_huc_print.h"
#include "i915_drv.h"
+#include "i915_reg.h"
#include <linux/device/bus.h>
#include <linux/mei_aux.h>
@@ -22,15 +23,23 @@
* capabilities by adding HuC specific commands to batch buffers.
*
* The kernel driver is only responsible for loading the HuC firmware and
- * triggering its security authentication, which is performed by the GuC on
- * older platforms and by the GSC on newer ones. For the GuC to correctly
- * perform the authentication, the HuC binary must be loaded before the GuC one.
+ * triggering its security authentication. This is done differently depending
+ * on the platform:
+ * - older platforms (from Gen9 to most Gen12s): the load is performed via DMA
+ * and the authentication via GuC
+ * - DG2: load and authentication are both performed via GSC.
+ * - MTL and newer platforms: the load is performed via DMA (same as with
+ * not-DG2 older platforms), while the authentication is done in 2-steps,
+ * a first auth for clear-media workloads via GuC and a second one for all
+ * workloads via GSC.
+ * On platforms where the GuC does the authentication, to correctly do so the
+ * HuC binary must be loaded before the GuC one.
* Loading the HuC is optional; however, not using the HuC might negatively
* impact power usage and/or performance of media workloads, depending on the
* use-cases.
* HuC must be reloaded on events that cause the WOPCM to lose its contents
- * (S3/S4, FLR); GuC-authenticated HuC must also be reloaded on GuC/GT reset,
- * while GSC-managed HuC will survive that.
+ * (S3/S4, FLR); on older platforms the HuC must also be reloaded on GuC/GT
+ * reset, while on newer ones it will survive that.
*
* See https://github.com/intel/media-driver for the latest details on HuC
* functionality.
@@ -106,7 +115,7 @@ static enum hrtimer_restart huc_delayed_load_timer_callback(struct hrtimer *hrti
{
struct intel_huc *huc = container_of(hrtimer, struct intel_huc, delayed_load.timer);
- if (!intel_huc_is_authenticated(huc)) {
+ if (!intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_GSC)
huc_notice(huc, "timed out waiting for MEI GSC\n");
else if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_PXP)
@@ -124,7 +133,7 @@ static void huc_delayed_load_start(struct intel_huc *huc)
{
ktime_t delay;
- GEM_BUG_ON(intel_huc_is_authenticated(huc));
+ GEM_BUG_ON(intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC));
/*
* On resume we don't have to wait for MEI-GSC to be re-probed, but we
@@ -284,13 +293,23 @@ void intel_huc_init_early(struct intel_huc *huc)
}
if (GRAPHICS_VER(i915) >= 11) {
- huc->status.reg = GEN11_HUC_KERNEL_LOAD_INFO;
- huc->status.mask = HUC_LOAD_SUCCESSFUL;
- huc->status.value = HUC_LOAD_SUCCESSFUL;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].reg = GEN11_HUC_KERNEL_LOAD_INFO;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_LOAD_SUCCESSFUL;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_LOAD_SUCCESSFUL;
} else {
- huc->status.reg = HUC_STATUS2;
- huc->status.mask = HUC_FW_VERIFIED;
- huc->status.value = HUC_FW_VERIFIED;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].reg = HUC_STATUS2;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_FW_VERIFIED;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_FW_VERIFIED;
+ }
+
+ if (IS_DG2(i915)) {
+ huc->status[INTEL_HUC_AUTH_BY_GSC].reg = GEN11_HUC_KERNEL_LOAD_INFO;
+ huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HUC_LOAD_SUCCESSFUL;
+ huc->status[INTEL_HUC_AUTH_BY_GSC].value = HUC_LOAD_SUCCESSFUL;
+ } else {
+ huc->status[INTEL_HUC_AUTH_BY_GSC].reg = HECI_FWSTS5(MTL_GSC_HECI1_BASE);
+ huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HECI_FWSTS5_HUC_AUTH_DONE;
+ huc->status[INTEL_HUC_AUTH_BY_GSC].value = HECI_FWSTS5_HUC_AUTH_DONE;
}
}
@@ -381,28 +400,38 @@ void intel_huc_suspend(struct intel_huc *huc)
delayed_huc_load_complete(huc);
}
-int intel_huc_wait_for_auth_complete(struct intel_huc *huc)
+static const char *auth_mode_string(struct intel_huc *huc,
+ enum intel_huc_authentication_type type)
+{
+ bool partial = huc->fw.has_gsc_headers && type == INTEL_HUC_AUTH_BY_GUC;
+
+ return partial ? "clear media" : "all workloads";
+}
+
+int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
+ enum intel_huc_authentication_type type)
{
struct intel_gt *gt = huc_to_gt(huc);
int ret;
ret = __intel_wait_for_register(gt->uncore,
- huc->status.reg,
- huc->status.mask,
- huc->status.value,
+ huc->status[type].reg,
+ huc->status[type].mask,
+ huc->status[type].value,
2, 50, NULL);
/* mark the load process as complete even if the wait failed */
delayed_huc_load_complete(huc);
if (ret) {
- huc_err(huc, "firmware not verified %pe\n", ERR_PTR(ret));
+ huc_err(huc, "firmware not verified for %s: %pe\n",
+ auth_mode_string(huc, type), ERR_PTR(ret));
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_LOAD_FAIL);
return ret;
}
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
- huc_info(huc, "authenticated!\n");
+ huc_info(huc, "authenticated for %s!\n", auth_mode_string(huc, type));
return 0;
}
@@ -442,7 +471,7 @@ int intel_huc_auth(struct intel_huc *huc)
}
/* Check authentication status, it should be done by now */
- ret = intel_huc_wait_for_auth_complete(huc);
+ ret = intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GUC);
if (ret)
goto fail;
@@ -453,16 +482,29 @@ int intel_huc_auth(struct intel_huc *huc)
return ret;
}
-bool intel_huc_is_authenticated(struct intel_huc *huc)
+bool intel_huc_is_authenticated(struct intel_huc *huc,
+ enum intel_huc_authentication_type type)
{
struct intel_gt *gt = huc_to_gt(huc);
intel_wakeref_t wakeref;
u32 status = 0;
with_intel_runtime_pm(gt->uncore->rpm, wakeref)
- status = intel_uncore_read(gt->uncore, huc->status.reg);
+ status = intel_uncore_read(gt->uncore, huc->status[type].reg);
- return (status & huc->status.mask) == huc->status.value;
+ return (status & huc->status[type].mask) == huc->status[type].value;
+}
+
+static bool huc_is_fully_authenticated(struct intel_huc *huc)
+{
+ struct intel_uc_fw *huc_fw = &huc->fw;
+
+ if (!huc_fw->has_gsc_headers)
+ return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC);
+ else if (intel_huc_is_loaded_by_gsc(huc) || HAS_ENGINE(huc_to_gt(huc), GSC0))
+ return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
+ else
+ return false;
}
/**
@@ -477,7 +519,9 @@ bool intel_huc_is_authenticated(struct intel_huc *huc)
*/
int intel_huc_check_status(struct intel_huc *huc)
{
- switch (__intel_uc_fw_status(&huc->fw)) {
+ struct intel_uc_fw *huc_fw = &huc->fw;
+
+ switch (__intel_uc_fw_status(huc_fw)) {
case INTEL_UC_FIRMWARE_NOT_SUPPORTED:
return -ENODEV;
case INTEL_UC_FIRMWARE_DISABLED:
@@ -494,7 +538,17 @@ int intel_huc_check_status(struct intel_huc *huc)
break;
}
- return intel_huc_is_authenticated(huc);
+ /*
+ * meu binaries loaded by GuC are first partially authenticated by GuC
+ * and then fully authenticated by GSC
+ */
+ if (huc_is_fully_authenticated(huc))
+ return 1; /* full auth */
+ else if (huc_fw->has_gsc_headers && !intel_huc_is_loaded_by_gsc(huc) &&
+ intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC))
+ return 2; /* clear media only */
+ else
+ return 0;
}
static bool huc_has_delayed_load(struct intel_huc *huc)
@@ -508,7 +562,10 @@ void intel_huc_update_auth_status(struct intel_huc *huc)
if (!intel_uc_fw_is_loadable(&huc->fw))
return;
- if (intel_huc_is_authenticated(huc))
+ if (!huc->fw.has_gsc_headers)
+ return;
+
+ if (huc_is_fully_authenticated(huc))
intel_uc_fw_change_status(&huc->fw,
INTEL_UC_FIRMWARE_RUNNING);
else if (huc_has_delayed_load(huc))
@@ -541,5 +598,5 @@ void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p)
with_intel_runtime_pm(gt->uncore->rpm, wakeref)
drm_printf(p, "HuC status: 0x%08x\n",
- intel_uncore_read(gt->uncore, huc->status.reg));
+ intel_uncore_read(gt->uncore, huc->status[INTEL_HUC_AUTH_BY_GUC].reg));
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
index 112f0dce4702..3f6aa7c37abc 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
@@ -22,6 +22,12 @@ enum intel_huc_delayed_load_status {
INTEL_HUC_DELAYED_LOAD_ERROR,
};
+enum intel_huc_authentication_type {
+ INTEL_HUC_AUTH_BY_GUC = 0,
+ INTEL_HUC_AUTH_BY_GSC,
+ INTEL_HUC_AUTH_MAX_MODES
+};
+
struct intel_huc {
/* Generic uC firmware management */
struct intel_uc_fw fw;
@@ -31,7 +37,7 @@ struct intel_huc {
i915_reg_t reg;
u32 mask;
u32 value;
- } status;
+ } status[INTEL_HUC_AUTH_MAX_MODES];
struct {
struct i915_sw_fence fence;
@@ -49,10 +55,12 @@ int intel_huc_init(struct intel_huc *huc);
void intel_huc_fini(struct intel_huc *huc);
void intel_huc_suspend(struct intel_huc *huc);
int intel_huc_auth(struct intel_huc *huc);
-int intel_huc_wait_for_auth_complete(struct intel_huc *huc);
+int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
+ enum intel_huc_authentication_type type);
+bool intel_huc_is_authenticated(struct intel_huc *huc,
+ enum intel_huc_authentication_type type);
int intel_huc_check_status(struct intel_huc *huc);
void intel_huc_update_auth_status(struct intel_huc *huc);
-bool intel_huc_is_authenticated(struct intel_huc *huc);
void intel_huc_register_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus);
void intel_huc_unregister_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus);
@@ -81,7 +89,7 @@ static inline bool intel_huc_is_loaded_by_gsc(const struct intel_huc *huc)
static inline bool intel_huc_wait_required(struct intel_huc *huc)
{
return intel_huc_is_used(huc) && intel_huc_is_loaded_by_gsc(huc) &&
- !intel_huc_is_authenticated(huc);
+ !intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
}
void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p);
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
index 3355dc1e2bc6..d2b4176c81d6 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
@@ -160,7 +160,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
* component gets re-bound and this function called again. If so, just
* mark the HuC as loaded.
*/
- if (intel_huc_is_authenticated(huc)) {
+ if (intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
return 0;
}
@@ -173,7 +173,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_TRANSFERRED);
- return intel_huc_wait_for_auth_complete(huc);
+ return intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GSC);
}
/**
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 0523418129c5..c14433795c91 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -941,6 +941,9 @@
#define HECI_H_GS1(base) _MMIO((base) + 0xc4c)
#define HECI_H_GS1_ER_PREP REG_BIT(0)
+#define HECI_FWSTS5(base) _MMIO(base + 0xc68)
+#define HECI_FWSTS5_HUC_AUTH_DONE (1 << 19)
+
#define HSW_GTT_CACHE_EN _MMIO(0x4024)
#define GTT_CACHE_EN_ALL 0xF0007FFF
#define GEN7_WR_WATERMARK _MMIO(0x4028)
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index f31dfacde601..a1848e806059 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -674,7 +674,8 @@ typedef struct drm_i915_irq_wait {
* If the IOCTL is successful, the returned parameter will be set to one of the
* following values:
* * 0 if HuC firmware load is not complete,
- * * 1 if HuC firmware is authenticated and running.
+ * * 1 if HuC firmware is loaded and fully authenticated,
+ * * 2 if HuC firmware is loaded and authenticated for clear media only
*/
#define I915_PARAM_HUC_STATUS 42
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCH v3 4/7] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
(?)
@ 2023-05-27 5:07 ` kernel test robot
-1 siblings, 0 replies; 52+ messages in thread
From: kernel test robot @ 2023-05-27 5:07 UTC (permalink / raw)
To: Daniele Ceraolo Spurio; +Cc: oe-kbuild-all
Hi Daniele,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm-tip/drm-tip]
url: https://github.com/intel-lab-lkp/linux/commits/Daniele-Ceraolo-Spurio/drm-i915-uc-perma-pin-firmwares/20230527-085429
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
patch link: https://lore.kernel.org/r/20230527005242.1346093-5-daniele.ceraolospurio%40intel.com
patch subject: [PATCH v3 4/7] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
config: x86_64-randconfig-a001-20230526 (https://download.01.org/0day-ci/archive/20230527/202305271233.h1MUODDM-lkp@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-12) 11.3.0
reproduce (this is a W=1 build):
# https://github.com/intel-lab-lkp/linux/commit/5e7ad1c45a6cbb80d8b9f71212d410d19bbe96d9
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Daniele-Ceraolo-Spurio/drm-i915-uc-perma-pin-firmwares/20230527-085429
git checkout 5e7ad1c45a6cbb80d8b9f71212d410d19bbe96d9
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=x86_64 olddefconfig
make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202305271233.h1MUODDM-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c: In function 'intel_pxp_gsccs_is_ready_for_sessions':
>> drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c:199:13: error: too few arguments to function 'intel_huc_is_authenticated'
199 | if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc) &&
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/i915/gt/uc/intel_uc.h:14,
from drivers/gpu/drm/i915/gt/intel_gt_types.h:19,
from drivers/gpu/drm/i915/gt/intel_engine.h:18,
from drivers/gpu/drm/i915/i915_drv.h:46,
from drivers/gpu/drm/i915/gt/intel_context.h:14,
from drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c:8:
drivers/gpu/drm/i915/gt/uc/intel_huc.h:60:6: note: declared here
60 | bool intel_huc_is_authenticated(struct intel_huc *huc,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/intel_huc_is_authenticated +199 drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
dc9ac125d81faf Alan Previn 2023-05-11 188
99afb7cc8c4457 Alan Previn 2023-05-11 189 bool intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp)
99afb7cc8c4457 Alan Previn 2023-05-11 190 {
99afb7cc8c4457 Alan Previn 2023-05-11 191 /*
99afb7cc8c4457 Alan Previn 2023-05-11 192 * GSC-fw loading, HuC-fw loading, HuC-fw authentication and
99afb7cc8c4457 Alan Previn 2023-05-11 193 * GSC-proxy init flow (requiring an mei component driver)
99afb7cc8c4457 Alan Previn 2023-05-11 194 * must all occur first before we can start requesting for PXP
99afb7cc8c4457 Alan Previn 2023-05-11 195 * sessions. Checking for completion on HuC authentication and
99afb7cc8c4457 Alan Previn 2023-05-11 196 * gsc-proxy init flow (the last set of dependencies that
99afb7cc8c4457 Alan Previn 2023-05-11 197 * are out of order) will suffice.
99afb7cc8c4457 Alan Previn 2023-05-11 198 */
99afb7cc8c4457 Alan Previn 2023-05-11 @199 if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc) &&
99afb7cc8c4457 Alan Previn 2023-05-11 200 intel_gsc_uc_fw_proxy_init_done(&pxp->ctrl_gt->uc.gsc))
99afb7cc8c4457 Alan Previn 2023-05-11 201 return true;
99afb7cc8c4457 Alan Previn 2023-05-11 202
99afb7cc8c4457 Alan Previn 2023-05-11 203 return false;
99afb7cc8c4457 Alan Previn 2023-05-11 204 }
99afb7cc8c4457 Alan Previn 2023-05-11 205
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCH v3 4/7] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
(?)
(?)
@ 2023-05-27 8:59 ` kernel test robot
-1 siblings, 0 replies; 52+ messages in thread
From: kernel test robot @ 2023-05-27 8:59 UTC (permalink / raw)
To: Daniele Ceraolo Spurio; +Cc: llvm, oe-kbuild-all
Hi Daniele,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm-tip/drm-tip]
url: https://github.com/intel-lab-lkp/linux/commits/Daniele-Ceraolo-Spurio/drm-i915-uc-perma-pin-firmwares/20230527-085429
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
patch link: https://lore.kernel.org/r/20230527005242.1346093-5-daniele.ceraolospurio%40intel.com
patch subject: [PATCH v3 4/7] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
config: x86_64-randconfig-x056-20230526 (https://download.01.org/0day-ci/archive/20230527/202305271643.4lrHpkZs-lkp@intel.com/config)
compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
mkdir -p ~/bin
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/5e7ad1c45a6cbb80d8b9f71212d410d19bbe96d9
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Daniele-Ceraolo-Spurio/drm-i915-uc-perma-pin-firmwares/20230527-085429
git checkout 5e7ad1c45a6cbb80d8b9f71212d410d19bbe96d9
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=x86_64 olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202305271643.4lrHpkZs-lkp@intel.com/
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c:199:54: error: too few arguments to function call, expected 2, have 1
if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc) &&
~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
drivers/gpu/drm/i915/gt/uc/intel_huc.h:60:6: note: 'intel_huc_is_authenticated' declared here
bool intel_huc_is_authenticated(struct intel_huc *huc,
^
1 error generated.
vim +199 drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
dc9ac125d81faf Alan Previn 2023-05-11 188
99afb7cc8c4457 Alan Previn 2023-05-11 189 bool intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp)
99afb7cc8c4457 Alan Previn 2023-05-11 190 {
99afb7cc8c4457 Alan Previn 2023-05-11 191 /*
99afb7cc8c4457 Alan Previn 2023-05-11 192 * GSC-fw loading, HuC-fw loading, HuC-fw authentication and
99afb7cc8c4457 Alan Previn 2023-05-11 193 * GSC-proxy init flow (requiring an mei component driver)
99afb7cc8c4457 Alan Previn 2023-05-11 194 * must all occur first before we can start requesting for PXP
99afb7cc8c4457 Alan Previn 2023-05-11 195 * sessions. Checking for completion on HuC authentication and
99afb7cc8c4457 Alan Previn 2023-05-11 196 * gsc-proxy init flow (the last set of dependencies that
99afb7cc8c4457 Alan Previn 2023-05-11 197 * are out of order) will suffice.
99afb7cc8c4457 Alan Previn 2023-05-11 198 */
99afb7cc8c4457 Alan Previn 2023-05-11 @199 if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc) &&
99afb7cc8c4457 Alan Previn 2023-05-11 200 intel_gsc_uc_fw_proxy_init_done(&pxp->ctrl_gt->uc.gsc))
99afb7cc8c4457 Alan Previn 2023-05-11 201 return true;
99afb7cc8c4457 Alan Previn 2023-05-11 202
99afb7cc8c4457 Alan Previn 2023-05-11 203 return false;
99afb7cc8c4457 Alan Previn 2023-05-11 204 }
99afb7cc8c4457 Alan Previn 2023-05-11 205
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 52+ messages in thread* [PATCH v4] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
@ 2023-05-30 15:29 ` Daniele Ceraolo Spurio
-1 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-30 15:29 UTC (permalink / raw)
To: intel-gfx; +Cc: John Harrison, Daniele Ceraolo Spurio, Alan Previn, dri-devel
Before we add the second step of the MTL HuC auth (via GSC), we need to
have the ability to differentiate between them. To do so, the huc
authentication check is duplicated for GuC and GSC auth, with meu
binaries being considered fully authenticated only after the GSC auth
step.
To report the difference between the 2 auth steps, a new case is added
to the HuC getparam. This way, the clear media driver can start
submitting before full auth, as partial auth is enough for those
workloads.
v2: fix authentication status check for DG2
v3: add a better comment at the top of the HuC file to explain the
different approaches to load and auth (John)
v4: update call to intel_huc_is_authenticated in the pxp code to check
for GSC authentication
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
---
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 111 ++++++++++++++++-----
drivers/gpu/drm/i915/gt/uc/intel_huc.h | 16 ++-
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 4 +-
drivers/gpu/drm/i915/i915_reg.h | 3 +
drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 2 +-
include/uapi/drm/i915_drm.h | 3 +-
6 files changed, 104 insertions(+), 35 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 37c6a8ca5c71..ab5246ae3979 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -10,6 +10,7 @@
#include "intel_huc.h"
#include "intel_huc_print.h"
#include "i915_drv.h"
+#include "i915_reg.h"
#include <linux/device/bus.h>
#include <linux/mei_aux.h>
@@ -22,15 +23,23 @@
* capabilities by adding HuC specific commands to batch buffers.
*
* The kernel driver is only responsible for loading the HuC firmware and
- * triggering its security authentication, which is performed by the GuC on
- * older platforms and by the GSC on newer ones. For the GuC to correctly
- * perform the authentication, the HuC binary must be loaded before the GuC one.
+ * triggering its security authentication. This is done differently depending
+ * on the platform:
+ * - older platforms (from Gen9 to most Gen12s): the load is performed via DMA
+ * and the authentication via GuC
+ * - DG2: load and authentication are both performed via GSC.
+ * - MTL and newer platforms: the load is performed via DMA (same as with
+ * not-DG2 older platforms), while the authentication is done in 2-steps,
+ * a first auth for clear-media workloads via GuC and a second one for all
+ * workloads via GSC.
+ * On platforms where the GuC does the authentication, to correctly do so the
+ * HuC binary must be loaded before the GuC one.
* Loading the HuC is optional; however, not using the HuC might negatively
* impact power usage and/or performance of media workloads, depending on the
* use-cases.
* HuC must be reloaded on events that cause the WOPCM to lose its contents
- * (S3/S4, FLR); GuC-authenticated HuC must also be reloaded on GuC/GT reset,
- * while GSC-managed HuC will survive that.
+ * (S3/S4, FLR); on older platforms the HuC must also be reloaded on GuC/GT
+ * reset, while on newer ones it will survive that.
*
* See https://github.com/intel/media-driver for the latest details on HuC
* functionality.
@@ -106,7 +115,7 @@ static enum hrtimer_restart huc_delayed_load_timer_callback(struct hrtimer *hrti
{
struct intel_huc *huc = container_of(hrtimer, struct intel_huc, delayed_load.timer);
- if (!intel_huc_is_authenticated(huc)) {
+ if (!intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_GSC)
huc_notice(huc, "timed out waiting for MEI GSC\n");
else if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_PXP)
@@ -124,7 +133,7 @@ static void huc_delayed_load_start(struct intel_huc *huc)
{
ktime_t delay;
- GEM_BUG_ON(intel_huc_is_authenticated(huc));
+ GEM_BUG_ON(intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC));
/*
* On resume we don't have to wait for MEI-GSC to be re-probed, but we
@@ -284,13 +293,23 @@ void intel_huc_init_early(struct intel_huc *huc)
}
if (GRAPHICS_VER(i915) >= 11) {
- huc->status.reg = GEN11_HUC_KERNEL_LOAD_INFO;
- huc->status.mask = HUC_LOAD_SUCCESSFUL;
- huc->status.value = HUC_LOAD_SUCCESSFUL;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].reg = GEN11_HUC_KERNEL_LOAD_INFO;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_LOAD_SUCCESSFUL;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_LOAD_SUCCESSFUL;
} else {
- huc->status.reg = HUC_STATUS2;
- huc->status.mask = HUC_FW_VERIFIED;
- huc->status.value = HUC_FW_VERIFIED;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].reg = HUC_STATUS2;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_FW_VERIFIED;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_FW_VERIFIED;
+ }
+
+ if (IS_DG2(i915)) {
+ huc->status[INTEL_HUC_AUTH_BY_GSC].reg = GEN11_HUC_KERNEL_LOAD_INFO;
+ huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HUC_LOAD_SUCCESSFUL;
+ huc->status[INTEL_HUC_AUTH_BY_GSC].value = HUC_LOAD_SUCCESSFUL;
+ } else {
+ huc->status[INTEL_HUC_AUTH_BY_GSC].reg = HECI_FWSTS5(MTL_GSC_HECI1_BASE);
+ huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HECI_FWSTS5_HUC_AUTH_DONE;
+ huc->status[INTEL_HUC_AUTH_BY_GSC].value = HECI_FWSTS5_HUC_AUTH_DONE;
}
}
@@ -381,28 +400,38 @@ void intel_huc_suspend(struct intel_huc *huc)
delayed_huc_load_complete(huc);
}
-int intel_huc_wait_for_auth_complete(struct intel_huc *huc)
+static const char *auth_mode_string(struct intel_huc *huc,
+ enum intel_huc_authentication_type type)
+{
+ bool partial = huc->fw.has_gsc_headers && type == INTEL_HUC_AUTH_BY_GUC;
+
+ return partial ? "clear media" : "all workloads";
+}
+
+int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
+ enum intel_huc_authentication_type type)
{
struct intel_gt *gt = huc_to_gt(huc);
int ret;
ret = __intel_wait_for_register(gt->uncore,
- huc->status.reg,
- huc->status.mask,
- huc->status.value,
+ huc->status[type].reg,
+ huc->status[type].mask,
+ huc->status[type].value,
2, 50, NULL);
/* mark the load process as complete even if the wait failed */
delayed_huc_load_complete(huc);
if (ret) {
- huc_err(huc, "firmware not verified %pe\n", ERR_PTR(ret));
+ huc_err(huc, "firmware not verified for %s: %pe\n",
+ auth_mode_string(huc, type), ERR_PTR(ret));
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_LOAD_FAIL);
return ret;
}
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
- huc_info(huc, "authenticated!\n");
+ huc_info(huc, "authenticated for %s!\n", auth_mode_string(huc, type));
return 0;
}
@@ -442,7 +471,7 @@ int intel_huc_auth(struct intel_huc *huc)
}
/* Check authentication status, it should be done by now */
- ret = intel_huc_wait_for_auth_complete(huc);
+ ret = intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GUC);
if (ret)
goto fail;
@@ -453,16 +482,29 @@ int intel_huc_auth(struct intel_huc *huc)
return ret;
}
-bool intel_huc_is_authenticated(struct intel_huc *huc)
+bool intel_huc_is_authenticated(struct intel_huc *huc,
+ enum intel_huc_authentication_type type)
{
struct intel_gt *gt = huc_to_gt(huc);
intel_wakeref_t wakeref;
u32 status = 0;
with_intel_runtime_pm(gt->uncore->rpm, wakeref)
- status = intel_uncore_read(gt->uncore, huc->status.reg);
+ status = intel_uncore_read(gt->uncore, huc->status[type].reg);
- return (status & huc->status.mask) == huc->status.value;
+ return (status & huc->status[type].mask) == huc->status[type].value;
+}
+
+static bool huc_is_fully_authenticated(struct intel_huc *huc)
+{
+ struct intel_uc_fw *huc_fw = &huc->fw;
+
+ if (!huc_fw->has_gsc_headers)
+ return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC);
+ else if (intel_huc_is_loaded_by_gsc(huc) || HAS_ENGINE(huc_to_gt(huc), GSC0))
+ return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
+ else
+ return false;
}
/**
@@ -477,7 +519,9 @@ bool intel_huc_is_authenticated(struct intel_huc *huc)
*/
int intel_huc_check_status(struct intel_huc *huc)
{
- switch (__intel_uc_fw_status(&huc->fw)) {
+ struct intel_uc_fw *huc_fw = &huc->fw;
+
+ switch (__intel_uc_fw_status(huc_fw)) {
case INTEL_UC_FIRMWARE_NOT_SUPPORTED:
return -ENODEV;
case INTEL_UC_FIRMWARE_DISABLED:
@@ -494,7 +538,17 @@ int intel_huc_check_status(struct intel_huc *huc)
break;
}
- return intel_huc_is_authenticated(huc);
+ /*
+ * meu binaries loaded by GuC are first partially authenticated by GuC
+ * and then fully authenticated by GSC
+ */
+ if (huc_is_fully_authenticated(huc))
+ return 1; /* full auth */
+ else if (huc_fw->has_gsc_headers && !intel_huc_is_loaded_by_gsc(huc) &&
+ intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC))
+ return 2; /* clear media only */
+ else
+ return 0;
}
static bool huc_has_delayed_load(struct intel_huc *huc)
@@ -508,7 +562,10 @@ void intel_huc_update_auth_status(struct intel_huc *huc)
if (!intel_uc_fw_is_loadable(&huc->fw))
return;
- if (intel_huc_is_authenticated(huc))
+ if (!huc->fw.has_gsc_headers)
+ return;
+
+ if (huc_is_fully_authenticated(huc))
intel_uc_fw_change_status(&huc->fw,
INTEL_UC_FIRMWARE_RUNNING);
else if (huc_has_delayed_load(huc))
@@ -541,5 +598,5 @@ void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p)
with_intel_runtime_pm(gt->uncore->rpm, wakeref)
drm_printf(p, "HuC status: 0x%08x\n",
- intel_uncore_read(gt->uncore, huc->status.reg));
+ intel_uncore_read(gt->uncore, huc->status[INTEL_HUC_AUTH_BY_GUC].reg));
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
index 112f0dce4702..3f6aa7c37abc 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
@@ -22,6 +22,12 @@ enum intel_huc_delayed_load_status {
INTEL_HUC_DELAYED_LOAD_ERROR,
};
+enum intel_huc_authentication_type {
+ INTEL_HUC_AUTH_BY_GUC = 0,
+ INTEL_HUC_AUTH_BY_GSC,
+ INTEL_HUC_AUTH_MAX_MODES
+};
+
struct intel_huc {
/* Generic uC firmware management */
struct intel_uc_fw fw;
@@ -31,7 +37,7 @@ struct intel_huc {
i915_reg_t reg;
u32 mask;
u32 value;
- } status;
+ } status[INTEL_HUC_AUTH_MAX_MODES];
struct {
struct i915_sw_fence fence;
@@ -49,10 +55,12 @@ int intel_huc_init(struct intel_huc *huc);
void intel_huc_fini(struct intel_huc *huc);
void intel_huc_suspend(struct intel_huc *huc);
int intel_huc_auth(struct intel_huc *huc);
-int intel_huc_wait_for_auth_complete(struct intel_huc *huc);
+int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
+ enum intel_huc_authentication_type type);
+bool intel_huc_is_authenticated(struct intel_huc *huc,
+ enum intel_huc_authentication_type type);
int intel_huc_check_status(struct intel_huc *huc);
void intel_huc_update_auth_status(struct intel_huc *huc);
-bool intel_huc_is_authenticated(struct intel_huc *huc);
void intel_huc_register_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus);
void intel_huc_unregister_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus);
@@ -81,7 +89,7 @@ static inline bool intel_huc_is_loaded_by_gsc(const struct intel_huc *huc)
static inline bool intel_huc_wait_required(struct intel_huc *huc)
{
return intel_huc_is_used(huc) && intel_huc_is_loaded_by_gsc(huc) &&
- !intel_huc_is_authenticated(huc);
+ !intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
}
void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p);
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
index 3355dc1e2bc6..d2b4176c81d6 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
@@ -160,7 +160,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
* component gets re-bound and this function called again. If so, just
* mark the HuC as loaded.
*/
- if (intel_huc_is_authenticated(huc)) {
+ if (intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
return 0;
}
@@ -173,7 +173,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_TRANSFERRED);
- return intel_huc_wait_for_auth_complete(huc);
+ return intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GSC);
}
/**
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 0523418129c5..c14433795c91 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -941,6 +941,9 @@
#define HECI_H_GS1(base) _MMIO((base) + 0xc4c)
#define HECI_H_GS1_ER_PREP REG_BIT(0)
+#define HECI_FWSTS5(base) _MMIO(base + 0xc68)
+#define HECI_FWSTS5_HUC_AUTH_DONE (1 << 19)
+
#define HSW_GTT_CACHE_EN _MMIO(0x4024)
#define GTT_CACHE_EN_ALL 0xF0007FFF
#define GEN7_WR_WATERMARK _MMIO(0x4028)
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
index 8dc41de3f6f7..016bd8fad89d 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
@@ -196,7 +196,7 @@ bool intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp)
* gsc-proxy init flow (the last set of dependencies that
* are out of order) will suffice.
*/
- if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc) &&
+ if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc, INTEL_HUC_AUTH_BY_GSC) &&
intel_gsc_uc_fw_proxy_init_done(&pxp->ctrl_gt->uc.gsc))
return true;
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index f31dfacde601..a1848e806059 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -674,7 +674,8 @@ typedef struct drm_i915_irq_wait {
* If the IOCTL is successful, the returned parameter will be set to one of the
* following values:
* * 0 if HuC firmware load is not complete,
- * * 1 if HuC firmware is authenticated and running.
+ * * 1 if HuC firmware is loaded and fully authenticated,
+ * * 2 if HuC firmware is loaded and authenticated for clear media only
*/
#define I915_PARAM_HUC_STATUS 42
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread* [Intel-gfx] [PATCH v4] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
@ 2023-05-30 15:29 ` Daniele Ceraolo Spurio
0 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-30 15:29 UTC (permalink / raw)
To: intel-gfx; +Cc: Alan Previn, dri-devel
Before we add the second step of the MTL HuC auth (via GSC), we need to
have the ability to differentiate between them. To do so, the huc
authentication check is duplicated for GuC and GSC auth, with meu
binaries being considered fully authenticated only after the GSC auth
step.
To report the difference between the 2 auth steps, a new case is added
to the HuC getparam. This way, the clear media driver can start
submitting before full auth, as partial auth is enough for those
workloads.
v2: fix authentication status check for DG2
v3: add a better comment at the top of the HuC file to explain the
different approaches to load and auth (John)
v4: update call to intel_huc_is_authenticated in the pxp code to check
for GSC authentication
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
---
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 111 ++++++++++++++++-----
drivers/gpu/drm/i915/gt/uc/intel_huc.h | 16 ++-
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 4 +-
drivers/gpu/drm/i915/i915_reg.h | 3 +
drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 2 +-
include/uapi/drm/i915_drm.h | 3 +-
6 files changed, 104 insertions(+), 35 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 37c6a8ca5c71..ab5246ae3979 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -10,6 +10,7 @@
#include "intel_huc.h"
#include "intel_huc_print.h"
#include "i915_drv.h"
+#include "i915_reg.h"
#include <linux/device/bus.h>
#include <linux/mei_aux.h>
@@ -22,15 +23,23 @@
* capabilities by adding HuC specific commands to batch buffers.
*
* The kernel driver is only responsible for loading the HuC firmware and
- * triggering its security authentication, which is performed by the GuC on
- * older platforms and by the GSC on newer ones. For the GuC to correctly
- * perform the authentication, the HuC binary must be loaded before the GuC one.
+ * triggering its security authentication. This is done differently depending
+ * on the platform:
+ * - older platforms (from Gen9 to most Gen12s): the load is performed via DMA
+ * and the authentication via GuC
+ * - DG2: load and authentication are both performed via GSC.
+ * - MTL and newer platforms: the load is performed via DMA (same as with
+ * not-DG2 older platforms), while the authentication is done in 2-steps,
+ * a first auth for clear-media workloads via GuC and a second one for all
+ * workloads via GSC.
+ * On platforms where the GuC does the authentication, to correctly do so the
+ * HuC binary must be loaded before the GuC one.
* Loading the HuC is optional; however, not using the HuC might negatively
* impact power usage and/or performance of media workloads, depending on the
* use-cases.
* HuC must be reloaded on events that cause the WOPCM to lose its contents
- * (S3/S4, FLR); GuC-authenticated HuC must also be reloaded on GuC/GT reset,
- * while GSC-managed HuC will survive that.
+ * (S3/S4, FLR); on older platforms the HuC must also be reloaded on GuC/GT
+ * reset, while on newer ones it will survive that.
*
* See https://github.com/intel/media-driver for the latest details on HuC
* functionality.
@@ -106,7 +115,7 @@ static enum hrtimer_restart huc_delayed_load_timer_callback(struct hrtimer *hrti
{
struct intel_huc *huc = container_of(hrtimer, struct intel_huc, delayed_load.timer);
- if (!intel_huc_is_authenticated(huc)) {
+ if (!intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_GSC)
huc_notice(huc, "timed out waiting for MEI GSC\n");
else if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_PXP)
@@ -124,7 +133,7 @@ static void huc_delayed_load_start(struct intel_huc *huc)
{
ktime_t delay;
- GEM_BUG_ON(intel_huc_is_authenticated(huc));
+ GEM_BUG_ON(intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC));
/*
* On resume we don't have to wait for MEI-GSC to be re-probed, but we
@@ -284,13 +293,23 @@ void intel_huc_init_early(struct intel_huc *huc)
}
if (GRAPHICS_VER(i915) >= 11) {
- huc->status.reg = GEN11_HUC_KERNEL_LOAD_INFO;
- huc->status.mask = HUC_LOAD_SUCCESSFUL;
- huc->status.value = HUC_LOAD_SUCCESSFUL;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].reg = GEN11_HUC_KERNEL_LOAD_INFO;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_LOAD_SUCCESSFUL;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_LOAD_SUCCESSFUL;
} else {
- huc->status.reg = HUC_STATUS2;
- huc->status.mask = HUC_FW_VERIFIED;
- huc->status.value = HUC_FW_VERIFIED;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].reg = HUC_STATUS2;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_FW_VERIFIED;
+ huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_FW_VERIFIED;
+ }
+
+ if (IS_DG2(i915)) {
+ huc->status[INTEL_HUC_AUTH_BY_GSC].reg = GEN11_HUC_KERNEL_LOAD_INFO;
+ huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HUC_LOAD_SUCCESSFUL;
+ huc->status[INTEL_HUC_AUTH_BY_GSC].value = HUC_LOAD_SUCCESSFUL;
+ } else {
+ huc->status[INTEL_HUC_AUTH_BY_GSC].reg = HECI_FWSTS5(MTL_GSC_HECI1_BASE);
+ huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HECI_FWSTS5_HUC_AUTH_DONE;
+ huc->status[INTEL_HUC_AUTH_BY_GSC].value = HECI_FWSTS5_HUC_AUTH_DONE;
}
}
@@ -381,28 +400,38 @@ void intel_huc_suspend(struct intel_huc *huc)
delayed_huc_load_complete(huc);
}
-int intel_huc_wait_for_auth_complete(struct intel_huc *huc)
+static const char *auth_mode_string(struct intel_huc *huc,
+ enum intel_huc_authentication_type type)
+{
+ bool partial = huc->fw.has_gsc_headers && type == INTEL_HUC_AUTH_BY_GUC;
+
+ return partial ? "clear media" : "all workloads";
+}
+
+int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
+ enum intel_huc_authentication_type type)
{
struct intel_gt *gt = huc_to_gt(huc);
int ret;
ret = __intel_wait_for_register(gt->uncore,
- huc->status.reg,
- huc->status.mask,
- huc->status.value,
+ huc->status[type].reg,
+ huc->status[type].mask,
+ huc->status[type].value,
2, 50, NULL);
/* mark the load process as complete even if the wait failed */
delayed_huc_load_complete(huc);
if (ret) {
- huc_err(huc, "firmware not verified %pe\n", ERR_PTR(ret));
+ huc_err(huc, "firmware not verified for %s: %pe\n",
+ auth_mode_string(huc, type), ERR_PTR(ret));
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_LOAD_FAIL);
return ret;
}
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
- huc_info(huc, "authenticated!\n");
+ huc_info(huc, "authenticated for %s!\n", auth_mode_string(huc, type));
return 0;
}
@@ -442,7 +471,7 @@ int intel_huc_auth(struct intel_huc *huc)
}
/* Check authentication status, it should be done by now */
- ret = intel_huc_wait_for_auth_complete(huc);
+ ret = intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GUC);
if (ret)
goto fail;
@@ -453,16 +482,29 @@ int intel_huc_auth(struct intel_huc *huc)
return ret;
}
-bool intel_huc_is_authenticated(struct intel_huc *huc)
+bool intel_huc_is_authenticated(struct intel_huc *huc,
+ enum intel_huc_authentication_type type)
{
struct intel_gt *gt = huc_to_gt(huc);
intel_wakeref_t wakeref;
u32 status = 0;
with_intel_runtime_pm(gt->uncore->rpm, wakeref)
- status = intel_uncore_read(gt->uncore, huc->status.reg);
+ status = intel_uncore_read(gt->uncore, huc->status[type].reg);
- return (status & huc->status.mask) == huc->status.value;
+ return (status & huc->status[type].mask) == huc->status[type].value;
+}
+
+static bool huc_is_fully_authenticated(struct intel_huc *huc)
+{
+ struct intel_uc_fw *huc_fw = &huc->fw;
+
+ if (!huc_fw->has_gsc_headers)
+ return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC);
+ else if (intel_huc_is_loaded_by_gsc(huc) || HAS_ENGINE(huc_to_gt(huc), GSC0))
+ return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
+ else
+ return false;
}
/**
@@ -477,7 +519,9 @@ bool intel_huc_is_authenticated(struct intel_huc *huc)
*/
int intel_huc_check_status(struct intel_huc *huc)
{
- switch (__intel_uc_fw_status(&huc->fw)) {
+ struct intel_uc_fw *huc_fw = &huc->fw;
+
+ switch (__intel_uc_fw_status(huc_fw)) {
case INTEL_UC_FIRMWARE_NOT_SUPPORTED:
return -ENODEV;
case INTEL_UC_FIRMWARE_DISABLED:
@@ -494,7 +538,17 @@ int intel_huc_check_status(struct intel_huc *huc)
break;
}
- return intel_huc_is_authenticated(huc);
+ /*
+ * meu binaries loaded by GuC are first partially authenticated by GuC
+ * and then fully authenticated by GSC
+ */
+ if (huc_is_fully_authenticated(huc))
+ return 1; /* full auth */
+ else if (huc_fw->has_gsc_headers && !intel_huc_is_loaded_by_gsc(huc) &&
+ intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC))
+ return 2; /* clear media only */
+ else
+ return 0;
}
static bool huc_has_delayed_load(struct intel_huc *huc)
@@ -508,7 +562,10 @@ void intel_huc_update_auth_status(struct intel_huc *huc)
if (!intel_uc_fw_is_loadable(&huc->fw))
return;
- if (intel_huc_is_authenticated(huc))
+ if (!huc->fw.has_gsc_headers)
+ return;
+
+ if (huc_is_fully_authenticated(huc))
intel_uc_fw_change_status(&huc->fw,
INTEL_UC_FIRMWARE_RUNNING);
else if (huc_has_delayed_load(huc))
@@ -541,5 +598,5 @@ void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p)
with_intel_runtime_pm(gt->uncore->rpm, wakeref)
drm_printf(p, "HuC status: 0x%08x\n",
- intel_uncore_read(gt->uncore, huc->status.reg));
+ intel_uncore_read(gt->uncore, huc->status[INTEL_HUC_AUTH_BY_GUC].reg));
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
index 112f0dce4702..3f6aa7c37abc 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
@@ -22,6 +22,12 @@ enum intel_huc_delayed_load_status {
INTEL_HUC_DELAYED_LOAD_ERROR,
};
+enum intel_huc_authentication_type {
+ INTEL_HUC_AUTH_BY_GUC = 0,
+ INTEL_HUC_AUTH_BY_GSC,
+ INTEL_HUC_AUTH_MAX_MODES
+};
+
struct intel_huc {
/* Generic uC firmware management */
struct intel_uc_fw fw;
@@ -31,7 +37,7 @@ struct intel_huc {
i915_reg_t reg;
u32 mask;
u32 value;
- } status;
+ } status[INTEL_HUC_AUTH_MAX_MODES];
struct {
struct i915_sw_fence fence;
@@ -49,10 +55,12 @@ int intel_huc_init(struct intel_huc *huc);
void intel_huc_fini(struct intel_huc *huc);
void intel_huc_suspend(struct intel_huc *huc);
int intel_huc_auth(struct intel_huc *huc);
-int intel_huc_wait_for_auth_complete(struct intel_huc *huc);
+int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
+ enum intel_huc_authentication_type type);
+bool intel_huc_is_authenticated(struct intel_huc *huc,
+ enum intel_huc_authentication_type type);
int intel_huc_check_status(struct intel_huc *huc);
void intel_huc_update_auth_status(struct intel_huc *huc);
-bool intel_huc_is_authenticated(struct intel_huc *huc);
void intel_huc_register_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus);
void intel_huc_unregister_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus);
@@ -81,7 +89,7 @@ static inline bool intel_huc_is_loaded_by_gsc(const struct intel_huc *huc)
static inline bool intel_huc_wait_required(struct intel_huc *huc)
{
return intel_huc_is_used(huc) && intel_huc_is_loaded_by_gsc(huc) &&
- !intel_huc_is_authenticated(huc);
+ !intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
}
void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p);
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
index 3355dc1e2bc6..d2b4176c81d6 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
@@ -160,7 +160,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
* component gets re-bound and this function called again. If so, just
* mark the HuC as loaded.
*/
- if (intel_huc_is_authenticated(huc)) {
+ if (intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
return 0;
}
@@ -173,7 +173,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_TRANSFERRED);
- return intel_huc_wait_for_auth_complete(huc);
+ return intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GSC);
}
/**
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 0523418129c5..c14433795c91 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -941,6 +941,9 @@
#define HECI_H_GS1(base) _MMIO((base) + 0xc4c)
#define HECI_H_GS1_ER_PREP REG_BIT(0)
+#define HECI_FWSTS5(base) _MMIO(base + 0xc68)
+#define HECI_FWSTS5_HUC_AUTH_DONE (1 << 19)
+
#define HSW_GTT_CACHE_EN _MMIO(0x4024)
#define GTT_CACHE_EN_ALL 0xF0007FFF
#define GEN7_WR_WATERMARK _MMIO(0x4028)
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
index 8dc41de3f6f7..016bd8fad89d 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
@@ -196,7 +196,7 @@ bool intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp)
* gsc-proxy init flow (the last set of dependencies that
* are out of order) will suffice.
*/
- if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc) &&
+ if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc, INTEL_HUC_AUTH_BY_GSC) &&
intel_gsc_uc_fw_proxy_init_done(&pxp->ctrl_gt->uc.gsc))
return true;
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index f31dfacde601..a1848e806059 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -674,7 +674,8 @@ typedef struct drm_i915_irq_wait {
* If the IOCTL is successful, the returned parameter will be set to one of the
* following values:
* * 0 if HuC firmware load is not complete,
- * * 1 if HuC firmware is authenticated and running.
+ * * 1 if HuC firmware is loaded and fully authenticated,
+ * * 2 if HuC firmware is loaded and authenticated for clear media only
*/
#define I915_PARAM_HUC_STATUS 42
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCH v4] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
2023-05-30 15:29 ` [Intel-gfx] " Daniele Ceraolo Spurio
@ 2023-05-31 0:01 ` John Harrison
-1 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-31 0:01 UTC (permalink / raw)
To: Daniele Ceraolo Spurio, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 08:29, Daniele Ceraolo Spurio wrote:
> Before we add the second step of the MTL HuC auth (via GSC), we need to
> have the ability to differentiate between them. To do so, the huc
> authentication check is duplicated for GuC and GSC auth, with meu
meu?
> binaries being considered fully authenticated only after the GSC auth
> step.
>
> To report the difference between the 2 auth steps, a new case is added
> to the HuC getparam. This way, the clear media driver can start
> submitting before full auth, as partial auth is enough for those
> workloads.
>
> v2: fix authentication status check for DG2
>
> v3: add a better comment at the top of the HuC file to explain the
> different approaches to load and auth (John)
>
> v4: update call to intel_huc_is_authenticated in the pxp code to check
> for GSC authentication
>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
> Cc: John Harrison <John.C.Harrison@Intel.com>
> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
> ---
> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 111 ++++++++++++++++-----
> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 16 ++-
> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 4 +-
> drivers/gpu/drm/i915/i915_reg.h | 3 +
> drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 2 +-
> include/uapi/drm/i915_drm.h | 3 +-
> 6 files changed, 104 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> index 37c6a8ca5c71..ab5246ae3979 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> @@ -10,6 +10,7 @@
> #include "intel_huc.h"
> #include "intel_huc_print.h"
> #include "i915_drv.h"
> +#include "i915_reg.h"
>
> #include <linux/device/bus.h>
> #include <linux/mei_aux.h>
> @@ -22,15 +23,23 @@
> * capabilities by adding HuC specific commands to batch buffers.
> *
> * The kernel driver is only responsible for loading the HuC firmware and
> - * triggering its security authentication, which is performed by the GuC on
> - * older platforms and by the GSC on newer ones. For the GuC to correctly
> - * perform the authentication, the HuC binary must be loaded before the GuC one.
> + * triggering its security authentication. This is done differently depending
> + * on the platform:
> + * - older platforms (from Gen9 to most Gen12s): the load is performed via DMA
> + * and the authentication via GuC
> + * - DG2: load and authentication are both performed via GSC.
> + * - MTL and newer platforms: the load is performed via DMA (same as with
> + * not-DG2 older platforms), while the authentication is done in 2-steps,
> + * a first auth for clear-media workloads via GuC and a second one for all
> + * workloads via GSC.
> + * On platforms where the GuC does the authentication, to correctly do so the
> + * HuC binary must be loaded before the GuC one.
> * Loading the HuC is optional; however, not using the HuC might negatively
> * impact power usage and/or performance of media workloads, depending on the
> * use-cases.
> * HuC must be reloaded on events that cause the WOPCM to lose its contents
> - * (S3/S4, FLR); GuC-authenticated HuC must also be reloaded on GuC/GT reset,
> - * while GSC-managed HuC will survive that.
> + * (S3/S4, FLR); on older platforms the HuC must also be reloaded on GuC/GT
> + * reset, while on newer ones it will survive that.
> *
> * See https://github.com/intel/media-driver for the latest details on HuC
> * functionality.
> @@ -106,7 +115,7 @@ static enum hrtimer_restart huc_delayed_load_timer_callback(struct hrtimer *hrti
> {
> struct intel_huc *huc = container_of(hrtimer, struct intel_huc, delayed_load.timer);
>
> - if (!intel_huc_is_authenticated(huc)) {
> + if (!intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
> if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_GSC)
> huc_notice(huc, "timed out waiting for MEI GSC\n");
> else if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_PXP)
> @@ -124,7 +133,7 @@ static void huc_delayed_load_start(struct intel_huc *huc)
> {
> ktime_t delay;
>
> - GEM_BUG_ON(intel_huc_is_authenticated(huc));
> + GEM_BUG_ON(intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC));
>
> /*
> * On resume we don't have to wait for MEI-GSC to be re-probed, but we
> @@ -284,13 +293,23 @@ void intel_huc_init_early(struct intel_huc *huc)
> }
>
> if (GRAPHICS_VER(i915) >= 11) {
> - huc->status.reg = GEN11_HUC_KERNEL_LOAD_INFO;
> - huc->status.mask = HUC_LOAD_SUCCESSFUL;
> - huc->status.value = HUC_LOAD_SUCCESSFUL;
> + huc->status[INTEL_HUC_AUTH_BY_GUC].reg = GEN11_HUC_KERNEL_LOAD_INFO;
> + huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_LOAD_SUCCESSFUL;
> + huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_LOAD_SUCCESSFUL;
> } else {
> - huc->status.reg = HUC_STATUS2;
> - huc->status.mask = HUC_FW_VERIFIED;
> - huc->status.value = HUC_FW_VERIFIED;
> + huc->status[INTEL_HUC_AUTH_BY_GUC].reg = HUC_STATUS2;
> + huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_FW_VERIFIED;
> + huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_FW_VERIFIED;
> + }
> +
> + if (IS_DG2(i915)) {
> + huc->status[INTEL_HUC_AUTH_BY_GSC].reg = GEN11_HUC_KERNEL_LOAD_INFO;
> + huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HUC_LOAD_SUCCESSFUL;
> + huc->status[INTEL_HUC_AUTH_BY_GSC].value = HUC_LOAD_SUCCESSFUL;
> + } else {
> + huc->status[INTEL_HUC_AUTH_BY_GSC].reg = HECI_FWSTS5(MTL_GSC_HECI1_BASE);
> + huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HECI_FWSTS5_HUC_AUTH_DONE;
> + huc->status[INTEL_HUC_AUTH_BY_GSC].value = HECI_FWSTS5_HUC_AUTH_DONE;
> }
> }
>
> @@ -381,28 +400,38 @@ void intel_huc_suspend(struct intel_huc *huc)
> delayed_huc_load_complete(huc);
> }
>
> -int intel_huc_wait_for_auth_complete(struct intel_huc *huc)
> +static const char *auth_mode_string(struct intel_huc *huc,
> + enum intel_huc_authentication_type type)
> +{
> + bool partial = huc->fw.has_gsc_headers && type == INTEL_HUC_AUTH_BY_GUC;
> +
> + return partial ? "clear media" : "all workloads";
> +}
> +
> +int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
> + enum intel_huc_authentication_type type)
> {
> struct intel_gt *gt = huc_to_gt(huc);
> int ret;
>
> ret = __intel_wait_for_register(gt->uncore,
> - huc->status.reg,
> - huc->status.mask,
> - huc->status.value,
> + huc->status[type].reg,
> + huc->status[type].mask,
> + huc->status[type].value,
> 2, 50, NULL);
>
> /* mark the load process as complete even if the wait failed */
> delayed_huc_load_complete(huc);
>
> if (ret) {
> - huc_err(huc, "firmware not verified %pe\n", ERR_PTR(ret));
> + huc_err(huc, "firmware not verified for %s: %pe\n",
> + auth_mode_string(huc, type), ERR_PTR(ret));
> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_LOAD_FAIL);
> return ret;
> }
>
> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
> - huc_info(huc, "authenticated!\n");
> + huc_info(huc, "authenticated for %s!\n", auth_mode_string(huc, type));
Not a blocker but should this have an exclamation? It sort of implies
the authentication is unexpected.
> return 0;
> }
>
> @@ -442,7 +471,7 @@ int intel_huc_auth(struct intel_huc *huc)
> }
>
> /* Check authentication status, it should be done by now */
> - ret = intel_huc_wait_for_auth_complete(huc);
> + ret = intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GUC);
> if (ret)
> goto fail;
>
> @@ -453,16 +482,29 @@ int intel_huc_auth(struct intel_huc *huc)
> return ret;
> }
>
> -bool intel_huc_is_authenticated(struct intel_huc *huc)
> +bool intel_huc_is_authenticated(struct intel_huc *huc,
> + enum intel_huc_authentication_type type)
> {
> struct intel_gt *gt = huc_to_gt(huc);
> intel_wakeref_t wakeref;
> u32 status = 0;
>
> with_intel_runtime_pm(gt->uncore->rpm, wakeref)
> - status = intel_uncore_read(gt->uncore, huc->status.reg);
> + status = intel_uncore_read(gt->uncore, huc->status[type].reg);
>
> - return (status & huc->status.mask) == huc->status.value;
> + return (status & huc->status[type].mask) == huc->status[type].value;
> +}
> +
> +static bool huc_is_fully_authenticated(struct intel_huc *huc)
> +{
> + struct intel_uc_fw *huc_fw = &huc->fw;
> +
> + if (!huc_fw->has_gsc_headers)
> + return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC);
> + else if (intel_huc_is_loaded_by_gsc(huc) || HAS_ENGINE(huc_to_gt(huc), GSC0))
> + return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
> + else
> + return false;
> }
>
> /**
> @@ -477,7 +519,9 @@ bool intel_huc_is_authenticated(struct intel_huc *huc)
> */
> int intel_huc_check_status(struct intel_huc *huc)
> {
> - switch (__intel_uc_fw_status(&huc->fw)) {
> + struct intel_uc_fw *huc_fw = &huc->fw;
> +
> + switch (__intel_uc_fw_status(huc_fw)) {
> case INTEL_UC_FIRMWARE_NOT_SUPPORTED:
> return -ENODEV;
> case INTEL_UC_FIRMWARE_DISABLED:
> @@ -494,7 +538,17 @@ int intel_huc_check_status(struct intel_huc *huc)
> break;
> }
>
> - return intel_huc_is_authenticated(huc);
> + /*
> + * meu binaries loaded by GuC are first partially authenticated by GuC
meu?
John.
> + * and then fully authenticated by GSC
> + */
> + if (huc_is_fully_authenticated(huc))
> + return 1; /* full auth */
> + else if (huc_fw->has_gsc_headers && !intel_huc_is_loaded_by_gsc(huc) &&
> + intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC))
> + return 2; /* clear media only */
> + else
> + return 0;
> }
>
> static bool huc_has_delayed_load(struct intel_huc *huc)
> @@ -508,7 +562,10 @@ void intel_huc_update_auth_status(struct intel_huc *huc)
> if (!intel_uc_fw_is_loadable(&huc->fw))
> return;
>
> - if (intel_huc_is_authenticated(huc))
> + if (!huc->fw.has_gsc_headers)
> + return;
> +
> + if (huc_is_fully_authenticated(huc))
> intel_uc_fw_change_status(&huc->fw,
> INTEL_UC_FIRMWARE_RUNNING);
> else if (huc_has_delayed_load(huc))
> @@ -541,5 +598,5 @@ void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p)
>
> with_intel_runtime_pm(gt->uncore->rpm, wakeref)
> drm_printf(p, "HuC status: 0x%08x\n",
> - intel_uncore_read(gt->uncore, huc->status.reg));
> + intel_uncore_read(gt->uncore, huc->status[INTEL_HUC_AUTH_BY_GUC].reg));
> }
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> index 112f0dce4702..3f6aa7c37abc 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> @@ -22,6 +22,12 @@ enum intel_huc_delayed_load_status {
> INTEL_HUC_DELAYED_LOAD_ERROR,
> };
>
> +enum intel_huc_authentication_type {
> + INTEL_HUC_AUTH_BY_GUC = 0,
> + INTEL_HUC_AUTH_BY_GSC,
> + INTEL_HUC_AUTH_MAX_MODES
> +};
> +
> struct intel_huc {
> /* Generic uC firmware management */
> struct intel_uc_fw fw;
> @@ -31,7 +37,7 @@ struct intel_huc {
> i915_reg_t reg;
> u32 mask;
> u32 value;
> - } status;
> + } status[INTEL_HUC_AUTH_MAX_MODES];
>
> struct {
> struct i915_sw_fence fence;
> @@ -49,10 +55,12 @@ int intel_huc_init(struct intel_huc *huc);
> void intel_huc_fini(struct intel_huc *huc);
> void intel_huc_suspend(struct intel_huc *huc);
> int intel_huc_auth(struct intel_huc *huc);
> -int intel_huc_wait_for_auth_complete(struct intel_huc *huc);
> +int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
> + enum intel_huc_authentication_type type);
> +bool intel_huc_is_authenticated(struct intel_huc *huc,
> + enum intel_huc_authentication_type type);
> int intel_huc_check_status(struct intel_huc *huc);
> void intel_huc_update_auth_status(struct intel_huc *huc);
> -bool intel_huc_is_authenticated(struct intel_huc *huc);
>
> void intel_huc_register_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus);
> void intel_huc_unregister_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus);
> @@ -81,7 +89,7 @@ static inline bool intel_huc_is_loaded_by_gsc(const struct intel_huc *huc)
> static inline bool intel_huc_wait_required(struct intel_huc *huc)
> {
> return intel_huc_is_used(huc) && intel_huc_is_loaded_by_gsc(huc) &&
> - !intel_huc_is_authenticated(huc);
> + !intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
> }
>
> void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p);
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> index 3355dc1e2bc6..d2b4176c81d6 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> @@ -160,7 +160,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
> * component gets re-bound and this function called again. If so, just
> * mark the HuC as loaded.
> */
> - if (intel_huc_is_authenticated(huc)) {
> + if (intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
> return 0;
> }
> @@ -173,7 +173,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
>
> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_TRANSFERRED);
>
> - return intel_huc_wait_for_auth_complete(huc);
> + return intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GSC);
> }
>
> /**
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 0523418129c5..c14433795c91 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -941,6 +941,9 @@
> #define HECI_H_GS1(base) _MMIO((base) + 0xc4c)
> #define HECI_H_GS1_ER_PREP REG_BIT(0)
>
> +#define HECI_FWSTS5(base) _MMIO(base + 0xc68)
> +#define HECI_FWSTS5_HUC_AUTH_DONE (1 << 19)
> +
> #define HSW_GTT_CACHE_EN _MMIO(0x4024)
> #define GTT_CACHE_EN_ALL 0xF0007FFF
> #define GEN7_WR_WATERMARK _MMIO(0x4028)
> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
> index 8dc41de3f6f7..016bd8fad89d 100644
> --- a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
> @@ -196,7 +196,7 @@ bool intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp)
> * gsc-proxy init flow (the last set of dependencies that
> * are out of order) will suffice.
> */
> - if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc) &&
> + if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc, INTEL_HUC_AUTH_BY_GSC) &&
> intel_gsc_uc_fw_proxy_init_done(&pxp->ctrl_gt->uc.gsc))
> return true;
>
> diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
> index f31dfacde601..a1848e806059 100644
> --- a/include/uapi/drm/i915_drm.h
> +++ b/include/uapi/drm/i915_drm.h
> @@ -674,7 +674,8 @@ typedef struct drm_i915_irq_wait {
> * If the IOCTL is successful, the returned parameter will be set to one of the
> * following values:
> * * 0 if HuC firmware load is not complete,
> - * * 1 if HuC firmware is authenticated and running.
> + * * 1 if HuC firmware is loaded and fully authenticated,
> + * * 2 if HuC firmware is loaded and authenticated for clear media only
> */
> #define I915_PARAM_HUC_STATUS 42
>
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [Intel-gfx] [PATCH v4] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
@ 2023-05-31 0:01 ` John Harrison
0 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-31 0:01 UTC (permalink / raw)
To: Daniele Ceraolo Spurio, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 08:29, Daniele Ceraolo Spurio wrote:
> Before we add the second step of the MTL HuC auth (via GSC), we need to
> have the ability to differentiate between them. To do so, the huc
> authentication check is duplicated for GuC and GSC auth, with meu
meu?
> binaries being considered fully authenticated only after the GSC auth
> step.
>
> To report the difference between the 2 auth steps, a new case is added
> to the HuC getparam. This way, the clear media driver can start
> submitting before full auth, as partial auth is enough for those
> workloads.
>
> v2: fix authentication status check for DG2
>
> v3: add a better comment at the top of the HuC file to explain the
> different approaches to load and auth (John)
>
> v4: update call to intel_huc_is_authenticated in the pxp code to check
> for GSC authentication
>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
> Cc: John Harrison <John.C.Harrison@Intel.com>
> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
> ---
> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 111 ++++++++++++++++-----
> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 16 ++-
> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 4 +-
> drivers/gpu/drm/i915/i915_reg.h | 3 +
> drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 2 +-
> include/uapi/drm/i915_drm.h | 3 +-
> 6 files changed, 104 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> index 37c6a8ca5c71..ab5246ae3979 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> @@ -10,6 +10,7 @@
> #include "intel_huc.h"
> #include "intel_huc_print.h"
> #include "i915_drv.h"
> +#include "i915_reg.h"
>
> #include <linux/device/bus.h>
> #include <linux/mei_aux.h>
> @@ -22,15 +23,23 @@
> * capabilities by adding HuC specific commands to batch buffers.
> *
> * The kernel driver is only responsible for loading the HuC firmware and
> - * triggering its security authentication, which is performed by the GuC on
> - * older platforms and by the GSC on newer ones. For the GuC to correctly
> - * perform the authentication, the HuC binary must be loaded before the GuC one.
> + * triggering its security authentication. This is done differently depending
> + * on the platform:
> + * - older platforms (from Gen9 to most Gen12s): the load is performed via DMA
> + * and the authentication via GuC
> + * - DG2: load and authentication are both performed via GSC.
> + * - MTL and newer platforms: the load is performed via DMA (same as with
> + * not-DG2 older platforms), while the authentication is done in 2-steps,
> + * a first auth for clear-media workloads via GuC and a second one for all
> + * workloads via GSC.
> + * On platforms where the GuC does the authentication, to correctly do so the
> + * HuC binary must be loaded before the GuC one.
> * Loading the HuC is optional; however, not using the HuC might negatively
> * impact power usage and/or performance of media workloads, depending on the
> * use-cases.
> * HuC must be reloaded on events that cause the WOPCM to lose its contents
> - * (S3/S4, FLR); GuC-authenticated HuC must also be reloaded on GuC/GT reset,
> - * while GSC-managed HuC will survive that.
> + * (S3/S4, FLR); on older platforms the HuC must also be reloaded on GuC/GT
> + * reset, while on newer ones it will survive that.
> *
> * See https://github.com/intel/media-driver for the latest details on HuC
> * functionality.
> @@ -106,7 +115,7 @@ static enum hrtimer_restart huc_delayed_load_timer_callback(struct hrtimer *hrti
> {
> struct intel_huc *huc = container_of(hrtimer, struct intel_huc, delayed_load.timer);
>
> - if (!intel_huc_is_authenticated(huc)) {
> + if (!intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
> if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_GSC)
> huc_notice(huc, "timed out waiting for MEI GSC\n");
> else if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_PXP)
> @@ -124,7 +133,7 @@ static void huc_delayed_load_start(struct intel_huc *huc)
> {
> ktime_t delay;
>
> - GEM_BUG_ON(intel_huc_is_authenticated(huc));
> + GEM_BUG_ON(intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC));
>
> /*
> * On resume we don't have to wait for MEI-GSC to be re-probed, but we
> @@ -284,13 +293,23 @@ void intel_huc_init_early(struct intel_huc *huc)
> }
>
> if (GRAPHICS_VER(i915) >= 11) {
> - huc->status.reg = GEN11_HUC_KERNEL_LOAD_INFO;
> - huc->status.mask = HUC_LOAD_SUCCESSFUL;
> - huc->status.value = HUC_LOAD_SUCCESSFUL;
> + huc->status[INTEL_HUC_AUTH_BY_GUC].reg = GEN11_HUC_KERNEL_LOAD_INFO;
> + huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_LOAD_SUCCESSFUL;
> + huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_LOAD_SUCCESSFUL;
> } else {
> - huc->status.reg = HUC_STATUS2;
> - huc->status.mask = HUC_FW_VERIFIED;
> - huc->status.value = HUC_FW_VERIFIED;
> + huc->status[INTEL_HUC_AUTH_BY_GUC].reg = HUC_STATUS2;
> + huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_FW_VERIFIED;
> + huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_FW_VERIFIED;
> + }
> +
> + if (IS_DG2(i915)) {
> + huc->status[INTEL_HUC_AUTH_BY_GSC].reg = GEN11_HUC_KERNEL_LOAD_INFO;
> + huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HUC_LOAD_SUCCESSFUL;
> + huc->status[INTEL_HUC_AUTH_BY_GSC].value = HUC_LOAD_SUCCESSFUL;
> + } else {
> + huc->status[INTEL_HUC_AUTH_BY_GSC].reg = HECI_FWSTS5(MTL_GSC_HECI1_BASE);
> + huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HECI_FWSTS5_HUC_AUTH_DONE;
> + huc->status[INTEL_HUC_AUTH_BY_GSC].value = HECI_FWSTS5_HUC_AUTH_DONE;
> }
> }
>
> @@ -381,28 +400,38 @@ void intel_huc_suspend(struct intel_huc *huc)
> delayed_huc_load_complete(huc);
> }
>
> -int intel_huc_wait_for_auth_complete(struct intel_huc *huc)
> +static const char *auth_mode_string(struct intel_huc *huc,
> + enum intel_huc_authentication_type type)
> +{
> + bool partial = huc->fw.has_gsc_headers && type == INTEL_HUC_AUTH_BY_GUC;
> +
> + return partial ? "clear media" : "all workloads";
> +}
> +
> +int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
> + enum intel_huc_authentication_type type)
> {
> struct intel_gt *gt = huc_to_gt(huc);
> int ret;
>
> ret = __intel_wait_for_register(gt->uncore,
> - huc->status.reg,
> - huc->status.mask,
> - huc->status.value,
> + huc->status[type].reg,
> + huc->status[type].mask,
> + huc->status[type].value,
> 2, 50, NULL);
>
> /* mark the load process as complete even if the wait failed */
> delayed_huc_load_complete(huc);
>
> if (ret) {
> - huc_err(huc, "firmware not verified %pe\n", ERR_PTR(ret));
> + huc_err(huc, "firmware not verified for %s: %pe\n",
> + auth_mode_string(huc, type), ERR_PTR(ret));
> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_LOAD_FAIL);
> return ret;
> }
>
> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
> - huc_info(huc, "authenticated!\n");
> + huc_info(huc, "authenticated for %s!\n", auth_mode_string(huc, type));
Not a blocker but should this have an exclamation? It sort of implies
the authentication is unexpected.
> return 0;
> }
>
> @@ -442,7 +471,7 @@ int intel_huc_auth(struct intel_huc *huc)
> }
>
> /* Check authentication status, it should be done by now */
> - ret = intel_huc_wait_for_auth_complete(huc);
> + ret = intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GUC);
> if (ret)
> goto fail;
>
> @@ -453,16 +482,29 @@ int intel_huc_auth(struct intel_huc *huc)
> return ret;
> }
>
> -bool intel_huc_is_authenticated(struct intel_huc *huc)
> +bool intel_huc_is_authenticated(struct intel_huc *huc,
> + enum intel_huc_authentication_type type)
> {
> struct intel_gt *gt = huc_to_gt(huc);
> intel_wakeref_t wakeref;
> u32 status = 0;
>
> with_intel_runtime_pm(gt->uncore->rpm, wakeref)
> - status = intel_uncore_read(gt->uncore, huc->status.reg);
> + status = intel_uncore_read(gt->uncore, huc->status[type].reg);
>
> - return (status & huc->status.mask) == huc->status.value;
> + return (status & huc->status[type].mask) == huc->status[type].value;
> +}
> +
> +static bool huc_is_fully_authenticated(struct intel_huc *huc)
> +{
> + struct intel_uc_fw *huc_fw = &huc->fw;
> +
> + if (!huc_fw->has_gsc_headers)
> + return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC);
> + else if (intel_huc_is_loaded_by_gsc(huc) || HAS_ENGINE(huc_to_gt(huc), GSC0))
> + return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
> + else
> + return false;
> }
>
> /**
> @@ -477,7 +519,9 @@ bool intel_huc_is_authenticated(struct intel_huc *huc)
> */
> int intel_huc_check_status(struct intel_huc *huc)
> {
> - switch (__intel_uc_fw_status(&huc->fw)) {
> + struct intel_uc_fw *huc_fw = &huc->fw;
> +
> + switch (__intel_uc_fw_status(huc_fw)) {
> case INTEL_UC_FIRMWARE_NOT_SUPPORTED:
> return -ENODEV;
> case INTEL_UC_FIRMWARE_DISABLED:
> @@ -494,7 +538,17 @@ int intel_huc_check_status(struct intel_huc *huc)
> break;
> }
>
> - return intel_huc_is_authenticated(huc);
> + /*
> + * meu binaries loaded by GuC are first partially authenticated by GuC
meu?
John.
> + * and then fully authenticated by GSC
> + */
> + if (huc_is_fully_authenticated(huc))
> + return 1; /* full auth */
> + else if (huc_fw->has_gsc_headers && !intel_huc_is_loaded_by_gsc(huc) &&
> + intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC))
> + return 2; /* clear media only */
> + else
> + return 0;
> }
>
> static bool huc_has_delayed_load(struct intel_huc *huc)
> @@ -508,7 +562,10 @@ void intel_huc_update_auth_status(struct intel_huc *huc)
> if (!intel_uc_fw_is_loadable(&huc->fw))
> return;
>
> - if (intel_huc_is_authenticated(huc))
> + if (!huc->fw.has_gsc_headers)
> + return;
> +
> + if (huc_is_fully_authenticated(huc))
> intel_uc_fw_change_status(&huc->fw,
> INTEL_UC_FIRMWARE_RUNNING);
> else if (huc_has_delayed_load(huc))
> @@ -541,5 +598,5 @@ void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p)
>
> with_intel_runtime_pm(gt->uncore->rpm, wakeref)
> drm_printf(p, "HuC status: 0x%08x\n",
> - intel_uncore_read(gt->uncore, huc->status.reg));
> + intel_uncore_read(gt->uncore, huc->status[INTEL_HUC_AUTH_BY_GUC].reg));
> }
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> index 112f0dce4702..3f6aa7c37abc 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> @@ -22,6 +22,12 @@ enum intel_huc_delayed_load_status {
> INTEL_HUC_DELAYED_LOAD_ERROR,
> };
>
> +enum intel_huc_authentication_type {
> + INTEL_HUC_AUTH_BY_GUC = 0,
> + INTEL_HUC_AUTH_BY_GSC,
> + INTEL_HUC_AUTH_MAX_MODES
> +};
> +
> struct intel_huc {
> /* Generic uC firmware management */
> struct intel_uc_fw fw;
> @@ -31,7 +37,7 @@ struct intel_huc {
> i915_reg_t reg;
> u32 mask;
> u32 value;
> - } status;
> + } status[INTEL_HUC_AUTH_MAX_MODES];
>
> struct {
> struct i915_sw_fence fence;
> @@ -49,10 +55,12 @@ int intel_huc_init(struct intel_huc *huc);
> void intel_huc_fini(struct intel_huc *huc);
> void intel_huc_suspend(struct intel_huc *huc);
> int intel_huc_auth(struct intel_huc *huc);
> -int intel_huc_wait_for_auth_complete(struct intel_huc *huc);
> +int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
> + enum intel_huc_authentication_type type);
> +bool intel_huc_is_authenticated(struct intel_huc *huc,
> + enum intel_huc_authentication_type type);
> int intel_huc_check_status(struct intel_huc *huc);
> void intel_huc_update_auth_status(struct intel_huc *huc);
> -bool intel_huc_is_authenticated(struct intel_huc *huc);
>
> void intel_huc_register_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus);
> void intel_huc_unregister_gsc_notifier(struct intel_huc *huc, const struct bus_type *bus);
> @@ -81,7 +89,7 @@ static inline bool intel_huc_is_loaded_by_gsc(const struct intel_huc *huc)
> static inline bool intel_huc_wait_required(struct intel_huc *huc)
> {
> return intel_huc_is_used(huc) && intel_huc_is_loaded_by_gsc(huc) &&
> - !intel_huc_is_authenticated(huc);
> + !intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
> }
>
> void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p);
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> index 3355dc1e2bc6..d2b4176c81d6 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> @@ -160,7 +160,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
> * component gets re-bound and this function called again. If so, just
> * mark the HuC as loaded.
> */
> - if (intel_huc_is_authenticated(huc)) {
> + if (intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
> return 0;
> }
> @@ -173,7 +173,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc)
>
> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_TRANSFERRED);
>
> - return intel_huc_wait_for_auth_complete(huc);
> + return intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GSC);
> }
>
> /**
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 0523418129c5..c14433795c91 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -941,6 +941,9 @@
> #define HECI_H_GS1(base) _MMIO((base) + 0xc4c)
> #define HECI_H_GS1_ER_PREP REG_BIT(0)
>
> +#define HECI_FWSTS5(base) _MMIO(base + 0xc68)
> +#define HECI_FWSTS5_HUC_AUTH_DONE (1 << 19)
> +
> #define HSW_GTT_CACHE_EN _MMIO(0x4024)
> #define GTT_CACHE_EN_ALL 0xF0007FFF
> #define GEN7_WR_WATERMARK _MMIO(0x4028)
> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
> index 8dc41de3f6f7..016bd8fad89d 100644
> --- a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
> @@ -196,7 +196,7 @@ bool intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp)
> * gsc-proxy init flow (the last set of dependencies that
> * are out of order) will suffice.
> */
> - if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc) &&
> + if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc, INTEL_HUC_AUTH_BY_GSC) &&
> intel_gsc_uc_fw_proxy_init_done(&pxp->ctrl_gt->uc.gsc))
> return true;
>
> diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
> index f31dfacde601..a1848e806059 100644
> --- a/include/uapi/drm/i915_drm.h
> +++ b/include/uapi/drm/i915_drm.h
> @@ -674,7 +674,8 @@ typedef struct drm_i915_irq_wait {
> * If the IOCTL is successful, the returned parameter will be set to one of the
> * following values:
> * * 0 if HuC firmware load is not complete,
> - * * 1 if HuC firmware is authenticated and running.
> + * * 1 if HuC firmware is loaded and fully authenticated,
> + * * 2 if HuC firmware is loaded and authenticated for clear media only
> */
> #define I915_PARAM_HUC_STATUS 42
>
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCH v4] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
2023-05-31 0:01 ` [Intel-gfx] " John Harrison
@ 2023-05-31 0:14 ` Ceraolo Spurio, Daniele
-1 siblings, 0 replies; 52+ messages in thread
From: Ceraolo Spurio, Daniele @ 2023-05-31 0:14 UTC (permalink / raw)
To: John Harrison, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 5:01 PM, John Harrison wrote:
> On 5/30/2023 08:29, Daniele Ceraolo Spurio wrote:
>> Before we add the second step of the MTL HuC auth (via GSC), we need to
>> have the ability to differentiate between them. To do so, the huc
>> authentication check is duplicated for GuC and GSC auth, with meu
> meu?
leftover from the meu drop. Will reword.
>
>> binaries being considered fully authenticated only after the GSC auth
>> step.
>>
>> To report the difference between the 2 auth steps, a new case is added
>> to the HuC getparam. This way, the clear media driver can start
>> submitting before full auth, as partial auth is enough for those
>> workloads.
>>
>> v2: fix authentication status check for DG2
>>
>> v3: add a better comment at the top of the HuC file to explain the
>> different approaches to load and auth (John)
>>
>> v4: update call to intel_huc_is_authenticated in the pxp code to check
>> for GSC authentication
>>
>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>> Cc: John Harrison <John.C.Harrison@Intel.com>
>> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
>> ---
>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 111 ++++++++++++++++-----
>> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 16 ++-
>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 4 +-
>> drivers/gpu/drm/i915/i915_reg.h | 3 +
>> drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 2 +-
>> include/uapi/drm/i915_drm.h | 3 +-
>> 6 files changed, 104 insertions(+), 35 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> index 37c6a8ca5c71..ab5246ae3979 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> @@ -10,6 +10,7 @@
>> #include "intel_huc.h"
>> #include "intel_huc_print.h"
>> #include "i915_drv.h"
>> +#include "i915_reg.h"
>> #include <linux/device/bus.h>
>> #include <linux/mei_aux.h>
>> @@ -22,15 +23,23 @@
>> * capabilities by adding HuC specific commands to batch buffers.
>> *
>> * The kernel driver is only responsible for loading the HuC
>> firmware and
>> - * triggering its security authentication, which is performed by the
>> GuC on
>> - * older platforms and by the GSC on newer ones. For the GuC to
>> correctly
>> - * perform the authentication, the HuC binary must be loaded before
>> the GuC one.
>> + * triggering its security authentication. This is done differently
>> depending
>> + * on the platform:
>> + * - older platforms (from Gen9 to most Gen12s): the load is
>> performed via DMA
>> + * and the authentication via GuC
>> + * - DG2: load and authentication are both performed via GSC.
>> + * - MTL and newer platforms: the load is performed via DMA (same as
>> with
>> + * not-DG2 older platforms), while the authentication is done in
>> 2-steps,
>> + * a first auth for clear-media workloads via GuC and a second one
>> for all
>> + * workloads via GSC.
>> + * On platforms where the GuC does the authentication, to correctly
>> do so the
>> + * HuC binary must be loaded before the GuC one.
>> * Loading the HuC is optional; however, not using the HuC might
>> negatively
>> * impact power usage and/or performance of media workloads,
>> depending on the
>> * use-cases.
>> * HuC must be reloaded on events that cause the WOPCM to lose its
>> contents
>> - * (S3/S4, FLR); GuC-authenticated HuC must also be reloaded on
>> GuC/GT reset,
>> - * while GSC-managed HuC will survive that.
>> + * (S3/S4, FLR); on older platforms the HuC must also be reloaded on
>> GuC/GT
>> + * reset, while on newer ones it will survive that.
>> *
>> * See https://github.com/intel/media-driver for the latest details
>> on HuC
>> * functionality.
>> @@ -106,7 +115,7 @@ static enum hrtimer_restart
>> huc_delayed_load_timer_callback(struct hrtimer *hrti
>> {
>> struct intel_huc *huc = container_of(hrtimer, struct intel_huc,
>> delayed_load.timer);
>> - if (!intel_huc_is_authenticated(huc)) {
>> + if (!intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
>> if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_GSC)
>> huc_notice(huc, "timed out waiting for MEI GSC\n");
>> else if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_PXP)
>> @@ -124,7 +133,7 @@ static void huc_delayed_load_start(struct
>> intel_huc *huc)
>> {
>> ktime_t delay;
>> - GEM_BUG_ON(intel_huc_is_authenticated(huc));
>> + GEM_BUG_ON(intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC));
>> /*
>> * On resume we don't have to wait for MEI-GSC to be re-probed,
>> but we
>> @@ -284,13 +293,23 @@ void intel_huc_init_early(struct intel_huc *huc)
>> }
>> if (GRAPHICS_VER(i915) >= 11) {
>> - huc->status.reg = GEN11_HUC_KERNEL_LOAD_INFO;
>> - huc->status.mask = HUC_LOAD_SUCCESSFUL;
>> - huc->status.value = HUC_LOAD_SUCCESSFUL;
>> + huc->status[INTEL_HUC_AUTH_BY_GUC].reg =
>> GEN11_HUC_KERNEL_LOAD_INFO;
>> + huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_LOAD_SUCCESSFUL;
>> + huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_LOAD_SUCCESSFUL;
>> } else {
>> - huc->status.reg = HUC_STATUS2;
>> - huc->status.mask = HUC_FW_VERIFIED;
>> - huc->status.value = HUC_FW_VERIFIED;
>> + huc->status[INTEL_HUC_AUTH_BY_GUC].reg = HUC_STATUS2;
>> + huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_FW_VERIFIED;
>> + huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_FW_VERIFIED;
>> + }
>> +
>> + if (IS_DG2(i915)) {
>> + huc->status[INTEL_HUC_AUTH_BY_GSC].reg =
>> GEN11_HUC_KERNEL_LOAD_INFO;
>> + huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HUC_LOAD_SUCCESSFUL;
>> + huc->status[INTEL_HUC_AUTH_BY_GSC].value = HUC_LOAD_SUCCESSFUL;
>> + } else {
>> + huc->status[INTEL_HUC_AUTH_BY_GSC].reg =
>> HECI_FWSTS5(MTL_GSC_HECI1_BASE);
>> + huc->status[INTEL_HUC_AUTH_BY_GSC].mask =
>> HECI_FWSTS5_HUC_AUTH_DONE;
>> + huc->status[INTEL_HUC_AUTH_BY_GSC].value =
>> HECI_FWSTS5_HUC_AUTH_DONE;
>> }
>> }
>> @@ -381,28 +400,38 @@ void intel_huc_suspend(struct intel_huc *huc)
>> delayed_huc_load_complete(huc);
>> }
>> -int intel_huc_wait_for_auth_complete(struct intel_huc *huc)
>> +static const char *auth_mode_string(struct intel_huc *huc,
>> + enum intel_huc_authentication_type type)
>> +{
>> + bool partial = huc->fw.has_gsc_headers && type ==
>> INTEL_HUC_AUTH_BY_GUC;
>> +
>> + return partial ? "clear media" : "all workloads";
>> +}
>> +
>> +int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
>> + enum intel_huc_authentication_type type)
>> {
>> struct intel_gt *gt = huc_to_gt(huc);
>> int ret;
>> ret = __intel_wait_for_register(gt->uncore,
>> - huc->status.reg,
>> - huc->status.mask,
>> - huc->status.value,
>> + huc->status[type].reg,
>> + huc->status[type].mask,
>> + huc->status[type].value,
>> 2, 50, NULL);
>> /* mark the load process as complete even if the wait failed */
>> delayed_huc_load_complete(huc);
>> if (ret) {
>> - huc_err(huc, "firmware not verified %pe\n", ERR_PTR(ret));
>> + huc_err(huc, "firmware not verified for %s: %pe\n",
>> + auth_mode_string(huc, type), ERR_PTR(ret));
>> intel_uc_fw_change_status(&huc->fw,
>> INTEL_UC_FIRMWARE_LOAD_FAIL);
>> return ret;
>> }
>> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
>> - huc_info(huc, "authenticated!\n");
>> + huc_info(huc, "authenticated for %s!\n", auth_mode_string(huc,
>> type));
> Not a blocker but should this have an exclamation? It sort of implies
> the authentication is unexpected.
I can drop it. I just left it because it was already there.
>
>> return 0;
>> }
>> @@ -442,7 +471,7 @@ int intel_huc_auth(struct intel_huc *huc)
>> }
>> /* Check authentication status, it should be done by now */
>> - ret = intel_huc_wait_for_auth_complete(huc);
>> + ret = intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GUC);
>> if (ret)
>> goto fail;
>> @@ -453,16 +482,29 @@ int intel_huc_auth(struct intel_huc *huc)
>> return ret;
>> }
>> -bool intel_huc_is_authenticated(struct intel_huc *huc)
>> +bool intel_huc_is_authenticated(struct intel_huc *huc,
>> + enum intel_huc_authentication_type type)
>> {
>> struct intel_gt *gt = huc_to_gt(huc);
>> intel_wakeref_t wakeref;
>> u32 status = 0;
>> with_intel_runtime_pm(gt->uncore->rpm, wakeref)
>> - status = intel_uncore_read(gt->uncore, huc->status.reg);
>> + status = intel_uncore_read(gt->uncore, huc->status[type].reg);
>> - return (status & huc->status.mask) == huc->status.value;
>> + return (status & huc->status[type].mask) ==
>> huc->status[type].value;
>> +}
>> +
>> +static bool huc_is_fully_authenticated(struct intel_huc *huc)
>> +{
>> + struct intel_uc_fw *huc_fw = &huc->fw;
>> +
>> + if (!huc_fw->has_gsc_headers)
>> + return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC);
>> + else if (intel_huc_is_loaded_by_gsc(huc) ||
>> HAS_ENGINE(huc_to_gt(huc), GSC0))
>> + return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
>> + else
>> + return false;
>> }
>> /**
>> @@ -477,7 +519,9 @@ bool intel_huc_is_authenticated(struct intel_huc
>> *huc)
>> */
>> int intel_huc_check_status(struct intel_huc *huc)
>> {
>> - switch (__intel_uc_fw_status(&huc->fw)) {
>> + struct intel_uc_fw *huc_fw = &huc->fw;
>> +
>> + switch (__intel_uc_fw_status(huc_fw)) {
>> case INTEL_UC_FIRMWARE_NOT_SUPPORTED:
>> return -ENODEV;
>> case INTEL_UC_FIRMWARE_DISABLED:
>> @@ -494,7 +538,17 @@ int intel_huc_check_status(struct intel_huc *huc)
>> break;
>> }
>> - return intel_huc_is_authenticated(huc);
>> + /*
>> + * meu binaries loaded by GuC are first partially authenticated
>> by GuC
> meu?
>
Same as the other one, will fix.
Daniele
> John.
>
>
>> + * and then fully authenticated by GSC
>> + */
>> + if (huc_is_fully_authenticated(huc))
>> + return 1; /* full auth */
>> + else if (huc_fw->has_gsc_headers &&
>> !intel_huc_is_loaded_by_gsc(huc) &&
>> + intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC))
>> + return 2; /* clear media only */
>> + else
>> + return 0;
>> }
>> static bool huc_has_delayed_load(struct intel_huc *huc)
>> @@ -508,7 +562,10 @@ void intel_huc_update_auth_status(struct
>> intel_huc *huc)
>> if (!intel_uc_fw_is_loadable(&huc->fw))
>> return;
>> - if (intel_huc_is_authenticated(huc))
>> + if (!huc->fw.has_gsc_headers)
>> + return;
>> +
>> + if (huc_is_fully_authenticated(huc))
>> intel_uc_fw_change_status(&huc->fw,
>> INTEL_UC_FIRMWARE_RUNNING);
>> else if (huc_has_delayed_load(huc))
>> @@ -541,5 +598,5 @@ void intel_huc_load_status(struct intel_huc *huc,
>> struct drm_printer *p)
>> with_intel_runtime_pm(gt->uncore->rpm, wakeref)
>> drm_printf(p, "HuC status: 0x%08x\n",
>> - intel_uncore_read(gt->uncore, huc->status.reg));
>> + intel_uncore_read(gt->uncore,
>> huc->status[INTEL_HUC_AUTH_BY_GUC].reg));
>> }
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> index 112f0dce4702..3f6aa7c37abc 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> @@ -22,6 +22,12 @@ enum intel_huc_delayed_load_status {
>> INTEL_HUC_DELAYED_LOAD_ERROR,
>> };
>> +enum intel_huc_authentication_type {
>> + INTEL_HUC_AUTH_BY_GUC = 0,
>> + INTEL_HUC_AUTH_BY_GSC,
>> + INTEL_HUC_AUTH_MAX_MODES
>> +};
>> +
>> struct intel_huc {
>> /* Generic uC firmware management */
>> struct intel_uc_fw fw;
>> @@ -31,7 +37,7 @@ struct intel_huc {
>> i915_reg_t reg;
>> u32 mask;
>> u32 value;
>> - } status;
>> + } status[INTEL_HUC_AUTH_MAX_MODES];
>> struct {
>> struct i915_sw_fence fence;
>> @@ -49,10 +55,12 @@ int intel_huc_init(struct intel_huc *huc);
>> void intel_huc_fini(struct intel_huc *huc);
>> void intel_huc_suspend(struct intel_huc *huc);
>> int intel_huc_auth(struct intel_huc *huc);
>> -int intel_huc_wait_for_auth_complete(struct intel_huc *huc);
>> +int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
>> + enum intel_huc_authentication_type type);
>> +bool intel_huc_is_authenticated(struct intel_huc *huc,
>> + enum intel_huc_authentication_type type);
>> int intel_huc_check_status(struct intel_huc *huc);
>> void intel_huc_update_auth_status(struct intel_huc *huc);
>> -bool intel_huc_is_authenticated(struct intel_huc *huc);
>> void intel_huc_register_gsc_notifier(struct intel_huc *huc, const
>> struct bus_type *bus);
>> void intel_huc_unregister_gsc_notifier(struct intel_huc *huc, const
>> struct bus_type *bus);
>> @@ -81,7 +89,7 @@ static inline bool intel_huc_is_loaded_by_gsc(const
>> struct intel_huc *huc)
>> static inline bool intel_huc_wait_required(struct intel_huc *huc)
>> {
>> return intel_huc_is_used(huc) &&
>> intel_huc_is_loaded_by_gsc(huc) &&
>> - !intel_huc_is_authenticated(huc);
>> + !intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
>> }
>> void intel_huc_load_status(struct intel_huc *huc, struct
>> drm_printer *p);
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> index 3355dc1e2bc6..d2b4176c81d6 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> @@ -160,7 +160,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct
>> intel_huc *huc)
>> * component gets re-bound and this function called again. If
>> so, just
>> * mark the HuC as loaded.
>> */
>> - if (intel_huc_is_authenticated(huc)) {
>> + if (intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
>> intel_uc_fw_change_status(&huc->fw,
>> INTEL_UC_FIRMWARE_RUNNING);
>> return 0;
>> }
>> @@ -173,7 +173,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct
>> intel_huc *huc)
>> intel_uc_fw_change_status(&huc->fw,
>> INTEL_UC_FIRMWARE_TRANSFERRED);
>> - return intel_huc_wait_for_auth_complete(huc);
>> + return intel_huc_wait_for_auth_complete(huc,
>> INTEL_HUC_AUTH_BY_GSC);
>> }
>> /**
>> diff --git a/drivers/gpu/drm/i915/i915_reg.h
>> b/drivers/gpu/drm/i915/i915_reg.h
>> index 0523418129c5..c14433795c91 100644
>> --- a/drivers/gpu/drm/i915/i915_reg.h
>> +++ b/drivers/gpu/drm/i915/i915_reg.h
>> @@ -941,6 +941,9 @@
>> #define HECI_H_GS1(base) _MMIO((base) + 0xc4c)
>> #define HECI_H_GS1_ER_PREP REG_BIT(0)
>> +#define HECI_FWSTS5(base) _MMIO(base + 0xc68)
>> +#define HECI_FWSTS5_HUC_AUTH_DONE (1 << 19)
>> +
>> #define HSW_GTT_CACHE_EN _MMIO(0x4024)
>> #define GTT_CACHE_EN_ALL 0xF0007FFF
>> #define GEN7_WR_WATERMARK _MMIO(0x4028)
>> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>> b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>> index 8dc41de3f6f7..016bd8fad89d 100644
>> --- a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>> @@ -196,7 +196,7 @@ bool intel_pxp_gsccs_is_ready_for_sessions(struct
>> intel_pxp *pxp)
>> * gsc-proxy init flow (the last set of dependencies that
>> * are out of order) will suffice.
>> */
>> - if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc) &&
>> + if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc,
>> INTEL_HUC_AUTH_BY_GSC) &&
>> intel_gsc_uc_fw_proxy_init_done(&pxp->ctrl_gt->uc.gsc))
>> return true;
>> diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
>> index f31dfacde601..a1848e806059 100644
>> --- a/include/uapi/drm/i915_drm.h
>> +++ b/include/uapi/drm/i915_drm.h
>> @@ -674,7 +674,8 @@ typedef struct drm_i915_irq_wait {
>> * If the IOCTL is successful, the returned parameter will be set
>> to one of the
>> * following values:
>> * * 0 if HuC firmware load is not complete,
>> - * * 1 if HuC firmware is authenticated and running.
>> + * * 1 if HuC firmware is loaded and fully authenticated,
>> + * * 2 if HuC firmware is loaded and authenticated for clear media
>> only
>> */
>> #define I915_PARAM_HUC_STATUS 42
>
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [Intel-gfx] [PATCH v4] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
@ 2023-05-31 0:14 ` Ceraolo Spurio, Daniele
0 siblings, 0 replies; 52+ messages in thread
From: Ceraolo Spurio, Daniele @ 2023-05-31 0:14 UTC (permalink / raw)
To: John Harrison, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 5:01 PM, John Harrison wrote:
> On 5/30/2023 08:29, Daniele Ceraolo Spurio wrote:
>> Before we add the second step of the MTL HuC auth (via GSC), we need to
>> have the ability to differentiate between them. To do so, the huc
>> authentication check is duplicated for GuC and GSC auth, with meu
> meu?
leftover from the meu drop. Will reword.
>
>> binaries being considered fully authenticated only after the GSC auth
>> step.
>>
>> To report the difference between the 2 auth steps, a new case is added
>> to the HuC getparam. This way, the clear media driver can start
>> submitting before full auth, as partial auth is enough for those
>> workloads.
>>
>> v2: fix authentication status check for DG2
>>
>> v3: add a better comment at the top of the HuC file to explain the
>> different approaches to load and auth (John)
>>
>> v4: update call to intel_huc_is_authenticated in the pxp code to check
>> for GSC authentication
>>
>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>> Cc: John Harrison <John.C.Harrison@Intel.com>
>> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
>> ---
>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 111 ++++++++++++++++-----
>> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 16 ++-
>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 4 +-
>> drivers/gpu/drm/i915/i915_reg.h | 3 +
>> drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 2 +-
>> include/uapi/drm/i915_drm.h | 3 +-
>> 6 files changed, 104 insertions(+), 35 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> index 37c6a8ca5c71..ab5246ae3979 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>> @@ -10,6 +10,7 @@
>> #include "intel_huc.h"
>> #include "intel_huc_print.h"
>> #include "i915_drv.h"
>> +#include "i915_reg.h"
>> #include <linux/device/bus.h>
>> #include <linux/mei_aux.h>
>> @@ -22,15 +23,23 @@
>> * capabilities by adding HuC specific commands to batch buffers.
>> *
>> * The kernel driver is only responsible for loading the HuC
>> firmware and
>> - * triggering its security authentication, which is performed by the
>> GuC on
>> - * older platforms and by the GSC on newer ones. For the GuC to
>> correctly
>> - * perform the authentication, the HuC binary must be loaded before
>> the GuC one.
>> + * triggering its security authentication. This is done differently
>> depending
>> + * on the platform:
>> + * - older platforms (from Gen9 to most Gen12s): the load is
>> performed via DMA
>> + * and the authentication via GuC
>> + * - DG2: load and authentication are both performed via GSC.
>> + * - MTL and newer platforms: the load is performed via DMA (same as
>> with
>> + * not-DG2 older platforms), while the authentication is done in
>> 2-steps,
>> + * a first auth for clear-media workloads via GuC and a second one
>> for all
>> + * workloads via GSC.
>> + * On platforms where the GuC does the authentication, to correctly
>> do so the
>> + * HuC binary must be loaded before the GuC one.
>> * Loading the HuC is optional; however, not using the HuC might
>> negatively
>> * impact power usage and/or performance of media workloads,
>> depending on the
>> * use-cases.
>> * HuC must be reloaded on events that cause the WOPCM to lose its
>> contents
>> - * (S3/S4, FLR); GuC-authenticated HuC must also be reloaded on
>> GuC/GT reset,
>> - * while GSC-managed HuC will survive that.
>> + * (S3/S4, FLR); on older platforms the HuC must also be reloaded on
>> GuC/GT
>> + * reset, while on newer ones it will survive that.
>> *
>> * See https://github.com/intel/media-driver for the latest details
>> on HuC
>> * functionality.
>> @@ -106,7 +115,7 @@ static enum hrtimer_restart
>> huc_delayed_load_timer_callback(struct hrtimer *hrti
>> {
>> struct intel_huc *huc = container_of(hrtimer, struct intel_huc,
>> delayed_load.timer);
>> - if (!intel_huc_is_authenticated(huc)) {
>> + if (!intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
>> if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_GSC)
>> huc_notice(huc, "timed out waiting for MEI GSC\n");
>> else if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_PXP)
>> @@ -124,7 +133,7 @@ static void huc_delayed_load_start(struct
>> intel_huc *huc)
>> {
>> ktime_t delay;
>> - GEM_BUG_ON(intel_huc_is_authenticated(huc));
>> + GEM_BUG_ON(intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC));
>> /*
>> * On resume we don't have to wait for MEI-GSC to be re-probed,
>> but we
>> @@ -284,13 +293,23 @@ void intel_huc_init_early(struct intel_huc *huc)
>> }
>> if (GRAPHICS_VER(i915) >= 11) {
>> - huc->status.reg = GEN11_HUC_KERNEL_LOAD_INFO;
>> - huc->status.mask = HUC_LOAD_SUCCESSFUL;
>> - huc->status.value = HUC_LOAD_SUCCESSFUL;
>> + huc->status[INTEL_HUC_AUTH_BY_GUC].reg =
>> GEN11_HUC_KERNEL_LOAD_INFO;
>> + huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_LOAD_SUCCESSFUL;
>> + huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_LOAD_SUCCESSFUL;
>> } else {
>> - huc->status.reg = HUC_STATUS2;
>> - huc->status.mask = HUC_FW_VERIFIED;
>> - huc->status.value = HUC_FW_VERIFIED;
>> + huc->status[INTEL_HUC_AUTH_BY_GUC].reg = HUC_STATUS2;
>> + huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_FW_VERIFIED;
>> + huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_FW_VERIFIED;
>> + }
>> +
>> + if (IS_DG2(i915)) {
>> + huc->status[INTEL_HUC_AUTH_BY_GSC].reg =
>> GEN11_HUC_KERNEL_LOAD_INFO;
>> + huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HUC_LOAD_SUCCESSFUL;
>> + huc->status[INTEL_HUC_AUTH_BY_GSC].value = HUC_LOAD_SUCCESSFUL;
>> + } else {
>> + huc->status[INTEL_HUC_AUTH_BY_GSC].reg =
>> HECI_FWSTS5(MTL_GSC_HECI1_BASE);
>> + huc->status[INTEL_HUC_AUTH_BY_GSC].mask =
>> HECI_FWSTS5_HUC_AUTH_DONE;
>> + huc->status[INTEL_HUC_AUTH_BY_GSC].value =
>> HECI_FWSTS5_HUC_AUTH_DONE;
>> }
>> }
>> @@ -381,28 +400,38 @@ void intel_huc_suspend(struct intel_huc *huc)
>> delayed_huc_load_complete(huc);
>> }
>> -int intel_huc_wait_for_auth_complete(struct intel_huc *huc)
>> +static const char *auth_mode_string(struct intel_huc *huc,
>> + enum intel_huc_authentication_type type)
>> +{
>> + bool partial = huc->fw.has_gsc_headers && type ==
>> INTEL_HUC_AUTH_BY_GUC;
>> +
>> + return partial ? "clear media" : "all workloads";
>> +}
>> +
>> +int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
>> + enum intel_huc_authentication_type type)
>> {
>> struct intel_gt *gt = huc_to_gt(huc);
>> int ret;
>> ret = __intel_wait_for_register(gt->uncore,
>> - huc->status.reg,
>> - huc->status.mask,
>> - huc->status.value,
>> + huc->status[type].reg,
>> + huc->status[type].mask,
>> + huc->status[type].value,
>> 2, 50, NULL);
>> /* mark the load process as complete even if the wait failed */
>> delayed_huc_load_complete(huc);
>> if (ret) {
>> - huc_err(huc, "firmware not verified %pe\n", ERR_PTR(ret));
>> + huc_err(huc, "firmware not verified for %s: %pe\n",
>> + auth_mode_string(huc, type), ERR_PTR(ret));
>> intel_uc_fw_change_status(&huc->fw,
>> INTEL_UC_FIRMWARE_LOAD_FAIL);
>> return ret;
>> }
>> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
>> - huc_info(huc, "authenticated!\n");
>> + huc_info(huc, "authenticated for %s!\n", auth_mode_string(huc,
>> type));
> Not a blocker but should this have an exclamation? It sort of implies
> the authentication is unexpected.
I can drop it. I just left it because it was already there.
>
>> return 0;
>> }
>> @@ -442,7 +471,7 @@ int intel_huc_auth(struct intel_huc *huc)
>> }
>> /* Check authentication status, it should be done by now */
>> - ret = intel_huc_wait_for_auth_complete(huc);
>> + ret = intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GUC);
>> if (ret)
>> goto fail;
>> @@ -453,16 +482,29 @@ int intel_huc_auth(struct intel_huc *huc)
>> return ret;
>> }
>> -bool intel_huc_is_authenticated(struct intel_huc *huc)
>> +bool intel_huc_is_authenticated(struct intel_huc *huc,
>> + enum intel_huc_authentication_type type)
>> {
>> struct intel_gt *gt = huc_to_gt(huc);
>> intel_wakeref_t wakeref;
>> u32 status = 0;
>> with_intel_runtime_pm(gt->uncore->rpm, wakeref)
>> - status = intel_uncore_read(gt->uncore, huc->status.reg);
>> + status = intel_uncore_read(gt->uncore, huc->status[type].reg);
>> - return (status & huc->status.mask) == huc->status.value;
>> + return (status & huc->status[type].mask) ==
>> huc->status[type].value;
>> +}
>> +
>> +static bool huc_is_fully_authenticated(struct intel_huc *huc)
>> +{
>> + struct intel_uc_fw *huc_fw = &huc->fw;
>> +
>> + if (!huc_fw->has_gsc_headers)
>> + return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC);
>> + else if (intel_huc_is_loaded_by_gsc(huc) ||
>> HAS_ENGINE(huc_to_gt(huc), GSC0))
>> + return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
>> + else
>> + return false;
>> }
>> /**
>> @@ -477,7 +519,9 @@ bool intel_huc_is_authenticated(struct intel_huc
>> *huc)
>> */
>> int intel_huc_check_status(struct intel_huc *huc)
>> {
>> - switch (__intel_uc_fw_status(&huc->fw)) {
>> + struct intel_uc_fw *huc_fw = &huc->fw;
>> +
>> + switch (__intel_uc_fw_status(huc_fw)) {
>> case INTEL_UC_FIRMWARE_NOT_SUPPORTED:
>> return -ENODEV;
>> case INTEL_UC_FIRMWARE_DISABLED:
>> @@ -494,7 +538,17 @@ int intel_huc_check_status(struct intel_huc *huc)
>> break;
>> }
>> - return intel_huc_is_authenticated(huc);
>> + /*
>> + * meu binaries loaded by GuC are first partially authenticated
>> by GuC
> meu?
>
Same as the other one, will fix.
Daniele
> John.
>
>
>> + * and then fully authenticated by GSC
>> + */
>> + if (huc_is_fully_authenticated(huc))
>> + return 1; /* full auth */
>> + else if (huc_fw->has_gsc_headers &&
>> !intel_huc_is_loaded_by_gsc(huc) &&
>> + intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC))
>> + return 2; /* clear media only */
>> + else
>> + return 0;
>> }
>> static bool huc_has_delayed_load(struct intel_huc *huc)
>> @@ -508,7 +562,10 @@ void intel_huc_update_auth_status(struct
>> intel_huc *huc)
>> if (!intel_uc_fw_is_loadable(&huc->fw))
>> return;
>> - if (intel_huc_is_authenticated(huc))
>> + if (!huc->fw.has_gsc_headers)
>> + return;
>> +
>> + if (huc_is_fully_authenticated(huc))
>> intel_uc_fw_change_status(&huc->fw,
>> INTEL_UC_FIRMWARE_RUNNING);
>> else if (huc_has_delayed_load(huc))
>> @@ -541,5 +598,5 @@ void intel_huc_load_status(struct intel_huc *huc,
>> struct drm_printer *p)
>> with_intel_runtime_pm(gt->uncore->rpm, wakeref)
>> drm_printf(p, "HuC status: 0x%08x\n",
>> - intel_uncore_read(gt->uncore, huc->status.reg));
>> + intel_uncore_read(gt->uncore,
>> huc->status[INTEL_HUC_AUTH_BY_GUC].reg));
>> }
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> index 112f0dce4702..3f6aa7c37abc 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>> @@ -22,6 +22,12 @@ enum intel_huc_delayed_load_status {
>> INTEL_HUC_DELAYED_LOAD_ERROR,
>> };
>> +enum intel_huc_authentication_type {
>> + INTEL_HUC_AUTH_BY_GUC = 0,
>> + INTEL_HUC_AUTH_BY_GSC,
>> + INTEL_HUC_AUTH_MAX_MODES
>> +};
>> +
>> struct intel_huc {
>> /* Generic uC firmware management */
>> struct intel_uc_fw fw;
>> @@ -31,7 +37,7 @@ struct intel_huc {
>> i915_reg_t reg;
>> u32 mask;
>> u32 value;
>> - } status;
>> + } status[INTEL_HUC_AUTH_MAX_MODES];
>> struct {
>> struct i915_sw_fence fence;
>> @@ -49,10 +55,12 @@ int intel_huc_init(struct intel_huc *huc);
>> void intel_huc_fini(struct intel_huc *huc);
>> void intel_huc_suspend(struct intel_huc *huc);
>> int intel_huc_auth(struct intel_huc *huc);
>> -int intel_huc_wait_for_auth_complete(struct intel_huc *huc);
>> +int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
>> + enum intel_huc_authentication_type type);
>> +bool intel_huc_is_authenticated(struct intel_huc *huc,
>> + enum intel_huc_authentication_type type);
>> int intel_huc_check_status(struct intel_huc *huc);
>> void intel_huc_update_auth_status(struct intel_huc *huc);
>> -bool intel_huc_is_authenticated(struct intel_huc *huc);
>> void intel_huc_register_gsc_notifier(struct intel_huc *huc, const
>> struct bus_type *bus);
>> void intel_huc_unregister_gsc_notifier(struct intel_huc *huc, const
>> struct bus_type *bus);
>> @@ -81,7 +89,7 @@ static inline bool intel_huc_is_loaded_by_gsc(const
>> struct intel_huc *huc)
>> static inline bool intel_huc_wait_required(struct intel_huc *huc)
>> {
>> return intel_huc_is_used(huc) &&
>> intel_huc_is_loaded_by_gsc(huc) &&
>> - !intel_huc_is_authenticated(huc);
>> + !intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
>> }
>> void intel_huc_load_status(struct intel_huc *huc, struct
>> drm_printer *p);
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> index 3355dc1e2bc6..d2b4176c81d6 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>> @@ -160,7 +160,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct
>> intel_huc *huc)
>> * component gets re-bound and this function called again. If
>> so, just
>> * mark the HuC as loaded.
>> */
>> - if (intel_huc_is_authenticated(huc)) {
>> + if (intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
>> intel_uc_fw_change_status(&huc->fw,
>> INTEL_UC_FIRMWARE_RUNNING);
>> return 0;
>> }
>> @@ -173,7 +173,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct
>> intel_huc *huc)
>> intel_uc_fw_change_status(&huc->fw,
>> INTEL_UC_FIRMWARE_TRANSFERRED);
>> - return intel_huc_wait_for_auth_complete(huc);
>> + return intel_huc_wait_for_auth_complete(huc,
>> INTEL_HUC_AUTH_BY_GSC);
>> }
>> /**
>> diff --git a/drivers/gpu/drm/i915/i915_reg.h
>> b/drivers/gpu/drm/i915/i915_reg.h
>> index 0523418129c5..c14433795c91 100644
>> --- a/drivers/gpu/drm/i915/i915_reg.h
>> +++ b/drivers/gpu/drm/i915/i915_reg.h
>> @@ -941,6 +941,9 @@
>> #define HECI_H_GS1(base) _MMIO((base) + 0xc4c)
>> #define HECI_H_GS1_ER_PREP REG_BIT(0)
>> +#define HECI_FWSTS5(base) _MMIO(base + 0xc68)
>> +#define HECI_FWSTS5_HUC_AUTH_DONE (1 << 19)
>> +
>> #define HSW_GTT_CACHE_EN _MMIO(0x4024)
>> #define GTT_CACHE_EN_ALL 0xF0007FFF
>> #define GEN7_WR_WATERMARK _MMIO(0x4028)
>> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>> b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>> index 8dc41de3f6f7..016bd8fad89d 100644
>> --- a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>> @@ -196,7 +196,7 @@ bool intel_pxp_gsccs_is_ready_for_sessions(struct
>> intel_pxp *pxp)
>> * gsc-proxy init flow (the last set of dependencies that
>> * are out of order) will suffice.
>> */
>> - if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc) &&
>> + if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc,
>> INTEL_HUC_AUTH_BY_GSC) &&
>> intel_gsc_uc_fw_proxy_init_done(&pxp->ctrl_gt->uc.gsc))
>> return true;
>> diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
>> index f31dfacde601..a1848e806059 100644
>> --- a/include/uapi/drm/i915_drm.h
>> +++ b/include/uapi/drm/i915_drm.h
>> @@ -674,7 +674,8 @@ typedef struct drm_i915_irq_wait {
>> * If the IOCTL is successful, the returned parameter will be set
>> to one of the
>> * following values:
>> * * 0 if HuC firmware load is not complete,
>> - * * 1 if HuC firmware is authenticated and running.
>> + * * 1 if HuC firmware is loaded and fully authenticated,
>> + * * 2 if HuC firmware is loaded and authenticated for clear media
>> only
>> */
>> #define I915_PARAM_HUC_STATUS 42
>
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCH v4] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
2023-05-31 0:14 ` [Intel-gfx] " Ceraolo Spurio, Daniele
@ 2023-05-31 0:24 ` John Harrison
-1 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-31 0:24 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 17:14, Ceraolo Spurio, Daniele wrote:
> On 5/30/2023 5:01 PM, John Harrison wrote:
>> On 5/30/2023 08:29, Daniele Ceraolo Spurio wrote:
>>> Before we add the second step of the MTL HuC auth (via GSC), we need to
>>> have the ability to differentiate between them. To do so, the huc
>>> authentication check is duplicated for GuC and GSC auth, with meu
>> meu?
>
> leftover from the meu drop. Will reword.
>
>>
>>> binaries being considered fully authenticated only after the GSC auth
>>> step.
>>>
>>> To report the difference between the 2 auth steps, a new case is added
>>> to the HuC getparam. This way, the clear media driver can start
>>> submitting before full auth, as partial auth is enough for those
>>> workloads.
>>>
>>> v2: fix authentication status check for DG2
>>>
>>> v3: add a better comment at the top of the HuC file to explain the
>>> different approaches to load and auth (John)
>>>
>>> v4: update call to intel_huc_is_authenticated in the pxp code to check
>>> for GSC authentication
>>>
>>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>>> Cc: John Harrison <John.C.Harrison@Intel.com>
>>> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
>>> ---
>>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 111
>>> ++++++++++++++++-----
>>> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 16 ++-
>>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 4 +-
>>> drivers/gpu/drm/i915/i915_reg.h | 3 +
>>> drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 2 +-
>>> include/uapi/drm/i915_drm.h | 3 +-
>>> 6 files changed, 104 insertions(+), 35 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> index 37c6a8ca5c71..ab5246ae3979 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> @@ -10,6 +10,7 @@
>>> #include "intel_huc.h"
>>> #include "intel_huc_print.h"
>>> #include "i915_drv.h"
>>> +#include "i915_reg.h"
>>> #include <linux/device/bus.h>
>>> #include <linux/mei_aux.h>
>>> @@ -22,15 +23,23 @@
>>> * capabilities by adding HuC specific commands to batch buffers.
>>> *
>>> * The kernel driver is only responsible for loading the HuC
>>> firmware and
>>> - * triggering its security authentication, which is performed by
>>> the GuC on
>>> - * older platforms and by the GSC on newer ones. For the GuC to
>>> correctly
>>> - * perform the authentication, the HuC binary must be loaded before
>>> the GuC one.
>>> + * triggering its security authentication. This is done differently
>>> depending
>>> + * on the platform:
>>> + * - older platforms (from Gen9 to most Gen12s): the load is
>>> performed via DMA
>>> + * and the authentication via GuC
>>> + * - DG2: load and authentication are both performed via GSC.
>>> + * - MTL and newer platforms: the load is performed via DMA (same
>>> as with
>>> + * not-DG2 older platforms), while the authentication is done in
>>> 2-steps,
>>> + * a first auth for clear-media workloads via GuC and a second
>>> one for all
>>> + * workloads via GSC.
>>> + * On platforms where the GuC does the authentication, to correctly
>>> do so the
>>> + * HuC binary must be loaded before the GuC one.
>>> * Loading the HuC is optional; however, not using the HuC might
>>> negatively
>>> * impact power usage and/or performance of media workloads,
>>> depending on the
>>> * use-cases.
>>> * HuC must be reloaded on events that cause the WOPCM to lose its
>>> contents
>>> - * (S3/S4, FLR); GuC-authenticated HuC must also be reloaded on
>>> GuC/GT reset,
>>> - * while GSC-managed HuC will survive that.
>>> + * (S3/S4, FLR); on older platforms the HuC must also be reloaded
>>> on GuC/GT
>>> + * reset, while on newer ones it will survive that.
>>> *
>>> * See https://github.com/intel/media-driver for the latest
>>> details on HuC
>>> * functionality.
>>> @@ -106,7 +115,7 @@ static enum hrtimer_restart
>>> huc_delayed_load_timer_callback(struct hrtimer *hrti
>>> {
>>> struct intel_huc *huc = container_of(hrtimer, struct
>>> intel_huc, delayed_load.timer);
>>> - if (!intel_huc_is_authenticated(huc)) {
>>> + if (!intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
>>> if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_GSC)
>>> huc_notice(huc, "timed out waiting for MEI GSC\n");
>>> else if (huc->delayed_load.status ==
>>> INTEL_HUC_WAITING_ON_PXP)
>>> @@ -124,7 +133,7 @@ static void huc_delayed_load_start(struct
>>> intel_huc *huc)
>>> {
>>> ktime_t delay;
>>> - GEM_BUG_ON(intel_huc_is_authenticated(huc));
>>> + GEM_BUG_ON(intel_huc_is_authenticated(huc,
>>> INTEL_HUC_AUTH_BY_GSC));
>>> /*
>>> * On resume we don't have to wait for MEI-GSC to be
>>> re-probed, but we
>>> @@ -284,13 +293,23 @@ void intel_huc_init_early(struct intel_huc *huc)
>>> }
>>> if (GRAPHICS_VER(i915) >= 11) {
>>> - huc->status.reg = GEN11_HUC_KERNEL_LOAD_INFO;
>>> - huc->status.mask = HUC_LOAD_SUCCESSFUL;
>>> - huc->status.value = HUC_LOAD_SUCCESSFUL;
>>> + huc->status[INTEL_HUC_AUTH_BY_GUC].reg =
>>> GEN11_HUC_KERNEL_LOAD_INFO;
>>> + huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_LOAD_SUCCESSFUL;
>>> + huc->status[INTEL_HUC_AUTH_BY_GUC].value =
>>> HUC_LOAD_SUCCESSFUL;
>>> } else {
>>> - huc->status.reg = HUC_STATUS2;
>>> - huc->status.mask = HUC_FW_VERIFIED;
>>> - huc->status.value = HUC_FW_VERIFIED;
>>> + huc->status[INTEL_HUC_AUTH_BY_GUC].reg = HUC_STATUS2;
>>> + huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_FW_VERIFIED;
>>> + huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_FW_VERIFIED;
>>> + }
>>> +
>>> + if (IS_DG2(i915)) {
>>> + huc->status[INTEL_HUC_AUTH_BY_GSC].reg =
>>> GEN11_HUC_KERNEL_LOAD_INFO;
>>> + huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HUC_LOAD_SUCCESSFUL;
>>> + huc->status[INTEL_HUC_AUTH_BY_GSC].value =
>>> HUC_LOAD_SUCCESSFUL;
>>> + } else {
>>> + huc->status[INTEL_HUC_AUTH_BY_GSC].reg =
>>> HECI_FWSTS5(MTL_GSC_HECI1_BASE);
>>> + huc->status[INTEL_HUC_AUTH_BY_GSC].mask =
>>> HECI_FWSTS5_HUC_AUTH_DONE;
>>> + huc->status[INTEL_HUC_AUTH_BY_GSC].value =
>>> HECI_FWSTS5_HUC_AUTH_DONE;
>>> }
>>> }
>>> @@ -381,28 +400,38 @@ void intel_huc_suspend(struct intel_huc *huc)
>>> delayed_huc_load_complete(huc);
>>> }
>>> -int intel_huc_wait_for_auth_complete(struct intel_huc *huc)
>>> +static const char *auth_mode_string(struct intel_huc *huc,
>>> + enum intel_huc_authentication_type type)
>>> +{
>>> + bool partial = huc->fw.has_gsc_headers && type ==
>>> INTEL_HUC_AUTH_BY_GUC;
>>> +
>>> + return partial ? "clear media" : "all workloads";
>>> +}
>>> +
>>> +int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
>>> + enum intel_huc_authentication_type type)
>>> {
>>> struct intel_gt *gt = huc_to_gt(huc);
>>> int ret;
>>> ret = __intel_wait_for_register(gt->uncore,
>>> - huc->status.reg,
>>> - huc->status.mask,
>>> - huc->status.value,
>>> + huc->status[type].reg,
>>> + huc->status[type].mask,
>>> + huc->status[type].value,
>>> 2, 50, NULL);
>>> /* mark the load process as complete even if the wait failed */
>>> delayed_huc_load_complete(huc);
>>> if (ret) {
>>> - huc_err(huc, "firmware not verified %pe\n", ERR_PTR(ret));
>>> + huc_err(huc, "firmware not verified for %s: %pe\n",
>>> + auth_mode_string(huc, type), ERR_PTR(ret));
>>> intel_uc_fw_change_status(&huc->fw,
>>> INTEL_UC_FIRMWARE_LOAD_FAIL);
>>> return ret;
>>> }
>>> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
>>> - huc_info(huc, "authenticated!\n");
>>> + huc_info(huc, "authenticated for %s!\n", auth_mode_string(huc,
>>> type));
>> Not a blocker but should this have an exclamation? It sort of implies
>> the authentication is unexpected.
>
> I can drop it. I just left it because it was already there.
Indeed. I'm just wondering if you know if there was a good reason for it
being added in the original message?
Hmm, it looks like Michal added it as part of the drm_info -> huc_info
update. Maybe check with him? But to me an exclamation implies an error
or other exceptional circumstance. So I would drop it myself.
John.
>
>>
>>> return 0;
>>> }
>>> @@ -442,7 +471,7 @@ int intel_huc_auth(struct intel_huc *huc)
>>> }
>>> /* Check authentication status, it should be done by now */
>>> - ret = intel_huc_wait_for_auth_complete(huc);
>>> + ret = intel_huc_wait_for_auth_complete(huc,
>>> INTEL_HUC_AUTH_BY_GUC);
>>> if (ret)
>>> goto fail;
>>> @@ -453,16 +482,29 @@ int intel_huc_auth(struct intel_huc *huc)
>>> return ret;
>>> }
>>> -bool intel_huc_is_authenticated(struct intel_huc *huc)
>>> +bool intel_huc_is_authenticated(struct intel_huc *huc,
>>> + enum intel_huc_authentication_type type)
>>> {
>>> struct intel_gt *gt = huc_to_gt(huc);
>>> intel_wakeref_t wakeref;
>>> u32 status = 0;
>>> with_intel_runtime_pm(gt->uncore->rpm, wakeref)
>>> - status = intel_uncore_read(gt->uncore, huc->status.reg);
>>> + status = intel_uncore_read(gt->uncore, huc->status[type].reg);
>>> - return (status & huc->status.mask) == huc->status.value;
>>> + return (status & huc->status[type].mask) ==
>>> huc->status[type].value;
>>> +}
>>> +
>>> +static bool huc_is_fully_authenticated(struct intel_huc *huc)
>>> +{
>>> + struct intel_uc_fw *huc_fw = &huc->fw;
>>> +
>>> + if (!huc_fw->has_gsc_headers)
>>> + return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC);
>>> + else if (intel_huc_is_loaded_by_gsc(huc) ||
>>> HAS_ENGINE(huc_to_gt(huc), GSC0))
>>> + return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
>>> + else
>>> + return false;
>>> }
>>> /**
>>> @@ -477,7 +519,9 @@ bool intel_huc_is_authenticated(struct intel_huc
>>> *huc)
>>> */
>>> int intel_huc_check_status(struct intel_huc *huc)
>>> {
>>> - switch (__intel_uc_fw_status(&huc->fw)) {
>>> + struct intel_uc_fw *huc_fw = &huc->fw;
>>> +
>>> + switch (__intel_uc_fw_status(huc_fw)) {
>>> case INTEL_UC_FIRMWARE_NOT_SUPPORTED:
>>> return -ENODEV;
>>> case INTEL_UC_FIRMWARE_DISABLED:
>>> @@ -494,7 +538,17 @@ int intel_huc_check_status(struct intel_huc *huc)
>>> break;
>>> }
>>> - return intel_huc_is_authenticated(huc);
>>> + /*
>>> + * meu binaries loaded by GuC are first partially authenticated
>>> by GuC
>> meu?
>>
>
> Same as the other one, will fix.
>
> Daniele
>
>> John.
>>
>>
>>> + * and then fully authenticated by GSC
>>> + */
>>> + if (huc_is_fully_authenticated(huc))
>>> + return 1; /* full auth */
>>> + else if (huc_fw->has_gsc_headers &&
>>> !intel_huc_is_loaded_by_gsc(huc) &&
>>> + intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC))
>>> + return 2; /* clear media only */
>>> + else
>>> + return 0;
>>> }
>>> static bool huc_has_delayed_load(struct intel_huc *huc)
>>> @@ -508,7 +562,10 @@ void intel_huc_update_auth_status(struct
>>> intel_huc *huc)
>>> if (!intel_uc_fw_is_loadable(&huc->fw))
>>> return;
>>> - if (intel_huc_is_authenticated(huc))
>>> + if (!huc->fw.has_gsc_headers)
>>> + return;
>>> +
>>> + if (huc_is_fully_authenticated(huc))
>>> intel_uc_fw_change_status(&huc->fw,
>>> INTEL_UC_FIRMWARE_RUNNING);
>>> else if (huc_has_delayed_load(huc))
>>> @@ -541,5 +598,5 @@ void intel_huc_load_status(struct intel_huc
>>> *huc, struct drm_printer *p)
>>> with_intel_runtime_pm(gt->uncore->rpm, wakeref)
>>> drm_printf(p, "HuC status: 0x%08x\n",
>>> - intel_uncore_read(gt->uncore, huc->status.reg));
>>> + intel_uncore_read(gt->uncore,
>>> huc->status[INTEL_HUC_AUTH_BY_GUC].reg));
>>> }
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> index 112f0dce4702..3f6aa7c37abc 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> @@ -22,6 +22,12 @@ enum intel_huc_delayed_load_status {
>>> INTEL_HUC_DELAYED_LOAD_ERROR,
>>> };
>>> +enum intel_huc_authentication_type {
>>> + INTEL_HUC_AUTH_BY_GUC = 0,
>>> + INTEL_HUC_AUTH_BY_GSC,
>>> + INTEL_HUC_AUTH_MAX_MODES
>>> +};
>>> +
>>> struct intel_huc {
>>> /* Generic uC firmware management */
>>> struct intel_uc_fw fw;
>>> @@ -31,7 +37,7 @@ struct intel_huc {
>>> i915_reg_t reg;
>>> u32 mask;
>>> u32 value;
>>> - } status;
>>> + } status[INTEL_HUC_AUTH_MAX_MODES];
>>> struct {
>>> struct i915_sw_fence fence;
>>> @@ -49,10 +55,12 @@ int intel_huc_init(struct intel_huc *huc);
>>> void intel_huc_fini(struct intel_huc *huc);
>>> void intel_huc_suspend(struct intel_huc *huc);
>>> int intel_huc_auth(struct intel_huc *huc);
>>> -int intel_huc_wait_for_auth_complete(struct intel_huc *huc);
>>> +int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
>>> + enum intel_huc_authentication_type type);
>>> +bool intel_huc_is_authenticated(struct intel_huc *huc,
>>> + enum intel_huc_authentication_type type);
>>> int intel_huc_check_status(struct intel_huc *huc);
>>> void intel_huc_update_auth_status(struct intel_huc *huc);
>>> -bool intel_huc_is_authenticated(struct intel_huc *huc);
>>> void intel_huc_register_gsc_notifier(struct intel_huc *huc,
>>> const struct bus_type *bus);
>>> void intel_huc_unregister_gsc_notifier(struct intel_huc *huc,
>>> const struct bus_type *bus);
>>> @@ -81,7 +89,7 @@ static inline bool
>>> intel_huc_is_loaded_by_gsc(const struct intel_huc *huc)
>>> static inline bool intel_huc_wait_required(struct intel_huc *huc)
>>> {
>>> return intel_huc_is_used(huc) &&
>>> intel_huc_is_loaded_by_gsc(huc) &&
>>> - !intel_huc_is_authenticated(huc);
>>> + !intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
>>> }
>>> void intel_huc_load_status(struct intel_huc *huc, struct
>>> drm_printer *p);
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> index 3355dc1e2bc6..d2b4176c81d6 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> @@ -160,7 +160,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct
>>> intel_huc *huc)
>>> * component gets re-bound and this function called again. If
>>> so, just
>>> * mark the HuC as loaded.
>>> */
>>> - if (intel_huc_is_authenticated(huc)) {
>>> + if (intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
>>> intel_uc_fw_change_status(&huc->fw,
>>> INTEL_UC_FIRMWARE_RUNNING);
>>> return 0;
>>> }
>>> @@ -173,7 +173,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct
>>> intel_huc *huc)
>>> intel_uc_fw_change_status(&huc->fw,
>>> INTEL_UC_FIRMWARE_TRANSFERRED);
>>> - return intel_huc_wait_for_auth_complete(huc);
>>> + return intel_huc_wait_for_auth_complete(huc,
>>> INTEL_HUC_AUTH_BY_GSC);
>>> }
>>> /**
>>> diff --git a/drivers/gpu/drm/i915/i915_reg.h
>>> b/drivers/gpu/drm/i915/i915_reg.h
>>> index 0523418129c5..c14433795c91 100644
>>> --- a/drivers/gpu/drm/i915/i915_reg.h
>>> +++ b/drivers/gpu/drm/i915/i915_reg.h
>>> @@ -941,6 +941,9 @@
>>> #define HECI_H_GS1(base) _MMIO((base) + 0xc4c)
>>> #define HECI_H_GS1_ER_PREP REG_BIT(0)
>>> +#define HECI_FWSTS5(base) _MMIO(base + 0xc68)
>>> +#define HECI_FWSTS5_HUC_AUTH_DONE (1 << 19)
>>> +
>>> #define HSW_GTT_CACHE_EN _MMIO(0x4024)
>>> #define GTT_CACHE_EN_ALL 0xF0007FFF
>>> #define GEN7_WR_WATERMARK _MMIO(0x4028)
>>> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>>> b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>>> index 8dc41de3f6f7..016bd8fad89d 100644
>>> --- a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>>> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>>> @@ -196,7 +196,7 @@ bool
>>> intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp)
>>> * gsc-proxy init flow (the last set of dependencies that
>>> * are out of order) will suffice.
>>> */
>>> - if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc) &&
>>> + if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc,
>>> INTEL_HUC_AUTH_BY_GSC) &&
>>> intel_gsc_uc_fw_proxy_init_done(&pxp->ctrl_gt->uc.gsc))
>>> return true;
>>> diff --git a/include/uapi/drm/i915_drm.h
>>> b/include/uapi/drm/i915_drm.h
>>> index f31dfacde601..a1848e806059 100644
>>> --- a/include/uapi/drm/i915_drm.h
>>> +++ b/include/uapi/drm/i915_drm.h
>>> @@ -674,7 +674,8 @@ typedef struct drm_i915_irq_wait {
>>> * If the IOCTL is successful, the returned parameter will be set
>>> to one of the
>>> * following values:
>>> * * 0 if HuC firmware load is not complete,
>>> - * * 1 if HuC firmware is authenticated and running.
>>> + * * 1 if HuC firmware is loaded and fully authenticated,
>>> + * * 2 if HuC firmware is loaded and authenticated for clear media
>>> only
>>> */
>>> #define I915_PARAM_HUC_STATUS 42
>>
>
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [Intel-gfx] [PATCH v4] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
@ 2023-05-31 0:24 ` John Harrison
0 siblings, 0 replies; 52+ messages in thread
From: John Harrison @ 2023-05-31 0:24 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele, intel-gfx; +Cc: Alan Previn, dri-devel
On 5/30/2023 17:14, Ceraolo Spurio, Daniele wrote:
> On 5/30/2023 5:01 PM, John Harrison wrote:
>> On 5/30/2023 08:29, Daniele Ceraolo Spurio wrote:
>>> Before we add the second step of the MTL HuC auth (via GSC), we need to
>>> have the ability to differentiate between them. To do so, the huc
>>> authentication check is duplicated for GuC and GSC auth, with meu
>> meu?
>
> leftover from the meu drop. Will reword.
>
>>
>>> binaries being considered fully authenticated only after the GSC auth
>>> step.
>>>
>>> To report the difference between the 2 auth steps, a new case is added
>>> to the HuC getparam. This way, the clear media driver can start
>>> submitting before full auth, as partial auth is enough for those
>>> workloads.
>>>
>>> v2: fix authentication status check for DG2
>>>
>>> v3: add a better comment at the top of the HuC file to explain the
>>> different approaches to load and auth (John)
>>>
>>> v4: update call to intel_huc_is_authenticated in the pxp code to check
>>> for GSC authentication
>>>
>>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>>> Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
>>> Cc: John Harrison <John.C.Harrison@Intel.com>
>>> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> #v2
>>> ---
>>> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 111
>>> ++++++++++++++++-----
>>> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 16 ++-
>>> drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 4 +-
>>> drivers/gpu/drm/i915/i915_reg.h | 3 +
>>> drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 2 +-
>>> include/uapi/drm/i915_drm.h | 3 +-
>>> 6 files changed, 104 insertions(+), 35 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> index 37c6a8ca5c71..ab5246ae3979 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>>> @@ -10,6 +10,7 @@
>>> #include "intel_huc.h"
>>> #include "intel_huc_print.h"
>>> #include "i915_drv.h"
>>> +#include "i915_reg.h"
>>> #include <linux/device/bus.h>
>>> #include <linux/mei_aux.h>
>>> @@ -22,15 +23,23 @@
>>> * capabilities by adding HuC specific commands to batch buffers.
>>> *
>>> * The kernel driver is only responsible for loading the HuC
>>> firmware and
>>> - * triggering its security authentication, which is performed by
>>> the GuC on
>>> - * older platforms and by the GSC on newer ones. For the GuC to
>>> correctly
>>> - * perform the authentication, the HuC binary must be loaded before
>>> the GuC one.
>>> + * triggering its security authentication. This is done differently
>>> depending
>>> + * on the platform:
>>> + * - older platforms (from Gen9 to most Gen12s): the load is
>>> performed via DMA
>>> + * and the authentication via GuC
>>> + * - DG2: load and authentication are both performed via GSC.
>>> + * - MTL and newer platforms: the load is performed via DMA (same
>>> as with
>>> + * not-DG2 older platforms), while the authentication is done in
>>> 2-steps,
>>> + * a first auth for clear-media workloads via GuC and a second
>>> one for all
>>> + * workloads via GSC.
>>> + * On platforms where the GuC does the authentication, to correctly
>>> do so the
>>> + * HuC binary must be loaded before the GuC one.
>>> * Loading the HuC is optional; however, not using the HuC might
>>> negatively
>>> * impact power usage and/or performance of media workloads,
>>> depending on the
>>> * use-cases.
>>> * HuC must be reloaded on events that cause the WOPCM to lose its
>>> contents
>>> - * (S3/S4, FLR); GuC-authenticated HuC must also be reloaded on
>>> GuC/GT reset,
>>> - * while GSC-managed HuC will survive that.
>>> + * (S3/S4, FLR); on older platforms the HuC must also be reloaded
>>> on GuC/GT
>>> + * reset, while on newer ones it will survive that.
>>> *
>>> * See https://github.com/intel/media-driver for the latest
>>> details on HuC
>>> * functionality.
>>> @@ -106,7 +115,7 @@ static enum hrtimer_restart
>>> huc_delayed_load_timer_callback(struct hrtimer *hrti
>>> {
>>> struct intel_huc *huc = container_of(hrtimer, struct
>>> intel_huc, delayed_load.timer);
>>> - if (!intel_huc_is_authenticated(huc)) {
>>> + if (!intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
>>> if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_GSC)
>>> huc_notice(huc, "timed out waiting for MEI GSC\n");
>>> else if (huc->delayed_load.status ==
>>> INTEL_HUC_WAITING_ON_PXP)
>>> @@ -124,7 +133,7 @@ static void huc_delayed_load_start(struct
>>> intel_huc *huc)
>>> {
>>> ktime_t delay;
>>> - GEM_BUG_ON(intel_huc_is_authenticated(huc));
>>> + GEM_BUG_ON(intel_huc_is_authenticated(huc,
>>> INTEL_HUC_AUTH_BY_GSC));
>>> /*
>>> * On resume we don't have to wait for MEI-GSC to be
>>> re-probed, but we
>>> @@ -284,13 +293,23 @@ void intel_huc_init_early(struct intel_huc *huc)
>>> }
>>> if (GRAPHICS_VER(i915) >= 11) {
>>> - huc->status.reg = GEN11_HUC_KERNEL_LOAD_INFO;
>>> - huc->status.mask = HUC_LOAD_SUCCESSFUL;
>>> - huc->status.value = HUC_LOAD_SUCCESSFUL;
>>> + huc->status[INTEL_HUC_AUTH_BY_GUC].reg =
>>> GEN11_HUC_KERNEL_LOAD_INFO;
>>> + huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_LOAD_SUCCESSFUL;
>>> + huc->status[INTEL_HUC_AUTH_BY_GUC].value =
>>> HUC_LOAD_SUCCESSFUL;
>>> } else {
>>> - huc->status.reg = HUC_STATUS2;
>>> - huc->status.mask = HUC_FW_VERIFIED;
>>> - huc->status.value = HUC_FW_VERIFIED;
>>> + huc->status[INTEL_HUC_AUTH_BY_GUC].reg = HUC_STATUS2;
>>> + huc->status[INTEL_HUC_AUTH_BY_GUC].mask = HUC_FW_VERIFIED;
>>> + huc->status[INTEL_HUC_AUTH_BY_GUC].value = HUC_FW_VERIFIED;
>>> + }
>>> +
>>> + if (IS_DG2(i915)) {
>>> + huc->status[INTEL_HUC_AUTH_BY_GSC].reg =
>>> GEN11_HUC_KERNEL_LOAD_INFO;
>>> + huc->status[INTEL_HUC_AUTH_BY_GSC].mask = HUC_LOAD_SUCCESSFUL;
>>> + huc->status[INTEL_HUC_AUTH_BY_GSC].value =
>>> HUC_LOAD_SUCCESSFUL;
>>> + } else {
>>> + huc->status[INTEL_HUC_AUTH_BY_GSC].reg =
>>> HECI_FWSTS5(MTL_GSC_HECI1_BASE);
>>> + huc->status[INTEL_HUC_AUTH_BY_GSC].mask =
>>> HECI_FWSTS5_HUC_AUTH_DONE;
>>> + huc->status[INTEL_HUC_AUTH_BY_GSC].value =
>>> HECI_FWSTS5_HUC_AUTH_DONE;
>>> }
>>> }
>>> @@ -381,28 +400,38 @@ void intel_huc_suspend(struct intel_huc *huc)
>>> delayed_huc_load_complete(huc);
>>> }
>>> -int intel_huc_wait_for_auth_complete(struct intel_huc *huc)
>>> +static const char *auth_mode_string(struct intel_huc *huc,
>>> + enum intel_huc_authentication_type type)
>>> +{
>>> + bool partial = huc->fw.has_gsc_headers && type ==
>>> INTEL_HUC_AUTH_BY_GUC;
>>> +
>>> + return partial ? "clear media" : "all workloads";
>>> +}
>>> +
>>> +int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
>>> + enum intel_huc_authentication_type type)
>>> {
>>> struct intel_gt *gt = huc_to_gt(huc);
>>> int ret;
>>> ret = __intel_wait_for_register(gt->uncore,
>>> - huc->status.reg,
>>> - huc->status.mask,
>>> - huc->status.value,
>>> + huc->status[type].reg,
>>> + huc->status[type].mask,
>>> + huc->status[type].value,
>>> 2, 50, NULL);
>>> /* mark the load process as complete even if the wait failed */
>>> delayed_huc_load_complete(huc);
>>> if (ret) {
>>> - huc_err(huc, "firmware not verified %pe\n", ERR_PTR(ret));
>>> + huc_err(huc, "firmware not verified for %s: %pe\n",
>>> + auth_mode_string(huc, type), ERR_PTR(ret));
>>> intel_uc_fw_change_status(&huc->fw,
>>> INTEL_UC_FIRMWARE_LOAD_FAIL);
>>> return ret;
>>> }
>>> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
>>> - huc_info(huc, "authenticated!\n");
>>> + huc_info(huc, "authenticated for %s!\n", auth_mode_string(huc,
>>> type));
>> Not a blocker but should this have an exclamation? It sort of implies
>> the authentication is unexpected.
>
> I can drop it. I just left it because it was already there.
Indeed. I'm just wondering if you know if there was a good reason for it
being added in the original message?
Hmm, it looks like Michal added it as part of the drm_info -> huc_info
update. Maybe check with him? But to me an exclamation implies an error
or other exceptional circumstance. So I would drop it myself.
John.
>
>>
>>> return 0;
>>> }
>>> @@ -442,7 +471,7 @@ int intel_huc_auth(struct intel_huc *huc)
>>> }
>>> /* Check authentication status, it should be done by now */
>>> - ret = intel_huc_wait_for_auth_complete(huc);
>>> + ret = intel_huc_wait_for_auth_complete(huc,
>>> INTEL_HUC_AUTH_BY_GUC);
>>> if (ret)
>>> goto fail;
>>> @@ -453,16 +482,29 @@ int intel_huc_auth(struct intel_huc *huc)
>>> return ret;
>>> }
>>> -bool intel_huc_is_authenticated(struct intel_huc *huc)
>>> +bool intel_huc_is_authenticated(struct intel_huc *huc,
>>> + enum intel_huc_authentication_type type)
>>> {
>>> struct intel_gt *gt = huc_to_gt(huc);
>>> intel_wakeref_t wakeref;
>>> u32 status = 0;
>>> with_intel_runtime_pm(gt->uncore->rpm, wakeref)
>>> - status = intel_uncore_read(gt->uncore, huc->status.reg);
>>> + status = intel_uncore_read(gt->uncore, huc->status[type].reg);
>>> - return (status & huc->status.mask) == huc->status.value;
>>> + return (status & huc->status[type].mask) ==
>>> huc->status[type].value;
>>> +}
>>> +
>>> +static bool huc_is_fully_authenticated(struct intel_huc *huc)
>>> +{
>>> + struct intel_uc_fw *huc_fw = &huc->fw;
>>> +
>>> + if (!huc_fw->has_gsc_headers)
>>> + return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC);
>>> + else if (intel_huc_is_loaded_by_gsc(huc) ||
>>> HAS_ENGINE(huc_to_gt(huc), GSC0))
>>> + return intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
>>> + else
>>> + return false;
>>> }
>>> /**
>>> @@ -477,7 +519,9 @@ bool intel_huc_is_authenticated(struct intel_huc
>>> *huc)
>>> */
>>> int intel_huc_check_status(struct intel_huc *huc)
>>> {
>>> - switch (__intel_uc_fw_status(&huc->fw)) {
>>> + struct intel_uc_fw *huc_fw = &huc->fw;
>>> +
>>> + switch (__intel_uc_fw_status(huc_fw)) {
>>> case INTEL_UC_FIRMWARE_NOT_SUPPORTED:
>>> return -ENODEV;
>>> case INTEL_UC_FIRMWARE_DISABLED:
>>> @@ -494,7 +538,17 @@ int intel_huc_check_status(struct intel_huc *huc)
>>> break;
>>> }
>>> - return intel_huc_is_authenticated(huc);
>>> + /*
>>> + * meu binaries loaded by GuC are first partially authenticated
>>> by GuC
>> meu?
>>
>
> Same as the other one, will fix.
>
> Daniele
>
>> John.
>>
>>
>>> + * and then fully authenticated by GSC
>>> + */
>>> + if (huc_is_fully_authenticated(huc))
>>> + return 1; /* full auth */
>>> + else if (huc_fw->has_gsc_headers &&
>>> !intel_huc_is_loaded_by_gsc(huc) &&
>>> + intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GUC))
>>> + return 2; /* clear media only */
>>> + else
>>> + return 0;
>>> }
>>> static bool huc_has_delayed_load(struct intel_huc *huc)
>>> @@ -508,7 +562,10 @@ void intel_huc_update_auth_status(struct
>>> intel_huc *huc)
>>> if (!intel_uc_fw_is_loadable(&huc->fw))
>>> return;
>>> - if (intel_huc_is_authenticated(huc))
>>> + if (!huc->fw.has_gsc_headers)
>>> + return;
>>> +
>>> + if (huc_is_fully_authenticated(huc))
>>> intel_uc_fw_change_status(&huc->fw,
>>> INTEL_UC_FIRMWARE_RUNNING);
>>> else if (huc_has_delayed_load(huc))
>>> @@ -541,5 +598,5 @@ void intel_huc_load_status(struct intel_huc
>>> *huc, struct drm_printer *p)
>>> with_intel_runtime_pm(gt->uncore->rpm, wakeref)
>>> drm_printf(p, "HuC status: 0x%08x\n",
>>> - intel_uncore_read(gt->uncore, huc->status.reg));
>>> + intel_uncore_read(gt->uncore,
>>> huc->status[INTEL_HUC_AUTH_BY_GUC].reg));
>>> }
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> index 112f0dce4702..3f6aa7c37abc 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
>>> @@ -22,6 +22,12 @@ enum intel_huc_delayed_load_status {
>>> INTEL_HUC_DELAYED_LOAD_ERROR,
>>> };
>>> +enum intel_huc_authentication_type {
>>> + INTEL_HUC_AUTH_BY_GUC = 0,
>>> + INTEL_HUC_AUTH_BY_GSC,
>>> + INTEL_HUC_AUTH_MAX_MODES
>>> +};
>>> +
>>> struct intel_huc {
>>> /* Generic uC firmware management */
>>> struct intel_uc_fw fw;
>>> @@ -31,7 +37,7 @@ struct intel_huc {
>>> i915_reg_t reg;
>>> u32 mask;
>>> u32 value;
>>> - } status;
>>> + } status[INTEL_HUC_AUTH_MAX_MODES];
>>> struct {
>>> struct i915_sw_fence fence;
>>> @@ -49,10 +55,12 @@ int intel_huc_init(struct intel_huc *huc);
>>> void intel_huc_fini(struct intel_huc *huc);
>>> void intel_huc_suspend(struct intel_huc *huc);
>>> int intel_huc_auth(struct intel_huc *huc);
>>> -int intel_huc_wait_for_auth_complete(struct intel_huc *huc);
>>> +int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
>>> + enum intel_huc_authentication_type type);
>>> +bool intel_huc_is_authenticated(struct intel_huc *huc,
>>> + enum intel_huc_authentication_type type);
>>> int intel_huc_check_status(struct intel_huc *huc);
>>> void intel_huc_update_auth_status(struct intel_huc *huc);
>>> -bool intel_huc_is_authenticated(struct intel_huc *huc);
>>> void intel_huc_register_gsc_notifier(struct intel_huc *huc,
>>> const struct bus_type *bus);
>>> void intel_huc_unregister_gsc_notifier(struct intel_huc *huc,
>>> const struct bus_type *bus);
>>> @@ -81,7 +89,7 @@ static inline bool
>>> intel_huc_is_loaded_by_gsc(const struct intel_huc *huc)
>>> static inline bool intel_huc_wait_required(struct intel_huc *huc)
>>> {
>>> return intel_huc_is_used(huc) &&
>>> intel_huc_is_loaded_by_gsc(huc) &&
>>> - !intel_huc_is_authenticated(huc);
>>> + !intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC);
>>> }
>>> void intel_huc_load_status(struct intel_huc *huc, struct
>>> drm_printer *p);
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> index 3355dc1e2bc6..d2b4176c81d6 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>>> @@ -160,7 +160,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct
>>> intel_huc *huc)
>>> * component gets re-bound and this function called again. If
>>> so, just
>>> * mark the HuC as loaded.
>>> */
>>> - if (intel_huc_is_authenticated(huc)) {
>>> + if (intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC)) {
>>> intel_uc_fw_change_status(&huc->fw,
>>> INTEL_UC_FIRMWARE_RUNNING);
>>> return 0;
>>> }
>>> @@ -173,7 +173,7 @@ int intel_huc_fw_load_and_auth_via_gsc(struct
>>> intel_huc *huc)
>>> intel_uc_fw_change_status(&huc->fw,
>>> INTEL_UC_FIRMWARE_TRANSFERRED);
>>> - return intel_huc_wait_for_auth_complete(huc);
>>> + return intel_huc_wait_for_auth_complete(huc,
>>> INTEL_HUC_AUTH_BY_GSC);
>>> }
>>> /**
>>> diff --git a/drivers/gpu/drm/i915/i915_reg.h
>>> b/drivers/gpu/drm/i915/i915_reg.h
>>> index 0523418129c5..c14433795c91 100644
>>> --- a/drivers/gpu/drm/i915/i915_reg.h
>>> +++ b/drivers/gpu/drm/i915/i915_reg.h
>>> @@ -941,6 +941,9 @@
>>> #define HECI_H_GS1(base) _MMIO((base) + 0xc4c)
>>> #define HECI_H_GS1_ER_PREP REG_BIT(0)
>>> +#define HECI_FWSTS5(base) _MMIO(base + 0xc68)
>>> +#define HECI_FWSTS5_HUC_AUTH_DONE (1 << 19)
>>> +
>>> #define HSW_GTT_CACHE_EN _MMIO(0x4024)
>>> #define GTT_CACHE_EN_ALL 0xF0007FFF
>>> #define GEN7_WR_WATERMARK _MMIO(0x4028)
>>> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>>> b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>>> index 8dc41de3f6f7..016bd8fad89d 100644
>>> --- a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>>> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
>>> @@ -196,7 +196,7 @@ bool
>>> intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp)
>>> * gsc-proxy init flow (the last set of dependencies that
>>> * are out of order) will suffice.
>>> */
>>> - if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc) &&
>>> + if (intel_huc_is_authenticated(&pxp->ctrl_gt->uc.huc,
>>> INTEL_HUC_AUTH_BY_GSC) &&
>>> intel_gsc_uc_fw_proxy_init_done(&pxp->ctrl_gt->uc.gsc))
>>> return true;
>>> diff --git a/include/uapi/drm/i915_drm.h
>>> b/include/uapi/drm/i915_drm.h
>>> index f31dfacde601..a1848e806059 100644
>>> --- a/include/uapi/drm/i915_drm.h
>>> +++ b/include/uapi/drm/i915_drm.h
>>> @@ -674,7 +674,8 @@ typedef struct drm_i915_irq_wait {
>>> * If the IOCTL is successful, the returned parameter will be set
>>> to one of the
>>> * following values:
>>> * * 0 if HuC firmware load is not complete,
>>> - * * 1 if HuC firmware is authenticated and running.
>>> + * * 1 if HuC firmware is loaded and fully authenticated,
>>> + * * 2 if HuC firmware is loaded and authenticated for clear media
>>> only
>>> */
>>> #define I915_PARAM_HUC_STATUS 42
>>
>
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 4/7] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
` (3 preceding siblings ...)
(?)
@ 2023-05-31 0:53 ` kernel test robot
-1 siblings, 0 replies; 52+ messages in thread
From: kernel test robot @ 2023-05-31 0:53 UTC (permalink / raw)
To: Daniele Ceraolo Spurio; +Cc: oe-kbuild-all
Hi Daniele,
kernel test robot noticed the following build warnings:
[auto build test WARNING on drm-tip/drm-tip]
url: https://github.com/intel-lab-lkp/linux/commits/Daniele-Ceraolo-Spurio/drm-i915-uc-perma-pin-firmwares/20230527-085429
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
patch link: https://lore.kernel.org/r/20230527005242.1346093-5-daniele.ceraolospurio%40intel.com
patch subject: [PATCH v3 4/7] drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
reproduce:
# https://github.com/intel-lab-lkp/linux/commit/5e7ad1c45a6cbb80d8b9f71212d410d19bbe96d9
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Daniele-Ceraolo-Spurio/drm-i915-uc-perma-pin-firmwares/20230527-085429
git checkout 5e7ad1c45a6cbb80d8b9f71212d410d19bbe96d9
make menuconfig
# enable CONFIG_COMPILE_TEST, CONFIG_WARN_MISSING_DOCUMENTS, CONFIG_WARN_ABI_ERRORS
make htmldocs
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202305310821.bZVw0PS0-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> Documentation/gpu/i915:546: ./drivers/gpu/drm/i915/gt/uc/intel_huc.c:28: WARNING: Unexpected indentation.
>> Documentation/gpu/i915:546: ./drivers/gpu/drm/i915/gt/uc/intel_huc.c:29: WARNING: Block quote ends without a blank line; unexpected unindent.
>> Documentation/gpu/i915:546: ./drivers/gpu/drm/i915/gt/uc/intel_huc.c:34: WARNING: Bullet list ends without a blank line; unexpected unindent.
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 5/7] drm/i915/mtl/huc: auth HuC via GSC
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
-1 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: Daniele Ceraolo Spurio, Alan Previn, dri-devel
The full authentication via the GSC requires an heci packet submission
to the GSC FW via the GSC CS. The GSC has new PXP command for this
(literally called NEW_HUC_AUTH).
The intel_huc_auth fuction is also updated to handle both authentication
types.
v2: check that the GuC auth for clear media has completed before
proceding with the full auth
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 27 +++++-
.../i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 50 +++++++---
drivers/gpu/drm/i915/gt/uc/intel_huc.h | 6 +-
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 94 +++++++++++++++++++
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 1 +
drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +-
.../drm/i915/pxp/intel_pxp_cmd_interface_43.h | 14 ++-
drivers/gpu/drm/i915/pxp/intel_pxp_huc.c | 2 +-
9 files changed, 176 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
index b26f493f86fa..c659cc01f32f 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
@@ -29,13 +29,32 @@ static void gsc_work(struct work_struct *work)
if (actions & GSC_ACTION_FW_LOAD) {
ret = intel_gsc_uc_fw_upload(gsc);
- if (ret == -EEXIST) /* skip proxy if not a new load */
- actions &= ~GSC_ACTION_FW_LOAD;
- else if (ret)
+ if (!ret)
+ /* setup proxy on a new load */
+ actions |= GSC_ACTION_SW_PROXY;
+ else if (ret != -EEXIST)
goto out_put;
+
+ /*
+ * The HuC auth can be done both before or after the proxy init;
+ * if done after, a proxy request will be issued and must be
+ * serviced before the authentication can complete.
+ * Since this worker also handles proxy requests, we can't
+ * perform an action that requires the proxy from within it and
+ * then stall waiting for it, because we'd be blocking the
+ * service path. Therefore, it is easier for us to load HuC
+ * first and do proxy later. The GSC will ack the HuC auth and
+ * then send the HuC proxy request as part of the proxy init
+ * flow.
+ * Note that we can only do the GSC auth if the GuC auth was
+ * successful.
+ */
+ if (intel_uc_uses_huc(>->uc) &&
+ intel_huc_is_authenticated(>->uc.huc, INTEL_HUC_AUTH_BY_GUC))
+ intel_huc_auth(>->uc.huc, INTEL_HUC_AUTH_BY_GSC);
}
- if (actions & (GSC_ACTION_FW_LOAD | GSC_ACTION_SW_PROXY)) {
+ if (actions & GSC_ACTION_SW_PROXY) {
if (!intel_gsc_uc_fw_init_done(gsc)) {
gt_err(gt, "Proxy request received with GSC not loaded!\n");
goto out_put;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
index 579c0f5a1438..0ad090304ca0 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
@@ -99,7 +99,7 @@ void intel_gsc_uc_heci_cmd_emit_mtl_header(struct intel_gsc_mtl_header *header,
u64 host_session_id)
{
host_session_id &= ~HOST_SESSION_MASK;
- if (heci_client_id == HECI_MEADDRESS_PXP)
+ if (host_session_id && heci_client_id == HECI_MEADDRESS_PXP)
host_session_id |= HOST_SESSION_PXP_SINGLE;
header->validity_marker = GSC_HECI_VALIDITY_MARKER;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index ab5246ae3979..5a4058d39550 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -355,20 +355,34 @@ static int check_huc_loading_mode(struct intel_huc *huc)
int intel_huc_init(struct intel_huc *huc)
{
+ struct intel_gt *gt = huc_to_gt(huc);
int err;
err = check_huc_loading_mode(huc);
if (err)
goto out;
+ if (HAS_ENGINE(gt, GSC0)) {
+ struct i915_vma *vma = intel_guc_allocate_vma(>->uc.guc, SZ_8K);
+ if (IS_ERR(vma)) {
+ huc_info(huc, "Failed to allocate heci pkt\n");
+ goto out;
+ }
+
+ huc->heci_pkt = vma;
+ }
+
err = intel_uc_fw_init(&huc->fw);
if (err)
- goto out;
+ goto out_pkt;
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_LOADABLE);
return 0;
+out_pkt:
+ if (huc->heci_pkt)
+ i915_vma_unpin_and_release(&huc->heci_pkt, 0);
out:
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_INIT_FAIL);
huc_info(huc, "initialization failed %pe\n", ERR_PTR(err));
@@ -383,6 +397,9 @@ void intel_huc_fini(struct intel_huc *huc)
*/
delayed_huc_load_fini(huc);
+ if (huc->heci_pkt)
+ i915_vma_unpin_and_release(&huc->heci_pkt, 0);
+
if (intel_uc_fw_is_loadable(&huc->fw))
intel_uc_fw_fini(&huc->fw);
}
@@ -438,6 +455,7 @@ int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
/**
* intel_huc_auth() - Authenticate HuC uCode
* @huc: intel_huc structure
+ * @type: authentication type (via GuC or via GSC)
*
* Called after HuC and GuC firmware loading during intel_uc_init_hw().
*
@@ -445,7 +463,7 @@ int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
* passing the offset of the RSA signature to intel_guc_auth_huc(). It then
* waits for up to 50ms for firmware verification ACK.
*/
-int intel_huc_auth(struct intel_huc *huc)
+int intel_huc_auth(struct intel_huc *huc, enum intel_huc_authentication_type type)
{
struct intel_gt *gt = huc_to_gt(huc);
struct intel_guc *guc = >->uc.guc;
@@ -454,31 +472,41 @@ int intel_huc_auth(struct intel_huc *huc)
if (!intel_uc_fw_is_loaded(&huc->fw))
return -ENOEXEC;
- /* GSC will do the auth */
+ /* GSC will do the auth with the load */
if (intel_huc_is_loaded_by_gsc(huc))
return -ENODEV;
+ if (intel_huc_is_authenticated(huc, type))
+ return -EEXIST;
+
ret = i915_inject_probe_error(gt->i915, -ENXIO);
if (ret)
goto fail;
- GEM_BUG_ON(intel_uc_fw_is_running(&huc->fw));
-
- ret = intel_guc_auth_huc(guc, intel_guc_ggtt_offset(guc, huc->fw.rsa_data));
- if (ret) {
- huc_err(huc, "authentication by GuC failed %pe\n", ERR_PTR(ret));
- goto fail;
+ switch(type) {
+ case INTEL_HUC_AUTH_BY_GUC:
+ ret = intel_guc_auth_huc(guc, intel_guc_ggtt_offset(guc, huc->fw.rsa_data));
+ break;
+ case INTEL_HUC_AUTH_BY_GSC:
+ ret = intel_huc_fw_auth_via_gsccs(huc);
+ break;
+ default:
+ MISSING_CASE(type);
+ ret = -EINVAL;
}
+ if (ret)
+ goto fail;
/* Check authentication status, it should be done by now */
- ret = intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GUC);
+ ret = intel_huc_wait_for_auth_complete(huc, type);
if (ret)
goto fail;
return 0;
fail:
- huc_probe_error(huc, "authentication failed %pe\n", ERR_PTR(ret));
+ huc_probe_error(huc, "%s authentication failed %pe\n",
+ auth_mode_string(huc, type), ERR_PTR(ret));
return ret;
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
index 3f6aa7c37abc..ba5cb08e9e7b 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
@@ -15,6 +15,7 @@
#include <linux/hrtimer.h>
struct bus_type;
+struct i915_vma;
enum intel_huc_delayed_load_status {
INTEL_HUC_WAITING_ON_GSC = 0,
@@ -46,6 +47,9 @@ struct intel_huc {
enum intel_huc_delayed_load_status status;
} delayed_load;
+ /* for load via GSCCS */
+ struct i915_vma *heci_pkt;
+
bool loaded_via_gsc;
};
@@ -54,7 +58,7 @@ void intel_huc_init_early(struct intel_huc *huc);
int intel_huc_init(struct intel_huc *huc);
void intel_huc_fini(struct intel_huc *huc);
void intel_huc_suspend(struct intel_huc *huc);
-int intel_huc_auth(struct intel_huc *huc);
+int intel_huc_auth(struct intel_huc *huc, enum intel_huc_authentication_type type);
int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
enum intel_huc_authentication_type type);
bool intel_huc_is_authenticated(struct intel_huc *huc,
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
index d2b4176c81d6..8e538d639b05 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
@@ -6,11 +6,105 @@
#include "gt/intel_gsc.h"
#include "gt/intel_gt.h"
#include "intel_gsc_binary_headers.h"
+#include "intel_gsc_uc_heci_cmd_submit.h"
#include "intel_huc.h"
#include "intel_huc_fw.h"
#include "intel_huc_print.h"
#include "i915_drv.h"
#include "pxp/intel_pxp_huc.h"
+#include "pxp/intel_pxp_cmd_interface_43.h"
+
+struct mtl_huc_auth_msg_in {
+ struct intel_gsc_mtl_header header;
+ struct pxp43_new_huc_auth_in huc_in;
+} __packed;
+
+struct mtl_huc_auth_msg_out {
+ struct intel_gsc_mtl_header header;
+ struct pxp43_huc_auth_out huc_out;
+} __packed;
+
+int intel_huc_fw_auth_via_gsccs(struct intel_huc *huc)
+{
+ struct intel_gt *gt = huc_to_gt(huc);
+ struct drm_i915_private *i915 = gt->i915;
+ struct drm_i915_gem_object *obj;
+ struct mtl_huc_auth_msg_in *msg_in;
+ struct mtl_huc_auth_msg_out *msg_out;
+ void *pkt_vaddr;
+ u64 pkt_offset;
+ int retry = 5;
+ int err = 0;
+
+ if (!huc->heci_pkt)
+ return -ENODEV;
+
+ obj = huc->heci_pkt->obj;
+ pkt_offset = i915_ggtt_offset(huc->heci_pkt);
+
+ pkt_vaddr = i915_gem_object_pin_map_unlocked(obj,
+ i915_coherent_map_type(i915, obj, true));
+ if (IS_ERR(pkt_vaddr))
+ return PTR_ERR(pkt_vaddr);
+
+ msg_in = pkt_vaddr;
+ msg_out = pkt_vaddr + SZ_4K;
+
+ intel_gsc_uc_heci_cmd_emit_mtl_header(&msg_in->header,
+ HECI_MEADDRESS_PXP,
+ sizeof(*msg_in), 0);
+
+ msg_in->huc_in.header.api_version = PXP_APIVER(4, 3);
+ msg_in->huc_in.header.command_id = PXP43_CMDID_NEW_HUC_AUTH;
+ msg_in->huc_in.header.status = 0;
+ msg_in->huc_in.header.buffer_len = sizeof(msg_in->huc_in) -
+ sizeof(msg_in->huc_in.header);
+ msg_in->huc_in.huc_base_address = huc->fw.vma_res.start;
+ msg_in->huc_in.huc_size = huc->fw.obj->base.size;
+
+ do {
+ err = intel_gsc_uc_heci_cmd_submit_packet(>->uc.gsc,
+ pkt_offset, sizeof(*msg_in),
+ pkt_offset + SZ_4K, SZ_4K);
+ if (err) {
+ huc_err(huc, "failed to submit GSC request to auth: %d\n", err);
+ goto out_unpin;
+ }
+
+ if (msg_out->header.flags & GSC_OUTFLAG_MSG_PENDING) {
+ msg_in->header.gsc_message_handle = msg_out->header.gsc_message_handle;
+ err = -EBUSY;
+ msleep(50);
+ }
+ } while (--retry && err == -EBUSY);
+
+ if (err)
+ goto out_unpin;
+
+ if (msg_out->header.message_size != sizeof(*msg_out)) {
+ huc_err(huc, "invalid GSC reply length %u [expected %zu]\n",
+ msg_out->header.message_size, sizeof(*msg_out));
+ err = -EPROTO;
+ goto out_unpin;
+ }
+
+ /*
+ * The GSC will return PXP_STATUS_OP_NOT_PERMITTED if the HuC is already
+ * loaded. If the same error is ever returned with HuC not loaded we'll
+ * still catch it when we check the authentication bit later.
+ */
+ if (msg_out->huc_out.header.status != PXP_STATUS_SUCCESS &&
+ msg_out->huc_out.header.status != PXP_STATUS_OP_NOT_PERMITTED) {
+ huc_err(huc, "auth failed with GSC error = 0x%x\n",
+ msg_out->huc_out.header.status);
+ err = -EIO;
+ goto out_unpin;
+ }
+
+out_unpin:
+ i915_gem_object_unpin_map(obj);
+ return err;
+}
static void get_version_from_gsc_manifest(struct intel_uc_fw_ver *ver, const void *data)
{
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
index 0999ffe6f962..307ab45e6b09 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
@@ -12,6 +12,7 @@ struct intel_uc_fw;
#include <linux/types.h>
int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc);
+int intel_huc_fw_auth_via_gsccs(struct intel_huc *huc);
int intel_huc_fw_upload(struct intel_huc *huc);
int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, size_t size);
#endif
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index 1e7f5cc9d550..18250fb64bd8 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -538,7 +538,7 @@ static int __uc_init_hw(struct intel_uc *uc)
if (intel_huc_is_loaded_by_gsc(huc))
intel_huc_update_auth_status(huc);
else
- intel_huc_auth(huc);
+ intel_huc_auth(huc, INTEL_HUC_AUTH_BY_GUC);
if (intel_uc_uses_guc_submission(uc)) {
ret = intel_guc_submission_enable(guc);
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h b/drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h
index 09777719cd84..c49829caa73f 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h
@@ -11,19 +11,27 @@
/* PXP-Cmd-Op definitions */
#define PXP43_CMDID_START_HUC_AUTH 0x0000003A
+#define PXP43_CMDID_NEW_HUC_AUTH 0x0000003F /* MTL+ */
#define PXP43_CMDID_INIT_SESSION 0x00000036
/* PXP-Packet sizes for MTL's GSCCS-HECI instruction */
#define PXP43_MAX_HECI_INOUT_SIZE (SZ_32K)
-/* PXP-Input-Packet: HUC-Authentication */
+/* PXP-Input-Packet: HUC Load and Authentication */
struct pxp43_start_huc_auth_in {
struct pxp_cmd_header header;
__le64 huc_base_address;
} __packed;
-/* PXP-Output-Packet: HUC-Authentication */
-struct pxp43_start_huc_auth_out {
+/* PXP-Input-Packet: HUC Auth-only */
+struct pxp43_new_huc_auth_in {
+ struct pxp_cmd_header header;
+ u64 huc_base_address;
+ u32 huc_size;
+} __packed;
+
+/* PXP-Output-Packet: HUC Load and Authentication or Auth-only */
+struct pxp43_huc_auth_out {
struct pxp_cmd_header header;
} __packed;
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_huc.c b/drivers/gpu/drm/i915/pxp/intel_pxp_huc.c
index 23431c36b60b..5eedce916942 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_huc.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_huc.c
@@ -19,7 +19,7 @@ int intel_pxp_huc_load_and_auth(struct intel_pxp *pxp)
struct intel_gt *gt;
struct intel_huc *huc;
struct pxp43_start_huc_auth_in huc_in = {0};
- struct pxp43_start_huc_auth_out huc_out = {0};
+ struct pxp43_huc_auth_out huc_out = {0};
dma_addr_t huc_phys_addr;
u8 client_id = 0;
u8 fence_id = 0;
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread* [Intel-gfx] [PATCH v3 5/7] drm/i915/mtl/huc: auth HuC via GSC
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
0 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: Alan Previn, dri-devel
The full authentication via the GSC requires an heci packet submission
to the GSC FW via the GSC CS. The GSC has new PXP command for this
(literally called NEW_HUC_AUTH).
The intel_huc_auth fuction is also updated to handle both authentication
types.
v2: check that the GuC auth for clear media has completed before
proceding with the full auth
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 27 +++++-
.../i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 50 +++++++---
drivers/gpu/drm/i915/gt/uc/intel_huc.h | 6 +-
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 94 +++++++++++++++++++
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 1 +
drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +-
.../drm/i915/pxp/intel_pxp_cmd_interface_43.h | 14 ++-
drivers/gpu/drm/i915/pxp/intel_pxp_huc.c | 2 +-
9 files changed, 176 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
index b26f493f86fa..c659cc01f32f 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
@@ -29,13 +29,32 @@ static void gsc_work(struct work_struct *work)
if (actions & GSC_ACTION_FW_LOAD) {
ret = intel_gsc_uc_fw_upload(gsc);
- if (ret == -EEXIST) /* skip proxy if not a new load */
- actions &= ~GSC_ACTION_FW_LOAD;
- else if (ret)
+ if (!ret)
+ /* setup proxy on a new load */
+ actions |= GSC_ACTION_SW_PROXY;
+ else if (ret != -EEXIST)
goto out_put;
+
+ /*
+ * The HuC auth can be done both before or after the proxy init;
+ * if done after, a proxy request will be issued and must be
+ * serviced before the authentication can complete.
+ * Since this worker also handles proxy requests, we can't
+ * perform an action that requires the proxy from within it and
+ * then stall waiting for it, because we'd be blocking the
+ * service path. Therefore, it is easier for us to load HuC
+ * first and do proxy later. The GSC will ack the HuC auth and
+ * then send the HuC proxy request as part of the proxy init
+ * flow.
+ * Note that we can only do the GSC auth if the GuC auth was
+ * successful.
+ */
+ if (intel_uc_uses_huc(>->uc) &&
+ intel_huc_is_authenticated(>->uc.huc, INTEL_HUC_AUTH_BY_GUC))
+ intel_huc_auth(>->uc.huc, INTEL_HUC_AUTH_BY_GSC);
}
- if (actions & (GSC_ACTION_FW_LOAD | GSC_ACTION_SW_PROXY)) {
+ if (actions & GSC_ACTION_SW_PROXY) {
if (!intel_gsc_uc_fw_init_done(gsc)) {
gt_err(gt, "Proxy request received with GSC not loaded!\n");
goto out_put;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
index 579c0f5a1438..0ad090304ca0 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
@@ -99,7 +99,7 @@ void intel_gsc_uc_heci_cmd_emit_mtl_header(struct intel_gsc_mtl_header *header,
u64 host_session_id)
{
host_session_id &= ~HOST_SESSION_MASK;
- if (heci_client_id == HECI_MEADDRESS_PXP)
+ if (host_session_id && heci_client_id == HECI_MEADDRESS_PXP)
host_session_id |= HOST_SESSION_PXP_SINGLE;
header->validity_marker = GSC_HECI_VALIDITY_MARKER;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index ab5246ae3979..5a4058d39550 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -355,20 +355,34 @@ static int check_huc_loading_mode(struct intel_huc *huc)
int intel_huc_init(struct intel_huc *huc)
{
+ struct intel_gt *gt = huc_to_gt(huc);
int err;
err = check_huc_loading_mode(huc);
if (err)
goto out;
+ if (HAS_ENGINE(gt, GSC0)) {
+ struct i915_vma *vma = intel_guc_allocate_vma(>->uc.guc, SZ_8K);
+ if (IS_ERR(vma)) {
+ huc_info(huc, "Failed to allocate heci pkt\n");
+ goto out;
+ }
+
+ huc->heci_pkt = vma;
+ }
+
err = intel_uc_fw_init(&huc->fw);
if (err)
- goto out;
+ goto out_pkt;
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_LOADABLE);
return 0;
+out_pkt:
+ if (huc->heci_pkt)
+ i915_vma_unpin_and_release(&huc->heci_pkt, 0);
out:
intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_INIT_FAIL);
huc_info(huc, "initialization failed %pe\n", ERR_PTR(err));
@@ -383,6 +397,9 @@ void intel_huc_fini(struct intel_huc *huc)
*/
delayed_huc_load_fini(huc);
+ if (huc->heci_pkt)
+ i915_vma_unpin_and_release(&huc->heci_pkt, 0);
+
if (intel_uc_fw_is_loadable(&huc->fw))
intel_uc_fw_fini(&huc->fw);
}
@@ -438,6 +455,7 @@ int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
/**
* intel_huc_auth() - Authenticate HuC uCode
* @huc: intel_huc structure
+ * @type: authentication type (via GuC or via GSC)
*
* Called after HuC and GuC firmware loading during intel_uc_init_hw().
*
@@ -445,7 +463,7 @@ int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
* passing the offset of the RSA signature to intel_guc_auth_huc(). It then
* waits for up to 50ms for firmware verification ACK.
*/
-int intel_huc_auth(struct intel_huc *huc)
+int intel_huc_auth(struct intel_huc *huc, enum intel_huc_authentication_type type)
{
struct intel_gt *gt = huc_to_gt(huc);
struct intel_guc *guc = >->uc.guc;
@@ -454,31 +472,41 @@ int intel_huc_auth(struct intel_huc *huc)
if (!intel_uc_fw_is_loaded(&huc->fw))
return -ENOEXEC;
- /* GSC will do the auth */
+ /* GSC will do the auth with the load */
if (intel_huc_is_loaded_by_gsc(huc))
return -ENODEV;
+ if (intel_huc_is_authenticated(huc, type))
+ return -EEXIST;
+
ret = i915_inject_probe_error(gt->i915, -ENXIO);
if (ret)
goto fail;
- GEM_BUG_ON(intel_uc_fw_is_running(&huc->fw));
-
- ret = intel_guc_auth_huc(guc, intel_guc_ggtt_offset(guc, huc->fw.rsa_data));
- if (ret) {
- huc_err(huc, "authentication by GuC failed %pe\n", ERR_PTR(ret));
- goto fail;
+ switch(type) {
+ case INTEL_HUC_AUTH_BY_GUC:
+ ret = intel_guc_auth_huc(guc, intel_guc_ggtt_offset(guc, huc->fw.rsa_data));
+ break;
+ case INTEL_HUC_AUTH_BY_GSC:
+ ret = intel_huc_fw_auth_via_gsccs(huc);
+ break;
+ default:
+ MISSING_CASE(type);
+ ret = -EINVAL;
}
+ if (ret)
+ goto fail;
/* Check authentication status, it should be done by now */
- ret = intel_huc_wait_for_auth_complete(huc, INTEL_HUC_AUTH_BY_GUC);
+ ret = intel_huc_wait_for_auth_complete(huc, type);
if (ret)
goto fail;
return 0;
fail:
- huc_probe_error(huc, "authentication failed %pe\n", ERR_PTR(ret));
+ huc_probe_error(huc, "%s authentication failed %pe\n",
+ auth_mode_string(huc, type), ERR_PTR(ret));
return ret;
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
index 3f6aa7c37abc..ba5cb08e9e7b 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
@@ -15,6 +15,7 @@
#include <linux/hrtimer.h>
struct bus_type;
+struct i915_vma;
enum intel_huc_delayed_load_status {
INTEL_HUC_WAITING_ON_GSC = 0,
@@ -46,6 +47,9 @@ struct intel_huc {
enum intel_huc_delayed_load_status status;
} delayed_load;
+ /* for load via GSCCS */
+ struct i915_vma *heci_pkt;
+
bool loaded_via_gsc;
};
@@ -54,7 +58,7 @@ void intel_huc_init_early(struct intel_huc *huc);
int intel_huc_init(struct intel_huc *huc);
void intel_huc_fini(struct intel_huc *huc);
void intel_huc_suspend(struct intel_huc *huc);
-int intel_huc_auth(struct intel_huc *huc);
+int intel_huc_auth(struct intel_huc *huc, enum intel_huc_authentication_type type);
int intel_huc_wait_for_auth_complete(struct intel_huc *huc,
enum intel_huc_authentication_type type);
bool intel_huc_is_authenticated(struct intel_huc *huc,
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
index d2b4176c81d6..8e538d639b05 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
@@ -6,11 +6,105 @@
#include "gt/intel_gsc.h"
#include "gt/intel_gt.h"
#include "intel_gsc_binary_headers.h"
+#include "intel_gsc_uc_heci_cmd_submit.h"
#include "intel_huc.h"
#include "intel_huc_fw.h"
#include "intel_huc_print.h"
#include "i915_drv.h"
#include "pxp/intel_pxp_huc.h"
+#include "pxp/intel_pxp_cmd_interface_43.h"
+
+struct mtl_huc_auth_msg_in {
+ struct intel_gsc_mtl_header header;
+ struct pxp43_new_huc_auth_in huc_in;
+} __packed;
+
+struct mtl_huc_auth_msg_out {
+ struct intel_gsc_mtl_header header;
+ struct pxp43_huc_auth_out huc_out;
+} __packed;
+
+int intel_huc_fw_auth_via_gsccs(struct intel_huc *huc)
+{
+ struct intel_gt *gt = huc_to_gt(huc);
+ struct drm_i915_private *i915 = gt->i915;
+ struct drm_i915_gem_object *obj;
+ struct mtl_huc_auth_msg_in *msg_in;
+ struct mtl_huc_auth_msg_out *msg_out;
+ void *pkt_vaddr;
+ u64 pkt_offset;
+ int retry = 5;
+ int err = 0;
+
+ if (!huc->heci_pkt)
+ return -ENODEV;
+
+ obj = huc->heci_pkt->obj;
+ pkt_offset = i915_ggtt_offset(huc->heci_pkt);
+
+ pkt_vaddr = i915_gem_object_pin_map_unlocked(obj,
+ i915_coherent_map_type(i915, obj, true));
+ if (IS_ERR(pkt_vaddr))
+ return PTR_ERR(pkt_vaddr);
+
+ msg_in = pkt_vaddr;
+ msg_out = pkt_vaddr + SZ_4K;
+
+ intel_gsc_uc_heci_cmd_emit_mtl_header(&msg_in->header,
+ HECI_MEADDRESS_PXP,
+ sizeof(*msg_in), 0);
+
+ msg_in->huc_in.header.api_version = PXP_APIVER(4, 3);
+ msg_in->huc_in.header.command_id = PXP43_CMDID_NEW_HUC_AUTH;
+ msg_in->huc_in.header.status = 0;
+ msg_in->huc_in.header.buffer_len = sizeof(msg_in->huc_in) -
+ sizeof(msg_in->huc_in.header);
+ msg_in->huc_in.huc_base_address = huc->fw.vma_res.start;
+ msg_in->huc_in.huc_size = huc->fw.obj->base.size;
+
+ do {
+ err = intel_gsc_uc_heci_cmd_submit_packet(>->uc.gsc,
+ pkt_offset, sizeof(*msg_in),
+ pkt_offset + SZ_4K, SZ_4K);
+ if (err) {
+ huc_err(huc, "failed to submit GSC request to auth: %d\n", err);
+ goto out_unpin;
+ }
+
+ if (msg_out->header.flags & GSC_OUTFLAG_MSG_PENDING) {
+ msg_in->header.gsc_message_handle = msg_out->header.gsc_message_handle;
+ err = -EBUSY;
+ msleep(50);
+ }
+ } while (--retry && err == -EBUSY);
+
+ if (err)
+ goto out_unpin;
+
+ if (msg_out->header.message_size != sizeof(*msg_out)) {
+ huc_err(huc, "invalid GSC reply length %u [expected %zu]\n",
+ msg_out->header.message_size, sizeof(*msg_out));
+ err = -EPROTO;
+ goto out_unpin;
+ }
+
+ /*
+ * The GSC will return PXP_STATUS_OP_NOT_PERMITTED if the HuC is already
+ * loaded. If the same error is ever returned with HuC not loaded we'll
+ * still catch it when we check the authentication bit later.
+ */
+ if (msg_out->huc_out.header.status != PXP_STATUS_SUCCESS &&
+ msg_out->huc_out.header.status != PXP_STATUS_OP_NOT_PERMITTED) {
+ huc_err(huc, "auth failed with GSC error = 0x%x\n",
+ msg_out->huc_out.header.status);
+ err = -EIO;
+ goto out_unpin;
+ }
+
+out_unpin:
+ i915_gem_object_unpin_map(obj);
+ return err;
+}
static void get_version_from_gsc_manifest(struct intel_uc_fw_ver *ver, const void *data)
{
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
index 0999ffe6f962..307ab45e6b09 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
@@ -12,6 +12,7 @@ struct intel_uc_fw;
#include <linux/types.h>
int intel_huc_fw_load_and_auth_via_gsc(struct intel_huc *huc);
+int intel_huc_fw_auth_via_gsccs(struct intel_huc *huc);
int intel_huc_fw_upload(struct intel_huc *huc);
int intel_huc_fw_get_binary_info(struct intel_uc_fw *huc_fw, const void *data, size_t size);
#endif
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index 1e7f5cc9d550..18250fb64bd8 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -538,7 +538,7 @@ static int __uc_init_hw(struct intel_uc *uc)
if (intel_huc_is_loaded_by_gsc(huc))
intel_huc_update_auth_status(huc);
else
- intel_huc_auth(huc);
+ intel_huc_auth(huc, INTEL_HUC_AUTH_BY_GUC);
if (intel_uc_uses_guc_submission(uc)) {
ret = intel_guc_submission_enable(guc);
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h b/drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h
index 09777719cd84..c49829caa73f 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h
@@ -11,19 +11,27 @@
/* PXP-Cmd-Op definitions */
#define PXP43_CMDID_START_HUC_AUTH 0x0000003A
+#define PXP43_CMDID_NEW_HUC_AUTH 0x0000003F /* MTL+ */
#define PXP43_CMDID_INIT_SESSION 0x00000036
/* PXP-Packet sizes for MTL's GSCCS-HECI instruction */
#define PXP43_MAX_HECI_INOUT_SIZE (SZ_32K)
-/* PXP-Input-Packet: HUC-Authentication */
+/* PXP-Input-Packet: HUC Load and Authentication */
struct pxp43_start_huc_auth_in {
struct pxp_cmd_header header;
__le64 huc_base_address;
} __packed;
-/* PXP-Output-Packet: HUC-Authentication */
-struct pxp43_start_huc_auth_out {
+/* PXP-Input-Packet: HUC Auth-only */
+struct pxp43_new_huc_auth_in {
+ struct pxp_cmd_header header;
+ u64 huc_base_address;
+ u32 huc_size;
+} __packed;
+
+/* PXP-Output-Packet: HUC Load and Authentication or Auth-only */
+struct pxp43_huc_auth_out {
struct pxp_cmd_header header;
} __packed;
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_huc.c b/drivers/gpu/drm/i915/pxp/intel_pxp_huc.c
index 23431c36b60b..5eedce916942 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_huc.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_huc.c
@@ -19,7 +19,7 @@ int intel_pxp_huc_load_and_auth(struct intel_pxp *pxp)
struct intel_gt *gt;
struct intel_huc *huc;
struct pxp43_start_huc_auth_in huc_in = {0};
- struct pxp43_start_huc_auth_out huc_out = {0};
+ struct pxp43_huc_auth_out huc_out = {0};
dma_addr_t huc_phys_addr;
u8 client_id = 0;
u8 fence_id = 0;
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCH v3 5/7] drm/i915/mtl/huc: auth HuC via GSC
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
@ 2023-05-31 0:33 ` Teres Alexis, Alan Previn
-1 siblings, 0 replies; 52+ messages in thread
From: Teres Alexis, Alan Previn @ 2023-05-31 0:33 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele, intel-gfx; +Cc: dri-devel
On Fri, 2023-05-26 at 17:52 -0700, Ceraolo Spurio, Daniele wrote:
> The full authentication via the GSC requires an heci packet submission
> to the GSC FW via the GSC CS. The GSC has new PXP command for this
> (literally called NEW_HUC_AUTH).
> The intel_huc_auth fuction is also updated to handle both authentication
> types.
>
alan:snip
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
> index b26f493f86fa..c659cc01f32f 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
> @@ -29,13 +29,32 @@ static void gsc_work(struct work_struct *work)
>
> if (actions & GSC_ACTION_FW_LOAD) {
> ret = intel_gsc_uc_fw_upload(gsc);
> - if (ret == -EEXIST) /* skip proxy if not a new load */
> - actions &= ~GSC_ACTION_FW_LOAD;
> - else if (ret)
> + if (!ret)
> + /* setup proxy on a new load */
> + actions |= GSC_ACTION_SW_PROXY;
> + else if (ret != -EEXIST)
> goto out_put;
alan: I realize that this worker doesnt print error values that
come back from intel_gsc_uc_fw_upload - wonder if we should print
it before goto out_put.
> +
> + /*
> + * The HuC auth can be done both before or after the proxy init;
> + * if done after, a proxy request will be issued and must be
> + * serviced before the authentication can complete.
> + * Since this worker also handles proxy requests, we can't
> + * perform an action that requires the proxy from within it and
> + * then stall waiting for it, because we'd be blocking the
> + * service path. Therefore, it is easier for us to load HuC
> + * first and do proxy later. The GSC will ack the HuC auth and
> + * then send the HuC proxy request as part of the proxy init
> + * flow.
> + * Note that we can only do the GSC auth if the GuC auth was
> + * successful.
> + */
> + if (intel_uc_uses_huc(>->uc) &&
> + intel_huc_is_authenticated(>->uc.huc, INTEL_HUC_AUTH_BY_GUC))
> + intel_huc_auth(>->uc.huc, INTEL_HUC_AUTH_BY_GSC);
> }
>
> - if (actions & (GSC_ACTION_FW_LOAD | GSC_ACTION_SW_PROXY)) {
> + if (actions & GSC_ACTION_SW_PROXY) {
> if (!intel_gsc_uc_fw_init_done(gsc)) {
> gt_err(gt, "Proxy request received with GSC not loaded!\n");
> goto out_put;
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
> index 579c0f5a1438..0ad090304ca0 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
>
alan:snip
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> index ab5246ae3979..5a4058d39550 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>
alan:snip
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> index d2b4176c81d6..8e538d639b05 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>
alan:snip
> +int intel_huc_fw_auth_via_gsccs(struct intel_huc *huc)
> +{
> + struct drm_i915_gem_object *obj;
> + void *pkt_vaddr;
> + u64 pkt_offset;
> + int retry = 5;
> + int err = 0;
> +
> + if (!huc->heci_pkt)
> + return -ENODEV;
> +
> + obj = huc->heci_pkt->obj;
> + pkt_offset = i915_ggtt_offset(huc->heci_pkt);
> +
> + pkt_vaddr = i915_gem_object_pin_map_unlocked(obj,
> + i915_coherent_map_type(i915, obj, true));
> + if (IS_ERR(pkt_vaddr))
> + return PTR_ERR(pkt_vaddr);
> +
> + msg_in = pkt_vaddr;
> + msg_out = pkt_vaddr + SZ_4K;
this 4K*2 (4k for input and 4K for output) seems to be hardcoded in two different locations.
One is here in intel_huc_fw_auth_via_gsccs and the other location in intel_huc_init which was
even in a different file. Perhaps its better to use a #define after to the definition of
PXP43_CMDID_NEW_HUC_AUTH... maybe something like a "#define PXP43_NEW_HUC_AUTH_INOUT_PKT_SIZE (SZ_4K)"
> +
> + intel_gsc_uc_heci_cmd_emit_mtl_header(&msg_in->header,
> + HECI_MEADDRESS_PXP,
> + sizeof(*msg_in), 0);
> +
> + msg_in->huc_in.header.api_version = PXP_APIVER(4, 3);
> + msg_in->huc_in.header.command_id = PXP43_CMDID_NEW_HUC_AUTH;
> + msg_in->huc_in.header.status = 0;
> + msg_in->huc_in.header.buffer_len = sizeof(msg_in->huc_in) -
> + sizeof(msg_in->huc_in.header);
> + msg_in->huc_in.huc_base_address = huc->fw.vma_res.start;
> + msg_in->huc_in.huc_size = huc->fw.obj->base.size;
alan: is this right?: fw.obj.base.size is the rounded up firmware size that was
allocated from intel_uc_fw_fetch when it calls i915_gem_object_create_shmem_from_data
That latter funcation populates obj with the "rounded up to 4K" size.
So is it okay use the 4k rounded up number for the size of the firmware microcode that needs to be authenticated?
(or, since this is a GSC FW command, does GSC FW parse the mei headers and extract the exact size to authenticate?)
alan:snip
> +
> +out_unpin:
> + i915_gem_object_unpin_map(obj);
> + return err;
> +}
>
alan:snip
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [Intel-gfx] [PATCH v3 5/7] drm/i915/mtl/huc: auth HuC via GSC
@ 2023-05-31 0:33 ` Teres Alexis, Alan Previn
0 siblings, 0 replies; 52+ messages in thread
From: Teres Alexis, Alan Previn @ 2023-05-31 0:33 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele, intel-gfx; +Cc: dri-devel
On Fri, 2023-05-26 at 17:52 -0700, Ceraolo Spurio, Daniele wrote:
> The full authentication via the GSC requires an heci packet submission
> to the GSC FW via the GSC CS. The GSC has new PXP command for this
> (literally called NEW_HUC_AUTH).
> The intel_huc_auth fuction is also updated to handle both authentication
> types.
>
alan:snip
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
> index b26f493f86fa..c659cc01f32f 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
> @@ -29,13 +29,32 @@ static void gsc_work(struct work_struct *work)
>
> if (actions & GSC_ACTION_FW_LOAD) {
> ret = intel_gsc_uc_fw_upload(gsc);
> - if (ret == -EEXIST) /* skip proxy if not a new load */
> - actions &= ~GSC_ACTION_FW_LOAD;
> - else if (ret)
> + if (!ret)
> + /* setup proxy on a new load */
> + actions |= GSC_ACTION_SW_PROXY;
> + else if (ret != -EEXIST)
> goto out_put;
alan: I realize that this worker doesnt print error values that
come back from intel_gsc_uc_fw_upload - wonder if we should print
it before goto out_put.
> +
> + /*
> + * The HuC auth can be done both before or after the proxy init;
> + * if done after, a proxy request will be issued and must be
> + * serviced before the authentication can complete.
> + * Since this worker also handles proxy requests, we can't
> + * perform an action that requires the proxy from within it and
> + * then stall waiting for it, because we'd be blocking the
> + * service path. Therefore, it is easier for us to load HuC
> + * first and do proxy later. The GSC will ack the HuC auth and
> + * then send the HuC proxy request as part of the proxy init
> + * flow.
> + * Note that we can only do the GSC auth if the GuC auth was
> + * successful.
> + */
> + if (intel_uc_uses_huc(>->uc) &&
> + intel_huc_is_authenticated(>->uc.huc, INTEL_HUC_AUTH_BY_GUC))
> + intel_huc_auth(>->uc.huc, INTEL_HUC_AUTH_BY_GSC);
> }
>
> - if (actions & (GSC_ACTION_FW_LOAD | GSC_ACTION_SW_PROXY)) {
> + if (actions & GSC_ACTION_SW_PROXY) {
> if (!intel_gsc_uc_fw_init_done(gsc)) {
> gt_err(gt, "Proxy request received with GSC not loaded!\n");
> goto out_put;
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
> index 579c0f5a1438..0ad090304ca0 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
>
alan:snip
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> index ab5246ae3979..5a4058d39550 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
>
alan:snip
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> index d2b4176c81d6..8e538d639b05 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
>
alan:snip
> +int intel_huc_fw_auth_via_gsccs(struct intel_huc *huc)
> +{
> + struct drm_i915_gem_object *obj;
> + void *pkt_vaddr;
> + u64 pkt_offset;
> + int retry = 5;
> + int err = 0;
> +
> + if (!huc->heci_pkt)
> + return -ENODEV;
> +
> + obj = huc->heci_pkt->obj;
> + pkt_offset = i915_ggtt_offset(huc->heci_pkt);
> +
> + pkt_vaddr = i915_gem_object_pin_map_unlocked(obj,
> + i915_coherent_map_type(i915, obj, true));
> + if (IS_ERR(pkt_vaddr))
> + return PTR_ERR(pkt_vaddr);
> +
> + msg_in = pkt_vaddr;
> + msg_out = pkt_vaddr + SZ_4K;
this 4K*2 (4k for input and 4K for output) seems to be hardcoded in two different locations.
One is here in intel_huc_fw_auth_via_gsccs and the other location in intel_huc_init which was
even in a different file. Perhaps its better to use a #define after to the definition of
PXP43_CMDID_NEW_HUC_AUTH... maybe something like a "#define PXP43_NEW_HUC_AUTH_INOUT_PKT_SIZE (SZ_4K)"
> +
> + intel_gsc_uc_heci_cmd_emit_mtl_header(&msg_in->header,
> + HECI_MEADDRESS_PXP,
> + sizeof(*msg_in), 0);
> +
> + msg_in->huc_in.header.api_version = PXP_APIVER(4, 3);
> + msg_in->huc_in.header.command_id = PXP43_CMDID_NEW_HUC_AUTH;
> + msg_in->huc_in.header.status = 0;
> + msg_in->huc_in.header.buffer_len = sizeof(msg_in->huc_in) -
> + sizeof(msg_in->huc_in.header);
> + msg_in->huc_in.huc_base_address = huc->fw.vma_res.start;
> + msg_in->huc_in.huc_size = huc->fw.obj->base.size;
alan: is this right?: fw.obj.base.size is the rounded up firmware size that was
allocated from intel_uc_fw_fetch when it calls i915_gem_object_create_shmem_from_data
That latter funcation populates obj with the "rounded up to 4K" size.
So is it okay use the 4k rounded up number for the size of the firmware microcode that needs to be authenticated?
(or, since this is a GSC FW command, does GSC FW parse the mei headers and extract the exact size to authenticate?)
alan:snip
> +
> +out_unpin:
> + i915_gem_object_unpin_map(obj);
> + return err;
> +}
>
alan:snip
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 6/7] drm/i915/mtl/huc: Use the media gt for the HuC getparam
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
-1 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: Daniele Ceraolo Spurio, John Harrison, dri-devel
On MTL, for obvious reasons, HuC is only available on the media tile.
We already disable SW support for HuC on the root gt due to the
absence of VCS engines, but we also need to update the getparam to point
to the HuC struct in the media GT.
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
---
drivers/gpu/drm/i915/i915_getparam.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_getparam.c b/drivers/gpu/drm/i915/i915_getparam.c
index 6f11d7eaa91a..890f2b382bee 100644
--- a/drivers/gpu/drm/i915/i915_getparam.c
+++ b/drivers/gpu/drm/i915/i915_getparam.c
@@ -100,7 +100,11 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data,
value = sseu->min_eu_in_pool;
break;
case I915_PARAM_HUC_STATUS:
- value = intel_huc_check_status(&to_gt(i915)->uc.huc);
+ /* On platform with a media GT, the HuC is on that GT */
+ if (i915->media_gt)
+ value = intel_huc_check_status(&i915->media_gt->uc.huc);
+ else
+ value = intel_huc_check_status(&to_gt(i915)->uc.huc);
if (value < 0)
return value;
break;
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [Intel-gfx] [PATCH v3 6/7] drm/i915/mtl/huc: Use the media gt for the HuC getparam
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
0 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel
On MTL, for obvious reasons, HuC is only available on the media tile.
We already disable SW support for HuC on the root gt due to the
absence of VCS engines, but we also need to update the getparam to point
to the HuC struct in the media GT.
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
---
drivers/gpu/drm/i915/i915_getparam.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_getparam.c b/drivers/gpu/drm/i915/i915_getparam.c
index 6f11d7eaa91a..890f2b382bee 100644
--- a/drivers/gpu/drm/i915/i915_getparam.c
+++ b/drivers/gpu/drm/i915/i915_getparam.c
@@ -100,7 +100,11 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data,
value = sseu->min_eu_in_pool;
break;
case I915_PARAM_HUC_STATUS:
- value = intel_huc_check_status(&to_gt(i915)->uc.huc);
+ /* On platform with a media GT, the HuC is on that GT */
+ if (i915->media_gt)
+ value = intel_huc_check_status(&i915->media_gt->uc.huc);
+ else
+ value = intel_huc_check_status(&to_gt(i915)->uc.huc);
if (value < 0)
return value;
break;
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH v3 7/7] drm/i915/huc: define HuC FW version for MTL
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
-1 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: John Harrison, Daniele Ceraolo Spurio, Alan Previn, dri-devel
Follow the same logic as DG2, so just a meu binary with no version number.
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index b752a7f1ed99..db7fbce51f8b 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -108,6 +108,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
fw_def(SKYLAKE, 0, guc_mmp(skl, 70, 1, 1))
#define INTEL_HUC_FIRMWARE_DEFS(fw_def, huc_raw, huc_mmp, huc_gsc) \
+ fw_def(METEORLAKE, 0, huc_gsc(mtl)) \
fw_def(DG2, 0, huc_gsc(dg2)) \
fw_def(ALDERLAKE_P, 0, huc_raw(tgl)) \
fw_def(ALDERLAKE_P, 0, huc_mmp(tgl, 7, 9, 3)) \
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [Intel-gfx] [PATCH v3 7/7] drm/i915/huc: define HuC FW version for MTL
@ 2023-05-27 0:52 ` Daniele Ceraolo Spurio
0 siblings, 0 replies; 52+ messages in thread
From: Daniele Ceraolo Spurio @ 2023-05-27 0:52 UTC (permalink / raw)
To: intel-gfx; +Cc: Alan Previn, dri-devel
Follow the same logic as DG2, so just a meu binary with no version number.
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index b752a7f1ed99..db7fbce51f8b 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -108,6 +108,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
fw_def(SKYLAKE, 0, guc_mmp(skl, 70, 1, 1))
#define INTEL_HUC_FIRMWARE_DEFS(fw_def, huc_raw, huc_mmp, huc_gsc) \
+ fw_def(METEORLAKE, 0, huc_gsc(mtl)) \
fw_def(DG2, 0, huc_gsc(dg2)) \
fw_def(ALDERLAKE_P, 0, huc_raw(tgl)) \
fw_def(ALDERLAKE_P, 0, huc_mmp(tgl, 7, 9, 3)) \
--
2.40.0
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: HuC loading and authentication for MTL (rev5)
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
` (7 preceding siblings ...)
(?)
@ 2023-05-27 1:22 ` Patchwork
-1 siblings, 0 replies; 52+ messages in thread
From: Patchwork @ 2023-05-27 1:22 UTC (permalink / raw)
To: Daniele Ceraolo Spurio; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: HuC loading and authentication for MTL (rev5)
URL : https://patchwork.freedesktop.org/series/117080/
State : warning
== Summary ==
Error: dim checkpatch failed
a945d853fdb8 drm/i915/uc: perma-pin firmwares
-:123: ERROR:SPACING: space prohibited before that close parenthesis ')'
#123: FILE: drivers/gpu/drm/i915/gt/uc/intel_uc.h:118:
+intel_uc_ops_function(resume_mappings, resume_mappings, void, );
total: 1 errors, 0 warnings, 0 checks, 244 lines checked
1e845f8dbef6 drm/i915/huc: Parse the GSC-enabled HuC binary
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:32: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#32:
new file mode 100644
-:280: WARNING:LINE_SPACING: Missing a blank line after declarations
#280: FILE: drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c:140:
+ u32 offset = entry_offset(entry);
+ if (offset < size && css_valid(data + offset, size - offset))
-:441: WARNING:LINE_SPACING: Missing a blank line after declarations
#441: FILE: drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c:679:
+ u32 delta = uc_fw->dma_start_offset;
+ __check_ccs_header(gt, fw->data + delta, fw->size - delta, uc_fw);
total: 0 errors, 3 warnings, 0 checks, 408 lines checked
143f47077ea0 drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
-:59: ERROR:SPACING: space required after that ',' (ctx:VxV)
#59: FILE: drivers/gpu/drm/i915/gt/uc/intel_huc.c:321:
+ huc_err(huc,"HW in DMA mode, but we have an incompatible GSC-enabled blob\n");
^
total: 1 errors, 0 warnings, 0 checks, 129 lines checked
63a06c071be7 drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
-:83: WARNING:AVOID_BUG: Do not crash the kernel unless it is absolutely unavoidable--use WARN_ON_ONCE() plus recovery code (if feasible) instead of BUG() or variants
#83: FILE: drivers/gpu/drm/i915/gt/uc/intel_huc.c:136:
+ GEM_BUG_ON(intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC));
-:333: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'base' may be better as '(base)' to avoid precedence issues
#333: FILE: drivers/gpu/drm/i915/i915_reg.h:944:
+#define HECI_FWSTS5(base) _MMIO(base + 0xc68)
total: 0 errors, 1 warnings, 1 checks, 285 lines checked
9af94661837f drm/i915/mtl/huc: auth HuC via GSC
-:9: WARNING:TYPO_SPELLING: 'fuction' may be misspelled - perhaps 'function'?
#9:
The intel_huc_auth fuction is also updated to handle both authentication
^^^^^^^
-:89: WARNING:LINE_SPACING: Missing a blank line after declarations
#89: FILE: drivers/gpu/drm/i915/gt/uc/intel_huc.c:367:
+ struct i915_vma *vma = intel_guc_allocate_vma(>->uc.guc, SZ_8K);
+ if (IS_ERR(vma)) {
-:161: ERROR:SPACING: space required before the open parenthesis '('
#161: FILE: drivers/gpu/drm/i915/gt/uc/intel_huc.c:486:
+ switch(type) {
total: 1 errors, 2 warnings, 0 checks, 335 lines checked
8ff61d43413a drm/i915/mtl/huc: Use the media gt for the HuC getparam
d5884211b9ed drm/i915/huc: define HuC FW version for MTL
^ permalink raw reply [flat|nested] 52+ messages in thread* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: HuC loading and authentication for MTL (rev5)
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
` (8 preceding siblings ...)
(?)
@ 2023-05-27 1:22 ` Patchwork
-1 siblings, 0 replies; 52+ messages in thread
From: Patchwork @ 2023-05-27 1:22 UTC (permalink / raw)
To: Daniele Ceraolo Spurio; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: HuC loading and authentication for MTL (rev5)
URL : https://patchwork.freedesktop.org/series/117080/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
^ permalink raw reply [flat|nested] 52+ messages in thread* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: HuC loading and authentication for MTL (rev5)
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
` (9 preceding siblings ...)
(?)
@ 2023-05-27 1:35 ` Patchwork
-1 siblings, 0 replies; 52+ messages in thread
From: Patchwork @ 2023-05-27 1:35 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 6047 bytes --]
== Series Details ==
Series: drm/i915: HuC loading and authentication for MTL (rev5)
URL : https://patchwork.freedesktop.org/series/117080/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13196 -> Patchwork_117080v5
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/index.html
Participating hosts (39 -> 38)
------------------------------
Additional (1): bat-mtlp-6
Missing (2): bat-atsm-1 fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_117080v5 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- fi-skl-6600u: NOTRUN -> [SKIP][1] ([fdo#109271])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/fi-skl-6600u/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence:
- bat-dg2-11: NOTRUN -> [SKIP][2] ([i915#1845] / [i915#5354]) +2 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/bat-dg2-11/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence.html
* igt@kms_pipe_crc_basic@read-crc:
- bat-adlp-9: NOTRUN -> [SKIP][3] ([i915#3546]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/bat-adlp-9/igt@kms_pipe_crc_basic@read-crc.html
* igt@kms_pipe_crc_basic@suspend-read-crc@pipe-b-dp-3:
- bat-dg2-9: [PASS][4] -> [FAIL][5] ([fdo#103375])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/bat-dg2-9/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-b-dp-3.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/bat-dg2-9/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-b-dp-3.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3@smem:
- fi-skl-6600u: [ABORT][6] -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/fi-skl-6600u/igt@gem_exec_suspend@basic-s3@smem.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/fi-skl-6600u/igt@gem_exec_suspend@basic-s3@smem.html
* igt@gem_huc_copy@huc-copy:
- {bat-mtlp-8}: [SKIP][8] ([i915#3595]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/bat-mtlp-8/igt@gem_huc_copy@huc-copy.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/bat-mtlp-8/igt@gem_huc_copy@huc-copy.html
* igt@i915_selftest@live@slpc:
- {bat-mtlp-8}: [DMESG-WARN][10] ([i915#6367]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/bat-mtlp-8/igt@i915_selftest@live@slpc.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/bat-mtlp-8/igt@i915_selftest@live@slpc.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[IGT#6]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/6
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3595]: https://gitlab.freedesktop.org/drm/intel/issues/3595
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4342]: https://gitlab.freedesktop.org/drm/intel/issues/4342
[i915#4423]: https://gitlab.freedesktop.org/drm/intel/issues/4423
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5190]: https://gitlab.freedesktop.org/drm/intel/issues/5190
[i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6645]: https://gitlab.freedesktop.org/drm/intel/issues/6645
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#8189]: https://gitlab.freedesktop.org/drm/intel/issues/8189
[i915#8497]: https://gitlab.freedesktop.org/drm/intel/issues/8497
Build changes
-------------
* Linux: CI_DRM_13196 -> Patchwork_117080v5
CI-20190529: 20190529
CI_DRM_13196: 9e0c716f834ec17dbf96c47c8b5a2b32c4f483cd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7307: f0714273cd896c637759b3790f485308c4c97008 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_117080v5: 9e0c716f834ec17dbf96c47c8b5a2b32c4f483cd @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
e24f35a8858c drm/i915/huc: define HuC FW version for MTL
9b229ef0ae3e drm/i915/mtl/huc: Use the media gt for the HuC getparam
83f554710722 drm/i915/mtl/huc: auth HuC via GSC
c37ca25ab902 drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
e45539b0b59a drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
590f5331fc1b drm/i915/huc: Parse the GSC-enabled HuC binary
835e51c7b4e6 drm/i915/uc: perma-pin firmwares
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/index.html
[-- Attachment #2: Type: text/html, Size: 5309 bytes --]
^ permalink raw reply [flat|nested] 52+ messages in thread* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: HuC loading and authentication for MTL (rev5)
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
` (10 preceding siblings ...)
(?)
@ 2023-05-28 1:07 ` Patchwork
-1 siblings, 0 replies; 52+ messages in thread
From: Patchwork @ 2023-05-28 1:07 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 8137 bytes --]
== Series Details ==
Series: drm/i915: HuC loading and authentication for MTL (rev5)
URL : https://patchwork.freedesktop.org/series/117080/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13196_full -> Patchwork_117080v5_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (7 -> 7)
------------------------------
No changes in participating hosts
Known issues
------------
Here are the changes found in Patchwork_117080v5_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#2842])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/shard-glk1/igt@gem_exec_fair@basic-pace-share@rcs0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/shard-glk9/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@kms_dither@fb-8bpc-vs-panel-6bpc@pipe-a-hdmi-a-1:
- shard-glk: NOTRUN -> [SKIP][3] ([fdo#109271])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/shard-glk3/igt@kms_dither@fb-8bpc-vs-panel-6bpc@pipe-a-hdmi-a-1.html
* igt@kms_plane_scaling@planes-downscale-factor-0-25-upscale-0-25@pipe-a-hdmi-a-1:
- shard-snb: NOTRUN -> [SKIP][4] ([fdo#109271]) +9 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/shard-snb1/igt@kms_plane_scaling@planes-downscale-factor-0-25-upscale-0-25@pipe-a-hdmi-a-1.html
* igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-25@pipe-b-hdmi-a-1:
- shard-snb: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4579]) +7 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/shard-snb1/igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-25@pipe-b-hdmi-a-1.html
* igt@kms_rotation_crc@multiplane-rotation:
- shard-glk: [PASS][6] -> [DMESG-FAIL][7] ([IGT#6] / [i915#118])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/shard-glk3/igt@kms_rotation_crc@multiplane-rotation.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/shard-glk6/igt@kms_rotation_crc@multiplane-rotation.html
#### Possible fixes ####
* igt@drm_fdinfo@virtual-idle:
- {shard-rkl}: [FAIL][8] ([i915#7742]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/shard-rkl-7/igt@drm_fdinfo@virtual-idle.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/shard-rkl-1/igt@drm_fdinfo@virtual-idle.html
* igt@gem_eio@unwedge-stress:
- {shard-dg1}: [FAIL][10] ([i915#5784]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/shard-dg1-15/igt@gem_eio@unwedge-stress.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/shard-dg1-17/igt@gem_eio@unwedge-stress.html
* igt@gem_exec_fair@basic-deadline:
- shard-glk: [FAIL][12] ([i915#2846]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/shard-glk8/igt@gem_exec_fair@basic-deadline.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/shard-glk3/igt@gem_exec_fair@basic-deadline.html
* igt@i915_pm_rc6_residency@rc6-idle@rcs0:
- {shard-dg1}: [FAIL][14] ([i915#3591]) -> [PASS][15] +1 similar issue
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/shard-dg1-14/igt@i915_pm_rc6_residency@rc6-idle@rcs0.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/shard-dg1-15/igt@i915_pm_rc6_residency@rc6-idle@rcs0.html
* igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait:
- {shard-rkl}: [SKIP][16] ([i915#1397]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/shard-rkl-7/igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/shard-rkl-1/igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-apl: [FAIL][18] ([IGT#6] / [i915#2346]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/shard-apl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/shard-apl6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@single-bo@pipe-b:
- {shard-rkl}: [INCOMPLETE][20] ([i915#8011]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/shard-rkl-7/igt@kms_cursor_legacy@single-bo@pipe-b.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/shard-rkl-1/igt@kms_cursor_legacy@single-bo@pipe-b.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a2:
- shard-glk: [FAIL][22] ([i915#79]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13196/shard-glk8/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a2.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/shard-glk8/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a2.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[IGT#6]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/6
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4816]: https://gitlab.freedesktop.org/drm/intel/issues/4816
[i915#4936]: https://gitlab.freedesktop.org/drm/intel/issues/4936
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5493]: https://gitlab.freedesktop.org/drm/intel/issues/5493
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8178]: https://gitlab.freedesktop.org/drm/intel/issues/8178
[i915#8211]: https://gitlab.freedesktop.org/drm/intel/issues/8211
[i915#8213]: https://gitlab.freedesktop.org/drm/intel/issues/8213
[i915#8234]: https://gitlab.freedesktop.org/drm/intel/issues/8234
[i915#8311]: https://gitlab.freedesktop.org/drm/intel/issues/8311
Build changes
-------------
* Linux: CI_DRM_13196 -> Patchwork_117080v5
CI-20190529: 20190529
CI_DRM_13196: 9e0c716f834ec17dbf96c47c8b5a2b32c4f483cd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7307: f0714273cd896c637759b3790f485308c4c97008 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_117080v5: 9e0c716f834ec17dbf96c47c8b5a2b32c4f483cd @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v5/index.html
[-- Attachment #2: Type: text/html, Size: 8043 bytes --]
^ permalink raw reply [flat|nested] 52+ messages in thread* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: HuC loading and authentication for MTL (rev6)
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
` (11 preceding siblings ...)
(?)
@ 2023-05-31 9:20 ` Patchwork
-1 siblings, 0 replies; 52+ messages in thread
From: Patchwork @ 2023-05-31 9:20 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: HuC loading and authentication for MTL (rev6)
URL : https://patchwork.freedesktop.org/series/117080/
State : warning
== Summary ==
Error: dim checkpatch failed
eda136a026c3 drm/i915/uc: perma-pin firmwares
-:124: ERROR:SPACING: space prohibited before that close parenthesis ')'
#124: FILE: drivers/gpu/drm/i915/gt/uc/intel_uc.h:118:
+intel_uc_ops_function(resume_mappings, resume_mappings, void, );
total: 1 errors, 0 warnings, 0 checks, 244 lines checked
72e5caa2255e drm/i915/huc: Parse the GSC-enabled HuC binary
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:32: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#32:
new file mode 100644
-:280: WARNING:LINE_SPACING: Missing a blank line after declarations
#280: FILE: drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c:140:
+ u32 offset = entry_offset(entry);
+ if (offset < size && css_valid(data + offset, size - offset))
-:441: WARNING:LINE_SPACING: Missing a blank line after declarations
#441: FILE: drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c:679:
+ u32 delta = uc_fw->dma_start_offset;
+ __check_ccs_header(gt, fw->data + delta, fw->size - delta, uc_fw);
total: 0 errors, 3 warnings, 0 checks, 408 lines checked
873345a5c74c drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
-:59: ERROR:SPACING: space required after that ',' (ctx:VxV)
#59: FILE: drivers/gpu/drm/i915/gt/uc/intel_huc.c:321:
+ huc_err(huc,"HW in DMA mode, but we have an incompatible GSC-enabled blob\n");
^
total: 1 errors, 0 warnings, 0 checks, 129 lines checked
1a335d255478 drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
-:86: WARNING:AVOID_BUG: Do not crash the kernel unless it is absolutely unavoidable--use WARN_ON_ONCE() plus recovery code (if feasible) instead of BUG() or variants
#86: FILE: drivers/gpu/drm/i915/gt/uc/intel_huc.c:136:
+ GEM_BUG_ON(intel_huc_is_authenticated(huc, INTEL_HUC_AUTH_BY_GSC));
-:336: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'base' may be better as '(base)' to avoid precedence issues
#336: FILE: drivers/gpu/drm/i915/i915_reg.h:944:
+#define HECI_FWSTS5(base) _MMIO(base + 0xc68)
total: 0 errors, 1 warnings, 1 checks, 293 lines checked
216e256ba37d drm/i915/mtl/huc: auth HuC via GSC
-:9: WARNING:TYPO_SPELLING: 'fuction' may be misspelled - perhaps 'function'?
#9:
The intel_huc_auth fuction is also updated to handle both authentication
^^^^^^^
-:89: WARNING:LINE_SPACING: Missing a blank line after declarations
#89: FILE: drivers/gpu/drm/i915/gt/uc/intel_huc.c:367:
+ struct i915_vma *vma = intel_guc_allocate_vma(>->uc.guc, SZ_8K);
+ if (IS_ERR(vma)) {
-:161: ERROR:SPACING: space required before the open parenthesis '('
#161: FILE: drivers/gpu/drm/i915/gt/uc/intel_huc.c:486:
+ switch(type) {
total: 1 errors, 2 warnings, 0 checks, 335 lines checked
deffa2572165 drm/i915/mtl/huc: Use the media gt for the HuC getparam
96473876a0c0 drm/i915/huc: define HuC FW version for MTL
^ permalink raw reply [flat|nested] 52+ messages in thread* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: HuC loading and authentication for MTL (rev6)
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
` (12 preceding siblings ...)
(?)
@ 2023-05-31 9:20 ` Patchwork
-1 siblings, 0 replies; 52+ messages in thread
From: Patchwork @ 2023-05-31 9:20 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: HuC loading and authentication for MTL (rev6)
URL : https://patchwork.freedesktop.org/series/117080/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
^ permalink raw reply [flat|nested] 52+ messages in thread* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: HuC loading and authentication for MTL (rev6)
2023-05-27 0:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
` (13 preceding siblings ...)
(?)
@ 2023-05-31 9:34 ` Patchwork
-1 siblings, 0 replies; 52+ messages in thread
From: Patchwork @ 2023-05-31 9:34 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 8623 bytes --]
== Series Details ==
Series: drm/i915: HuC loading and authentication for MTL (rev6)
URL : https://patchwork.freedesktop.org/series/117080/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13204 -> Patchwork_117080v6
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/index.html
Participating hosts (36 -> 36)
------------------------------
Additional (1): fi-kbl-soraka
Missing (1): bat-dg1-5
Known issues
------------
Here are the changes found in Patchwork_117080v6 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3@smem:
- bat-rpls-2: NOTRUN -> [FAIL][1] ([fdo#103375]) +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/bat-rpls-2/igt@gem_exec_suspend@basic-s3@smem.html
* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271] / [i915#2190])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/fi-kbl-soraka/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#4613]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/fi-kbl-soraka/igt@gem_lmem_swapping@basic.html
* igt@i915_pm_backlight@basic-brightness@edp-1:
- bat-rplp-1: NOTRUN -> [ABORT][4] ([i915#7077])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/bat-rplp-1/igt@i915_pm_backlight@basic-brightness@edp-1.html
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-hsw-4770: [PASS][5] -> [SKIP][6] ([fdo#109271])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13204/fi-hsw-4770/igt@i915_pm_rpm@basic-pci-d3-state.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/fi-hsw-4770/igt@i915_pm_rpm@basic-pci-d3-state.html
* igt@i915_pm_rpm@basic-rte:
- fi-hsw-4770: [PASS][7] -> [FAIL][8] ([i915#7364])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13204/fi-hsw-4770/igt@i915_pm_rpm@basic-rte.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/fi-hsw-4770/igt@i915_pm_rpm@basic-rte.html
* igt@i915_selftest@live@gt_heartbeat:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][9] ([i915#5334] / [i915#7872])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/fi-kbl-soraka/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][10] ([i915#1886] / [i915#7913])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@slpc:
- bat-rpls-2: [PASS][11] -> [DMESG-WARN][12] ([i915#6367])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13204/bat-rpls-2/igt@i915_selftest@live@slpc.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/bat-rpls-2/igt@i915_selftest@live@slpc.html
- bat-rpls-1: [PASS][13] -> [DMESG-WARN][14] ([i915#6367])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13204/bat-rpls-1/igt@i915_selftest@live@slpc.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/bat-rpls-1/igt@i915_selftest@live@slpc.html
* igt@kms_chamelium_frames@hdmi-crc-fast:
- fi-kbl-soraka: NOTRUN -> [SKIP][15] ([fdo#109271]) +14 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/fi-kbl-soraka/igt@kms_chamelium_frames@hdmi-crc-fast.html
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- bat-rpls-2: NOTRUN -> [SKIP][16] ([i915#7828])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/bat-rpls-2/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
* igt@kms_pipe_crc_basic@suspend-read-crc:
- bat-rpls-2: NOTRUN -> [SKIP][17] ([i915#1845])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/bat-rpls-2/igt@kms_pipe_crc_basic@suspend-read-crc.html
* igt@kms_setmode@basic-clone-single-crtc:
- fi-kbl-soraka: NOTRUN -> [SKIP][18] ([fdo#109271] / [i915#4579])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/fi-kbl-soraka/igt@kms_setmode@basic-clone-single-crtc.html
#### Possible fixes ####
* igt@gem_huc_copy@huc-copy:
- {bat-mtlp-8}: [SKIP][19] ([i915#3595]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13204/bat-mtlp-8/igt@gem_huc_copy@huc-copy.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/bat-mtlp-8/igt@gem_huc_copy@huc-copy.html
* igt@i915_module_load@load:
- {bat-adlp-11}: [ABORT][21] ([i915#4423] / [i915#8189]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13204/bat-adlp-11/igt@i915_module_load@load.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/bat-adlp-11/igt@i915_module_load@load.html
#### Warnings ####
* igt@i915_suspend@basic-s2idle-without-i915:
- bat-rpls-2: [ABORT][23] ([i915#6687]) -> [FAIL][24] ([fdo#103375])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13204/bat-rpls-2/igt@i915_suspend@basic-s2idle-without-i915.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/bat-rpls-2/igt@i915_suspend@basic-s2idle-without-i915.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-rplp-1: [ABORT][25] ([i915#4579] / [i915#8260]) -> [SKIP][26] ([i915#3555] / [i915#4579])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13204/bat-rplp-1/igt@kms_setmode@basic-clone-single-crtc.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/bat-rplp-1/igt@kms_setmode@basic-clone-single-crtc.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3595]: https://gitlab.freedesktop.org/drm/intel/issues/3595
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4423]: https://gitlab.freedesktop.org/drm/intel/issues/4423
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#7059]: https://gitlab.freedesktop.org/drm/intel/issues/7059
[i915#7077]: https://gitlab.freedesktop.org/drm/intel/issues/7077
[i915#7364]: https://gitlab.freedesktop.org/drm/intel/issues/7364
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7872]: https://gitlab.freedesktop.org/drm/intel/issues/7872
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#8189]: https://gitlab.freedesktop.org/drm/intel/issues/8189
[i915#8260]: https://gitlab.freedesktop.org/drm/intel/issues/8260
Build changes
-------------
* Linux: CI_DRM_13204 -> Patchwork_117080v6
CI-20190529: 20190529
CI_DRM_13204: 83a048e62ecf7838b583389e60c1defa530a5668 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7311: c031030f39aff973330668a5a2f1593408da78ae @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_117080v6: 83a048e62ecf7838b583389e60c1defa530a5668 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
5ad1405b02e5 drm/i915/huc: define HuC FW version for MTL
daab1ac7cd58 drm/i915/mtl/huc: Use the media gt for the HuC getparam
7ea68dcc305f drm/i915/mtl/huc: auth HuC via GSC
982d36c252c9 drm/i915/huc: differentiate the 2 steps of the MTL HuC auth flow
c27b551e9bc6 drm/i915/huc: Load GSC-enabled HuC via DMA xfer if the fuse says so
6ff620ec56df drm/i915/huc: Parse the GSC-enabled HuC binary
c213cb2be8f1 drm/i915/uc: perma-pin firmwares
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117080v6/index.html
[-- Attachment #2: Type: text/html, Size: 9969 bytes --]
^ permalink raw reply [flat|nested] 52+ messages in thread