Commit 502d7630 authored by Sunil Khatri's avatar Sunil Khatri Committed by Alex Deucher
Browse files

drm/amdgpu: validate resume before function call 



Before making a function call to resume, validate
the function pointer like we do in sw_init.

Use the helper function amdgpu_ip_block_resume where
same checks and calls are repeated.

Signed-off-by: default avatarSunil Khatri <sunil.khatri@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e095026f

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

+4 −9
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev) 
		dev_err(adev->dev, "Failed to get BIF handle\n");

		return -EINVAL;

	}

	r = cmn_block->version->funcs->resume(cmn_block);

	r = amdgpu_ip_block_resume(cmn_block);

	if (r)

		return r;
@@ -275,15 +275,10 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev) 
		      adev->ip_blocks[i].version->type ==

			      AMD_IP_BLOCK_TYPE_SDMA))

			continue;

		r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);

		if (r) {

			dev_err(adev->dev,

				"resume of IP block <%s> failed %d\n",

				adev->ip_blocks[i].version->funcs->name, r);

			return r;

		}



		adev->ip_blocks[i].status.hw = true;

		r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);

		if (r)

			return r;

	}



	for (i = 0; i < adev->num_ip_blocks; i++) {

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

+2 −0
Original line number Diff line number Diff line
@@ -365,6 +365,8 @@ bool amdgpu_device_ip_is_valid(struct amdgpu_device *adev, 
			      enum amd_ip_block_type block_type);

int amdgpu_ip_block_suspend(struct amdgpu_ip_block *ip_block);



int amdgpu_ip_block_resume(struct amdgpu_ip_block *ip_block);



#define AMDGPU_MAX_IP_NUM 16



struct amdgpu_ip_block_status {

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

+37 −27
Original line number Diff line number Diff line
@@ -290,6 +290,24 @@ int amdgpu_ip_block_suspend(struct amdgpu_ip_block *ip_block) 
	return 0;

}



int amdgpu_ip_block_resume(struct amdgpu_ip_block *ip_block)

{

	int r;



	if (ip_block->version->funcs->resume) {

		r = ip_block->version->funcs->resume(ip_block);

		if (r) {

			dev_err(ip_block->adev->dev,

				"resume of IP block <%s> failed %d\n",

				ip_block->version->funcs->name, r);

			return r;

		}

	}



	ip_block->status.hw = true;

	return 0;

}



/**

 * DOC: board_info

 *
@@ -2762,12 +2780,9 @@ static int amdgpu_device_fw_loading(struct amdgpu_device *adev) 
				break;



			if (amdgpu_in_reset(adev) || adev->in_suspend) {

				r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);

				if (r) {

					DRM_ERROR("resume of IP block <%s> failed %d\n",

							  adev->ip_blocks[i].version->funcs->name, r);

				r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);

				if (r)

					return r;

				}

			} else {

				r = adev->ip_blocks[i].version->funcs->hw_init(&adev->ip_blocks[i]);

				if (r) {
@@ -2775,9 +2790,8 @@ static int amdgpu_device_fw_loading(struct amdgpu_device *adev) 
							  adev->ip_blocks[i].version->funcs->name, r);

					return r;

				}

			}



				adev->ip_blocks[i].status.hw = true;

			}

			break;

		}

	}
@@ -3682,17 +3696,21 @@ static int amdgpu_device_ip_reinit_late_sriov(struct amdgpu_device *adev) 
				block->status.hw)

				continue;



			if (block->version->type == AMD_IP_BLOCK_TYPE_SMC)

				r = block->version->funcs->resume(&adev->ip_blocks[i]);

			else

				r = block->version->funcs->hw_init(&adev->ip_blocks[i]);



			DRM_INFO("RE-INIT-late: %s %s\n", block->version->funcs->name, r?"failed":"succeeded");

			if (block->version->type == AMD_IP_BLOCK_TYPE_SMC) {

				r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);

				if (r)

					return r;

			} else {

				r = block->version->funcs->hw_init(&adev->ip_blocks[i]);

				if (r) {

					DRM_ERROR("hw_init of IP block <%s> failed %d\n",

						  adev->ip_blocks[i].version->funcs->name, r);

					return r;

				}

				block->status.hw = true;

			}

		}

	}



	return 0;

}
@@ -3721,14 +3739,10 @@ static int amdgpu_device_ip_resume_phase1(struct amdgpu_device *adev) 
		    adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH ||

		    (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP && amdgpu_sriov_vf(adev))) {



			r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);

			if (r) {

				DRM_ERROR("resume of IP block <%s> failed %d\n",

					  adev->ip_blocks[i].version->funcs->name, r);

			r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);

			if (r)

				return r;

		}

			adev->ip_blocks[i].status.hw = true;

		}

	}



	return 0;
@@ -3759,14 +3773,10 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev) 
		    adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH ||

		    adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP)

			continue;

		r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);

		if (r) {

			DRM_ERROR("resume of IP block <%s> failed %d\n",

				  adev->ip_blocks[i].version->funcs->name, r);

		r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);

		if (r)

			return r;

	}

		adev->ip_blocks[i].status.hw = true;

	}



	return 0;

}

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

+4 −16
Original line number Diff line number Diff line
@@ -169,16 +169,10 @@ static int sienna_cichlid_mode2_restore_ip(struct amdgpu_device *adev) 


	for (i = 0; i < adev->num_ip_blocks; i++) {

		if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH) {

			r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);

			if (r) {

				dev_err(adev->dev,

					"resume of IP block <%s> failed %d\n",

					adev->ip_blocks[i].version->funcs->name, r);

			r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);

			if (r)

				return r;

		}



			adev->ip_blocks[i].status.hw = true;

		}

	}



	for (i = 0; i < adev->num_ip_blocks; i++) {
@@ -187,17 +181,11 @@ static int sienna_cichlid_mode2_restore_ip(struct amdgpu_device *adev) 
		      adev->ip_blocks[i].version->type ==

			      AMD_IP_BLOCK_TYPE_SDMA))

			continue;

		r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);

		if (r) {

			dev_err(adev->dev,

				"resume of IP block <%s> failed %d\n",

				adev->ip_blocks[i].version->funcs->name, r);

		r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);

		if (r)

			return r;

	}



		adev->ip_blocks[i].status.hw = true;

	}



	for (i = 0; i < adev->num_ip_blocks; i++) {

		if (!(adev->ip_blocks[i].version->type ==

			      AMD_IP_BLOCK_TYPE_GFX ||

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

+2 −8
Original line number Diff line number Diff line
@@ -180,17 +180,11 @@ static int smu_v13_0_10_mode2_restore_ip(struct amdgpu_device *adev) 
		      adev->ip_blocks[i].version->type ==

			      AMD_IP_BLOCK_TYPE_SDMA))

			continue;

		r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);

		if (r) {

			dev_err(adev->dev,

				"resume of IP block <%s> failed %d\n",

				adev->ip_blocks[i].version->funcs->name, r);

		r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);

		if (r)

			return r;

	}



		adev->ip_blocks[i].status.hw = true;

	}



	for (i = 0; i < adev->num_ip_blocks; i++) {

		if (!(adev->ip_blocks[i].version->type ==

			      AMD_IP_BLOCK_TYPE_GFX ||