Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44014 )
Change subject: src/soc/intel/common/block: Mark only TSEG range as IO_CACHEABLE
......................................................................
src/soc/intel/common/block: Mark only TSEG range as IO_CACHEABLE
This patch ensures that the TSEG region is only mapped as cacheable so
that one can perform SMRAM relocation faster.
Ideally don't need to mark the entire TOP_OF_RAM till BGSM range (used for
ME stolen memory, PTT, DPR, PRMRR, TSEG etc) as cacheable as no executable code
exist there except TSEG region. Hence only mark TSEG range as cacheable (+ reserved)
and other ranges as reserve alone.
TEST=Able to build and boot ICL, TGL RVP.
Without this CL:
PCI: 00:00.0 resource base 77000000 size 4800000 align 0 gran 0 limit 0 flags f0004200 index 9
PCI: 00:00.0 resource base 7b800000 size 4400000 align 0 gran 0 limit 0 flags f0000200 index a
With this CL:
PCI: 00:00.0 resource base 77000000 size 4000000 align 0 gran 0 limit 0 flags f0000200 index 9
PCI: 00:00.0 resource base 7b000000 size 800000 align 0 gran 0 limit 0 flags f0004200 index a
PCI: 00:00.0 resource base 7b800000 size 4400000 align 0 gran 0 limit 0 flags f0000200 index b
Change-Id: I64c14b14caf0a53219fdc02ec6bbd375955a0c8e
Signed-off-by: Subrata Banik <subrata.banik(a)intel.com>
---
M src/soc/intel/common/block/systemagent/systemagent.c
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/14/44014/1
diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c
index e12e07c..b15ca01 100644
--- a/src/soc/intel/common/block/systemagent/systemagent.c
+++ b/src/soc/intel/common/block/systemagent/systemagent.c
@@ -173,8 +173,13 @@
sa_get_mem_map(dev, &sa_map_values[0]);
- /* top_of_ram -> BGSM */
+ /* top_of_ram -> TSEG */
base_k = top_of_ram;
+ size_k = sa_map_values[SA_TSEG_REG] - base_k;
+ mmio_resource(dev, index++, base_k / KiB, size_k / KiB);
+
+ /* TSEG -> BGSM */
+ base_k = sa_map_values[SA_TSEG_REG];
size_k = sa_map_values[SA_BGSM_REG] - base_k;
reserved_ram_resource(dev, index++, base_k / KiB, size_k / KiB);
--
To view, visit https://review.coreboot.org/c/coreboot/+/44014
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I64c14b14caf0a53219fdc02ec6bbd375955a0c8e
Gerrit-Change-Number: 44014
Gerrit-PatchSet: 1
Gerrit-Owner: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-MessageType: newchange
Werner Zeh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35645 )
Change subject: vboot: Fix wrong algorithm in TCPA log for BOOT_MODE
......................................................................
vboot: Fix wrong algorithm in TCPA log for BOOT_MODE
The hash algorithm for VBOOTs BOOT_MODE is fixed to sha1 but TCPA log
uses sha256 as the name for the algorithm. This leads to an log entry
with 20 bytes (sha1) while the algorithm is set to sha256 (which needs
32 bytes of hash). Fix it by using the matching algorithm name for
BOOT_MODE.
Change-Id: Ia25938ac5f6c29f60a4819023b99f7796849f574
Signed-off-by: Werner Zeh <werner.zeh(a)siemens.com>
---
M src/security/vboot/tpm_common.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/35645/1
diff --git a/src/security/vboot/tpm_common.c b/src/security/vboot/tpm_common.c
index 0a211c5..1db7189 100644
--- a/src/security/vboot/tpm_common.c
+++ b/src/security/vboot/tpm_common.c
@@ -46,7 +46,7 @@
switch (which_digest) {
/* SHA1 of (devmode|recmode|keyblock) bits */
case BOOT_MODE_PCR:
- return tpm_extend_pcr(pcr, VB2_HASH_SHA256, buffer, size,
+ return tpm_extend_pcr(pcr, VB2_HASH_SHA1, buffer, size,
TPM_PCR_BOOT_MODE);
/* SHA256 of HWID */
case HWID_DIGEST_PCR:
--
To view, visit https://review.coreboot.org/c/coreboot/+/35645
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ia25938ac5f6c29f60a4819023b99f7796849f574
Gerrit-Change-Number: 35645
Gerrit-PatchSet: 1
Gerrit-Owner: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-MessageType: newchange
Maxim Polyakov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44472 )
Change subject: util/intelp2m/snr: Remove incorrent GPO macro
......................................................................
util/intelp2m/snr: Remove incorrent GPO macro
GPIO Driver mode is used for configuration interrupt routing for
external devices through GPI. But there is no point in configuring
this for GPO and according to the changes in the project [1], this
patch removes the code to generate PAD_CFG_GPO_GPIO_DRIVER macro.
[1] Change-Id: I74c318897647836f4604a937543254f44b470433
Change-Id: Ibe7b787d455b638e70e54fb8b048c8aad8283037
Signed-off-by: Maxim Polyakov <max.senia.poliak(a)gmail.com>
---
M util/intelp2m/platforms/snr/macro.go
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/44472/1
diff --git a/util/intelp2m/platforms/snr/macro.go b/util/intelp2m/platforms/snr/macro.go
index 86cc7b7..3340ec0 100644
--- a/util/intelp2m/platforms/snr/macro.go
+++ b/util/intelp2m/platforms/snr/macro.go
@@ -213,11 +213,6 @@
dw0.CntrMaskFieldsClear(common.RxLevelEdgeConfigurationMask)
}
macro.Set("PAD_CFG")
- if macro.IsOwnershipDriver() {
- // PAD_CFG_GPO_GPIO_DRIVER(pad, val, rst, pull)
- macro.Add("_GPO_GPIO_DRIVER").Add("(").Id().Val().Rstsrc().Pull().Add("),")
- return
- }
if term != 0 {
// e.g. PAD_CFG_TERM_GPO(GPP_B23, 1, DN_20K, DEEP),
macro.Add("_TERM")
--
To view, visit https://review.coreboot.org/c/coreboot/+/44472
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ibe7b787d455b638e70e54fb8b048c8aad8283037
Gerrit-Change-Number: 44472
Gerrit-PatchSet: 1
Gerrit-Owner: Maxim Polyakov <max.senia.poliak(a)gmail.com>
Gerrit-MessageType: newchange
Maxim Polyakov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44466 )
Change subject: mb/intel/glkrvp: Undo set DRIVER for GPO
......................................................................
mb/intel/glkrvp: Undo set DRIVER for GPO
GPIO Driver mode is used for configuration interrupt routing for
external devices through GPI. But there is no point in configuring
this for GPO. This patch replaces the PAD_CFG_GPO_GPIO_DRIVER macro
with others that do not set the corresponding bit in the Host Software
Pad Ownership register.
Change-Id: Iac7d674e79e0caee467fc087e6d36192e84a12d8
Signed-off-by: Maxim Polyakov <max.senia.poliak(a)gmail.com>
---
M src/mainboard/intel/glkrvp/variants/baseboard/gpio.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/44466/1
diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c b/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c
index 56df526..d70a064 100644
--- a/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c
+++ b/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c
@@ -35,7 +35,7 @@
PAD_CFG_NF(GPIO_21, UP_20K, DEEP, NF2), /* CNV_MFUART2_RXD */
PAD_CFG_NF_IOSSTATE(GPIO_22, UP_20K, DEEP, NF2, TxDRxE), /* CNV_MFUART2_TXD */
PAD_CFG_NF(GPIO_23, UP_20K, DEEP, NF2), /* CNV_GNSS_PABLANKIt */
- PAD_CFG_GPO_GPIO_DRIVER(GPIO_24, 1, DEEP, DN_20K),
+ PAD_CFG_TERM_GPO(GPIO_24, 1, DN_20K, DEEP),
PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_25, 1, DEEP, UP_20K, TxLASTRxE, SAME),/*WWAN /RF_KILL_GPS*/
PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_26, UP_20K, DEEP, NF2, HIZCRx1, DISPUPD),/* NFC Interrupt */
PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_27, 1, DEEP, NONE, IGNORE, DISPUPD),/* RF_KILL_WiFi/WiFi_Disable */
--
To view, visit https://review.coreboot.org/c/coreboot/+/44466
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Iac7d674e79e0caee467fc087e6d36192e84a12d8
Gerrit-Change-Number: 44466
Gerrit-PatchSet: 1
Gerrit-Owner: Maxim Polyakov <max.senia.poliak(a)gmail.com>
Gerrit-MessageType: newchange
Maxim Polyakov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39764 )
Change subject: soc/intel/{apl,glk}: add options to configure GPU
......................................................................
soc/intel/{apl,glk}: add options to configure GPU
Adds options to select the primary GPU device and configure IGD, which
allows to override the appropriate FSP options in the SoC code. These
changes do not affect the configuration of the boards with the Apollo
Lake and Gemini Lake processors, because if these parameters are not
defined in the devicetree, they will be set to the default values.
Change-Id: I6e8013980259aadeb3a1fd504d31062ccb5ef7af
Signed-off-by: Maxim Polyakov <max.senia.poliak(a)gmail.com>
---
M src/soc/intel/apollolake/chip.h
M src/soc/intel/apollolake/romstage.c
2 files changed, 46 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/39764/1
diff --git a/src/soc/intel/apollolake/chip.h b/src/soc/intel/apollolake/chip.h
index c7fa3e7..8bea454 100644
--- a/src/soc/intel/apollolake/chip.h
+++ b/src/soc/intel/apollolake/chip.h
@@ -48,6 +48,39 @@
/* Common structure containing soc config data required by common code*/
struct soc_intel_common_config common_soc_config;
+ /* Select DVMT 5.0 Pre-Allocated (Fixed) Graphics Memory size */
+ enum {
+ DVMT_64MB = 2, /* Default */
+ DVMT_96MB,
+ DVMT_128MB,
+ DVMT_160MB,
+ DVMT_192MB,
+ DVMT_224MB,
+ DVMT_256MB,
+ DVMT_288MB,
+ DVMT_320MB,
+ DVMT_352MB,
+ DVMT_384MB,
+ DVMT_416MB,
+ DVMT_448MB,
+ DVMT_480MB,
+ DVMT_512MB,
+ } igd_dvmt_50_pre_alloc_size;
+
+ /* Select the Aperture Size for GPU device */
+ enum {
+ APERTURE_128MB = 1, /* Default */
+ APERTURE_256MB,
+ APERTURE_512MB,
+ } igd_aperture_size;
+
+ /* Select the GTT Size for GPU device */
+ enum {
+ GTT_2MB = 1,
+ GTT_4MB,
+ GTT_8MB, /* Default */
+ } igd_gtt_size;
+
/*
* Mapping from PCIe root port to CLKREQ input on the SOC. The SOC has
* four CLKREQ inputs, but six root ports. Root ports without an
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index 2efb520..5872e7a 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -264,10 +264,23 @@
static void soc_gpu_init_params(FSPM_UPD *mupd)
{
FSP_M_CONFIG *m_cfg = &mupd->FspmConfig;
+ const struct soc_intel_apollolake_config *soc_cfg = config_of_soc();
const struct device *dev = pcidev_path_on_root(SA_DEVFN_IGD);
if (dev && dev->enabled && CONFIG(ONBOARD_VGA_IS_PRIMARY) {
m_cfg->PrimaryVideoAdaptor = PRIMARY_IGD;
+ /*
+ * Override FSP settings for IGD only if they are set in the devicetree.
+ * Otherwise, the default values from UPD will be used for them
+ */
+ if (soc_cfg->igd_dvmt_50_pre_alloc_size)
+ m_cfg->IgdDvmt50PreAlloc = soc_cfg->igd_dvmt_50_pre_alloc_size;
+
+ if (soc_cfg->igd_aperture_size)
+ m_cfg->IgdApertureSize = soc_cfg->igd_aperture_size;
+
+ if (soc_cfg->igd_gtt_size)
+ m_cfg->GttSize = soc_cfg->igd_gtt_size;
} else {
m_cfg->PrimaryVideoAdaptor = PRIMARY_PCI;
}
--
To view, visit https://review.coreboot.org/c/coreboot/+/39764
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I6e8013980259aadeb3a1fd504d31062ccb5ef7af
Gerrit-Change-Number: 39764
Gerrit-PatchSet: 1
Gerrit-Owner: Maxim Polyakov <max.senia.poliak(a)gmail.com>
Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-MessageType: newchange