Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46461 )
Change subject: soc/intel/skl: replace conditional on dt option reading CPUID for CPPC
......................................................................
soc/intel/skl: replace conditional on dt option reading CPUID for CPPC
Check ISST (Intel SpeedShift) availability via CPUID.06H:EAX[7], instead
of relying on the devicetree option `speed_shift_enable`, that is going
to be dropped.
Test: GCPC and _CPC entries still get generated on Supermicro X11SSM-F
Change-Id: I5f9bf09385627fb6a1d8e566a80370f7ddd8605e
Signed-off-by: Michael Niewöhner <foss(a)mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46461
Reviewed-by: Nico Huber <nico.h(a)gmx.de>
Reviewed-by: Felix Singer <felixsinger(a)posteo.net>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
---
M src/soc/intel/skylake/acpi.c
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
build bot (Jenkins): Verified
Nico Huber: Looks good to me, approved
Felix Singer: Looks good to me, but someone else must approve
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index 275e77d..637092b 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -35,6 +35,8 @@
#include "chip.h"
+#define CPUID_6_EAX_ISST (1 << 7)
+
/*
* List of suported C-states in this processor.
*/
@@ -379,7 +381,7 @@
printk(BIOS_DEBUG, "Found %d CPU(s) with %d core(s) each.\n",
numcpus, cores_per_package);
- if (config->speed_shift_enable) {
+ if (cpuid_eax(6) & CPUID_6_EAX_ISST) {
struct cppc_config cppc_config;
cpu_init_cppc_config(&cppc_config, 2 /* version 2 */);
acpigen_write_CPPC_package(&cppc_config);
@@ -405,7 +407,7 @@
cores_per_package);
}
- if (config->speed_shift_enable)
+ if (cpuid_eax(6) & CPUID_6_EAX_ISST)
acpigen_write_CPPC_method();
acpigen_pop_len();
--
To view, visit https://review.coreboot.org/c/coreboot/+/46461
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I5f9bf09385627fb6a1d8e566a80370f7ddd8605e
Gerrit-Change-Number: 46461
Gerrit-PatchSet: 12
Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de>
Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Reviewer: Tim Wawrzynczak <twawrzynczak(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: merged
Hello Martin Roth, Marc Jones, Johnny Lin, Angel Pons, Kyösti Mälkki,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/45765
to review the following change.
Change subject: console/init: Drop CONSOLE_LEVEL_CONST
......................................................................
console/init: Drop CONSOLE_LEVEL_CONST
We limited the configurability of the debug level to stages that have
a `.data` section. This is not really a requirement, because a `.bss`
section should suffice and we always have that now.
Making the debug level always configurable, adds an early call to
get_option(). But that shouldn't hurt: The value is cached locally.
Change-Id: I11484fc32dcbba8d31772bd0b82785f17b2fba11
Signed-off-by: Nico Huber <nico.h(a)gmx.de>
---
M src/console/init.c
1 file changed, 2 insertions(+), 18 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/45765/1
diff --git a/src/console/init.c b/src/console/init.c
index 1dba9ad..9776e2a 100644
--- a/src/console/init.c
+++ b/src/console/init.c
@@ -8,40 +8,24 @@
#include <option.h>
#include <version.h>
-/* Mutable console log level only allowed when RAM comes online. */
-#define CONSOLE_LEVEL_CONST !ENV_STAGE_HAS_DATA_SECTION
-
static int console_inited;
-static int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
+static int console_loglevel;
static inline int get_log_level(void)
{
if (console_inited == 0)
return -1;
- if (CONSOLE_LEVEL_CONST)
- return get_console_loglevel();
return console_loglevel;
}
-static inline void set_log_level(int new_level)
-{
- if (CONSOLE_LEVEL_CONST)
- return;
-
- console_loglevel = new_level;
-}
-
static void init_log_level(void)
{
int debug_level = get_console_loglevel();
- if (CONSOLE_LEVEL_CONST)
- return;
-
get_option(&debug_level, "debug_level");
- set_log_level(debug_level);
+ console_loglevel = debug_level;
}
int console_log_level(int msg_level)
--
To view, visit https://review.coreboot.org/c/coreboot/+/45765
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I11484fc32dcbba8d31772bd0b82785f17b2fba11
Gerrit-Change-Number: 45765
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Johnny Lin <Johnny_Lin(a)wiwynn.com>
Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
Gerrit-Reviewer: Marc Jones <marc.jones(a)amd.corp-partner.google.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-MessageType: newchange
Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46562 )
Change subject: soc/intel/common/block/smbus: Add Cannonpoint PCH-H PCI ID
......................................................................
soc/intel/common/block/smbus: Add Cannonpoint PCH-H PCI ID
Tis is required to make sure the defined SMBUS_BASE address is valid even
after PCI enumeration.
Tested on Prodrive Hermes.
Change-Id: Ibd40e556fd890000836d23682d4e9e3aa5200c54
Signed-off-by: Patrick Rudolph <patrick.rudolph(a)9elements.com>
---
M src/soc/intel/common/block/smbus/smbus.c
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/46562/1
diff --git a/src/soc/intel/common/block/smbus/smbus.c b/src/soc/intel/common/block/smbus/smbus.c
index ae9f650..f97defb 100644
--- a/src/soc/intel/common/block/smbus/smbus.c
+++ b/src/soc/intel/common/block/smbus/smbus.c
@@ -76,6 +76,7 @@
static const unsigned short pci_device_ids[] = {
PCI_DEVICE_ID_INTEL_CNL_SMBUS,
+ PCI_DEVICE_ID_INTEL_CNP_H_SMBUS,
PCI_DEVICE_ID_INTEL_SPT_LP_SMBUS,
PCI_DEVICE_ID_INTEL_SPT_H_SMBUS,
PCI_DEVICE_ID_INTEL_LWB_SMBUS_SUPER,
--
To view, visit https://review.coreboot.org/c/coreboot/+/46562
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ibd40e556fd890000836d23682d4e9e3aa5200c54
Gerrit-Change-Number: 46562
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-MessageType: newchange
Tim Chu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46071 )
Change subject: mb/ocp/deltalake: Use BMC version to represent ec version
......................................................................
mb/ocp/deltalake: Use BMC version to represent ec version
In deltalake, there's no embedded controller and BMC version is
used to represent ec version.
TEST=Build with CB:45138 and CB:46070
Execute "dmidecode -t 0" to check if the firmware version is correct
Signed-off-by: Tim Chu <Tim.Chu(a)quantatw.com>
Change-Id: I388efd749170f0ebbb4dd4d32199675d92cc018e
---
M src/mainboard/ocp/deltalake/ramstage.c
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/46071/1
diff --git a/src/mainboard/ocp/deltalake/ramstage.c b/src/mainboard/ocp/deltalake/ramstage.c
index e00f1c3..625634c 100644
--- a/src/mainboard/ocp/deltalake/ramstage.c
+++ b/src/mainboard/ocp/deltalake/ramstage.c
@@ -26,6 +26,19 @@
extern struct fru_info_str fru_strings;
static char slot_id_str[SLOT_ID_LEN];
+/*
+ * Update SMBIOS type 0 ec version.
+ * In deltalake, BMC version is used to represent ec version.
+ */
+void smbios_ec_revision(uint8_t *ec_major_revision, uint8_t *ec_minor_revision)
+{
+ uint8_t bmc_major_revision, bmc_minor_revision;
+
+ ipmi_bmc_version(&bmc_major_revision, &bmc_minor_revision);
+ *ec_major_revision = bmc_major_revision & 0x7f; /* bit[6:0] Major Firmware Revision */
+ *ec_minor_revision = ((bmc_minor_revision / 16) * 10) + (bmc_minor_revision % 16);
+}
+
/* Override SMBIOS 2 Location In Chassis from BMC */
const char *smbios_mainboard_location_in_chassis(void)
{
--
To view, visit https://review.coreboot.org/c/coreboot/+/46071
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I388efd749170f0ebbb4dd4d32199675d92cc018e
Gerrit-Change-Number: 46071
Gerrit-PatchSet: 1
Gerrit-Owner: Tim Chu <Tim.Chu(a)quantatw.com>
Gerrit-MessageType: newchange