[coreboot-gerrit] Change in coreboot[master]: drivers/ipmi: Add option to wait for BMC

[Martin Roth (Code Review)]

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34569 )

Change subject: drivers/ipmi: Add option to wait for BMC
......................................................................

drivers/ipmi: Add option to wait for BMC

The BMC on Supermicro X11SSH takes 34 seconds to start the IPMI KCS, but
the default timeout of the IPMI KCS code is just 100 msec.

Add a configurable timeout option to wait for the BMC to become ready.
As it only should boot very long after power on reset, it's not a
problem on reset or warm boot.

Tested on Supermicro X11SSH.
The IPMI driver doesn't fail with a time-out any more.

Change-Id: I22c6885eae6fd7c778ac37b18f95b8775e9064e3
Signed-off-by: Patrick Rudolph 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34569
Tested-by: build bot (Jenkins) 
Reviewed-by: Philipp Deppenwiese 
---
M src/drivers/ipmi/chip.h
M src/drivers/ipmi/ipmi_kcs_ops.c
2 files changed, 37 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Philipp Deppenwiese: Looks good to me, approved

diff --git a/src/drivers/ipmi/chip.h b/src/drivers/ipmi/chip.h
index eb8b4e6..1c5afe7 100644
--- a/src/drivers/ipmi/chip.h
+++ b/src/drivers/ipmi/chip.h
@@ -24,6 +24,17 @@
    u8 gpe_interrupt;
    u8 have_apic;
    u32 apic_interrupt;
+	/*
+	 * Wait for BMC to boot.
+	 * This can be used if the BMC takes a long time to boot after PoR:
+	 * AST2400 on Supermicro X11SSH: 34 s
+	 */
+	bool wait_for_bmc;
+	/*
+	 * The timeout in seconds to wait for the IPMI service to be loaded.
+	 * Will be used if wait_for_bmc is true.
+	 */
+	u16 bmc_boot_timeout;
 };

#endif /* _IMPI_CHIP_H_ */
diff --git a/src/drivers/ipmi/ipmi_kcs_ops.c b/src/drivers/ipmi/ipmi_kcs_ops.c
index 0cc4e0a..21102bb 100644
--- a/src/drivers/ipmi/ipmi_kcs_ops.c
+++ b/src/drivers/ipmi/ipmi_kcs_ops.c
@@ -32,6 +32,7 @@
 #endif
 #include <version.h>
 #include <delay.h>
+#include <timer.h>
 #include "ipmi_kcs.h"
 #include "chip.h"

@@ -62,12 +63,37 @@
 {
    struct ipmi_devid_rsp rsp;
    uint32_t man_id = 0, prod_id = 0;
+	struct drivers_ipmi_config *conf = NULL;

if (!dev->enabled)
    	return;

+	printk(BIOS_DEBUG, "IPMI: PNP KCS 0x%x\n", dev->path.pnp.port);
+
+	if (dev->chip_info)
+		conf = dev->chip_info;
+
    /* Get IPMI version for ACPI and SMBIOS */
+	if (conf && conf->wait_for_bmc && conf->bmc_boot_timeout) {
+		struct stopwatch sw;
+		stopwatch_init_msecs_expire(&sw, conf->bmc_boot_timeout * 1000);
+		printk(BIOS_DEBUG, "IPMI: Waiting for BMC...\n");
+
+		while (!stopwatch_expired(&sw)) {
+			if (inb(dev->path.pnp.port) != 0xff)
+				break;
+			mdelay(100);
+		}
+		if (stopwatch_expired(&sw)) {
+			printk(BIOS_INFO, "IPMI: Waiting for BMC timed out\n");
+			/* Don't write tables if communication failed */
+			dev->enabled = 0;
+			return;
+		}
+	}
+
    if (!ipmi_get_device_id(dev, &rsp)) {
+		/* Queried the IPMI revision from BMC */
    	ipmi_revision_minor = IPMI_IPMI_VERSION_MINOR(rsp.ipmi_version);
    	ipmi_revision_major = IPMI_IPMI_VERSION_MAJOR(rsp.ipmi_version);