[coreboot-gerrit] Change in coreboot[master]: mb/ocp/deltalake: Update SMBIOS type 2 Location In Chassis from BMC

[Johnny Lin (Code Review)]

Johnny Lin has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42277 )

Change subject: mb/ocp/deltalake: Update SMBIOS type 2 Location In Chassis from BMC
......................................................................

mb/ocp/deltalake: Update SMBIOS type 2 Location In Chassis from BMC

There are 4 slots in YV3, Location In Chassis should be 1~4.

Tested=on OCP Delta Lake, dmidecode -t 2 verified the string is correct.

Change-Id: I3b65ecc6f6421d85d1cb890c522be4787362a01b
Signed-off-by: Johnny Lin 
---
M src/mainboard/ocp/deltalake/ipmi.c
M src/mainboard/ocp/deltalake/ipmi.h
M src/mainboard/ocp/deltalake/ramstage.c
3 files changed, 48 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/42277/1

diff --git a/src/mainboard/ocp/deltalake/ipmi.c b/src/mainboard/ocp/deltalake/ipmi.c
index fe620fa..dd81bfd 100644
--- a/src/mainboard/ocp/deltalake/ipmi.c
+++ b/src/mainboard/ocp/deltalake/ipmi.c
@@ -45,3 +45,28 @@

return CB_SUCCESS;
 }
+
+enum cb_err ipmi_get_slot_id(uint8_t *slot_id)
+{
+	int ret;
+	struct ipmi_config_rsp {
+		struct ipmi_rsp resp;
+		uint8_t board_sku_id;
+		uint8_t board_rev_id;
+		uint8_t slot_id;
+		uint8_t slot_config_id;
+	} __packed;
+	struct ipmi_config_rsp rsp;
+
+	ret = ipmi_kcs_message(BMC_KCS_BASE, IPMI_NETFN_OEM, 0x0, IPMI_OEM_GET_BOARD_ID,
+			NULL, 0, (unsigned char *) &rsp, sizeof(rsp));
+
+	if (ret < sizeof(struct ipmi_rsp) || rsp.resp.completion_code) {
+		printk(BIOS_ERR, "IPMI: %s command failed (ret=%d resp=0x%x)\n",
+			__func__, ret, rsp.resp.completion_code);
+		return CB_ERR;
+	}
+	*slot_id = rsp.slot_id;
+
+	return CB_SUCCESS;
+}
diff --git a/src/mainboard/ocp/deltalake/ipmi.h b/src/mainboard/ocp/deltalake/ipmi.h
index 310ff27..b167473 100644
--- a/src/mainboard/ocp/deltalake/ipmi.h
+++ b/src/mainboard/ocp/deltalake/ipmi.h
@@ -8,6 +8,7 @@
 #define IPMI_NETFN_OEM			0x30
 #define   IPMI_OEM_SET_PPIN		0x77
 #define   IPMI_OEM_GET_PCIE_CONFIG	0xf4
+#define   IPMI_OEM_GET_BOARD_ID     0x37

#define PCIE_CONFIG_UNKNOWN	0x0
 #define PCIE_CONFIG_A		0x1
@@ -24,4 +25,5 @@

enum cb_err ipmi_set_ppin(struct ppin_req *req);
 enum cb_err ipmi_get_pcie_config(uint8_t *config);
+enum cb_err ipmi_get_slot_id(uint8_t *slot_id);
 #endif
diff --git a/src/mainboard/ocp/deltalake/ramstage.c b/src/mainboard/ocp/deltalake/ramstage.c
index ae11296..f08eb9b 100644
--- a/src/mainboard/ocp/deltalake/ramstage.c
+++ b/src/mainboard/ocp/deltalake/ramstage.c
@@ -4,10 +4,31 @@
 #include <drivers/ipmi/ipmi_ops.h>
 #include <drivers/ocp/dmi/ocp_dmi.h>
 #include <soc/ramstage.h>
+#include <stdio.h>

#include "ipmi.h"

+#define SLOT_ID_LEN 2
+
 extern struct fru_info_str fru_strings;
+static char slot_id_str[SLOT_ID_LEN];
+
+/* Override SMBIOS 2 Location In Chassis from BMC */
+const char *smbios_mainboard_location_in_chassis(void)
+{
+	uint8_t slot_id = 0;
+
+	if (ipmi_get_slot_id(&slot_id) != CB_SUCCESS)
+		return "";
+
+	/* Sanity check, slot_id can only be 1~4 since there are 4 slots in YV3 */
+	if (!slot_id || slot_id > 4) {
+		printk(BIOS_ERR, "slot_id %d is not between 1~4\n", slot_id);
+		return "";
+	}
+	snprintf(slot_id_str, SLOT_ID_LEN, "%d", slot_id);
+	return slot_id_str;
+}

static void dl_oem_smbios_strings(struct device *dev, struct smbios_type11 *t)
 {