Commit b37c41f2 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amdgpu: enable pptable ucode loading 



With SCPM enabled, pptable cannot be uploaded to SMU directly.
The transferring has to be via PSP.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 288908ed

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

+3 −0
Original line number Diff line number Diff line
@@ -2154,6 +2154,9 @@ static int psp_get_fw_type(struct amdgpu_firmware_info *ucode, 
	case AMDGPU_UCODE_ID_SMC:

		*type = GFX_FW_TYPE_SMU;

		break;

	case AMDGPU_UCODE_ID_PPTABLE:

		*type = GFX_FW_TYPE_PPTABLE;

		break;

	case AMDGPU_UCODE_ID_UVD:

		*type = GFX_FW_TYPE_UVD;

		break;

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

+6 −0
Original line number Diff line number Diff line
@@ -543,6 +543,8 @@ const char *amdgpu_ucode_name(enum AMDGPU_UCODE_ID ucode_id) 
		return "STORAGE";

	case AMDGPU_UCODE_ID_SMC:

		return "SMC";

	case AMDGPU_UCODE_ID_PPTABLE:

		return "PPTABLE";

	case AMDGPU_UCODE_ID_UVD:

		return "UVD";

	case AMDGPU_UCODE_ID_UVD1:
@@ -720,6 +722,10 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev, 
			ucode_addr = (u8 *)ucode->fw->data +

				le32_to_cpu(header->ucode_array_offset_bytes);

			break;

		case AMDGPU_UCODE_ID_PPTABLE:

			ucode->ucode_size = ucode->fw->size;

			ucode_addr = (u8 *)ucode->fw->data;

			break;

		default:

			ucode->ucode_size = le32_to_cpu(header->ucode_size_bytes);

			ucode_addr = (u8 *)ucode->fw->data +

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

+1 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ enum AMDGPU_UCODE_ID { 
	AMDGPU_UCODE_ID_RLC_G,

	AMDGPU_UCODE_ID_STORAGE,

	AMDGPU_UCODE_ID_SMC,

	AMDGPU_UCODE_ID_PPTABLE,

	AMDGPU_UCODE_ID_UVD,

	AMDGPU_UCODE_ID_UVD1,

	AMDGPU_UCODE_ID_VCE,

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+6 −0
Original line number Diff line number Diff line
@@ -1027,6 +1027,12 @@ static int smu_sw_init(void *handle) 
		return ret;

	}



	ret = smu_init_pptable_microcode(smu);

	if (ret) {

		dev_err(adev->dev, "Failed to setup pptable firmware!\n");

		return ret;

	}



	ret = smu_register_irq_handler(smu);

	if (ret) {

		dev_err(adev->dev, "Failed to register smc irq handler!\n");

drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h

+8 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "dm_pp_interface.h"

#include "dm_pp_smu.h"

#include "smu_types.h"

#include "linux/firmware.h"



#define SMU_THERMAL_MINIMUM_ALERT_TEMP		0

#define SMU_THERMAL_MAXIMUM_ALERT_TEMP		255
@@ -557,6 +558,8 @@ struct smu_context 
	struct smu_user_dpm_profile user_dpm_profile;



	struct stb_context stb_context;



	struct firmware pptable_firmware;

};



struct i2c_adapter;
@@ -1298,6 +1301,11 @@ struct pptable_funcs { 
	 *										of SMUBUS table.

	 */

	int (*send_hbm_bad_channel_flag)(struct smu_context *smu, uint32_t size);



	/**

	 * @init_pptable_microcode: Prepare the pptable microcode to upload via PSP

	 */

	int (*init_pptable_microcode)(struct smu_context *smu);

};



typedef enum {