[AMD Official Use Only - AMD Internal Distribution Only]
Acked-by: Mangesh Gadre <mangesh.ga...@amd.com>
>-----Original Message-----
>From: Lazar, Lijo <lijo.la...@amd.com>
>Sent: Thursday, May 29, 2025 2:00 PM
>To: amd-gfx@lists.freedesktop.org
>Cc: Zhang, Hawking <hawking.zh...@amd.com>; Deucher, Alexander
><alexander.deuc...@amd.com>; Kamal, Asad <asad.ka...@amd.com>; Gadre,
>Mangesh <mangesh.ga...@amd.com>
>Subject: [PATCH 2/2] drm/amdgpu: Remove nbiov7.9 replay count reporting
>
>Direct pcie replay count reporting is not available on nbio v7.9.
>Reporting is done through firmware.
>
>Signed-off-by: Lijo Lazar <lijo.la...@amd.com>
>
>Fixes: 50709d18f4a6 ("drm/amdgpu: Add pci replay count to nbio v7.9")
>---
> drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 20 --------------------
> 1 file changed, 20 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
>b/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
>index a376f072700d..1c22bc11c1f8 100644
>--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
>+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
>@@ -31,9 +31,6 @@
>
> #define NPS_MODE_MASK 0x000000FFL
>
>-/* Core 0 Port 0 counter */
>-#define smnPCIEP_NAK_COUNTER 0x1A340218
>-
> static void nbio_v7_9_remap_hdp_registers(struct amdgpu_device *adev) {
> 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)
> }
> }
>
>-static u64 nbio_v7_9_get_pcie_replay_count(struct amdgpu_device *adev) -{
>- u32 val, nak_r, nak_g;
>-
>- if (adev->flags & AMD_IS_APU)
>- return 0;
>-
>- /* Get the number of NAKs received and generated */
>- val = RREG32_PCIE(smnPCIEP_NAK_COUNTER);
>- nak_r = val & 0xFFFF;
>- nak_g = val >> 16;
>-
>- /* Add the total number of NAKs, i.e the number of replays */
>- return (nak_r + nak_g);
>-}
>-
> #define MMIO_REG_HOLE_OFFSET 0x1A000
>
> 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 = {
> .get_memory_partition_mode = nbio_v7_9_get_memory_partition_mode,
> .is_nps_switch_requested = nbio_v7_9_is_nps_switch_requested,
> .init_registers = nbio_v7_9_init_registers,
>- .get_pcie_replay_count = nbio_v7_9_get_pcie_replay_count,
> .set_reg_remap = nbio_v7_9_set_reg_remap, };
>
>--
>2.25.1
