Commit 52cd9bc4 authored by Pratik Vishwakarma's avatar Pratik Vishwakarma Committed by Alex Deucher
Browse files

drm/amd: Enable SMUIO 15_0_0 support 



Add SMUIO 15_0_0.

Signed-off-by: default avatarPratik Vishwakarma <Pratik.Vishwakarma@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 65653210

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ amdgpu-y += \ 
	smuio_v13_0_3.o \

	smuio_v13_0_6.o \

	smuio_v14_0_2.o \

	smuio_v15_0_0.o \

	smuio_v15_0_8.o



# add reset block

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

+4 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
#include "smuio_v13_0_3.h"

#include "smuio_v13_0_6.h"

#include "smuio_v14_0_2.h"

#include "smuio_v15_0_0.h"

#include "smuio_v15_0_8.h"

#include "vcn_v5_0_0.h"

#include "vcn_v5_0_1.h"
@@ -3192,6 +3193,9 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev) 
	case IP_VERSION(14, 0, 2):

		adev->smuio.funcs = &smuio_v14_0_2_funcs;

		break;

	case IP_VERSION(15, 0, 0):

		adev->smuio.funcs = &smuio_v15_0_0_funcs;

		break;

	case IP_VERSION(15, 0, 8):

		adev->smuio.funcs = &smuio_v15_0_8_funcs;

		break;

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

0 → 100644
+50 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2025 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */

#include "amdgpu.h"

#include "smuio_v15_0_0.h"

#include "smuio/smuio_15_0_0_offset.h"

#include "smuio/smuio_15_0_0_sh_mask.h"

#include <linux/preempt.h>



static u64 smuio_v15_0_0_get_gpu_clock_counter(struct amdgpu_device *adev)

{

	u64 clock;

	u64 clock_counter_lo, clock_counter_hi_pre, clock_counter_hi_after;



	preempt_disable();

	clock_counter_hi_pre = (u64)RREG32_SOC15(SMUIO, 0, regGOLDEN_TSC_COUNT_UPPER);

	clock_counter_lo = (u64)RREG32_SOC15(SMUIO, 0, regGOLDEN_TSC_COUNT_LOWER);

	/* the clock counter may be udpated during polling the counters */

	clock_counter_hi_after = (u64)RREG32_SOC15(SMUIO, 0, regGOLDEN_TSC_COUNT_UPPER);

	if (clock_counter_hi_pre != clock_counter_hi_after)

		clock_counter_lo = (u64)RREG32_SOC15(SMUIO, 0, regGOLDEN_TSC_COUNT_LOWER);

	preempt_enable();



	clock = clock_counter_lo | (clock_counter_hi_after << 32ULL);



	return clock;

}



const struct amdgpu_smuio_funcs smuio_v15_0_0_funcs = {

	.get_gpu_clock_counter = smuio_v15_0_0_get_gpu_clock_counter,

};

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

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2025 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */

#ifndef __SMUIO_V15_0_0_H__

#define __SMUIO_V15_0_0_H__



#include "soc15_common.h"



extern const struct amdgpu_smuio_funcs smuio_v15_0_0_funcs;



#endif /* __SMUIO_V15_0_0_H__ */