Commit 3d2ea552 authored by Rajneesh Bhardwaj's avatar Rajneesh Bhardwaj Committed by Alex Deucher
Browse files

drm/amdgpu: implement smuio v13_0_3 callbacks 



Add smuio v13_0_3 callbacks for SMUIO.

Tested-by: default avatarOri Messinger <Ori.Messinger@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarRajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 63121b11

drivers/gpu/drm/amd/amdgpu/Makefile

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

	smuio_v11_0_6.o \

	smuio_v13_0.o \

	smuio_v13_0_3.o \

	smuio_v13_0_6.o



# add reset block

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

+5 −0
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ enum amdgpu_gfx_partition { 


#define NUM_XCC(x) hweight16(x)



enum amdgpu_pkg_type {

	AMDGPU_PKG_TYPE_APU = 2,

	AMDGPU_PKG_TYPE_UNKNOWN,

};



struct amdgpu_mec {

	struct amdgpu_bo	*hpd_eop_obj;

	u64			hpd_eop_gpu_addr;

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

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ struct amdgpu_smuio_funcs { 
	void (*get_clock_gating_state)(struct amdgpu_device *adev, u64 *flags);

	u32 (*get_die_id)(struct amdgpu_device *adev);

	u32 (*get_socket_id)(struct amdgpu_device *adev);

	enum amdgpu_pkg_type (*get_pkg_type)(struct amdgpu_device *adev);

	bool (*is_host_gpu_xgmi_supported)(struct amdgpu_device *adev);

};

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

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

 * Copyright 2022 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_v13_0_3.h"

#include "soc15_common.h"

#include "smuio/smuio_13_0_3_offset.h"

#include "smuio/smuio_13_0_3_sh_mask.h"



#define PKG_TYPE_MASK		0x00000003L



/**

 * smuio_v13_0_3_get_die_id - query die id from FCH.

 *

 * @adev: amdgpu device pointer

 *

 * Returns die id

 */

static u32 smuio_v13_0_3_get_die_id(struct amdgpu_device *adev)

{

	u32 data, die_id;



	data = RREG32_SOC15(SMUIO, 0, regSMUIO_MCM_CONFIG);

	die_id = REG_GET_FIELD(data, SMUIO_MCM_CONFIG, DIE_ID);



	return die_id;

}



/**

 * smuio_v13_0_3_get_socket_id - query socket id from FCH

 *

 * @adev: amdgpu device pointer

 *

 * Returns socket id

 */

static u32 smuio_v13_0_3_get_socket_id(struct amdgpu_device *adev)

{

	u32 data, socket_id;



	data = RREG32_SOC15(SMUIO, 0, regSMUIO_MCM_CONFIG);

	socket_id = REG_GET_FIELD(data, SMUIO_MCM_CONFIG, SOCKET_ID);



	return socket_id;

}



/**

 * smuio_v13_0_3_get_pkg_type - query package type set by MP1/bootcode

 *

 * @adev: amdgpu device pointer

 *

 * Returns package type

 */



static enum amdgpu_pkg_type smuio_v13_0_3_get_pkg_type(struct amdgpu_device *adev)

{

	enum amdgpu_pkg_type pkg_type;

	u32 data;



	data = RREG32_SOC15(SMUIO, 0, regSMUIO_MCM_CONFIG);

	data = REG_GET_FIELD(data, SMUIO_MCM_CONFIG, PKG_TYPE);

	/* pkg_type[4:0]

	 *

	 * bit 1 == 1 APU form factor

	 *

	 * b0100 - b1111 - Reserved

	 */

	switch (data & PKG_TYPE_MASK) {

	case 0x2:

		pkg_type = AMDGPU_PKG_TYPE_APU;

		break;

	default:

		pkg_type = AMDGPU_PKG_TYPE_UNKNOWN;

		break;

	}



	return pkg_type;

}





const struct amdgpu_smuio_funcs smuio_v13_0_3_funcs = {

	.get_die_id = smuio_v13_0_3_get_die_id,

	.get_socket_id = smuio_v13_0_3_get_socket_id,

	.get_pkg_type = smuio_v13_0_3_get_pkg_type,

};

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

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

 * Copyright 2022 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_V13_0_3_H__

#define __SMUIO_V13_0_3_H__



extern const struct amdgpu_smuio_funcs smuio_v13_0_3_funcs;



#endif /* __SMUIO_V13_0_3_H__ */