Skip to content

Commit 11e4bfe

Browse files
Lijo Lazargregkh
authored andcommitted
drm/amdgpu: Remove nbiov7.9 replay count reporting
[ Upstream commit 0f566f0 ] Direct pcie replay count reporting is not available on nbio v7.9. Reporting is done through firmware. Signed-off-by: Lijo Lazar <[email protected]> Acked-by: Mangesh Gadre <[email protected]> Reviewed-by: Asad Kamal <[email protected]> Fixes: 50709d1 ("drm/amdgpu: Add pci replay count to nbio v7.9") Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 54efe13 commit 11e4bfe

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131

3232
#define NPS_MODE_MASK 0x000000FFL
3333

34-
/* Core 0 Port 0 counter */
35-
#define smnPCIEP_NAK_COUNTER 0x1A340218
36-
3734
static void nbio_v7_9_remap_hdp_registers(struct amdgpu_device *adev)
3835
{
3936
WREG32_SOC15(NBIO, 0, regBIF_BX0_REMAP_HDP_MEM_FLUSH_CNTL,
@@ -467,22 +464,6 @@ static void nbio_v7_9_init_registers(struct amdgpu_device *adev)
467464
}
468465
}
469466

470-
static u64 nbio_v7_9_get_pcie_replay_count(struct amdgpu_device *adev)
471-
{
472-
u32 val, nak_r, nak_g;
473-
474-
if (adev->flags & AMD_IS_APU)
475-
return 0;
476-
477-
/* Get the number of NAKs received and generated */
478-
val = RREG32_PCIE(smnPCIEP_NAK_COUNTER);
479-
nak_r = val & 0xFFFF;
480-
nak_g = val >> 16;
481-
482-
/* Add the total number of NAKs, i.e the number of replays */
483-
return (nak_r + nak_g);
484-
}
485-
486467
#define MMIO_REG_HOLE_OFFSET 0x1A000
487468

488469
static void nbio_v7_9_set_reg_remap(struct amdgpu_device *adev)
@@ -524,7 +505,6 @@ const struct amdgpu_nbio_funcs nbio_v7_9_funcs = {
524505
.get_memory_partition_mode = nbio_v7_9_get_memory_partition_mode,
525506
.is_nps_switch_requested = nbio_v7_9_is_nps_switch_requested,
526507
.init_registers = nbio_v7_9_init_registers,
527-
.get_pcie_replay_count = nbio_v7_9_get_pcie_replay_count,
528508
.set_reg_remap = nbio_v7_9_set_reg_remap,
529509
};
530510

0 commit comments

Comments
 (0)