Skip to content

Commit c3a613a

Browse files
committed
drm/xe/soc_remapper: Add system controller config for SoC remapper
Define system controller config bits and helpers for SoC remapper. 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-8-umesh.nerlige.ramappa@intel.com
1 parent 32eab46 commit c3a613a

5 files changed

Lines changed: 24 additions & 2 deletions

File tree

drivers/gpu/drm/xe/regs/xe_soc_remapper_regs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99

1010
#define SG_REMAP_INDEX1 XE_REG(SOC_BASE + 0x08)
1111
#define SG_REMAP_TELEM_MASK REG_GENMASK(31, 24)
12+
#define SG_REMAP_SYSCTRL_MASK REG_GENMASK(23, 16)
1213

1314
#endif

drivers/gpu/drm/xe/xe_device_types.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,8 @@ struct xe_device {
334334
u8 has_pxp:1;
335335
/** @info.has_range_tlb_inval: Has range based TLB invalidations */
336336
u8 has_range_tlb_inval:1;
337+
/** @info.has_soc_remapper_sysctrl: Has SoC remapper system controller */
338+
u8 has_soc_remapper_sysctrl:1;
337339
/** @info.has_soc_remapper_telem: Has SoC remapper telemetry support */
338340
u8 has_soc_remapper_telem:1;
339341
/** @info.has_sriov: Supports SR-IOV */
@@ -587,6 +589,9 @@ struct xe_device {
587589

588590
/** @soc_remapper.set_telem_region: Set telemetry index */
589591
void (*set_telem_region)(struct xe_device *xe, u32 index);
592+
593+
/** @soc_remapper.set_sysctrl_region: Set system controller index */
594+
void (*set_sysctrl_region)(struct xe_device *xe, u32 index);
590595
} soc_remapper;
591596

592597
/**

drivers/gpu/drm/xe/xe_pci.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ static const struct xe_device_desc cri_desc = {
422422
.has_mbx_power_limits = true,
423423
.has_mert = true,
424424
.has_pre_prod_wa = 1,
425+
.has_soc_remapper_sysctrl = true,
425426
.has_soc_remapper_telem = true,
426427
.has_sriov = true,
427428
.max_gt_per_tile = 2,
@@ -694,6 +695,7 @@ static int xe_info_init_early(struct xe_device *xe,
694695
xe->info.has_page_reclaim_hw_assist = desc->has_page_reclaim_hw_assist;
695696
xe->info.has_pre_prod_wa = desc->has_pre_prod_wa;
696697
xe->info.has_pxp = desc->has_pxp;
698+
xe->info.has_soc_remapper_sysctrl = desc->has_soc_remapper_sysctrl;
697699
xe->info.has_soc_remapper_telem = desc->has_soc_remapper_telem;
698700
xe->info.has_sriov = xe_configfs_primary_gt_allowed(to_pci_dev(xe->drm.dev)) &&
699701
desc->has_sriov;

drivers/gpu/drm/xe/xe_pci_types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ struct xe_device_desc {
5353
u8 has_pre_prod_wa:1;
5454
u8 has_page_reclaim_hw_assist:1;
5555
u8 has_pxp:1;
56+
u8 has_soc_remapper_sysctrl:1;
5657
u8 has_soc_remapper_telem:1;
5758
u8 has_sriov:1;
5859
u8 needs_scratch:1;

drivers/gpu/drm/xe/xe_soc_remapper.c

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ static void xe_soc_remapper_set_telem_region(struct xe_device *xe, u32 index)
2020
REG_FIELD_PREP(SG_REMAP_TELEM_MASK, index));
2121
}
2222

23+
static void xe_soc_remapper_set_sysctrl_region(struct xe_device *xe, u32 index)
24+
{
25+
xe_soc_remapper_set_region(xe, SG_REMAP_INDEX1, SG_REMAP_SYSCTRL_MASK,
26+
REG_FIELD_PREP(SG_REMAP_SYSCTRL_MASK, index));
27+
}
28+
2329
/**
2430
* xe_soc_remapper_init() - Initialize SoC remapper
2531
* @xe: Pointer to xe device.
@@ -30,10 +36,17 @@ static void xe_soc_remapper_set_telem_region(struct xe_device *xe, u32 index)
3036
*/
3137
int xe_soc_remapper_init(struct xe_device *xe)
3238
{
33-
if (xe->info.has_soc_remapper_telem) {
39+
bool has_soc_remapper = xe->info.has_soc_remapper_telem ||
40+
xe->info.has_soc_remapper_sysctrl;
41+
42+
if (has_soc_remapper)
3443
spin_lock_init(&xe->soc_remapper.lock);
44+
45+
if (xe->info.has_soc_remapper_telem)
3546
xe->soc_remapper.set_telem_region = xe_soc_remapper_set_telem_region;
36-
}
47+
48+
if (xe->info.has_soc_remapper_sysctrl)
49+
xe->soc_remapper.set_sysctrl_region = xe_soc_remapper_set_sysctrl_region;
3750

3851
return 0;
3952
}

0 commit comments

Comments
 (0)