Skip to contentSkip to conversation

drm/amdgpu: use helper macro HW_ERR instead of Hardware error string

PATCH In review Yang Wang 2 participants 2 messages Jan 29, 2024

Subsystems (2)
lore
Share & tools
lore

Yang Wang

author
#0 lore raw

PATCH 1/1 drm/amdgpu: use helper macro HW_ERR instead of Hardware error string

use helper macro HW_ERR to instead of Hardwareare error string.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c |  4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c +2 -2
index d7d2ec3ce399..be525cf3a182 100644
@@ -120,10 +120,10 @@ static void aca_smu_bank_dump(struct amdgpu_device *adev, int idx, int total, st
 {
 	int i;
 
-	dev_info(adev->dev, "[Hardware error] Accelerator Check Architecture events logged\n");
+	dev_info(adev->dev, HW_ERR "Accelerator Check Architecture events logged\n");
 	/* plus 1 for output format, e.g: ACA[08/08]: xxxx */
 	for (i = 0; i < ARRAY_SIZE(aca_regs); i++)
-		dev_info(adev->dev, "[Hardware error] ACA[%02d/%02d].%s=0x%016llx\n",
+		dev_info(adev->dev, HW_ERR "ACA[%02d/%02d].%s=0x%016llx\n",
 			 idx + 1, total, aca_regs[i].name, bank->regs[aca_regs[i].reg_idx]);
 }
 
drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c +6 -6
index 6452c09f22c6..24ad4b97177b 100644
@@ -212,16 +212,16 @@ int amdgpu_mca_smu_set_debug_mode(struct amdgpu_device *adev, bool enable)
 
 static void amdgpu_mca_smu_mca_bank_dump(struct amdgpu_device *adev, int idx, struct mca_bank_entry *entry)
 {
-	dev_info(adev->dev, "[Hardware error] Accelerator Check Architecture events logged\n");
-	dev_info(adev->dev, "[Hardware error] aca entry[%02d].STATUS=0x%016llx\n",
+	dev_info(adev->dev, HW_ERR "Accelerator Check Architecture events logged\n");
+	dev_info(adev->dev, HW_ERR "aca entry[%02d].STATUS=0x%016llx\n",
 		 idx, entry->regs[MCA_REG_IDX_STATUS]);
-	dev_info(adev->dev, "[Hardware error] aca entry[%02d].ADDR=0x%016llx\n",
+	dev_info(adev->dev, HW_ERR "aca entry[%02d].ADDR=0x%016llx\n",
 		 idx, entry->regs[MCA_REG_IDX_ADDR]);
-	dev_info(adev->dev, "[Hardware error] aca entry[%02d].MISC0=0x%016llx\n",
+	dev_info(adev->dev, HW_ERR "aca entry[%02d].MISC0=0x%016llx\n",
 		 idx, entry->regs[MCA_REG_IDX_MISC0]);
-	dev_info(adev->dev, "[Hardware error] aca entry[%02d].IPID=0x%016llx\n",
+	dev_info(adev->dev, HW_ERR "aca entry[%02d].IPID=0x%016llx\n",
 		 idx, entry->regs[MCA_REG_IDX_IPID]);
-	dev_info(adev->dev, "[Hardware error] aca entry[%02d].SYND=0x%016llx\n",
+	dev_info(adev->dev, HW_ERR "aca entry[%02d].SYND=0x%016llx\n",
 		 idx, entry->regs[MCA_REG_IDX_SYND]);
 }
 
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw

[AMD Official Use Only - General]

Regards,
Hawking
-----Original Message-----
From: Wang, Yang(Kevin) <[email protected]>
Sent: Monday, January 29, 2024 17:10
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Wang, Yang(Kevin) <[email protected]>
Subject: [PATCH] drm/amdgpu: use helper macro HW_ERR instead of Hardware error string

use helper macro HW_ERR to instead of Hardwareare error string.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c |  4 ++--  drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c +3 -2
index d7d2ec3ce399..be525cf3a182 100644
@@ -120,10 +120,10 @@ static void aca_smu_bank_dump(struct amdgpu_device *adev, int idx, int total, st  {
        int i;
 
-       dev_info(adev->dev, "[Hardware error] Accelerator Check Architecture events logged\n");
+       dev_info(adev->dev, HW_ERR "Accelerator Check Architecture events
+logged\n");
        /* plus 1 for output format, e.g: ACA[08/08]: xxxx */
        for (i = 0; i < ARRAY_SIZE(aca_regs); i++)
-               dev_info(adev->dev, "[Hardware error] ACA[%02d/%02d].%s=0x%016llx\n",
+               dev_info(adev->dev, HW_ERR "ACA[%02d/%02d].%s=0x%016llx\n",
                         idx + 1, total, aca_regs[i].name, bank->regs[aca_regs[i].reg_idx]);  }
 
drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c +6 -7
index 6452c09f22c6..24ad4b97177b 100644
@@ -212,16 +212,16 @@ int amdgpu_mca_smu_set_debug_mode(struct amdgpu_device *adev, bool enable)
 
 static void amdgpu_mca_smu_mca_bank_dump(struct amdgpu_device *adev, int idx, struct mca_bank_entry *entry)  {
-       dev_info(adev->dev, "[Hardware error] Accelerator Check Architecture events logged\n");
-       dev_info(adev->dev, "[Hardware error] aca entry[%02d].STATUS=0x%016llx\n",
+       dev_info(adev->dev, HW_ERR "Accelerator Check Architecture events logged\n");
+       dev_info(adev->dev, HW_ERR "aca entry[%02d].STATUS=0x%016llx\n",
                 idx, entry->regs[MCA_REG_IDX_STATUS]);
-       dev_info(adev->dev, "[Hardware error] aca entry[%02d].ADDR=0x%016llx\n",
+       dev_info(adev->dev, HW_ERR "aca entry[%02d].ADDR=0x%016llx\n",
                 idx, entry->regs[MCA_REG_IDX_ADDR]);
-       dev_info(adev->dev, "[Hardware error] aca entry[%02d].MISC0=0x%016llx\n",
+       dev_info(adev->dev, HW_ERR "aca entry[%02d].MISC0=0x%016llx\n",
                 idx, entry->regs[MCA_REG_IDX_MISC0]);
-       dev_info(adev->dev, "[Hardware error] aca entry[%02d].IPID=0x%016llx\n",
+       dev_info(adev->dev, HW_ERR "aca entry[%02d].IPID=0x%016llx\n",
                 idx, entry->regs[MCA_REG_IDX_IPID]);
-       dev_info(adev->dev, "[Hardware error] aca entry[%02d].SYND=0x%016llx\n",
+       dev_info(adev->dev, HW_ERR "aca entry[%02d].SYND=0x%016llx\n",
                 idx, entry->regs[MCA_REG_IDX_SYND]);  }
 
--

2.34.1