6 files changed, 9 insertions, 40 deletions
diff --git a/src/mainboard/ocp/tiogapass/Kconfig b/src/mainboard/ocp/tiogapass/Kconfig
index 67c1fa9d52..2ead76db72 100644
--- a/src/mainboard/ocp/tiogapass/Kconfig
+++ b/src/mainboard/ocp/tiogapass/Kconfig
@@ -8,6 +8,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_ACPI_TABLES
 	select IPMI_KCS
 	select IPMI_KCS_ROMSTAGE
+	select IPMI_OCP
 	select MAINBOARD_USES_FSP2_0
 	select OCP_DMI
 	select PARALLEL_MP_AP_WORK
diff --git a/src/mainboard/ocp/tiogapass/devicetree.cb b/src/mainboard/ocp/tiogapass/devicetree.cb
index 488f677a95..833bb20e21 100644
--- a/src/mainboard/ocp/tiogapass/devicetree.cb
+++ b/src/mainboard/ocp/tiogapass/devicetree.cb
@@ -76,6 +76,9 @@ chip soc/intel/xeon_sp/skx
 				register "bmc_i2c_address" = "0x20"
 				register "bmc_boot_timeout" = "90"
 			end
+			chip drivers/ipmi/ocp # OCP specific IPMI porting
+				device pnp ca2.1 on end
+			end
 		end # Intel Corporation C621 Series Chipset LPC/eSPI Controller
 		device pci 1f.1 hidden end # p2sb
 		device pci 1f.2 on end # Intel Corporation C620 Series Chipset Family Power Management Controller
diff --git a/src/mainboard/ocp/tiogapass/ipmi.c b/src/mainboard/ocp/tiogapass/ipmi.c
index 0cdf110bd8..74f96fe36c 100644
--- a/src/mainboard/ocp/tiogapass/ipmi.c
+++ b/src/mainboard/ocp/tiogapass/ipmi.c
@@ -3,29 +3,13 @@
 #include <console/console.h>
 #include <drivers/ipmi/ipmi_kcs.h>
 #include <drivers/ipmi/ipmi_ops.h>
+#include <drivers/ipmi/ocp/ipmi_ocp.h>
 #include <drivers/vpd/vpd.h>
 #include <string.h>
 
 #include "ipmi.h"
 #include "vpd.h"
 
-void ipmi_set_ppin(struct ppin_req *req)
-{
-	int ret;
-	struct ipmi_rsp rsp;
-
-	ret = ipmi_kcs_message(CONFIG_BMC_KCS_BASE, IPMI_NETFN_OEM, 0x0, IPMI_OEM_SET_PPIN,
-			(const unsigned char *) req, sizeof(*req),
-			(unsigned char *) &rsp, sizeof(rsp));
-
-	if (ret < sizeof(struct ipmi_rsp) || rsp.completion_code) {
-		printk(BIOS_ERR, "IPMI: %s command failed (ret=%d resp=0x%x)\n",
-			__func__, ret, rsp.completion_code);
-		return;
-	}
-	printk(BIOS_DEBUG, "IPMI Set PPIN to BMC done.\n");
-}
-
 void init_frb2_wdt(void)
 {
 	char val[VPD_LEN];
diff --git a/src/mainboard/ocp/tiogapass/ipmi.h b/src/mainboard/ocp/tiogapass/ipmi.h
index 798f3125ef..93101c2bfe 100644
--- a/src/mainboard/ocp/tiogapass/ipmi.h
+++ b/src/mainboard/ocp/tiogapass/ipmi.h
@@ -4,17 +4,5 @@
 #define TIOGAPASS_IPMI_H
 #include <types.h>
 
-#define IPMI_NETFN_OEM 0x30
-#define IPMI_OEM_SET_PPIN 0x77
-
-/* PPIN for 2 CPU IPMI request */
-struct ppin_req {
-	uint32_t cpu0_lo;
-	uint32_t cpu0_hi;
-	uint32_t cpu1_lo;
-	uint32_t cpu1_hi;
-} __packed;
-/* Send CPU0 and CPU1 PPIN to BMC */
-void ipmi_set_ppin(struct ppin_req *req);
 void init_frb2_wdt(void);
 #endif
diff --git a/src/mainboard/ocp/tiogapass/ramstage.c b/src/mainboard/ocp/tiogapass/ramstage.c
index 29148d14ec..df7720538e 100644
--- a/src/mainboard/ocp/tiogapass/ramstage.c
+++ b/src/mainboard/ocp/tiogapass/ramstage.c
@@ -7,8 +7,6 @@
 #include <soc/ramstage.h>
 #include <soc/lewisburg_pch_gpio_defs.h>
 
-#include "ipmi.h"
-
 extern struct fru_info_str fru_strings;
 
 static const struct port_information SMBIOS_type8_info[] = {
@@ -185,14 +183,6 @@ static void mainboard_enable(struct device *dev)
 
 static void mainboard_final(void *chip_info)
 {
-	struct ppin_req req;
-
-	req.cpu0_lo = xeon_sp_ppin[0].lo;
-	req.cpu0_hi = xeon_sp_ppin[0].hi;
-	req.cpu1_lo = xeon_sp_ppin[1].lo;
-	req.cpu1_hi = xeon_sp_ppin[1].hi;
-	/* Set PPIN to BMC */
-	ipmi_set_ppin(&req);
 }
 
 struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/ocp/tiogapass/romstage.c b/src/mainboard/ocp/tiogapass/romstage.c
index fb2ce0217a..20c74660ce 100644
--- a/src/mainboard/ocp/tiogapass/romstage.c
+++ b/src/mainboard/ocp/tiogapass/romstage.c
@@ -3,6 +3,7 @@
 #include <fsp/api.h>
 #include <FspmUpd.h>
 #include <drivers/ipmi/ipmi_kcs.h>
+#include <drivers/ipmi/ocp/ipmi_ocp.h>
 #include <soc/romstage.h>
 #include <string.h>
 #include <gpio.h>
@@ -53,8 +54,10 @@ static void mainboard_config_iio(FSPM_UPD *mupd)
 void mainboard_memory_init_params(FSPM_UPD *mupd)
 {
 	/* It's better to run get BMC selftest result first */
-	if (ipmi_kcs_premem_init(CONFIG_BMC_KCS_BASE, 0) == CB_SUCCESS)
+	if (ipmi_kcs_premem_init(CONFIG_BMC_KCS_BASE, 0) == CB_SUCCESS) {
+		ipmi_set_post_start(CONFIG_BMC_KCS_BASE);
 		init_frb2_wdt();
+	}
 	mainboard_config_iio(mupd);
 
 	/* do not configure GPIO controller inside FSP-M */