[coreboot-gerrit] Change in coreboot[master]: mb/scaleway/tagada: Add bmcInfo interface
Julien Viard de Galbert (Code Review)
gerrit at coreboot.org
Mon Feb 19 16:47:25 CET 2018
Julien Viard de Galbert has uploaded this change for review. ( https://review.coreboot.org/23813
Change subject: mb/scaleway/tagada: Add bmcInfo interface
......................................................................
mb/scaleway/tagada: Add bmcInfo interface
This interface gives access to configuration information stored in flash
by the Tagada BMC before booting the SoC.
Change-Id: I4351aa11b08bdf65e14706b261c532bbf8837aed
Signed-off-by: Julien Viard de Galbert <jviarddegalbert at online.net>
---
M src/mainboard/scaleway/tagada/Kconfig
M src/mainboard/scaleway/tagada/Makefile.inc
A src/mainboard/scaleway/tagada/bmcinfo.c
A src/mainboard/scaleway/tagada/bmcinfo.h
A src/mainboard/scaleway/tagada/bootblock.c
M src/mainboard/scaleway/tagada/romstage.c
6 files changed, 242 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/23813/1
diff --git a/src/mainboard/scaleway/tagada/Kconfig b/src/mainboard/scaleway/tagada/Kconfig
index 53c1f6d..e03728d 100644
--- a/src/mainboard/scaleway/tagada/Kconfig
+++ b/src/mainboard/scaleway/tagada/Kconfig
@@ -33,4 +33,10 @@
string
default "Scaleway"
+config BMC_INFO_LOC
+ hex "BMC information location in flash"
+ default 0xff802000
+ help
+ Location of BMC SERIAL information.
+
endif # BOARD_SCALEWAY_TAGADA
diff --git a/src/mainboard/scaleway/tagada/Makefile.inc b/src/mainboard/scaleway/tagada/Makefile.inc
index 2c8186f..7d426df 100644
--- a/src/mainboard/scaleway/tagada/Makefile.inc
+++ b/src/mainboard/scaleway/tagada/Makefile.inc
@@ -14,6 +14,8 @@
## GNU General Public License for more details.
##
+bootblock-y += bootblock.c
+
romstage-y += hsio.c
ramstage-y += ramstage.c
@@ -21,4 +23,10 @@
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.c
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c
+bootblock-y += bmcinfo.c
+postcar-y += bmcinfo.c
+romstage-y += bmcinfo.c
+ramstage-y += bmcinfo.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += bmcinfo.c
+
CPPFLAGS_common += -Isrc/mainboard/$(MAINBOARDDIR)/
diff --git a/src/mainboard/scaleway/tagada/bmcinfo.c b/src/mainboard/scaleway/tagada/bmcinfo.c
new file mode 100644
index 0000000..e9761b6
--- /dev/null
+++ b/src/mainboard/scaleway/tagada/bmcinfo.c
@@ -0,0 +1,155 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2017 Online SAS.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <arch/early_variables.h>
+
+#include <console/console.h>
+
+#include "bmcinfo.h"
+
+typedef struct {
+ u32 magic0; // "BMCI"
+ u32 magic1; // "nfo0"
+ u16 length;
+ u16 chksum;
+ u8 uuid[16];
+ u8 bmcSerial[9]; // as null terminated string
+ u8 slot;
+ u8 corebootVerbosityLevel;
+ u8 relaxSecurity;
+ u32 baudrate;
+ u8 bootOption;
+ u8 endMarker; // Insert new fields before
+} biosBmcInfo_t;
+
+#define BIOSBMCINFO_MAGIC0 0x49434d42
+#define BIOSBMCINFO_MAGIC1 0x306f666e
+
+
+#define BMC_INFO ((biosBmcInfo_t *)CONFIG_BMC_INFO_LOC)
+
+enum biosBmcInfoValidFlag_e {
+ BMCINFO_UNTESTED = 0,
+ BMCINFO_INVALID,
+ BMCINFO_INVALID_WARNED,
+ BMCINFO_VALID,
+};
+
+static enum biosBmcInfoValidFlag_e CAR_GLOBAL biosBmcInfoValidFlag;
+
+static bool bmcInfoIsValid(void)
+{
+ const biosBmcInfo_t *bmc_info = BMC_INFO;
+ int flag = car_get_var(biosBmcInfoValidFlag);
+ if (flag == BMCINFO_UNTESTED) {
+ flag = BMCINFO_INVALID;
+ if ((bmc_info->magic0 == BIOSBMCINFO_MAGIC0)
+ && (bmc_info->magic1 == BIOSBMCINFO_MAGIC1)
+ && (bmc_info->length >= offsetof(biosBmcInfo_t, endMarker))
+ && (bmc_info->length <= 0x1000)) {
+ u16 chksum = 0 - (bmc_info->chksum & 0xff)
+ - (bmc_info->chksum >> 8);
+ int i;
+ for (i = 0; i < bmc_info->length ; i++)
+ chksum += ((u8 *)bmc_info)[i];
+ if (bmc_info->chksum == chksum)
+ flag = BMCINFO_VALID;
+ }
+ car_set_var(biosBmcInfoValidFlag, flag);
+ }
+#if !defined(__PRE_RAM__)
+ if (flag == BMCINFO_INVALID) {
+ int length = offsetof(biosBmcInfo_t, endMarker);
+ printk(BIOS_CRIT, "WARNING "
+ "bmcInfo not available please update your BMC.\n");
+ flag = BMCINFO_INVALID_WARNED;
+ car_set_var(biosBmcInfoValidFlag, flag);
+ printk(BIOS_CRIT, "bmcInfo magic = \"%x-%x\"\n",
+ bmc_info->magic0, bmc_info->magic1);
+ printk(BIOS_CRIT, "bmcInfo length = %d expected = %d\"\n",
+ bmc_info->length, length);
+ u16 chksum = 0 - (bmc_info->chksum & 0xff)
+ - (bmc_info->chksum >> 8);
+ int i;
+ for (i = 0; i < bmc_info->length; i++)
+ chksum += ((u8 *)bmc_info)[i];
+ printk(BIOS_CRIT, "bmcInfo chksum = 0x%x expected = 0x%x\"\n",
+ bmc_info->chksum, chksum);
+ }
+#endif
+ return (flag == BMCINFO_VALID);
+}
+
+
+const char *bmcInfoSerial(void)
+{
+ if (bmcInfoIsValid())
+ return (char*) BMC_INFO->bmcSerial;
+ return NULL;
+}
+
+const u8 *bmcInfoUuid(void)
+{
+ if (bmcInfoIsValid())
+ return BMC_INFO->uuid;
+ return NULL;
+}
+
+const u32 bmcInfoBaudrate(void)
+{
+ if (bmcInfoIsValid())
+ return BMC_INFO->baudrate;
+ return 0;
+}
+
+const int bmcInfoCorebootVerbosityLevel(void)
+{
+ if (bmcInfoIsValid())
+ return BMC_INFO->corebootVerbosityLevel & 0xf;
+ return -1;
+}
+
+const int bmcInfoFSPVerbosityLevel(void)
+{
+ if (bmcInfoIsValid())
+ return BMC_INFO->corebootVerbosityLevel >> 4;
+ return 0;
+}
+
+const int bmcInfoSlot(void)
+{
+ if (bmcInfoIsValid())
+ return BMC_INFO->slot;
+ return -1;
+}
+
+const int bmcInfoRelaxSecurity(void)
+{
+ if (bmcInfoIsValid())
+ return BMC_INFO->relaxSecurity;
+ return 0;
+}
+
+const int bmcInfoBootOption(void)
+{
+ if (bmcInfoIsValid())
+ return BMC_INFO->bootOption;
+ return 0;
+}
+
diff --git a/src/mainboard/scaleway/tagada/bmcinfo.h b/src/mainboard/scaleway/tagada/bmcinfo.h
new file mode 100644
index 0000000..d7d6541
--- /dev/null
+++ b/src/mainboard/scaleway/tagada/bmcinfo.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2017 Online SAS.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+#ifndef MAINBOARD_BMCINFO_H
+#define MAINBOARD_BMCINFO_H
+
+// Do not place disks in boot order
+#define BOOT_OPTION_NIC_ONLY 0
+// Boot to disk first (before network)
+#define BOOT_OPTION_DISK_FIRST 1
+// Boot to disk second (after network)
+#define BOOT_OPTION_DISK_SECOND 2
+// Boot order mask
+#define BOOT_OPTION_ORDER_MASK 3
+// Reset after boot sequence (don't go to EFI shell)
+#define BOOT_OPTION_NO_EFISHELL 0x80
+
+const char *bmcInfoSerial(void);
+const u8 *bmcInfoUuid(void);
+const u32 bmcInfoBaudrate(void);
+const int bmcInfoCorebootVerbosityLevel(void);
+const int bmcInfoFSPVerbosityLevel(void);
+const int bmcInfoSlot(void);
+const int bmcInfoRelaxSecurity(void);
+const int bmcInfoBootOption(void);
+
+#endif /* MAINBOARD_BMCINFO_H */
diff --git a/src/mainboard/scaleway/tagada/bootblock.c b/src/mainboard/scaleway/tagada/bootblock.c
new file mode 100644
index 0000000..e8443fd
--- /dev/null
+++ b/src/mainboard/scaleway/tagada/bootblock.c
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Online SAS.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <bootblock_common.h>
+#include <console/console.h>
+#include "bmcinfo.h"
+
+/*
+ * Display board serial early
+ */
+
+void bootblock_mainboard_init(void)
+{
+ if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE))
+ printk(BIOS_SPEW, "Board Serial: %s.\n", bmcInfoSerial());
+}
+
diff --git a/src/mainboard/scaleway/tagada/romstage.c b/src/mainboard/scaleway/tagada/romstage.c
index d6a1282..cae6324f 100644
--- a/src/mainboard/scaleway/tagada/romstage.c
+++ b/src/mainboard/scaleway/tagada/romstage.c
@@ -20,6 +20,7 @@
#include <fsp/api.h>
#include <fsp/soc_binding.h>
#include <string.h>
+#include "bmcinfo.h"
void mainboard_config_gpios(void);
void mainboard_memory_init_params(FSPM_UPD *mupd);
@@ -32,6 +33,7 @@
size_t num;
const struct pad_config *table;
+ printk(BIOS_SPEW, "Board Serial: %s.\n", bmcInfoSerial());
/* Configure pads prior to SiliconInit() in case there's any
* dependencies during hardware initialization.
*/
@@ -50,7 +52,8 @@
void mainboard_memory_init_params(FSPM_UPD *mupd)
{
- mupd->FspmConfig.PcdFspDebugPrintErrorLevel = 3; // Verbose
+ mupd->FspmConfig.PcdFspDebugPrintErrorLevel =
+ bmcInfoFSPVerbosityLevel();
// Enable Rmt and Fast Boot by default, RMT will be run only on first
// boot or when dimms change
--
To view, visit https://review.coreboot.org/23813
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4351aa11b08bdf65e14706b261c532bbf8837aed
Gerrit-Change-Number: 23813
Gerrit-PatchSet: 1
Gerrit-Owner: Julien Viard de Galbert <jviarddegalbert at online.net>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180219/c73dd0fc/attachment-0001.html>
More information about the coreboot-gerrit
mailing list