[PATCH 014/109] drm/amd/ras: Change variable name to avoid confusion

From: YiPeng Chai <[email protected]>

Change variable name to avoid confusion.

Signed-off-by: YiPeng Chai <[email protected]>
Reviewed-by: Hawking Zhang <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
---
 drivers/gpu/drm/amd/ras/core/aca.c            | 22 +++++++++----------
 drivers/gpu/drm/amd/ras/core/aca.h            |  6 ++---
 drivers/gpu/drm/amd/ras/core/ras.h            |  4 ++--
 .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c  |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/amd/ras/core/aca.c b/drivers/gpu/drm/amd/ras/core/aca.c
index 67269062f072b..032524b921c14 100644
--- a/drivers/gpu/drm/amd/ras/core/aca.c
+++ b/drivers/gpu/drm/amd/ras/core/aca.c
@@ -185,10 +185,10 @@ static int aca_parse_bank(struct ras_core_context *ras_core,
 static int aca_check_block_ecc_info(struct ras_core_context *ras_core,
 			struct aca_block *aca_blk, struct aca_ecc_info *info)
 {
-	if (info->socket_id >= aca_blk->ecc.socket_num_per_hive) {
+	if (info->socket_id >= aca_blk->ecc.socket_num_per_node) {
 		RAS_DEV_ERR(ras_core->dev,
 			"Socket id (%d) is out of config! max:%u\n",
-			info->socket_id, aca_blk->ecc.socket_num_per_hive);
+			info->socket_id, aca_blk->ecc.socket_num_per_node);
 		return -ENODATA;
 	}
 
@@ -457,7 +457,7 @@ int ras_aca_clear_all_blocks_ecc_count(struct ras_core_context *ras_core)
 	for (blk = RAS_BLOCK_ID__UMC; blk < RAS_BLOCK_ID__LAST; blk++) {
 		aca_blk = ras_aca_get_block_handle(ras_core, blk);
 		if (aca_blk) {
-			for (skt = 0; skt < aca_blk->ecc.socket_num_per_hive; skt++)
+			for (skt = 0; skt < aca_blk->ecc.socket_num_per_node; skt++)
 				__clear_block_socket_ecc_count(ras_core,
 						blk, &aca_blk->ecc.socket[skt]);
 		}
@@ -476,7 +476,7 @@ int ras_aca_clear_block_new_ecc_count(struct ras_core_context *ras_core, u32 blk
 
 	mutex_lock(&ras_core->ras_aca.aca_lock);
 	aca_blk = ras_aca_get_block_handle(ras_core, blk);
-	for (skt = 0; skt < aca_blk->ecc.socket_num_per_hive; skt++) {
+	for (skt = 0; skt < aca_blk->ecc.socket_num_per_node; skt++) {
 		for (aid = 0; aid < aca_blk->ecc.socket[skt].aid_num; aid++) {
 			aid_ecc = &aca_blk->ecc.socket[skt].aid[aid];
 			if (blk == RAS_BLOCK_ID__GFX) {
@@ -562,7 +562,7 @@ int ras_aca_get_block_ecc_count(struct ras_core_context *ras_core,
 	memset(&ecc, 0, sizeof(ecc));
 
 	mutex_lock(&ras_core->ras_aca.aca_lock);
-	for (skt = 0; skt < aca_blk->ecc.socket_num_per_hive; skt++) {
+	for (skt = 0; skt < aca_blk->ecc.socket_num_per_node; skt++) {
 		memset(&skt_ecc, 0, sizeof(skt_ecc));
 		__get_block_socket_ecc_count(ras_core, blk,
 				&aca_blk->ecc.socket[skt], &skt_ecc);
@@ -586,21 +586,21 @@ int ras_aca_sw_init(struct ras_core_context *ras_core)
 	struct ras_aca *ras_aca = &ras_core->ras_aca;
 	struct ras_aca_config *aca_cfg = &ras_core->config->aca_cfg;
 	struct aca_block *aca_blk;
-	uint32_t socket_num_per_hive;
+	uint32_t socket_num_per_node;
 	uint32_t aid_num_per_socket;
 	uint32_t xcd_num_per_aid;
 	int blk, skt, aid;
 
-	socket_num_per_hive = aca_cfg->socket_num_per_hive;
+	socket_num_per_node = aca_cfg->socket_num_per_node;
 	aid_num_per_socket = aca_cfg->aid_num_per_socket;
 	xcd_num_per_aid = aca_cfg->xcd_num_per_aid;
 
 	if (!xcd_num_per_aid || !aid_num_per_socket ||
-		(socket_num_per_hive > MAX_SOCKET_NUM_PER_HIVE) ||
+		(socket_num_per_node > MAX_SOCKET_NUM_PER_NODE) ||
 	    (aid_num_per_socket > MAX_AID_NUM_PER_SOCKET) ||
 	    (xcd_num_per_aid > MAX_XCD_NUM_PER_AID)) {
 		RAS_DEV_ERR(ras_core->dev, "Invalid ACA system configuration: %d, %d, %d\n",
-			socket_num_per_hive, aid_num_per_socket, xcd_num_per_aid);
+			socket_num_per_node, aid_num_per_socket, xcd_num_per_aid);
 		return -EINVAL;
 	}
 
@@ -608,8 +608,8 @@ int ras_aca_sw_init(struct ras_core_context *ras_core)
 
 	for (blk = 0; blk < RAS_BLOCK_ID__LAST; blk++) {
 		aca_blk = &ras_aca->aca_blk[blk];
-		aca_blk->ecc.socket_num_per_hive = socket_num_per_hive;
-		for (skt = 0; skt < aca_blk->ecc.socket_num_per_hive; skt++) {
+		aca_blk->ecc.socket_num_per_node = socket_num_per_node;
+		for (skt = 0; skt < aca_blk->ecc.socket_num_per_node; skt++) {
 			aca_blk->ecc.socket[skt].aid_num = aid_num_per_socket;
 			if (blk == RAS_BLOCK_ID__GFX) {
 				for (aid = 0; aid < aca_blk->ecc.socket[skt].aid_num; aid++)
diff --git a/drivers/gpu/drm/amd/ras/core/aca.h b/drivers/gpu/drm/amd/ras/core/aca.h
index a8aac196605aa..76fd511dfa7ef 100644
--- a/drivers/gpu/drm/amd/ras/core/aca.h
+++ b/drivers/gpu/drm/amd/ras/core/aca.h
@@ -26,7 +26,7 @@
 #define __ACA_H__
 #include "ras.h"
 
-#define MAX_SOCKET_NUM_PER_HIVE 8
+#define MAX_SOCKET_NUM_PER_NODE 8
 #define MAX_AID_NUM_PER_SOCKET 4
 #define MAX_XCD_NUM_PER_AID 2
 #define MAX_ACA_RAS_BLOCK  20
@@ -115,8 +115,8 @@ struct aca_socket_ecc {
 };
 
 struct aca_block_ecc {
-	struct aca_socket_ecc socket[MAX_SOCKET_NUM_PER_HIVE];
-	u32 socket_num_per_hive;
+	struct aca_socket_ecc socket[MAX_SOCKET_NUM_PER_NODE];
+	u32 socket_num_per_node;
 };
 
 struct aca_bank_hw_ops {
diff --git a/drivers/gpu/drm/amd/ras/core/ras.h b/drivers/gpu/drm/amd/ras/core/ras.h
index 5baeb15473a83..3e0203d627985 100644
--- a/drivers/gpu/drm/amd/ras/core/ras.h
+++ b/drivers/gpu/drm/amd/ras/core/ras.h
@@ -262,7 +262,7 @@ struct ras_bank_ecc_node {
 };
 
 struct ras_aca_config {
-	u32 socket_num_per_hive;
+	u32 socket_num_per_node;
 	u32 aid_num_per_socket;
 	u32 xcd_num_per_aid;
 };
@@ -319,7 +319,7 @@ struct ras_core_config {
 struct ras_core_context {
 	void *dev;
 	struct ras_core_config *config;
-	u32 socket_num_per_hive;
+	u32 socket_num_per_node;
 	u32 aid_num_per_socket;
 	u32 xcd_num_per_aid;
 	int max_ue_banks_per_query;
diff --git a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
index 8ba6d8d76a5a4..e2d5f3d968895 100644
--- a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
+++ b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
@@ -34,7 +34,7 @@
 #include "amdgpu_ras_nbio_v7_9.h"
 #include "amdgpu_ras_mce.h"
 
-#define MAX_SOCKET_NUM_PER_HIVE		8
+#define MAX_SOCKET_NUM_PER_NODE		8
 #define MAX_AID_NUM_PER_SOCKET		4
 #define MAX_XCD_NUM_PER_AID			2
 
@@ -89,7 +89,7 @@ static int amdgpu_ras_mgr_init_aca_config(struct amdgpu_device *adev,
 {
 	struct ras_aca_config *aca_cfg = &config->aca_cfg;
 
-	aca_cfg->socket_num_per_hive = MAX_SOCKET_NUM_PER_HIVE;
+	aca_cfg->socket_num_per_node = MAX_SOCKET_NUM_PER_NODE;
 	aca_cfg->aid_num_per_socket = MAX_AID_NUM_PER_SOCKET;
 	aca_cfg->xcd_num_per_aid = MAX_XCD_NUM_PER_AID;
 
-- 
2.55.0