Add SoC remapper support for system controller
Subsystems (2)
v4 cover Add SoC remapper support for system controller
Add system controller configuration using SoC remapper for Xe3p
v2:
- s/remapper/soc_remapper/
- return status from init during probe
- reorder patches 1 and 2 from earlier series
- fix copyright year
- retain comment
- s/BITS/MASK/
v3 and v4 with review comments incorporated.
Umesh Nerlige Ramappa (3):
drm/xe/soc_remapper: Initialize SoC remapper during Xe probe drm/xe/soc_remapper: Use SoC remapper herlper from VSEC code drm/xe/soc_remapper: Add system controller config for SoC remapper
drivers/gpu/drm/xe/Makefile | 1 + drivers/gpu/drm/xe/regs/xe_pmt.h | 3 -- .../gpu/drm/xe/regs/xe_soc_remapper_regs.h | 14 +++++ drivers/gpu/drm/xe/xe_device.c | 5 ++ drivers/gpu/drm/xe/xe_device_types.h | 16 ++++++ drivers/gpu/drm/xe/xe_pci.c | 5 ++ drivers/gpu/drm/xe/xe_pci_types.h | 2 + drivers/gpu/drm/xe/xe_soc_remapper.c | 52 +++++++++++++++++++ drivers/gpu/drm/xe/xe_soc_remapper.h | 13 +++++ drivers/gpu/drm/xe/xe_vsec.c | 6 ++- 10 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 drivers/gpu/drm/xe/regs/xe_soc_remapper_regs.h create mode 100644 drivers/gpu/drm/xe/xe_soc_remapper.c create mode 100644 drivers/gpu/drm/xe/xe_soc_remapper.h
Signature · 1 line
2.43.0
PATCH v4 1/3 drm/xe/soc_remapper: Initialize SoC remapper during Xe probe
SoC remapper is used to map different HW functions in the SoC to their respective drivers. Initialize SoC remapper during driver load.
---
v2: (Ashutosh/Lucas)
- s/remapper/soc_remapper/
- return status from init during probe
- reorder patches 1 and 2 from earlier series
- fix copyright year
v3: (Michal, Badal)
- Kernel doc fixes
- Alphabetical order for headers/objects
- Add has_soc_remapper
- Drop unnecessary headers
v4: (Badal)
- Telem and SC need separate has_ checks
--- drivers/gpu/drm/xe/Makefile | 1 + drivers/gpu/drm/xe/xe_device.c | 5 +++++ drivers/gpu/drm/xe/xe_device_types.h | 6 ++++++ drivers/gpu/drm/xe/xe_soc_remapper.c | 21 +++++++++++++++++++++ drivers/gpu/drm/xe/xe_soc_remapper.h | 13 +++++++++++++ 5 files changed, 46 insertions(+) create mode 100644 drivers/gpu/drm/xe/xe_soc_remapper.c create mode 100644 drivers/gpu/drm/xe/xe_soc_remapper.h
drivers/gpu/drm/xe/Makefile +1 -0
@@ -115,6 +115,7 @@ xe-y += xe_bb.o \ xe_sa.o \ xe_sched_job.o \ xe_shrinker.o \ + xe_soc_remapper.o \ xe_step.o \ xe_survivability_mode.o \ xe_sync.o \
drivers/gpu/drm/xe/xe_device.c +5 -0
@@ -61,6 +61,7 @@#include "xe_pxp.h" #include "xe_query.h" #include "xe_shrinker.h" +#include "xe_soc_remapper.h" #include "xe_survivability_mode.h" #include "xe_sriov.h" #include "xe_tile.h"
@@ -906,6 +907,10 @@ int xe_device_probe(struct xe_device *xe)xe_nvm_init (xe); + err =xe_soc_remapper_init (xe); +if (err) +return err; + err =xe_heci_gsc_init (xe);if (err)return err;
drivers/gpu/drm/xe/xe_device_types.h +6 -0
@@ -560,6 +560,12 @@ struct xe_device {struct mutex lock; } pmt; +/** @soc_remapper: SoC remapper object */ +struct { +/** @soc_remapper.lock: Serialize access to SoC Remapper's index registers */ +spinlock_t lock; + } soc_remapper; +/** * @pm_callback_task: Track the active task that is running in either * the runtime_suspend or runtime_resume callbacks.
drivers/gpu/drm/xe/xe_soc_remapper.c new file +21 -0
@@ -0,0 +1,21 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2025 Intel Corporation +*/ + +#include "xe_soc_remapper.h" + +/** +* xe_soc_remapper_init() - Initialize SoC remapper +* @xe: Pointer to xe device. +* +* Initialize SoC remapper. + +* Return: 0 on success, error code on failure +*/ +int xe_soc_remapper_init (struct xe_device *xe) +{ +spin_lock_init (&xe->soc_remapper.lock); + +return 0 ; +}
drivers/gpu/drm/xe/xe_soc_remapper.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2025 Intel Corporation +*/ + +#ifndef _XE_SOC_REMAPPER_H_ +#define _XE_SOC_REMAPPER_H_ + +#include "xe_device_types.h" + +int xe_soc_remapper_init (struct xe_device *xe); + +#endif
Signature · 1 line
2.43.0
PATCH v4 2/3 drm/xe/soc_remapper: Use SoC remapper herlper from VSEC code
In reply to Umesh Nerlige RamappaSince different drivers can use SoC remapper, modify VSEC code to access SoC remapper via a helper that would synchronize such accesses.
---
v2: (Lucas)
- retain comment
- s/BITS/MASK/
v3: (Michal)
- Use scope based locks
- Add kernel doc for functions
v4: (Badal)
- Prevent bad accesses to SoC remapper
- Enable soc remapper for BMG
--- drivers/gpu/drm/xe/regs/xe_pmt.h | 3 --- .../gpu/drm/xe/regs/xe_soc_remapper_regs.h | 13 +++++++++++ drivers/gpu/drm/xe/xe_device_types.h | 5 ++++ drivers/gpu/drm/xe/xe_pci.c | 3 +++ drivers/gpu/drm/xe/xe_pci_types.h | 1 + drivers/gpu/drm/xe/xe_soc_remapper.c | 23 ++++++++++++++++++- drivers/gpu/drm/xe/xe_vsec.c | 6 +++-- 7 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 drivers/gpu/drm/xe/regs/xe_soc_remapper_regs.h
drivers/gpu/drm/xe/regs/xe_pmt.h +0 -3
@@ -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)
drivers/gpu/drm/xe/regs/xe_soc_remapper_regs.h new file +13 -0
@@ -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
drivers/gpu/drm/xe/xe_device_types.h +5 -0
@@ -320,6 +320,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 */
@@ -564,6 +566,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;/**
drivers/gpu/drm/xe/xe_pci.c +3 -0
@@ -367,6 +367,7 @@ static const struct xe_device_desc bmg_desc = { .has_gsc_nvm = 1, .has_heci_cscfi = 1, .has_late_bind = true, + .has_soc_remapper_telem = true, .has_sriov = true, .has_mem_copy_instr = true, .max_gt_per_tile = 2,
@@ -413,6 +414,7 @@ static const struct xe_device_desc cri_desc = { .has_flat_ccs = false, .has_mbx_power_limits = true, .has_mert = true, + .has_soc_remapper_telem = true, .has_sriov = true, .max_gt_per_tile = 2, .require_force_probe = true,
@@ -681,6 +683,7 @@ static int xe_info_init_early(struct xe_device *xe, xe->info.has_llc = desc->has_llc; xe->info.has_mert = desc->has_mert; 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;
drivers/gpu/drm/xe/xe_pci_types.h +1 -0
@@ -50,6 +50,7 @@ struct xe_device_desc { u8 has_mem_copy_instr:1; u8 has_mert:1; u8 has_pxp:1; + u8 has_soc_remapper_telem:1; u8 has_sriov:1; u8 needs_scratch:1; u8 skip_guc_pc:1;
drivers/gpu/drm/xe/xe_soc_remapper.c +22 -1
@@ -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,13 @@*/ int xe_soc_remapper_init (struct xe_device *xe) { -spin_lock_init (&xe->soc_remapper.lock); +bool has_soc_remapper = xe->info.has_soc_remapper_telem; + +if (has_soc_remapper) +spin_lock_init (&xe->soc_remapper.lock); + +if (xe->info.has_soc_remapper_telem) + xe->soc_remapper.set_telem_region = xe_soc_remapper_set_telem_region;return 0 ; }
drivers/gpu/drm/xe/xe_vsec.c +4 -2
@@ -162,9 +162,11 @@ int xe_pmt_telem_read(struct pci_dev *pdev, u32 guid, u64 *data, loff_t user_offif (!xe_pm_runtime_get_if_active (xe))return -ENODATA ; +if (!xe->soc_remapper.set_telem_region) +return -ENODEV ; +/* 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);
Signature · 1 line
2.43.0
PATCH v4 3/3 drm/xe/soc_remapper: Add system controller config for SoC remapper
In reply to Umesh Nerlige RamappaDefine system controller config bits and helpers for SoC remapper.
---
v2: (Badal)
- Add kernel doc for function
v3: (Badal)
- Prevent bad access to SoC remapper
--- drivers/gpu/drm/xe/regs/xe_soc_remapper_regs.h | 1 + drivers/gpu/drm/xe/xe_device_types.h | 5 +++++ drivers/gpu/drm/xe/xe_pci.c | 2 ++ drivers/gpu/drm/xe/xe_pci_types.h | 1 + drivers/gpu/drm/xe/xe_soc_remapper.c | 12 +++++++++++- 5 files changed, 20 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/regs/xe_soc_remapper_regs.h +1 -0
@@ -9,5 +9,6 @@#define SG_REMAP_INDEX1 XE_REG(SOC_BASE + 0x08)#define SG_REMAP_TELEM_MASK REG_GENMASK(31, 24) +#define SG_REMAP_SYSCTRL_MASK REG_GENMASK(23, 16)#endif
drivers/gpu/drm/xe/xe_device_types.h +5 -0
@@ -322,6 +322,8 @@ struct xe_device { u8 has_range_tlb_inval:1;/** @info.has_soc_remapper_telem: Has SoC remapper telemetry support */ u8 has_soc_remapper_telem:1; +/** @info.has_soc_remapper_sysctrl: Has SoC remapper system controller */ + u8 has_soc_remapper_sysctrl:1;/** @info.has_sriov: Supports SR-IOV */ u8 has_sriov:1;/** @info.has_usm: Device has unified shared memory support */
@@ -569,6 +571,9 @@ struct xe_device {/** @soc_remapper.set_telem_region: Set telemetry index */ void (*set_telem_region)(struct xe_device *xe,u32 index); + +/** @soc_remapper.set_sysctrl_region: Set system controller index */ +void (*set_sysctrl_region)(struct xe_device *xe,u32 index); } soc_remapper;/**
drivers/gpu/drm/xe/xe_pci.c +2 -0
@@ -414,6 +414,7 @@ static const struct xe_device_desc cri_desc = { .has_flat_ccs = false, .has_mbx_power_limits = true, .has_mert = true, + .has_soc_remapper_sysctrl = true, .has_soc_remapper_telem = true, .has_sriov = true, .max_gt_per_tile = 2,
@@ -683,6 +684,7 @@ static int xe_info_init_early(struct xe_device *xe, xe->info.has_llc = desc->has_llc; xe->info.has_mert = desc->has_mert; xe->info.has_pxp = desc->has_pxp; + xe->info.has_soc_remapper_sysctrl = desc->has_soc_remapper_sysctrl; 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;
drivers/gpu/drm/xe/xe_pci_types.h +1 -0
@@ -50,6 +50,7 @@ struct xe_device_desc { u8 has_mem_copy_instr:1; u8 has_mert:1; u8 has_pxp:1; + u8 has_soc_remapper_sysctrl:1; u8 has_soc_remapper_telem:1; u8 has_sriov:1; u8 needs_scratch:1;
drivers/gpu/drm/xe/xe_soc_remapper.c +11 -1
@@ -20,6 +20,12 @@ static void xe_soc_remapper_set_telem_region(struct xe_device *xe, u32 index) REG_FIELD_PREP(SG_REMAP_TELEM_MASK, index)); } +static void xe_soc_remapper_set_sysctrl_region (struct xe_device *xe,u32 index) +{ +xe_soc_remapper_set_region (xe,SG_REMAP_INDEX1 ,SG_REMAP_SYSCTRL_MASK , +REG_FIELD_PREP (SG_REMAP_SYSCTRL_MASK , index)); +} +/** * xe_soc_remapper_init() - Initialize SoC remapper * @xe: Pointer to xe device.
@@ -30,7 +36,8 @@ static void xe_soc_remapper_set_telem_region(struct xe_device *xe, u32 index)*/ int xe_soc_remapper_init (struct xe_device *xe) { -bool has_soc_remapper = xe->info.has_soc_remapper_telem; +bool has_soc_remapper = xe->info.has_soc_remapper_telem || + xe->info.has_soc_remapper_sysctrl;if (has_soc_remapper)spin_lock_init (&xe->soc_remapper.lock);
@@ -38,5 +45,8 @@ int xe_soc_remapper_init(struct xe_device *xe)if (xe->info.has_soc_remapper_telem) xe->soc_remapper.set_telem_region = xe_soc_remapper_set_telem_region; +if (xe->info.has_soc_remapper_sysctrl) + xe->soc_remapper.set_sysctrl_region = xe_soc_remapper_set_sysctrl_region; +return 0 ; }
Signature · 1 line
2.43.0