aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Jeffery <andrew@aj.id.au>2019-03-05 13:43:18 +1030
committerStewart Smith <stewart@linux.ibm.com>2019-03-05 15:28:05 +1100
commit52be9b85e45527cdf13084192beb378ff2466e99 (patch)
treefe0658c57c314c530795ea5dfc45aada7124b61b
parentee01ef4ed82aa78fcf5516ffd6d49a92b8e912bf (diff)
downloadskiboot-52be9b85e45527cdf13084192beb378ff2466e99.zip
skiboot-52be9b85e45527cdf13084192beb378ff2466e99.tar.gz
skiboot-52be9b85e45527cdf13084192beb378ff2466e99.tar.bz2
zaius: Add BMC description
Frederic reported that Zaius was failing with a NULL dereference when trying to initialise IPMI HIOMAP. It turns out that the BMC wasn't described at all, so add a description. Tested on zaius1, which reached petitboot with the patch applied. Reported-by: Frederic Barrat <fbarrat@linux.ibm.com> Tested-by: Frederic Barrat <fbarrat@linux.ibm.com> Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
-rw-r--r--platforms/astbmc/zaius.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/platforms/astbmc/zaius.c b/platforms/astbmc/zaius.c
index dda97cb..23a4072 100644
--- a/platforms/astbmc/zaius.c
+++ b/platforms/astbmc/zaius.c
@@ -234,13 +234,32 @@ static bool zaius_probe(void)
return true;
}
+/* Extracted from zaius1-bmc */
+static const struct bmc_hw_config bmc_hw_zaius = {
+ .scu_revision_id = 0x04030303,
+ .mcr_configuration = 0x11000FD7,
+ .mcr_scu_mpll = 0x000071C1,
+ .mcr_scu_strap = 0x00000000,
+};
+
+static const struct bmc_sw_config bmc_sw_openbmc = {
+ .ipmi_oem_partial_add_esel = IPMI_CODE(0x3a, 0xf0),
+ .ipmi_oem_hiomap_cmd = IPMI_CODE(0x3a, 0x5a),
+};
+
+static const struct bmc_platform bmc_zaius_openbmc = {
+ .name = "zaius:openbmc",
+ .hw = &bmc_hw_zaius,
+ .sw = &bmc_sw_openbmc,
+};
+
DECLARE_PLATFORM(zaius) = {
.name = "Zaius",
.probe = zaius_probe,
.init = astbmc_init,
.start_preload_resource = flash_start_preload_resource,
.resource_loaded = flash_resource_loaded,
- .bmc = NULL, /* FIXME: Add openBMC */
+ .bmc = &bmc_zaius_openbmc,
.pci_get_slot_info = zaius_get_slot_info,
.pci_probe_complete = check_all_slot_table,
.cec_power_down = astbmc_ipmi_power_down,