[coreboot-gerrit] Patch set updated for coreboot: mainboard/intel/kblrvp: Add support to read board ID from EC

[Aamir Bohra (aamir.bohra@intel.com)]

Aamir Bohra (aamir.bohra at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17283

-gerrit

commit 7d8bf9d4cfc75db9de26f2d684eee32067b550bd
Author: Aamir Bohra <aamir.bohra at intel.com>
Date:   Tue Nov 8 14:06:17 2016 +0530

    mainboard/intel/kblrvp: Add support to read board ID from EC
    
    Add a function to identify an Intel RVP board by querying EC
    
    Change-Id: I21337000827639fb8f22c5ee9bc5d86f1ebe1e74
    Signed-off-by: Aamir Bohra <aamir.bohra at intel.com>
---
 src/mainboard/intel/kblrvp/Kconfig      |  1 +
 src/mainboard/intel/kblrvp/Makefile.inc |  4 ++++
 src/mainboard/intel/kblrvp/board_id.c   | 32 ++++++++++++++++++++++++++++++++
 src/mainboard/intel/kblrvp/board_id.h   | 33 +++++++++++++++++++++++++++++++++
 src/soc/intel/common/Kconfig            |  5 +++++
 5 files changed, 75 insertions(+)

diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig
index 7df726c..01501ea 100644
--- a/src/mainboard/intel/kblrvp/Kconfig
+++ b/src/mainboard/intel/kblrvp/Kconfig
@@ -7,6 +7,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_SMI_HANDLER
+	select MAINBOARD_HAS_ACPI_EC
 	select MMCONF_SUPPORT
 	select MONOTONIC_TIMER_MSR
 	select SOC_INTEL_SKYLAKE
diff --git a/src/mainboard/intel/kblrvp/Makefile.inc b/src/mainboard/intel/kblrvp/Makefile.inc
index de1da23..f2c2076 100644
--- a/src/mainboard/intel/kblrvp/Makefile.inc
+++ b/src/mainboard/intel/kblrvp/Makefile.inc
@@ -20,7 +20,11 @@ bootblock-y += bootblock.c
 
 bootblock-$(CONFIG_CHROMEOS) += chromeos.c
 verstage-$(CONFIG_CHROMEOS) += chromeos.c
+
+romstage-$(CONFIG_MAINBOARD_HAS_ACPI_EC) += board_id.c
 romstage-$(CONFIG_CHROMEOS) += chromeos.c
+
+ramstage-$(CONFIG_MAINBOARD_HAS_ACPI_EC) += board_id.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
 
 ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
diff --git a/src/mainboard/intel/kblrvp/board_id.c b/src/mainboard/intel/kblrvp/board_id.c
new file mode 100644
index 0000000..8878f30
--- /dev/null
+++ b/src/mainboard/intel/kblrvp/board_id.c
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2016 Intel Corporation.
+ *
+ * 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 "board_id.h"
+#include <ec/acpi/ec.h>
+#include <stdint.h>
+
+/*
+ * Get Board ID via EC I/O port write/read
+ */
+int get_board_id(void)
+{
+	uint8_t buffer[2];
+	uint8_t index;
+	if (send_ec_command(EC_FAB_ID_CMD) == 0) {
+		for (index = 0; index < sizeof(buffer); index++)
+			buffer[index] = recv_ec_data();
+		return ((buffer[1]<<8) | buffer[0]);
+	}
+	return -1;
+}
diff --git a/src/mainboard/intel/kblrvp/board_id.h b/src/mainboard/intel/kblrvp/board_id.h
new file mode 100644
index 0000000..c0fb366
--- /dev/null
+++ b/src/mainboard/intel/kblrvp/board_id.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2016 Intel Corporation.
+ *
+ * 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_BOARD_ID_H_
+#define _MAINBOARD_BOARD_ID_H_
+
+/* Mobile Board Id 0x00 - 0xFF */
+#define BOARD_ID_SKL_A0_RVP3	0x04
+#define BOARD_ID_SKL_RVP7	0x0B
+
+/* 60-6F reserved for KBL RVPs */
+#define BOARD_ID_KBL_LPDDR3_RVP3	0x60
+#define BOARD_ID_KBL_LPDDR3_RVP7	0x64
+
+/* Board/FAB ID Command */
+#define EC_FAB_ID_CMD	0x0D
+
+/* Returns Board Id on success and < 0 on errror */
+int get_board_id(void);
+
+#endif /* _MAINBOARD_BOARD_ID_H_ */
diff --git a/src/soc/intel/common/Kconfig b/src/soc/intel/common/Kconfig
index affec55..a03122c 100644
--- a/src/soc/intel/common/Kconfig
+++ b/src/soc/intel/common/Kconfig
@@ -114,4 +114,9 @@ config SOC_INTEL_COMMON_NHLT
 	bool
 	default n
 
+config MAINBOARD_HAS_ACPI_EC
+	bool
+	default n
+	select EC_ACPI
+
 endif # SOC_INTEL_COMMON