drm/xe/soc_remapper: Use SoC remapper helper from VSEC code

Since different drivers can use SoC remapper, modify VSEC code to
access SoC remapper via a helper that would synchronize such accesses.

Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: Badal Nilawar <badal.nilawar@intel.com>
Link: https://patch.msgid.link/20251223183943.3175941-7-umesh.nerlige.ramappa@intel.com

diff --git a/drivers/gpu/drm/xe/regs/xe_pmt.h b/drivers/gpu/drm/xe/regs/xe_pmt.h
index 0f79c0714454693e4e0c6124f54cbdd86444ab49..240d57993ea6fd50caad5d63a1ee67c5758eafb2 100644 (file)
--- a/drivers/gpu/drm/xe/regs/xe_pmt.h
+++ b/drivers/gpu/drm/xe/regs/xe_pmt.h
@@ -18,9 +18,6 @@
 #define BMG_TELEMETRY_BASE_OFFSET      0xE0000
 #define BMG_TELEMETRY_OFFSET           (SOC_BASE + BMG_TELEMETRY_BASE_OFFSET)
 
-#define SG_REMAP_INDEX1                        XE_REG(SOC_BASE + 0x08)
-#define   SG_REMAP_BITS                        REG_GENMASK(31, 24)
-
 #define BMG_MODS_RESIDENCY_OFFSET              (0x4D0)
 #define BMG_G2_RESIDENCY_OFFSET                (0x530)
 #define BMG_G6_RESIDENCY_OFFSET                (0x538)

diff --git a/drivers/gpu/drm/xe/regs/xe_soc_remapper_regs.h b/drivers/gpu/drm/xe/regs/xe_soc_remapper_regs.h
new file mode 100644 (file)
index 0000000..9edf234
--- /dev/null
+++ b/drivers/gpu/drm/xe/regs/xe_soc_remapper_regs.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2025 Intel Corporation
+ */
+#ifndef _XE_SOC_REMAPPER_REGS_H_
+#define _XE_SOC_REMAPPER_REGS_H_
+
+#include "xe_regs.h"
+
+#define SG_REMAP_INDEX1                        XE_REG(SOC_BASE + 0x08)
+#define   SG_REMAP_TELEM_MASK          REG_GENMASK(31, 24)
+
+#endif

diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 69570e21c16bf35923869544d400d8d5d899c524..e292c6ebd4cb2ffb3cb2b656303a29277b8d2390 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -334,6 +334,8 @@ struct xe_device {
                u8 has_pxp:1;
                /** @info.has_range_tlb_inval: Has range based TLB invalidations */
                u8 has_range_tlb_inval:1;
+               /** @info.has_soc_remapper_telem: Has SoC remapper telemetry support */
+               u8 has_soc_remapper_telem:1;
                /** @info.has_sriov: Supports SR-IOV */
                u8 has_sriov:1;
                /** @info.has_usm: Device has unified shared memory support */
@@ -582,6 +584,9 @@ struct xe_device {
        struct {
                /** @soc_remapper.lock: Serialize access to SoC Remapper's index registers */
                spinlock_t lock;
+
+               /** @soc_remapper.set_telem_region: Set telemetry index */
+               void (*set_telem_region)(struct xe_device *xe, u32 index);
        } soc_remapper;
 
        /**

diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index 18d4e6b5c319480db9f1dc72e385e69db584f566..55daa1b5f383eb77adff08e016c81eae3f66c663 100644 (file)
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -370,6 +370,7 @@ static const struct xe_device_desc bmg_desc = {
        .has_i2c = true,
        .has_late_bind = true,
        .has_pre_prod_wa = 1,
+       .has_soc_remapper_telem = true,
        .has_sriov = true,
        .has_mem_copy_instr = true,
        .max_gt_per_tile = 2,
@@ -421,6 +422,7 @@ static const struct xe_device_desc cri_desc = {
        .has_mbx_power_limits = true,
        .has_mert = true,
        .has_pre_prod_wa = 1,
+       .has_soc_remapper_telem = true,
        .has_sriov = true,
        .max_gt_per_tile = 2,
        .require_force_probe = true,
@@ -692,6 +694,7 @@ static int xe_info_init_early(struct xe_device *xe,
        xe->info.has_page_reclaim_hw_assist = desc->has_page_reclaim_hw_assist;
        xe->info.has_pre_prod_wa = desc->has_pre_prod_wa;
        xe->info.has_pxp = desc->has_pxp;
+       xe->info.has_soc_remapper_telem = desc->has_soc_remapper_telem;
        xe->info.has_sriov = xe_configfs_primary_gt_allowed(to_pci_dev(xe->drm.dev)) &&
                desc->has_sriov;
        xe->info.has_mem_copy_instr = desc->has_mem_copy_instr;

diff --git a/drivers/gpu/drm/xe/xe_pci_types.h b/drivers/gpu/drm/xe/xe_pci_types.h
index 3bb51d1559513d7612a7055d1a1bbf3acea1cad1..e2bd4c81b2a7aab12f553b4f859b6cb2e2782b8a 100644 (file)
--- a/drivers/gpu/drm/xe/xe_pci_types.h
+++ b/drivers/gpu/drm/xe/xe_pci_types.h
@@ -53,6 +53,7 @@ struct xe_device_desc {
        u8 has_pre_prod_wa:1;
        u8 has_page_reclaim_hw_assist:1;
        u8 has_pxp:1;
+       u8 has_soc_remapper_telem:1;
        u8 has_sriov:1;
        u8 needs_scratch:1;
        u8 skip_guc_pc:1;

diff --git a/drivers/gpu/drm/xe/xe_soc_remapper.c b/drivers/gpu/drm/xe/xe_soc_remapper.c
index f2cc1f5b334ae382815fc2b213c8f371e6e763a0..9fd084f76c6b67631e97be3ddd08e69e05342189 100644 (file)
--- a/drivers/gpu/drm/xe/xe_soc_remapper.c
+++ b/drivers/gpu/drm/xe/xe_soc_remapper.c
@@ -3,8 +3,23 @@
  * Copyright © 2025 Intel Corporation
  */
 
+#include "regs/xe_soc_remapper_regs.h"
+#include "xe_mmio.h"
 #include "xe_soc_remapper.h"
 
+static void xe_soc_remapper_set_region(struct xe_device *xe, struct xe_reg reg,
+                                      u32 mask, u32 val)
+{
+       guard(spinlock_irqsave)(&xe->soc_remapper.lock);
+       xe_mmio_rmw32(xe_root_tile_mmio(xe), reg, mask, val);
+}
+
+static void xe_soc_remapper_set_telem_region(struct xe_device *xe, u32 index)
+{
+       xe_soc_remapper_set_region(xe, SG_REMAP_INDEX1, SG_REMAP_TELEM_MASK,
+                                  REG_FIELD_PREP(SG_REMAP_TELEM_MASK, index));
+}
+
 /**
  * xe_soc_remapper_init() - Initialize SoC remapper
  * @xe: Pointer to xe device.
@@ -15,7 +30,10 @@
  */
 int xe_soc_remapper_init(struct xe_device *xe)
 {
-       spin_lock_init(&xe->soc_remapper.lock);
+       if (xe->info.has_soc_remapper_telem) {
+               spin_lock_init(&xe->soc_remapper.lock);
+               xe->soc_remapper.set_telem_region = xe_soc_remapper_set_telem_region;
+       }
 
        return 0;
 }

diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c
index 8f23a27871b60570d9fb2c9955b8dc4a65617a14..c83ea3d48faead0c75c4b75b5232a58afc6907db 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vsec.c
+++ b/drivers/gpu/drm/xe/xe_vsec.c
@@ -158,13 +158,15 @@ int xe_pmt_telem_read(struct pci_dev *pdev, u32 guid, u64 *data, loff_t user_off
 
        guard(mutex)(&xe->pmt.lock);
 
+       if (!xe->soc_remapper.set_telem_region)
+               return -ENODEV;
+
        /* indicate that we are not at an appropriate power level */
        if (!xe_pm_runtime_get_if_active(xe))
                return -ENODATA;
 
        /* set SoC re-mapper index register based on GUID memory region */
-       xe_mmio_rmw32(xe_root_tile_mmio(xe), SG_REMAP_INDEX1, SG_REMAP_BITS,
-                     REG_FIELD_PREP(SG_REMAP_BITS, mem_region));
+       xe->soc_remapper.set_telem_region(xe, mem_region);
 
        memcpy_fromio(data, telem_addr, count);
        xe_pm_runtime_put(xe);