[RFC PATCH 07/10] ras/amd/atl: Add Hygon DF discovery and MCA decode at initialization

[Aichun Shi]

Add node number bounds, Data Fabric discovery and UMC MCA to system
address decoder for Hygon while keeping the AMD path unchanged.
Address translation function is exported by
amd_convert_umc_mca_addr_to_sys_addr() and used by users such as EDAC.

- Add Hygon node number support in amd_atl_init(),
  amd_atl_exit() and __df_indirect_read().
- Call hygon_get_df_system_info() to get Hygon-specific Data Fabric
  system information.
- Register hygon_convert_umc_mca_addr_to_sys_addr() as the address
  translation decoder for Hygon.

Signed-off-by: Aichun Shi <shiaichun@xxxxxxxxxxxxxx>
---
 drivers/ras/amd/atl/access.c |  9 ++++++++-
 drivers/ras/amd/atl/core.c   | 21 ++++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/drivers/ras/amd/atl/access.c b/drivers/ras/amd/atl/access.c
index c2334f8f9add..6d75bcb930d4 100644
--- a/drivers/ras/amd/atl/access.c
+++ b/drivers/ras/amd/atl/access.c
@@ -68,9 +68,16 @@ static int __df_indirect_read(u16 node, u8 func, u16 reg, u8 instance_id, u32 *l
 	struct pci_dev *F4;
 	int err = -ENODEV;
 	u32 ficaa = 0;
+	u16 num_nodes;
+	bool is_hygon = boot_cpu_data.x86_vendor == X86_VENDOR_HYGON;
 
 	node = get_accessible_node(node);
-	if (node >= amd_nb_num()) {
+	if (is_hygon)
+		num_nodes = amd_num_nodes();
+	else
+		num_nodes = amd_nb_num();
+
+	if (node >= num_nodes) {
 		pr_debug("Node %u is out of bounds\n", node);
 		goto out;
 	}
diff --git a/drivers/ras/amd/atl/core.c b/drivers/ras/amd/atl/core.c
index b7083588b46e..bbbbff4d43a3 100644
--- a/drivers/ras/amd/atl/core.c
+++ b/drivers/ras/amd/atl/core.c
@@ -195,22 +195,37 @@ MODULE_DEVICE_TABLE(x86cpu, amd_atl_cpuids);
 static int __init amd_atl_init(void)
 {
 	int ret;
+	u16 num_nodes;
+	bool is_hygon = boot_cpu_data.x86_vendor == X86_VENDOR_HYGON;
 
 	if (!x86_match_cpu(amd_atl_cpuids))
 		return -ENODEV;
 
-	if (!amd_nb_num())
+	if (is_hygon)
+		num_nodes = amd_num_nodes();
+	else
+		num_nodes = amd_nb_num();
+
+	if (!num_nodes)
 		return -ENODEV;
 
 	check_for_legacy_df_access();
 
-	ret = get_df_system_info();
+	if (is_hygon)
+		ret = hygon_get_df_system_info();
+	else
+		ret = get_df_system_info();
+
 	if (ret)
 		return ret;
 
 	/* Increment this module's recount so that it can't be easily unloaded. */
 	__module_get(THIS_MODULE);
-	amd_atl_register_decoder(convert_umc_mca_addr_to_sys_addr);
+
+	if (is_hygon)
+		amd_atl_register_decoder(hygon_convert_umc_mca_addr_to_sys_addr);
+	else
+		amd_atl_register_decoder(convert_umc_mca_addr_to_sys_addr);
 
 	pr_info("AMD Address Translation Library initialized\n");
 	return 0;
-- 
2.47.3