Delete ras_if->name in the RAS ctx structure and remove related lines.

Signed-off-by: Candice Li candice.li@amd.com

---

drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 1 -

drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 1 -

drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 1 -

drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 1 -

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 4 +---

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 5 +++--

drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 1 -

drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 1 -

drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 1 -

drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 4 ++--

10 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c

index 9cfef56b2aee..5beaa7c1bd11 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c

@@ -615,7 +615,6 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev)

adev->gfx.ras_if->block = AMDGPU_RAS_BLOCK__GFX;

adev->gfx.ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

adev->gfx.ras_if->sub_block_index = 0;

- strcpy(adev->gfx.ras_if->name, "gfx");

}

fs_info.head = ih_info.head = *adev->gfx.ras_if;

r = amdgpu_ras_late_init(adev, adev->gfx.ras_if,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c

index 1d50d534d77c..a766e1aad2b9 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c

@@ -41,7 +41,6 @@ int amdgpu_hdp_ras_late_init(struct amdgpu_device *adev)

adev->hdp.ras_if->block = AMDGPU_RAS_BLOCK__HDP;

adev->hdp.ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

adev->hdp.ras_if->sub_block_index = 0;

- strcpy(adev->hdp.ras_if->name, "hdp");

}

ih_info.head = fs_info.head = *adev->hdp.ras_if;

r = amdgpu_ras_late_init(adev, adev->hdp.ras_if,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c

index ead3dc572ec5..24297dc51434 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c

@@ -41,7 +41,6 @@ int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev)

adev->mmhub.ras_if->block = AMDGPU_RAS_BLOCK__MMHUB;

adev->mmhub.ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

adev->mmhub.ras_if->sub_block_index = 0;

- strcpy(adev->mmhub.ras_if->name, "mmhub");

}

ih_info.head = fs_info.head = *adev->mmhub.ras_if;

r = amdgpu_ras_late_init(adev, adev->mmhub.ras_if,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c

index 6201a5f4b4fa..6afb02fef8cf 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c

@@ -39,7 +39,6 @@ int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev)

adev->nbio.ras_if->block = AMDGPU_RAS_BLOCK__PCIE_BIF;

adev->nbio.ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

adev->nbio.ras_if->sub_block_index = 0;

- strcpy(adev->nbio.ras_if->name, "pcie_bif");

}

ih_info.head = fs_info.head = *adev->nbio.ras_if;

r = amdgpu_ras_late_init(adev, adev->nbio.ras_if,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

index 3811b6b6a192..96a8fd0ca1df 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

@@ -64,7 +64,6 @@ const char *ras_block_string[] = {

};

#define ras_err_str(i) (ras_error_string[ffs(i)])

-#define ras_block_str(i) (ras_block_string[i])

#define RAS_DEFAULT_FLAGS (AMDGPU_RAS_FLAG_INIT_BY_VBIOS)

@@ -530,7 +529,7 @@ static inline void put_obj(struct ras_manager *obj)

if (obj && (--obj->use == 0))

list_del(&obj->node);

if (obj && (obj->use < 0))

- DRM_ERROR("RAS ERROR: Unbalance obj(%s) use\n", obj->head.name);

+ DRM_ERROR("RAS ERROR: Unbalance obj(%s) use\n", ras_block_str(obj->head.block));

}

/* make one obj and return it. */

@@ -793,7 +792,6 @@ static int amdgpu_ras_enable_all_features(struct amdgpu_device *adev,

.type = default_ras_type,

.sub_block_index = 0,

};

- strcpy(head.name, ras_block_str(i));

if (bypass) {

* bypass psp. vbios enable ras for us.

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h

index 471ffe885fdf..abc5710898e8 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h

@@ -53,6 +53,9 @@ enum amdgpu_ras_block {

AMDGPU_RAS_BLOCK__LAST

};

+extern const char *ras_block_string[];

+#define ras_block_str(i) (ras_block_string[i])

#define AMDGPU_RAS_BLOCK_COUNT AMDGPU_RAS_BLOCK__LAST

#define AMDGPU_RAS_BLOCK_MASK ((1ULL << AMDGPU_RAS_BLOCK_COUNT) - 1)

@@ -306,8 +309,6 @@ struct ras_common_if {

enum amdgpu_ras_block block;

enum amdgpu_ras_error_type type;

uint32_t sub_block_index;

- /* block name */

- char name[32];

};

struct amdgpu_ras {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c

index de91d29c9d96..65debb65a5df 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c

@@ -105,7 +105,6 @@ int amdgpu_sdma_ras_late_init(struct amdgpu_device *adev,

adev->sdma.ras_if->block = AMDGPU_RAS_BLOCK__SDMA;

adev->sdma.ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

adev->sdma.ras_if->sub_block_index = 0;

- strcpy(adev->sdma.ras_if->name, "sdma");

}

fs_info.head = ih_info->head = *adev->sdma.ras_if;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c

index 0c7c56a91b25..a90029ee9733 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c

@@ -41,7 +41,6 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev)

adev->umc.ras_if->block = AMDGPU_RAS_BLOCK__UMC;

adev->umc.ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

adev->umc.ras_if->sub_block_index = 0;

- strcpy(adev->umc.ras_if->name, "umc");

}

ih_info.head = fs_info.head = *adev->umc.ras_if;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c

index 258cf86b32f6..2e47bc446700 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c

@@ -663,7 +663,6 @@ static int amdgpu_xgmi_ras_late_init(struct amdgpu_device *adev)

adev->gmc.xgmi.ras_if->block = AMDGPU_RAS_BLOCK__XGMI_WAFL;

adev->gmc.xgmi.ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

adev->gmc.xgmi.ras_if->sub_block_index = 0;

- strcpy(adev->gmc.xgmi.ras_if->name, "xgmi_wafl");

}

ih_info.head = fs_info.head = *adev->gmc.xgmi.ras_if;

r = amdgpu_ras_late_init(adev, adev->gmc.xgmi.ras_if,

diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c

index cef929746739..1c94a14fc18d 100644

--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c

+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c

@@ -372,13 +372,13 @@ static void nbio_v7_4_handle_ras_controller_intr_no_bifring(struct amdgpu_device

"errors detected in %s block, "

"no user action is needed.\n",

obj->err_data.ce_count,

- adev->nbio.ras_if->name);

+ ras_block_str(adev->nbio.ras_if->block));

if (err_data.ue_count)

dev_info(adev->dev, "%ld uncorrectable hardware "

"errors detected in %s block\n",

obj->err_data.ue_count,

- adev->nbio.ras_if->name);

+ ras_block_str(adev->nbio.ras_if->block));

}

dev_info(adev->dev, "RAS controller interrupt triggered "

2.17.1

Thanks,

Candice