[coreboot-gerrit] Change in coreboot[master]: sb/intel/bd82x6x: Factor out `mkhi_get_fwcaps`

[Angel Pons (Code Review)]

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45261 )

Change subject: sb/intel/bd82x6x: Factor out `mkhi_get_fwcaps`
......................................................................

sb/intel/bd82x6x: Factor out `mkhi_get_fwcaps`

Both versions of this function do the same, but handle the received data
differently. Use the version from `me_8.x.c` and adapt `me.c` as needed.

Change-Id: I0792341ac0152eba3a8917fa23cad09d9054637d
Signed-off-by: Angel Pons 
---
M src/southbridge/intel/bd82x6x/me.c
M src/southbridge/intel/bd82x6x/me.h
M src/southbridge/intel/bd82x6x/me_8.x.c
M src/southbridge/intel/bd82x6x/me_common.c
4 files changed, 30 insertions(+), 52 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/45261/1

diff --git a/src/southbridge/intel/bd82x6x/me.c b/src/southbridge/intel/bd82x6x/me.c
index 56602e6..100ee7e 100644
--- a/src/southbridge/intel/bd82x6x/me.c
+++ b/src/southbridge/intel/bd82x6x/me.c
@@ -58,32 +58,6 @@
    return 0;
 }

-/* Get ME Firmware Capabilities */
-static int __unused mkhi_get_fwcaps(void)
-{
-	u32 rule_id = 0;
-	struct me_fwcaps cap;
-	struct mkhi_header mkhi = {
-		.group_id	= MKHI_GROUP_ID_FWCAPS,
-		.command	= MKHI_FWCAPS_GET_RULE,
-	};
-	struct mei_header mei = {
-		.is_complete	= 1,
-		.host_address	= MEI_HOST_ADDRESS,
-		.client_address	= MEI_ADDRESS_MKHI,
-		.length		= sizeof(mkhi) + sizeof(rule_id),
-	};
-
-	/* Send request and wait for response */
-	if (mei_sendrecv(&mei, &mkhi, &rule_id, &cap, sizeof(cap)) < 0) {
-		printk(BIOS_ERR, "ME: GET FWCAPS message failed\n");
-		return -1;
-	}
-
-	intel_me_print_fwcaps(&cap.caps_sku);
-	return 0;
-}
-
 #ifdef __SIMPLE_DEVICE__

/* Send END OF POST message to the ME */
@@ -203,7 +177,9 @@
    		/* Print ME firmware version */
    		mkhi_get_fw_version();
    		/* Print ME firmware capabilities */
-			mkhi_get_fwcaps();
+			mefwcaps_sku cap;
+			if (mkhi_get_fwcaps(&cap) != 0)
+				intel_me_print_fwcaps(&cap);
    	}

/*
diff --git a/src/southbridge/intel/bd82x6x/me.h b/src/southbridge/intel/bd82x6x/me.h
index e7ce1d6..ce1817f0 100644
--- a/src/southbridge/intel/bd82x6x/me.h
+++ b/src/southbridge/intel/bd82x6x/me.h
@@ -375,6 +375,8 @@
    u8 reserved[3];
 } __packed;

+int mkhi_get_fwcaps(mefwcaps_sku *cap);
+
 void intel_me_print_fwcaps(const mefwcaps_sku *const cap);

#endif /* _INTEL_ME_H */
diff --git a/src/southbridge/intel/bd82x6x/me_8.x.c b/src/southbridge/intel/bd82x6x/me_8.x.c
index 96c9e86..3613fe4 100644
--- a/src/southbridge/intel/bd82x6x/me_8.x.c
+++ b/src/southbridge/intel/bd82x6x/me_8.x.c
@@ -40,31 +40,6 @@
 }

/* Get ME Firmware Capabilities */
-static int mkhi_get_fwcaps(mefwcaps_sku *cap)
-{
-	u32 rule_id = 0;
-	struct me_fwcaps cap_msg;
-	struct mkhi_header mkhi = {
-		.group_id       = MKHI_GROUP_ID_FWCAPS,
-		.command        = MKHI_FWCAPS_GET_RULE,
-	};
-	struct mei_header mei = {
-		.is_complete    = 1,
-		.host_address   = MEI_HOST_ADDRESS,
-		.client_address = MEI_ADDRESS_MKHI,
-		.length         = sizeof(mkhi) + sizeof(rule_id),
-	};
-
-	/* Send request and wait for response */
-	if (mei_sendrecv(&mei, &mkhi, &rule_id, &cap_msg, sizeof(cap_msg)) < 0) {
-		printk(BIOS_ERR, "ME: GET FWCAPS message failed\n");
-		return -1;
-	}
-	*cap = cap_msg.caps_sku;
-	return 0;
-}
-
-/* Get ME Firmware Capabilities */
 static void __unused me_print_fwcaps(mbp_fw_caps *caps_section)
 {
    mefwcaps_sku *cap = &caps_section->fw_capabilities;
diff --git a/src/southbridge/intel/bd82x6x/me_common.c b/src/southbridge/intel/bd82x6x/me_common.c
index d9cd68a..b0a9fe2 100644
--- a/src/southbridge/intel/bd82x6x/me_common.c
+++ b/src/southbridge/intel/bd82x6x/me_common.c
@@ -30,6 +30,31 @@
    return me_bios_path_values[path];
 }

+/* Get ME Firmware Capabilities */
+int mkhi_get_fwcaps(mefwcaps_sku *cap)
+{
+	u32 rule_id = 0;
+	struct me_fwcaps cap_msg;
+	struct mkhi_header mkhi = {
+		.group_id       = MKHI_GROUP_ID_FWCAPS,
+		.command        = MKHI_FWCAPS_GET_RULE,
+	};
+	struct mei_header mei = {
+		.is_complete    = 1,
+		.host_address   = MEI_HOST_ADDRESS,
+		.client_address = MEI_ADDRESS_MKHI,
+		.length         = sizeof(mkhi) + sizeof(rule_id),
+	};
+
+	/* Send request and wait for response */
+	if (mei_sendrecv(&mei, &mkhi, &rule_id, &cap_msg, sizeof(cap_msg)) < 0) {
+		printk(BIOS_ERR, "ME: GET FWCAPS message failed\n");
+		return -1;
+	}
+	*cap = cap_msg.caps_sku;
+	return 0;
+}
+
 static inline void print_cap(const char *name, int state)
 {
    printk(BIOS_DEBUG, "ME Capability: %-41s : %sabled\n",