drm/xe: Correct BMG VSEC header sizing

The intel_vsec_header information for the crashlog feature is
incorrect.

Update the VSEC header with correct sizing and count.

Since the crashlog entries are "merged" (num_entries = 2), the
separate capabilities entries must be merged as well.

Fixes: 0c45e76fcc62 ("drm/xe/vsec: Support BMG devices")
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Reviewed-by: David E. Box <david.e.box@linux.intel.com>
Link: https://lore.kernel.org/r/20250713172943.7335-4-michael.j.ruhl@intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c
index 1bf7e709e1100fc1fc424b422b0a4e7babdf0e20..56930ad42962169b34ddae1fe9ebcdf185db9b77 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vsec.c
+++ b/drivers/gpu/drm/xe/xe_vsec.c
@@ -33,30 +33,19 @@ static struct intel_vsec_header bmg_telemetry = {
        .offset = BMG_DISCOVERY_OFFSET,
 };
 
-static struct intel_vsec_header bmg_punit_crashlog = {
+static struct intel_vsec_header bmg_crashlog = {
        .rev = 1,
        .length = 0x10,
        .id = VSEC_ID_CRASHLOG,
-       .num_entries = 1,
-       .entry_size = 4,
+       .num_entries = 2,
+       .entry_size = 6,
        .tbir = 0,
        .offset = BMG_DISCOVERY_OFFSET + 0x60,
 };
 
-static struct intel_vsec_header bmg_oobmsm_crashlog = {
-       .rev = 1,
-       .length = 0x10,
-       .id = VSEC_ID_CRASHLOG,
-       .num_entries = 1,
-       .entry_size = 4,
-       .tbir = 0,
-       .offset = BMG_DISCOVERY_OFFSET + 0x78,
-};
-
 static struct intel_vsec_header *bmg_capabilities[] = {
        &bmg_telemetry,
-       &bmg_punit_crashlog,
-       &bmg_oobmsm_crashlog,
+       &bmg_crashlog,
        NULL
 };