[coreboot-gerrit] [M] Change in coreboot[main]: soc/intel/xeon_sp: Add fill_pd_distances

[Shuo Liu (Code Review)]

Attention is currently required from: Chen, Gang C, Ziang Wang.

Hello Chen, Gang C, Ziang Wang,

I'd like you to do a code review.
Please visit

https://review.coreboot.org/c/coreboot/+/81442?usp=email

to review the following change.

Change subject: soc/intel/xeon_sp: Add fill_pd_distances
......................................................................

soc/intel/xeon_sp: Add fill_pd_distances

Update a simple algorithm to cover some basic case for proximity
domain distance handling, include NUMA and CXL 1.1 Type-2 devices.

In the same time, the local variable usage of fill_pds() is
optimized.

Change-Id: I2b666dc2a140d1bb1fdff9bc7b835d5cf5b4bbc5
Signed-off-by: Shuo Liu 
Signed-off-by: Ziang Wang 
Signed-off-by: Gang Chen 
---
M src/soc/intel/xeon_sp/include/soc/numa.h
M src/soc/intel/xeon_sp/numa.c
M src/soc/intel/xeon_sp/uncore.c
3 files changed, 36 insertions(+), 19 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/81442/1

diff --git a/src/soc/intel/xeon_sp/include/soc/numa.h b/src/soc/intel/xeon_sp/include/soc/numa.h
index 929b61c..b00eb88 100644
--- a/src/soc/intel/xeon_sp/include/soc/numa.h
+++ b/src/soc/intel/xeon_sp/include/soc/numa.h
@@ -57,6 +57,7 @@

void dump_pds(void);
 void fill_pds(void);
+void fill_pd_distances(void);

/*
  * Return the total size of memory regions in generic initiator affinity
diff --git a/src/soc/intel/xeon_sp/numa.c b/src/soc/intel/xeon_sp/numa.c
index 2c7bb65..8340f4d 100644
--- a/src/soc/intel/xeon_sp/numa.c
+++ b/src/soc/intel/xeon_sp/numa.c
@@ -50,8 +50,8 @@
    memset(pds.pds, 0, sizeof(struct proximity_domain) * pds.num_pds);

/* Fill in processor domains */
-	uint8_t i, j, socket;
-	for (socket = 0, i = 0; i < num_sockets; socket++) {
+	uint8_t i = 0;
+	for (uint8_t socket = 0; socket < num_sockets; socket++) {
    	if (!soc_cpu_is_enabled(socket))
    		continue;
    	pds.pds[i].pd_type = PD_TYPE_PROCESSOR;
@@ -59,13 +59,6 @@
    	pds.pds[i].distances = malloc(sizeof(uint8_t) * pds.num_pds);
    	if (!pds.pds[i].distances)
    		die("%s %d out of memory.", __FILE__, __LINE__);
-		/* hard code the distances for now, till we know how to calculate them. */
-		for (j = 0; j < pds.num_pds; j++) {
-			if (j == i)
-				pds.pds[i].distances[j] = 0x0a;
-			else
-				pds.pds[i].distances[j] = 0x0e;
-		}
    	i++;
    }

@@ -75,10 +68,9 @@

#if CONFIG(SOC_INTEL_HAS_CXL)
    /* There are CXL nodes, fill in generic initiator domain after the processors pds */
-	uint8_t skt_id, cxl_id;
    const CXL_NODE_SOCKET *cxl_hob = get_cxl_node();
-	for (skt_id = 0, i = num_sockets; skt_id < MAX_SOCKET; skt_id++, i++) {
-		for (cxl_id = 0; cxl_id < cxl_hob[skt_id].CxlNodeCount; ++cxl_id) {
+	for (uint8_t skt_id = 0; skt_id < MAX_SOCKET; skt_id++) {
+		for (uint8_t cxl_id = 0; cxl_id < cxl_hob[skt_id].CxlNodeCount; ++cxl_id) {
    		const CXL_NODE_INFO node = cxl_hob[skt_id].CxlNodeInfo[cxl_id];
    		pds.pds[i].pd_type = PD_TYPE_GENERIC_INITIATOR;
    		pds.pds[i].socket_bitmap = node.SocketBitmap;
@@ -89,13 +81,7 @@
    		pds.pds[i].distances = malloc(sizeof(uint8_t) * pds.num_pds);
    		if (!pds.pds[i].distances)
    			die("%s %d out of memory.", __FILE__, __LINE__);
-			/* hard code the distances until we know how to calculate them */
-			for (j = 0; j < pds.num_pds; j++) {
-				if (j == i)
-					pds.pds[i].distances[j] = 0x0a;
-				else
-					pds.pds[i].distances[j] = 0x0e;
-			}
+			i++;
    	}
    }
 #endif
@@ -151,3 +137,32 @@
 {
    return socket_to_pd(mem->SocketId);
 }
+
+#define PD_DISTANCE_SELF                0x0A
+#define PD_DISTANCE_SAME_SOCKET         0x0C
+#define PD_DISTANCE_CROSS_SOCKET        0x14
+#define PD_DISTANCE_MAX                 0xFF
+#define PD_DISTANCE_IO_EXTRA            0x01
+
+void fill_pd_distances(void)
+{
+	for (int i = 0; i < pds.num_pds; i++) {
+		for (int j = 0; j < pds.num_pds; j++) {
+			if (i == j) {
+				pds.pds[i].distances[j] = PD_DISTANCE_SELF;
+				continue;
+			}
+
+			if (pds.pds[i].socket_bitmap == pds.pds[j].socket_bitmap)
+				pds.pds[i].distances[j] = PD_DISTANCE_SAME_SOCKET;
+			else
+				pds.pds[i].distances[j] = PD_DISTANCE_CROSS_SOCKET;
+
+			if (pds.pds[i].pd_type == PD_TYPE_GENERIC_INITIATOR)
+				pds.pds[i].distances[j] += PD_DISTANCE_IO_EXTRA;
+
+			if (pds.pds[j].pd_type == PD_TYPE_GENERIC_INITIATOR)
+				pds.pds[i].distances[j] += PD_DISTANCE_IO_EXTRA;
+		}
+	}
+}
diff --git a/src/soc/intel/xeon_sp/uncore.c b/src/soc/intel/xeon_sp/uncore.c
index 4af88cc..306aaf3 100644
--- a/src/soc/intel/xeon_sp/uncore.c
+++ b/src/soc/intel/xeon_sp/uncore.c
@@ -344,6 +344,7 @@
    	if (!once) {
    		/* Construct NUMA data structure. This is needed for CXL. */
    		fill_pds();
+			fill_pd_distances();
    		dump_pds();
    		once = true;
    	}