Commit e55565f8 authored by Tim Huang's avatar Tim Huang Committed by Alex Deucher
Browse files

drm/amdgpu: add support for PSP IP version 14.0.5 



This initializes PSP IP version 14.0.5.

Signed-off-by: default avatarTim Huang <tim.huang@amd.com>
Reviewed-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e7704d7c

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

+1 −0
Original line number Diff line number Diff line
@@ -2031,6 +2031,7 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev) 
		break;

	case IP_VERSION(14, 0, 2):

	case IP_VERSION(14, 0, 3):

	case IP_VERSION(14, 0, 5):

		amdgpu_device_ip_block_add(adev, &psp_v14_0_ip_block);

		break;

	default:

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

+4 −0
Original line number Diff line number Diff line
@@ -246,6 +246,10 @@ static int psp_early_init(struct amdgpu_ip_block *ip_block) 
	case IP_VERSION(14, 0, 3):

		psp_v14_0_set_psp_funcs(psp);

		break;

	case IP_VERSION(14, 0, 5):

		psp_v14_0_set_psp_funcs(psp);

		psp->boot_time_tmr = false;

		break;

	default:

		return -EINVAL;

	}

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

+10 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ MODULE_FIRMWARE("amdgpu/psp_14_0_2_sos.bin"); 
MODULE_FIRMWARE("amdgpu/psp_14_0_2_ta.bin");

MODULE_FIRMWARE("amdgpu/psp_14_0_3_sos.bin");

MODULE_FIRMWARE("amdgpu/psp_14_0_3_ta.bin");

MODULE_FIRMWARE("amdgpu/psp_14_0_5_toc.bin");

MODULE_FIRMWARE("amdgpu/psp_14_0_5_ta.bin");



/* For large FW files the time to complete can be very long */

#define USBC_PD_POLLING_LIMIT_S 240
@@ -72,6 +74,14 @@ static int psp_v14_0_init_microcode(struct psp_context *psp) 
		if (err)

			return err;

		break;

	case IP_VERSION(14, 0, 5):

		err = psp_init_toc_microcode(psp, ucode_prefix);

		if (err)

			return err;

		err = psp_init_ta_microcode(psp, ucode_prefix);

		if (err)

			return err;

		break;

	default:

		BUG();

	}