Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30527
Change subject: sb/intel/bd82x6x: Move pcie ACPI code to a common place
......................................................................
sb/intel/bd82x6x: Move pcie ACPI code to a common place
Change-Id: I45144f9c397ff9a0be011990ba33db9ffef351e7
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
---
M src/southbridge/intel/bd82x6x/acpi/pch.asl
R src/southbridge/intel/common/acpi/pcie.asl
R src/southbridge/intel/common/acpi/pcie_port.asl
3 files changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/30527/1
diff --git a/src/southbridge/intel/bd82x6x/acpi/pch.asl b/src/southbridge/intel/bd82x6x/acpi/pch.asl
index a068bc0..d3aa7a4 100644
--- a/src/southbridge/intel/bd82x6x/acpi/pch.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/pch.asl
@@ -238,7 +238,7 @@
#include "audio.asl"
// PCI Express Ports 0:1c.x
-#include "pcie.asl"
+#include <southbridge/intel/common/acpi/pcie.asl>
// USB EHCI 0:1d.0 and 0:1a.0, XHCI 0:14.0
#include "usb.asl"
diff --git a/src/southbridge/intel/bd82x6x/acpi/pcie.asl b/src/southbridge/intel/common/acpi/pcie.asl
similarity index 100%
rename from src/southbridge/intel/bd82x6x/acpi/pcie.asl
rename to src/southbridge/intel/common/acpi/pcie.asl
diff --git a/src/southbridge/intel/bd82x6x/acpi/pcie_port.asl b/src/southbridge/intel/common/acpi/pcie_port.asl
similarity index 100%
rename from src/southbridge/intel/bd82x6x/acpi/pcie_port.asl
rename to src/southbridge/intel/common/acpi/pcie_port.asl
--
To view, visit https://review.coreboot.org/c/coreboot/+/30527
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I45144f9c397ff9a0be011990ba33db9ffef351e7
Gerrit-Change-Number: 30527
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-MessageType: newchange
Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30524
Change subject: cpu/intel/common: improve VMX/lock bit debug output
......................................................................
cpu/intel/common: improve VMX/lock bit debug output
Currently, if the IA32_FEATURE_CONTROL lock bit is already
set, VMX status isn't reported. Adjust debug output to
provide more useful infomation on both VMX and lock bit statuses.
Test: build/boot google/chell, observe useful output in cbmem log
regardless of lock bit status.
Change-Id: Ie50f214f7e3fcfd6c3d0d2de034a93518c0a6b46
Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com>
---
M src/cpu/intel/common/common_init.c
1 file changed, 16 insertions(+), 22 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/30524/1
diff --git a/src/cpu/intel/common/common_init.c b/src/cpu/intel/common/common_init.c
index 9c0fcbb..486e412 100644
--- a/src/cpu/intel/common/common_init.c
+++ b/src/cpu/intel/common/common_init.c
@@ -43,27 +43,26 @@
msr = rdmsr(IA32_FEATURE_CONTROL);
if (msr.lo & (1 << 0)) {
- printk(BIOS_ERR, "IA32_FEATURE_CONTROL is locked, so %s will do nothing\n",
- __func__);
+ printk(BIOS_DEBUG, "IA32_FEATURE_CONTROL already locked; ");
/* IA32_FEATURE_CONTROL locked. If we set it again we get an
* illegal instruction
*/
- return;
+ } else {
+
+ /* IA32_FEATURE_CONTROL MSR may initialize with random values.
+ * It must be cleared regardless of VMX config setting.
+ */
+ msr.hi = msr.lo = 0;
+
+ if (enable) {
+ msr.lo |= (1 << 2);
+ if (feature_flag & CPUID_SMX)
+ msr.lo |= (1 << 1);
+ }
+
+ wrmsr(IA32_FEATURE_CONTROL, msr);
}
- /* The IA32_FEATURE_CONTROL MSR may initialize with random values.
- * It must be cleared regardless of VMX config setting.
- */
- msr.hi = msr.lo = 0;
-
- if (enable) {
- msr.lo |= (1 << 2);
- if (feature_flag & CPUID_SMX)
- msr.lo |= (1 << 1);
- }
-
- wrmsr(IA32_FEATURE_CONTROL, msr);
-
printk(BIOS_DEBUG, "VMX status: %s\n",
enable ? "enabled" : "disabled");
}
@@ -75,15 +74,10 @@
msr = rdmsr(IA32_FEATURE_CONTROL);
if (msr.lo & (1 << 0)) {
- printk(BIOS_ERR, "IA32_FEATURE_CONTROL is locked, so %s will do nothing\n",
- __func__);
/* IA32_FEATURE_CONTROL locked. If we set it again we get an
* illegal instruction
*/
- return;
- }
-
- if (lock) {
+ } else if (lock) {
/* Set lock bit */
msr.lo |= (1 << 0);
wrmsr(IA32_FEATURE_CONTROL, msr);
--
To view, visit https://review.coreboot.org/c/coreboot/+/30524
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ie50f214f7e3fcfd6c3d0d2de034a93518c0a6b46
Gerrit-Change-Number: 30524
Gerrit-PatchSet: 1
Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-MessageType: newchange
Piotr Król has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30519
Change subject: dell/optiplex_7010: Use a common acpi/cpu.asl file
......................................................................
dell/optiplex_7010: Use a common acpi/cpu.asl file
Signed-off-by: Piotr Król <piotr.krol(a)3mdeb.com>
Change-Id: I15517b7a1274f579ccb1b063e31bc14320a4eae3
---
M src/mainboard/dell/optiplex_7010/dsdt.asl
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/30519/1
diff --git a/src/mainboard/dell/optiplex_7010/dsdt.asl b/src/mainboard/dell/optiplex_7010/dsdt.asl
index 9b32670..fffe14e 100644
--- a/src/mainboard/dell/optiplex_7010/dsdt.asl
+++ b/src/mainboard/dell/optiplex_7010/dsdt.asl
@@ -12,7 +12,7 @@
{
// Some generic macros
#include "acpi/platform.asl"
- #include <cpu/intel/model_206ax/acpi/cpu.asl>
+ #include <cpu/intel/common/acpi/cpu.asl>
#include <southbridge/intel/bd82x6x/acpi/platform.asl>
/* global NVS and variables. */
#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
--
To view, visit https://review.coreboot.org/c/coreboot/+/30519
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I15517b7a1274f579ccb1b063e31bc14320a4eae3
Gerrit-Change-Number: 30519
Gerrit-PatchSet: 1
Gerrit-Owner: Piotr Król <piotr.krol(a)3mdeb.com>
Gerrit-MessageType: newchange
Maulik V Vaghela has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30516
Change subject: soc/intel/cannonlake: Enable CNVi based on devicetree
......................................................................
soc/intel/cannonlake: Enable CNVi based on devicetree
Set PchCnvimode to Auto if CNVi is enabled in device tree. This will
allow FSP to configure CNVi.
Change-Id: I4f77fe5e9f561d3b498403e42dfc7afdcfaedf6f
Signed-off-by: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
---
M src/soc/intel/cannonlake/fsp_params.c
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/30516/1
diff --git a/src/soc/intel/cannonlake/fsp_params.c b/src/soc/intel/cannonlake/fsp_params.c
index 78b27e9..8166dea 100644
--- a/src/soc/intel/cannonlake/fsp_params.c
+++ b/src/soc/intel/cannonlake/fsp_params.c
@@ -162,6 +162,10 @@
dev->enabled = 0;
params->XdciEnable = dev->enabled;
+ /* Enable CNVi Wifi if enabled in device tree */
+ dev = dev_find_slot(0, PCH_DEVFN_CNViWIFI);
+ params->PchCnviMode = dev->enabled;
+
/* PCI Express */
for (i = 0; i < ARRAY_SIZE(config->PcieClkSrcUsage); i++) {
if (config->PcieClkSrcUsage[i] == 0)
--
To view, visit https://review.coreboot.org/c/coreboot/+/30516
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I4f77fe5e9f561d3b498403e42dfc7afdcfaedf6f
Gerrit-Change-Number: 30516
Gerrit-PatchSet: 1
Gerrit-Owner: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
Gerrit-Reviewer: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-MessageType: newchange
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30508
Change subject: [TEST]ec/google/chromeec/ec.c: Don't use CAR_GLOBAL
......................................................................
[TEST]ec/google/chromeec/ec.c: Don't use CAR_GLOBAL
All platforms using this code have NO_CAR_GLOBAL_MIGRATION.
Change-Id: Id63ff0f9cfbf29f23cb26d3731a286f58b9aa8d6
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
---
M src/ec/google/chromeec/ec.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/30508/1
diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c
index d2a0849..a440e12 100644
--- a/src/ec/google/chromeec/ec.c
+++ b/src/ec/google/chromeec/ec.c
@@ -232,7 +232,7 @@
#define UHEPI_SUPPORTED 1
#define UHEPI_NOT_SUPPORTED 2
- static int uhepi_support CAR_GLOBAL;
+ static int uhepi_support;
if (!uhepi_support) {
uhepi_support = google_chromeec_check_feature
--
To view, visit https://review.coreboot.org/c/coreboot/+/30508
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Id63ff0f9cfbf29f23cb26d3731a286f58b9aa8d6
Gerrit-Change-Number: 30508
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-MessageType: newchange
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30487
Change subject: mb/google/slippy: Add a VBT for all variants
......................................................................
mb/google/slippy: Add a VBT for all variants
The vbt.bin is the same across all variants.
Change-Id: I82c72c561e1058e0b77d80baf330b64f7c6b08e3
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
---
M src/mainboard/google/slippy/Kconfig
A src/mainboard/google/slippy/data.vbt
2 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/30487/1
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index 9d206dc..ecc8aff 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -15,6 +15,7 @@
select MAINBOARD_HAS_TPM1
select INTEL_INT15
select MAINBOARD_HAS_LIBGFXINIT
+ select INTEL_GMA_HAVE_VBT
if BOARD_GOOGLE_BASEBOARD_SLIPPY
@@ -65,4 +66,10 @@
string
default "pci8086,0406.rom"
+# Override the default variant behavior, since the data.vbt is the same
+# for all variants.
+config INTEL_GMA_VBT_FILE
+ default "src/mainboard/$(MAINBOARDDIR)/data.vbt"
+
+
endif # BOARD_GOOGLE_BASEBOARD_SLIPPY
diff --git a/src/mainboard/google/slippy/data.vbt b/src/mainboard/google/slippy/data.vbt
new file mode 100644
index 0000000..915b152
--- /dev/null
+++ b/src/mainboard/google/slippy/data.vbt
Binary files differ
--
To view, visit https://review.coreboot.org/c/coreboot/+/30487
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I82c72c561e1058e0b77d80baf330b64f7c6b08e3
Gerrit-Change-Number: 30487
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-MessageType: newchange