Attention is currently required from: Kapil Porwal, Nick Vaccaro, Subrata Banik.
Hello Kapil Porwal, Nick Vaccaro, Subrata Banik,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/80504?usp=email
to look at the new patch set (#3).
Change subject: soc/intel/alderlake: Remove CNVi assertions
......................................................................
soc/intel/alderlake: Remove CNVi assertions
In alderlake, the checks for CNVi functionality is in an assertion,
which causes the boot to stop if there is a mismatch. However, in the
meteorlake code, if we don't detect CNVi is enabled, it just disables
the CNVi wifi, bluetooth, etc. This seems to make sense and allows us
to enable CNVi bluetooth when necessary.
BUG=b:325084796
BRANCH=None
TEST=test image on both SKU1 and SKU2 and make sure that BT devices
are enumerated. Also, make sure that we can boot on both SKUs.
Change-Id: I822a4e360fde100b8289cacf10a01f6d97facbb4
Signed-off-by: Shelley Chen <shchen(a)google.com>
---
M src/soc/intel/alderlake/fsp_params.c
1 file changed, 13 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/80504/3
--
To view, visit https://review.coreboot.org/c/coreboot/+/80504?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I822a4e360fde100b8289cacf10a01f6d97facbb4
Gerrit-Change-Number: 80504
Gerrit-PatchSet: 3
Gerrit-Owner: Shelley Chen <shchen(a)google.com>
Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Attention: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-MessageType: newpatchset
Attention is currently required from: Arthur Heymans, Felix Held.
Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80409?usp=email )
Change subject: include/device/device: drop unused soft_reserved_ram_resource macro
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/80409?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I6b454175c6530e539aa24dffb771368b0aea6da9
Gerrit-Change-Number: 80409
Gerrit-PatchSet: 3
Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Comment-Date: Wed, 14 Feb 2024 22:55:23 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Shelley Chen has uploaded a new patch set (#2). ( https://review.coreboot.org/c/coreboot/+/80505?usp=email )
Change subject: Revert "mb/google/brox: Remove CNVi Bluetooth"
......................................................................
Revert "mb/google/brox: Remove CNVi Bluetooth"
This reverts commit 94af3e551b250375b44050fdafd79f7e9f16f361.
With the fix in CB:80504, we can put this back in now in order to
enabled bluetooth.
BUG=b:319188820,b:325084796
BRANCH=None
TEST=emerge-brox coreboot chromeos-bootimage make sure we can boot to
kernel on both SKU1 and SKU2. Also, make sure that BT is
enumerated on SKU2 and SKU1.
Change-Id: I99ee088c060aafe461c93cf3a83b28f7b14a6f97
Signed-off-by: Shelley Chen <shchen(a)google.com>
---
M src/mainboard/google/brox/variants/baseboard/brox/devicetree.cb
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/80505/2
--
To view, visit https://review.coreboot.org/c/coreboot/+/80505?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I99ee088c060aafe461c93cf3a83b28f7b14a6f97
Gerrit-Change-Number: 80505
Gerrit-PatchSet: 2
Gerrit-Owner: Shelley Chen <shchen(a)google.com>
Gerrit-MessageType: newpatchset
Shelley Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80504?usp=email )
Change subject: soc/intel/alderlake: Fix CNVi assertions
......................................................................
soc/intel/alderlake: Fix CNVi assertions
In alderlake, the checks for CNVi functionality is in an assertion,
which causes the boot to stop if there is a mismatch. However, in the
meteorlake code, if we don't detect CNVi is enabled, it just disables
the CNVi wifi, bluetooth, etc. This seems to make sense and allows us
to enable CNVi bluetooth when necessary.
BUG=b:325084796
BRANCH=None
TEST=test image on both SKU1 and SKU2 and make sure that BT devices
are enumerated. Also, make sure that we can boot on both SKUs.
Change-Id: I822a4e360fde100b8289cacf10a01f6d97facbb4
Signed-off-by: Shelley Chen <shchen(a)google.com>
---
M src/soc/intel/alderlake/fsp_params.c
1 file changed, 13 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/80504/1
diff --git a/src/soc/intel/alderlake/fsp_params.c b/src/soc/intel/alderlake/fsp_params.c
index 5edfbcc..adcaafd 100644
--- a/src/soc/intel/alderlake/fsp_params.c
+++ b/src/soc/intel/alderlake/fsp_params.c
@@ -832,10 +832,19 @@
s_cfg->CnviMode = is_devfn_enabled(PCH_DEVFN_CNVI_WIFI);
s_cfg->CnviBtCore = config->cnvi_bt_core;
s_cfg->CnviBtAudioOffload = config->cnvi_bt_audio_offload;
- /* Assert if CNVi BT is enabled without CNVi being enabled. */
- assert(s_cfg->CnviMode || !s_cfg->CnviBtCore);
- /* Assert if CNVi BT offload is enabled without CNVi BT being enabled. */
- assert(s_cfg->CnviBtCore || !s_cfg->CnviBtAudioOffload);
+ if (!s_cfg->CnviMode && s_cfg->CnviWifiCore) {
+ printk(BIOS_ERR, "CNVi WiFi is enabled without CNVi being enabled\n");
+ s_cfg->CnviWifiCore = 0;
+ }
+ if (!s_cfg->CnviBtCore && s_cfg->CnviBtAudioOffload) {
+ printk(BIOS_ERR, "BT offload is enabled without CNVi BT being enabled\n");
+ s_cfg->CnviBtAudioOffload = 0;
+ }
+ if (!s_cfg->CnviMode && s_cfg->CnviBtCore) {
+ printk(BIOS_ERR, "CNVi BT is enabled without CNVi being enabled\n");
+ s_cfg->CnviBtCore = 0;
+ s_cfg->CnviBtAudioOffload = 0;
+ }
}
static void fill_fsps_vmd_params(FSP_S_CONFIG *s_cfg,
--
To view, visit https://review.coreboot.org/c/coreboot/+/80504?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I822a4e360fde100b8289cacf10a01f6d97facbb4
Gerrit-Change-Number: 80504
Gerrit-PatchSet: 1
Gerrit-Owner: Shelley Chen <shchen(a)google.com>
Gerrit-MessageType: newchange