Michael Niewöhner has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36354 )
Change subject: soc/intel/skylake: use cpu_lt_lock_memory in cpu_lock_sgx_memory
......................................................................
soc/intel/skylake: use cpu_lt_lock_memory in cpu_lock_sgx_memory
Use the new common function to set LT_LOCK_MEMORY prior to SGX
activation.
Change-Id: Iefec0e61c7482a70af60dabc0bec3bf712d8b48a
Signed-off-by: Michael Niewöhner <foss(a)mniewoehner.de>
---
M src/soc/intel/skylake/cpu.c
1 file changed, 1 insertion(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/54/36354/1
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index 63142b9..6e77938 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -578,11 +578,5 @@
void cpu_lock_sgx_memory(void)
{
- msr_t msr;
-
- msr = rdmsr(MSR_LT_LOCK_MEMORY);
- if ((msr.lo & 1) == 0) {
- msr.lo |= 1; /* Lock it */
- wrmsr(MSR_LT_LOCK_MEMORY, msr);
- }
+ cpu_lt_lock_memory(NULL);
}
--
To view, visit https://review.coreboot.org/c/coreboot/+/36354
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Iefec0e61c7482a70af60dabc0bec3bf712d8b48a
Gerrit-Change-Number: 36354
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Niewöhner
Gerrit-Reviewer: Michael Niewöhner
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-MessageType: newchange
Michael Niewöhner has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36142 )
Change subject: mb/supermicro/x11-lga1151-series: docs: update issues
......................................................................
mb/supermicro/x11-lga1151-series: docs: update issues
Add MRC cache issue to documentation.
Change-Id: Id347e67c732380f250bb9c597618d16ca8e5c978
Signed-off-by: Michael Niewöhner <foss(a)mniewoehner.de>
---
M Documentation/mainboard/supermicro/x11-lga1151-series/x11-lga1151-series.md
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/36142/1
diff --git a/Documentation/mainboard/supermicro/x11-lga1151-series/x11-lga1151-series.md b/Documentation/mainboard/supermicro/x11-lga1151-series/x11-lga1151-series.md
index 8c99527..bbe7579 100644
--- a/Documentation/mainboard/supermicro/x11-lga1151-series/x11-lga1151-series.md
+++ b/Documentation/mainboard/supermicro/x11-lga1151-series/x11-lga1151-series.md
@@ -30,6 +30,7 @@
These issues apply to all boards. Have a look at the board-specific issues, too.
- TianoCore doesn't work with Aspeed NGI, as it's text mode only (Fix is WIP CB:35726)
+- MRC caching does not work with cold boot
## ToDo
--
To view, visit https://review.coreboot.org/c/coreboot/+/36142
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Id347e67c732380f250bb9c597618d16ca8e5c978
Gerrit-Change-Number: 36142
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Niewöhner
Gerrit-MessageType: newchange
Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36457 )
Change subject: soc/intel/{cnl,icl}: Move globalnvs.asl into common/block/acpi
......................................................................
soc/intel/{cnl,icl}: Move globalnvs.asl into common/block/acpi
This patch creates a common instance of globalnvs.asl inside intel common
code (soc/intel/common/block/acpi/acpi) and ask cnl & icl soc code to
refer globalnvs.asl from common code block.
TEST=Able to build and boot Hatch and ICL DE system. Dump DSDT.asl to verify
GNVS operation region presence after booting to OS.
Change-Id: Ia9fb12a75557bd7dc38f6d22ba2b32065d18b3ee
Signed-off-by: Subrata Banik <subrata.banik(a)intel.com>
---
M src/mainboard/google/dragonegg/dsdt.asl
M src/mainboard/google/drallion/dsdt.asl
M src/mainboard/google/hatch/dsdt.asl
M src/mainboard/google/sarien/dsdt.asl
M src/mainboard/intel/cannonlake_rvp/dsdt.asl
M src/mainboard/intel/coffeelake_rvp/dsdt.asl
M src/mainboard/intel/icelake_rvp/dsdt.asl
D src/soc/intel/cannonlake/acpi/globalnvs.asl
R src/soc/intel/common/block/acpi/acpi/globalnvs.asl
9 files changed, 8 insertions(+), 65 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/36457/1
diff --git a/src/mainboard/google/dragonegg/dsdt.asl b/src/mainboard/google/dragonegg/dsdt.asl
index ab0b977..8a43784 100644
--- a/src/mainboard/google/dragonegg/dsdt.asl
+++ b/src/mainboard/google/dragonegg/dsdt.asl
@@ -30,7 +30,7 @@
#include <soc/intel/icelake/acpi/platform.asl>
// global NVS and variables
- #include <soc/intel/icelake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
// CPU
#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/google/drallion/dsdt.asl b/src/mainboard/google/drallion/dsdt.asl
index 2568800..5ffdf18 100644
--- a/src/mainboard/google/drallion/dsdt.asl
+++ b/src/mainboard/google/drallion/dsdt.asl
@@ -29,7 +29,7 @@
#include <soc/intel/cannonlake/acpi/platform.asl>
/* global NVS and variables */
- #include <soc/intel/cannonlake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
/* CPU */
#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/google/hatch/dsdt.asl b/src/mainboard/google/hatch/dsdt.asl
index e2959a7..344e4a7 100644
--- a/src/mainboard/google/hatch/dsdt.asl
+++ b/src/mainboard/google/hatch/dsdt.asl
@@ -30,7 +30,7 @@
#include <soc/intel/cannonlake/acpi/platform.asl>
/* global NVS and variables */
- #include <soc/intel/cannonlake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
/* CPU */
#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/google/sarien/dsdt.asl b/src/mainboard/google/sarien/dsdt.asl
index 58e0704..22e283f 100644
--- a/src/mainboard/google/sarien/dsdt.asl
+++ b/src/mainboard/google/sarien/dsdt.asl
@@ -29,7 +29,7 @@
#include <soc/intel/cannonlake/acpi/platform.asl>
/* global NVS and variables */
- #include <soc/intel/cannonlake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
/* CPU */
#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/intel/cannonlake_rvp/dsdt.asl b/src/mainboard/intel/cannonlake_rvp/dsdt.asl
index c719d23..5f4a349 100644
--- a/src/mainboard/intel/cannonlake_rvp/dsdt.asl
+++ b/src/mainboard/intel/cannonlake_rvp/dsdt.asl
@@ -29,7 +29,7 @@
#include <soc/intel/cannonlake/acpi/platform.asl>
// global NVS and variables
- #include <soc/intel/cannonlake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
Scope (\_SB) {
Device (PCI0)
diff --git a/src/mainboard/intel/coffeelake_rvp/dsdt.asl b/src/mainboard/intel/coffeelake_rvp/dsdt.asl
index 70d0bd6..c5f1136 100644
--- a/src/mainboard/intel/coffeelake_rvp/dsdt.asl
+++ b/src/mainboard/intel/coffeelake_rvp/dsdt.asl
@@ -29,7 +29,7 @@
#include <soc/intel/cannonlake/acpi/platform.asl>
// global NVS and variables
- #include <soc/intel/cannonlake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
Scope (\_SB) {
Device (PCI0)
diff --git a/src/mainboard/intel/icelake_rvp/dsdt.asl b/src/mainboard/intel/icelake_rvp/dsdt.asl
index ad469fa..15890f1 100644
--- a/src/mainboard/intel/icelake_rvp/dsdt.asl
+++ b/src/mainboard/intel/icelake_rvp/dsdt.asl
@@ -30,7 +30,7 @@
#include <soc/intel/icelake/acpi/platform.asl>
// global NVS and variables
- #include <soc/intel/icelake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
// CPU
#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/soc/intel/cannonlake/acpi/globalnvs.asl b/src/soc/intel/cannonlake/acpi/globalnvs.asl
deleted file mode 100644
index 940cf43..0000000
--- a/src/soc/intel/cannonlake/acpi/globalnvs.asl
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- * Copyright (C) 2014 Google Inc.
- * Copyright (C) 2015 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.
- */
-
-/* Global Variables */
-
-Name (\PICM, 0) // IOAPIC/8259
-
-/*
- * Global ACPI memory region. This region is used for passing information
- * between coreboot (aka "the system bios"), ACPI, and the SMI handler.
- * Since we don't know where this will end up in memory at ACPI compile time,
- * we have to fix it up in coreboot's ACPI creation phase.
- */
-
-External (NVSA)
-
-OperationRegion (GNVS, SystemMemory, NVSA, 0x2000)
-Field (GNVS, ByteAcc, NoLock, Preserve)
-{
- /* Miscellaneous */
- OSYS, 16, // 0x00 - Operating System
- SMIF, 8, // 0x02 - SMI function
- PCNT, 8, // 0x03 - Processor Count
- PPCM, 8, // 0x04 - Max PPC State
- TLVL, 8, // 0x05 - Throttle Level Limit
- LIDS, 8, // 0x06 - LID State
- PWRS, 8, // 0x07 - AC Power State
- CBMC, 32, // 0x08 - 0x0b AC Power State
- PM1I, 64, // 0x0c - 0x13 PM1 wake status bit
- GPEI, 64, // 0x14 - 0x17 GPE wake status bit
- DPTE, 8, // 0x1c - Enable DPTF
- NHLA, 64, // 0x1d - 0x24 NHLT Address
- NHLL, 32, // 0x25 - 0x28 NHLT Length
- CID1, 16, // 0x29 - 0x2a Wifi Country Identifier
- U2WE, 16, // 0x2b - 0x2c USB2 Wake Enable Bitmap
- U3WE, 16, // 0x2d - 0x2e USB3 Wake Enable Bitmap
- UIOR, 8, // 0x2f - UART debug controller init on S3 resume
-
- /* ChromeOS specific */
- Offset (0x100),
- #include <vendorcode/google/chromeos/acpi/gnvs.asl>
-}
diff --git a/src/soc/intel/icelake/acpi/globalnvs.asl b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl
similarity index 96%
rename from src/soc/intel/icelake/acpi/globalnvs.asl
rename to src/soc/intel/common/block/acpi/acpi/globalnvs.asl
index 678ce5a..8e8241b 100644
--- a/src/soc/intel/icelake/acpi/globalnvs.asl
+++ b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl
@@ -1,7 +1,7 @@
/*
* This file is part of the coreboot project.
*
- * Copyright (C) 2018 Intel Corp.
+ * Copyright (C) 2019 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
@@ -30,7 +30,6 @@
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
- Offset (0x00),
OSYS, 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PCNT, 8, // 0x03 - Processor Count
--
To view, visit https://review.coreboot.org/c/coreboot/+/36457
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ia9fb12a75557bd7dc38f6d22ba2b32065d18b3ee
Gerrit-Change-Number: 36457
Gerrit-PatchSet: 1
Gerrit-Owner: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-MessageType: newchange
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36312 )
Change subject: [TESTME]mb/asus/{p5gc-mx,p5qpl-am}: Use system_reset instead of full_reset
......................................................................
[TESTME]mb/asus/{p5gc-mx,p5qpl-am}: Use system_reset instead of full_reset
The GMCH needs to sample BSEL again after the SuperIO GPIO to
configure BSEL have been set. This happens when RSTIN# is asserted,
which in turn happens when PCIRST# is asserted by the southbridge.
This needs to be tested on hardware.
Change-Id: I246ac15d0d12ffc18686c7d22a9e6c2b43dce535
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
---
M src/mainboard/asus/p5gc-mx/romstage.c
M src/mainboard/asus/p5qpl-am/romstage.c
2 files changed, 10 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/36312/1
diff --git a/src/mainboard/asus/p5gc-mx/romstage.c b/src/mainboard/asus/p5gc-mx/romstage.c
index 20a2b56..0814203 100644
--- a/src/mainboard/asus/p5gc-mx/romstage.c
+++ b/src/mainboard/asus/p5gc-mx/romstage.c
@@ -182,7 +182,11 @@
if (!s3resume && setup_sio_gpio(c_bsel)) {
printk(BIOS_DEBUG,
"Needs reset to configure CPU BSEL straps\n");
- full_reset();
+ /* BSEL is resampled if GMCH RSTIN# is asserted which
+ in it turn gets asserted by PCIRST#. */
+ pci_update_config16(PCI_DEV(0, 0x1e, 0), PCI_BRIDGE_CONTROL, 0,
+ PCI_BRIDGE_CTL_BUS_RESET);
+ system_reset();
}
/* Enable SPD ROMs and DDR-II DRAM */
diff --git a/src/mainboard/asus/p5qpl-am/romstage.c b/src/mainboard/asus/p5qpl-am/romstage.c
index 30480ad..c60b4d2 100644
--- a/src/mainboard/asus/p5qpl-am/romstage.c
+++ b/src/mainboard/asus/p5qpl-am/romstage.c
@@ -184,7 +184,11 @@
if (!s3_resume && setup_sio_gpio()) {
printk(BIOS_DEBUG,
"Needs reset to configure CPU BSEL straps\n");
- full_reset();
+ /* BSEL is resampled if GMCH RSTIN# is asserted which
+ in it turn gets asserted by PCIRST#. */
+ pci_update_config16(PCI_DEV(0, 0x1e, 0), PCI_BRIDGE_CONTROL, 0,
+ PCI_BRIDGE_CTL_BUS_RESET);
+ system_reset();
}
sdram_initialize(boot_path, spd_addrmap);
--
To view, visit https://review.coreboot.org/c/coreboot/+/36312
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I246ac15d0d12ffc18686c7d22a9e6c2b43dce535
Gerrit-Change-Number: 36312
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/+/32042
Change subject: console/kconfig: Move ONBOARD_VGA_IS_PRIMARY to 'devices'
......................................................................
console/kconfig: Move ONBOARD_VGA_IS_PRIMARY to 'devices'
This has nothing to do with console options.
This also improves the help text to reflect what it actually does.
Change-Id: I039f4f6bbe144769d6a362192b225838ed3d9d43
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
---
M src/console/Kconfig
M src/device/Kconfig
2 files changed, 10 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/32042/1
diff --git a/src/console/Kconfig b/src/console/Kconfig
index 61ba667..fb87e67 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -176,13 +176,6 @@
# TODO: Deps?
# TODO: Improve description.
-config ONBOARD_VGA_IS_PRIMARY
- bool "Use onboard VGA as primary video device"
- default n
- depends on PCI
- help
- If not selected, the last adapter found will be used.
-
config CONSOLE_NE2K
bool "Network console over NE2000 compatible Ethernet adapter"
default n
diff --git a/src/device/Kconfig b/src/device/Kconfig
index 8001b43..2da12bc 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -683,4 +683,14 @@
I2C controller is not (yet) available. The platform code needs to
provide bindings to manually toggle I2C lines.
+config ONBOARD_VGA_IS_PRIMARY
+ bool "Use onboard VGA as primary video device"
+ default n
+ depends on PCI
+ help
+ This option lets you select which VGA device will be used
+ to decode legacy VGA cycles. Not all chipsets implement this
+ however. If not selected, the last adapter found will be used,
+ else the onboard adapter is used.
+
endmenu
--
To view, visit https://review.coreboot.org/c/coreboot/+/32042
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I039f4f6bbe144769d6a362192b225838ed3d9d43
Gerrit-Change-Number: 32042
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-MessageType: newchange