Skip to content

Commit 87e6505

Browse files
Shaoyun Liualexdeucher
authored andcommitted
drm/amd/amdgpu : Use the MES INV_TLBS API for tlb invalidation on gfx12
From MES version 0x81, it provide the new API INV_TLBS that support invalidate tlbs with PASID. Signed-off-by: Shaoyun Liu <shaoyun.liu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent e86a411 commit 87e6505

3 files changed

Lines changed: 68 additions & 0 deletions

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,13 @@ struct mes_reset_queue_input {
280280
bool is_kq;
281281
};
282282

283+
struct mes_inv_tlbs_pasid_input {
284+
uint32_t xcc_id;
285+
uint16_t pasid;
286+
uint8_t hub_id;
287+
uint8_t flush_type;
288+
};
289+
283290
enum mes_misc_opcode {
284291
MES_MISC_OP_WRITE_REG,
285292
MES_MISC_OP_READ_REG,
@@ -367,6 +374,9 @@ struct amdgpu_mes_funcs {
367374

368375
int (*reset_hw_queue)(struct amdgpu_mes *mes,
369376
struct mes_reset_queue_input *input);
377+
378+
int (*invalidate_tlbs_pasid)(struct amdgpu_mes *mes,
379+
struct mes_inv_tlbs_pasid_input *input);
370380
};
371381

372382
#define amdgpu_mes_kiq_hw_init(adev) (adev)->mes.kiq_hw_init((adev))

drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,22 @@ static void gmc_v12_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
336336
uint16_t queried;
337337
int vmid, i;
338338

339+
if (adev->enable_uni_mes && adev->mes.ring[AMDGPU_MES_SCHED_PIPE].sched.ready &&
340+
(adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 0x81) {
341+
struct mes_inv_tlbs_pasid_input input = {0};
342+
input.pasid = pasid;
343+
input.flush_type = flush_type;
344+
input.hub_id = AMDGPU_GFXHUB(0);
345+
/* MES will invalidate all gc_hub for the device from master */
346+
adev->mes.funcs->invalidate_tlbs_pasid(&adev->mes, &input);
347+
if (all_hub) {
348+
/* Only need to invalidate mm_hub now, gfx12 only support one mmhub */
349+
input.hub_id = AMDGPU_MMHUB0(0);
350+
adev->mes.funcs->invalidate_tlbs_pasid(&adev->mes, &input);
351+
}
352+
return;
353+
}
354+
339355
for (vmid = 1; vmid < 16; vmid++) {
340356
bool valid;
341357

drivers/gpu/drm/amd/amdgpu/mes_v12_0.c

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ static const char *mes_v12_0_opcodes[] = {
108108
"SET_SE_MODE",
109109
"SET_GANG_SUBMIT",
110110
"SET_HW_RSRC_1",
111+
"INVALIDATE_TLBS",
111112
};
112113

113114
static const char *mes_v12_0_misc_opcodes[] = {
@@ -879,6 +880,46 @@ static int mes_v12_0_reset_hw_queue(struct amdgpu_mes *mes,
879880
offsetof(union MESAPI__RESET, api_status));
880881
}
881882

883+
static int mes_v12_inv_tlb_convert_hub_id(uint8_t id)
884+
{
885+
/*
886+
* MES doesn't support invalidate gc_hub on slave xcc individually
887+
* master xcc will invalidate all gc_hub for the partition
888+
*/
889+
if (AMDGPU_IS_GFXHUB(id))
890+
return 0;
891+
else if (AMDGPU_IS_MMHUB0(id))
892+
return 1;
893+
else
894+
return -EINVAL;
895+
896+
}
897+
898+
static int mes_v12_0_inv_tlbs_pasid(struct amdgpu_mes *mes,
899+
struct mes_inv_tlbs_pasid_input *input)
900+
{
901+
union MESAPI__INV_TLBS mes_inv_tlbs;
902+
903+
memset(&mes_inv_tlbs, 0, sizeof(mes_inv_tlbs));
904+
905+
mes_inv_tlbs.header.type = MES_API_TYPE_SCHEDULER;
906+
mes_inv_tlbs.header.opcode = MES_SCH_API_INV_TLBS;
907+
mes_inv_tlbs.header.dwsize = API_FRAME_SIZE_IN_DWORDS;
908+
909+
mes_inv_tlbs.invalidate_tlbs.inv_sel = 0;
910+
mes_inv_tlbs.invalidate_tlbs.flush_type = input->flush_type;
911+
mes_inv_tlbs.invalidate_tlbs.inv_sel_id = input->pasid;
912+
913+
/*convert amdgpu_mes_hub_id to mes expected hub_id */
914+
mes_inv_tlbs.invalidate_tlbs.hub_id = mes_v12_inv_tlb_convert_hub_id(input->hub_id);
915+
if (mes_inv_tlbs.invalidate_tlbs.hub_id < 0)
916+
return -EINVAL;
917+
return mes_v12_0_submit_pkt_and_poll_completion(mes, AMDGPU_MES_KIQ_PIPE,
918+
&mes_inv_tlbs, sizeof(mes_inv_tlbs),
919+
offsetof(union MESAPI__INV_TLBS, api_status));
920+
921+
}
922+
882923
static const struct amdgpu_mes_funcs mes_v12_0_funcs = {
883924
.add_hw_queue = mes_v12_0_add_hw_queue,
884925
.remove_hw_queue = mes_v12_0_remove_hw_queue,
@@ -888,6 +929,7 @@ static const struct amdgpu_mes_funcs mes_v12_0_funcs = {
888929
.resume_gang = mes_v12_0_resume_gang,
889930
.misc_op = mes_v12_0_misc_op,
890931
.reset_hw_queue = mes_v12_0_reset_hw_queue,
932+
.invalidate_tlbs_pasid = mes_v12_0_inv_tlbs_pasid,
891933
};
892934

893935
static int mes_v12_0_allocate_ucode_buffer(struct amdgpu_device *adev,

0 commit comments

Comments
 (0)