[coreboot-gerrit] Change in ...coreboot[master]: arch/x86/smbios: Reference type 7

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32132 )

Change subject: arch/x86/smbios: Reference type 7
......................................................................

arch/x86/smbios: Reference type 7

Fill in the handle to cache entries of type 7 in the type 4 structure.

Tested on Intel Sandy Bridge (Lenovo T520).
All 3 caches are referenced.

Change-Id: Idf876b0c21c65f72a945d26c5898074b140763f8
Signed-off-by: Patrick Rudolph 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32132
Tested-by: build bot (Jenkins) 
Reviewed-by: Richard Spiegel 
---
M src/arch/x86/smbios.c
1 file changed, 25 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Richard Spiegel: Looks good to me, approved

diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c
index 0f9b458..44ff578 100644
--- a/src/arch/x86/smbios.c
+++ b/src/arch/x86/smbios.c
@@ -730,10 +730,12 @@
  * @param current Pointer to memory address to write the tables to
  * @param handle Pointer to handle for the tables
  * @param max_struct_size Pointer to maximum struct size
+ * @param type4 Pointer to SMBIOS type 4 structure
  */
 static int smbios_write_type7_cache_parameters(unsigned long *current,
    				       int *handle,
-					       int *max_struct_size)
+					       int *max_struct_size,
+					       struct smbios_type4 *type4)
 {
    struct cpuid_result res;
    unsigned int cnt = 0;
@@ -802,9 +804,25 @@
    	else
    		associativity = smbios_cache_associativity(assoc);

-		update_max(len, *max_struct_size, smbios_write_type7(current,
-			*handle++, level, SMBIOS_CACHE_SRAM_TYPE_UNKNOWN,
-			associativity, type, cache_size, cache_size));
+		const int h = (*handle)++;
+
+		update_max(len, *max_struct_size, smbios_write_type7(current, h,
+			   level, SMBIOS_CACHE_SRAM_TYPE_UNKNOWN, associativity,
+			   type, cache_size, cache_size));
+
+		if (type4) {
+			switch (level) {
+			case 1:
+				type4->l1_cache_handle = h;
+				break;
+			case 2:
+				type4->l2_cache_handle = h;
+				break;
+			case 3:
+				type4->l3_cache_handle = h;
+				break;
+			}
+		}
    };

return len;
@@ -981,10 +999,12 @@
    handle++;
    update_max(len, max_struct_size, smbios_write_type3(&current,
    	handle++));
+
+	struct smbios_type4 *type4 = (struct smbios_type4 *)current;
    update_max(len, max_struct_size, smbios_write_type4(&current,
    	handle++));
    len += smbios_write_type7_cache_parameters(&current, &handle,
-		&max_struct_size);
+		&max_struct_size, type4);
    update_max(len, max_struct_size, smbios_write_type11(&current,
    	&handle));
    if (CONFIG(ELOG))