Skip to contentSkip to conversation

drm/amdgpu: fix uninitialized scalar variable warning

PATCH Superseded Tim Huang 2 participants 3 messages Apr 23, 2024

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Tim Huang

author
#0 lore raw

PATCH v2 1/1 drm/amdgpu: fix uninitialized scalar variable warning

From: Tim Huang <[email protected]>

Clear warning that uses uninitialized value fw_size.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +3 -2
index d95555dc5485..8d5cdbb99d8d 100644
@@ -1084,7 +1084,7 @@ void amdgpu_gfx_cp_init_microcode(struct amdgpu_device *adev,
 	const struct gfx_firmware_header_v2_0 *cp_hdr_v2_0;
 	struct amdgpu_firmware_info *info = NULL;
 	const struct firmware *ucode_fw;
-	unsigned int fw_size;
+	unsigned int fw_size = 0;
 
 	switch (ucode_id) {
 	case AMDGPU_UCODE_ID_CP_PFP:
@@ -1205,7 +1205,8 @@ void amdgpu_gfx_cp_init_microcode(struct amdgpu_device *adev,
 		fw_size = le32_to_cpu(cp_hdr_v2_0->data_size_bytes);
 		break;
 	default:
-		break;
+		dev_err(adev->dev, "Invalid ucode id %u\n", ucode_id);
+		return;
 	}
 
 	if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
Signature · 1 line
2.39.2
maintainer
#1 lore raw

Am 23.04.24 um 10:43 schrieb Tim Huang:

Quoted 14 lines

From: Tim Huang <[email protected]>

Clear warning that uses uninitialized value fw_size.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +0 -0
index d95555dc5485..8d5cdbb99d8d 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c void amdgpu_gfx_cp_init_microcode(struct amdgpu_device *adev, · line 1087

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1 -1
@@ -1084,7 +1084,7 @@ void amdgpu_gfx_cp_init_microcode(struct amdgpu_device *adev,
  	const struct gfx_firmware_header_v2_0 *cp_hdr_v2_0;
  	struct amdgpu_firmware_info *info = NULL;
  	const struct firmware *ucode_fw;
-	unsigned int fw_size;
+	unsigned int fw_size = 0;

You don't need that any more when the default case returns.

Regards,
Christian.

Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +2 -1
  	switch (ucode_id) {
  	case AMDGPU_UCODE_ID_CP_PFP:
@@ -1205,7 +1205,8 @@ void amdgpu_gfx_cp_init_microcode(struct amdgpu_device *adev,
  		fw_size = le32_to_cpu(cp_hdr_v2_0->data_size_bytes);
  		break;
  	default:
-		break;
+		dev_err(adev->dev, "Invalid ucode id %u\n", ucode_id);
+		return;
  	}
 
  	if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
author
#2 lore raw

[AMD Official Use Only - General]

-----Original Message-----
From: Koenig, Christian <[email protected]>
Sent: Tuesday, April 23, 2024 7:30 PM
To: Huang, Tim <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH v2] drm/amdgpu: fix uninitialized scalar variable warning

Am 23.04.24 um 10:43 schrieb Tim Huang:

Quoted 21 lines

From: Tim Huang <[email protected]>

Clear warning that uses uninitialized value fw_size.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1 -1
index d95555dc5485..8d5cdbb99d8d 100644
@@ -1084,7 +1084,7 @@ void amdgpu_gfx_cp_init_microcode(struct amdgpu_device *adev,
      const struct gfx_firmware_header_v2_0 *cp_hdr_v2_0;
      struct amdgpu_firmware_info *info = NULL;
      const struct firmware *ucode_fw;
-     unsigned int fw_size;
+     unsigned int fw_size = 0;
 
 
Quoted 1 line

You don't need that any more when the default case returns.

Yes, will not set this default and send out new patch. Thanks.

Tim

Quoted 16 lines

Regards,
Christian.

      switch (ucode_id) {
      case AMDGPU_UCODE_ID_CP_PFP:
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +2 -1
@@ -1205,7 +1205,8 @@ void amdgpu_gfx_cp_init_microcode(struct amdgpu_device *adev,
              fw_size = le32_to_cpu(cp_hdr_v2_0->data_size_bytes);
              break;
      default:
-             break;
+             dev_err(adev->dev, "Invalid ucode id %u\n", ucode_id);
+             return;
      }
 
      if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {