Commit 6aade587 authored by Jiri Kosina's avatar Jiri Kosina Committed by Alex Deucher
Browse files

drm/amdgpu: Avoid printing of stack contents on firmware load error 



In case when psp_init_asd_microcode() fails to load ASD microcode file,
psp_v12_0_init_microcode() tries to print the firmware filename that
failed to load before bailing out.

This is wrong because:

- the firmware filename it would want it print is an incorrect one as
  psp_init_asd_microcode() and psp_v12_0_init_microcode() are loading
  different filenames
- it tries to print fw_name, but that's not yet been initialized by that
  time, so it prints random stack contents, e.g.

    amdgpu 0000:04:00.0: Direct firmware load for amdgpu/renoir_asd.bin failed with error -2
    amdgpu 0000:04:00.0: amdgpu: fail to initialize asd microcode
    amdgpu 0000:04:00.0: amdgpu: psp v12.0: Failed to load firmware "\xfeTO\x8e\xff\xff"

Fix that by bailing out immediately, instead of priting the bogus error
message.

Reported-by: default avatarVojtech Pavlik <vojtech@ucw.cz>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent d47255d3

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

+3 −4
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int psp_v12_0_init_microcode(struct psp_context *psp) 


	err = psp_init_asd_microcode(psp, chip_name);

	if (err)

		goto out;

		return err;



	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name);

	err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev);
@@ -80,7 +80,7 @@ static int psp_v12_0_init_microcode(struct psp_context *psp) 
	} else {

		err = amdgpu_ucode_validate(adev->psp.ta_fw);

		if (err)

			goto out2;

			goto out;



		ta_hdr = (const struct ta_firmware_header_v1_0 *)

				 adev->psp.ta_fw->data;
@@ -105,10 +105,9 @@ static int psp_v12_0_init_microcode(struct psp_context *psp) 


	return 0;



out2:

out:

	release_firmware(adev->psp.ta_fw);

	adev->psp.ta_fw = NULL;

out:

	if (err) {

		dev_err(adev->dev,

			"psp v12.0: Failed to load firmware \"%s\"\n",