Richard Spiegel has uploaded this change for review. ( https://review.coreboot.org/23575
Change subject: soc/amd/stoneyridge/acpi/sleepstates.asl: Fix guarded code
......................................................................
soc/amd/stoneyridge/acpi/sleepstates.asl: Fix guarded code
Remove #if statement and replace it with if(IS_ENABLED(...)) per coreboot
recommendations.
BUG=b:62200858
TEST=Build kahlee.
Change-Id: I268b228706a625e1415c4f24e808261c279ba41e
Signed-off-by: Richard Spiegel <richard.spiegel(a)silverbackltd.com>
---
M src/soc/amd/stoneyridge/acpi/sleepstates.asl
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/23575/1
diff --git a/src/soc/amd/stoneyridge/acpi/sleepstates.asl b/src/soc/amd/stoneyridge/acpi/sleepstates.asl
index 2f36738..bdca91e 100644
--- a/src/soc/amd/stoneyridge/acpi/sleepstates.asl
+++ b/src/soc/amd/stoneyridge/acpi/sleepstates.asl
@@ -3,6 +3,7 @@
*
* Copyright (C) 2007-2009 coresystems GmbH
* Copyright (C) 2011 The ChromiumOS Authors. All rights reserved.
+ * Copyright (C) 2018 Advanced Micro Devices, Inc.
*
* 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
@@ -15,11 +16,10 @@
*/
/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
-#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
-Name (SSFG, 0x0D)
-#else
-Name (SSFG, 0x09)
-#endif
+Name(SSFG, 0x09)
+if (IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)) {
+ Store(0x0D, SSFG)
+}
/* Supported sleep states: */
Name(\_S0, Package () {0x00, 0x00, 0x00, 0x00} ) /* (S0) - working state */
--
To view, visit https://review.coreboot.org/23575
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I268b228706a625e1415c4f24e808261c279ba41e
Gerrit-Change-Number: 23575
Gerrit-PatchSet: 1
Gerrit-Owner: Richard Spiegel <richard.spiegel(a)silverbackltd.com>
Richard Spiegel has uploaded this change for review. ( https://review.coreboot.org/23574
Change subject: soc/amd/stoneyridge/acpi/sb_pci0_fch.asl: Fix guarded code
......................................................................
soc/amd/stoneyridge/acpi/sb_pci0_fch.asl: Fix guarded code
Remove #if statements and replace them with if(IS_ENABLED(...)) per coreboot
recommendations. The if conditional on CONFIG_ACPI_ENABLE_THERMAL_ZONE will
be moved to procedure ITZE() inside AmdImc.asl.
BUG=b:62200858
TEST=Build kahlee.
Change-Id: I3a518e4b76a5124d4b860d03d33878d145d0c1de
Signed-off-by: Richard Spiegel <richard.spiegel(a)silverbackltd.com>
---
M src/soc/amd/stoneyridge/acpi/AmdImc.asl
M src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
2 files changed, 37 insertions(+), 36 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/74/23574/1
diff --git a/src/soc/amd/stoneyridge/acpi/AmdImc.asl b/src/soc/amd/stoneyridge/acpi/AmdImc.asl
index 519b05c..8fcdb54 100644
--- a/src/soc/amd/stoneyridge/acpi/AmdImc.asl
+++ b/src/soc/amd/stoneyridge/acpi/AmdImc.asl
@@ -1,7 +1,7 @@
/*
* This file is part of the coreboot project.
*
- * Copyright (C) 2015 Advanced Micro Devices, Inc.
+ * Copyright (C) 2015-2018 Advanced Micro Devices, Inc.
*
* 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
@@ -32,33 +32,38 @@
Method(WACK, 0)
{
- Store(0, Local0)
- While (LNotEqual(Local0, 0xFA)) {
- Store(MRG0, Local0)
- Sleep(10)
+ if (IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)) {
+ Store(0, Local0)
+ While (LNotEqual(Local0, 0xFA)) {
+ Store(MRG0, Local0)
+ Sleep(10)
+ }
}
}
//Init
Method (ITZE, 0)
{
- Store(0, MRG0)
- Store(0xB5, MRG1)
- Store(0, MRG2)
- Store(0x96, MSTI)
- WACK()
+ if (LAnd(IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM),
+ IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE))) {
+ Store(0, MRG0)
+ Store(0xB5, MRG1)
+ Store(0, MRG2)
+ Store(0x96, MSTI)
+ WACK()
- Store(0, MRG0)
- Store(0, MRG1)
- Store(0, MRG2)
- Store(0x80, MSTI)
- WACK()
+ Store(0, MRG0)
+ Store(0, MRG1)
+ Store(0, MRG2)
+ Store(0x80, MSTI)
+ WACK()
- Or(MRG2, 0x01, Local0)
+ Or(MRG2, 0x01, Local0)
- Store(0, MRG0)
- Store(0, MRG1)
- Store(Local0, MRG2)
- Store(0x81, MSTI)
- WACK()
+ Store(0, MRG0)
+ Store(0, MRG1)
+ Store(Local0, MRG2)
+ Store(0x81, MSTI)
+ WACK()
+ }
}
diff --git a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
index ad7326c..af9323c 100644
--- a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
+++ b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
@@ -1,7 +1,7 @@
/*
* This file is part of the coreboot project.
*
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
+ * Copyright (C) 2011-2018 Advanced Micro Devices, Inc.
* Copyright (C) 2013 Sage Electronic Engineering, LLC
*
* This program is free software; you can redistribute it and/or modify
@@ -130,9 +130,13 @@
Return(CRES) /* note to change the Name buffer */
} /* end of Method(_SB.PCI0._CRS) */
-#if IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)
- #include "acpi/AmdImc.asl"
-#endif
+/*
+ * You can't use if (IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)) outside a
+ * method, thus the file has to be permanently included and the
+ * if (IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)) moved to every method
+ * within the file.
+ */
+#include "acpi/AmdImc.asl"
/*
*
@@ -159,17 +163,9 @@
/* Determine the OS we're running on */
OSFL()
-/*
- * This is an ugly temporary construction part of a group of commits that
- * will remove all #if from ASL files. This message plus this temporary
- * construction will be removed in next commit from the series, its sole
- * purpose to facilitate next commit.
- */
-#if IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)
-#if IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE)
- ITZE() /* enable IMC Fan Control*/
-#endif
-#endif
+ if (IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)) {
+ ITZE() /* enable IMC Fan Control*/
+ }
} /* End Method(_SB._INI) */
Method(OSFL, 0){
--
To view, visit https://review.coreboot.org/23574
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a518e4b76a5124d4b860d03d33878d145d0c1de
Gerrit-Change-Number: 23574
Gerrit-PatchSet: 1
Gerrit-Owner: Richard Spiegel <richard.spiegel(a)silverbackltd.com>
Richard Spiegel has uploaded this change for review. ( https://review.coreboot.org/23573
Change subject: soc/amd/stoneyridge/acpi/sb_pci0_fch.asl: Fix instability
......................................................................
soc/amd/stoneyridge/acpi/sb_pci0_fch.asl: Fix instability
A file that has several methods cannot be included inside a method. It has
to be included inside a scope, but not inside a method or it'll cause
problems (instability).
BUG=b:62200858
TEST=Build kahlee.
Change-Id: If6c877df5a87df1b348de92868b91eed4a76de55
Signed-off-by: Richard Spiegel <richard.spiegel(a)silverbackltd.com>
---
M src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
1 file changed, 10 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/23573/1
diff --git a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
index 216b57c..ad7326c 100644
--- a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
+++ b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
@@ -130,6 +130,10 @@
Return(CRES) /* note to change the Name buffer */
} /* end of Method(_SB.PCI0._CRS) */
+#if IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)
+ #include "acpi/AmdImc.asl"
+#endif
+
/*
*
* FIRST METHOD CALLED UPON BOOT
@@ -155,9 +159,13 @@
/* Determine the OS we're running on */
OSFL()
+/*
+ * This is an ugly temporary construction part of a group of commits that
+ * will remove all #if from ASL files. This message plus this temporary
+ * construction will be removed in next commit from the series, its sole
+ * purpose to facilitate next commit.
+ */
#if IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)
- /* TODO: It is unstable. */
- #include "acpi/AmdImc.asl"
#if IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE)
ITZE() /* enable IMC Fan Control*/
#endif
--
To view, visit https://review.coreboot.org/23573
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: If6c877df5a87df1b348de92868b91eed4a76de55
Gerrit-Change-Number: 23573
Gerrit-PatchSet: 1
Gerrit-Owner: Richard Spiegel <richard.spiegel(a)silverbackltd.com>
Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/23572
Change subject: google/lars: Turn on keyboard backlight in romstage
......................................................................
google/lars: Turn on keyboard backlight in romstage
Cherry-pick from Chromium:
a60ac10 [Lars: Turn on keyboard backlight in romstage]
Use the keyboard backlight to provide indication that the system is
booting. This is useful for determining that a system is in S0 and
is running BIOS code.
TEST=boot on Lars and see keyboard backlight come on early
Original-Change-Id: I4fede6cff85f4487cedfbccf6cc24c6380d905e0
Original-Signed-off-by: Jenny TC <jenny.tc(a)intel.com>
Original-Tested-by: Divagar Mohandass <divagar.mohandass(a)intel.com>
Original-Reviewed-by: Duncan Laurie <dlaurie(a)chromium.org>
Change-Id: I4b1fed10d9bd1ae1b265e848417836f816f252f3
Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com>
---
M src/mainboard/google/lars/romstage.c
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/23572/1
diff --git a/src/mainboard/google/lars/romstage.c b/src/mainboard/google/lars/romstage.c
index 926be87..b3ef0d8 100644
--- a/src/mainboard/google/lars/romstage.c
+++ b/src/mainboard/google/lars/romstage.c
@@ -17,6 +17,7 @@
#include <string.h>
#include <gpio.h>
+#include <ec/google/chromeec/ec.h>
#include <soc/pei_data.h>
#include <soc/pei_wrapper.h>
#include <soc/romstage.h>
@@ -33,6 +34,10 @@
GPIO_MEM_CONFIG_3,
};
+ /* Turn on keyboard backlight to indicate we are booting */
+ if (params->power_state->prev_sleep_state != ACPI_S3)
+ google_chromeec_kbbacklight(25);
+
params->pei_data->mem_cfg_id = gpio_base2_value(spd_gpios,
ARRAY_SIZE(spd_gpios));
/* Fill out PEI DATA */
--
To view, visit https://review.coreboot.org/23572
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b1fed10d9bd1ae1b265e848417836f816f252f3
Gerrit-Change-Number: 23572
Gerrit-PatchSet: 1
Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Jenny Tc <jenny.tc(a)intel.com>
Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/23570
Change subject: google/lars: Update the MAINBOARD_FAMILY string in Kconfig
......................................................................
google/lars: Update the MAINBOARD_FAMILY string in Kconfig
Cherry-pick from Chromium:
99cd8f8 [lars: Update the MAINBOARD_FAMILY string in Kconfig]
This string was left at the default for kunimitsu and should be
updated to indicate the proper mainboard.
Original-Change-Id: Icc0e162d57242e7b0610fb570ef1a8a45ee16e4f
Original-Signed-off-by: Duncan Laurie <dlaurie(a)chromium.org>
Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Change-Id: Ia4b70227c8cfdfe939e40ea6258d494337a2907b
Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com>
---
M src/mainboard/google/lars/Kconfig
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/23570/1
diff --git a/src/mainboard/google/lars/Kconfig b/src/mainboard/google/lars/Kconfig
index cda4b53..fdcc7ab 100644
--- a/src/mainboard/google/lars/Kconfig
+++ b/src/mainboard/google/lars/Kconfig
@@ -40,7 +40,7 @@
config MAINBOARD_FAMILY
string
- default "Intel_Kunimitsu"
+ default "Google_Lars"
config MAX_CPUS
int
--
To view, visit https://review.coreboot.org/23570
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4b70227c8cfdfe939e40ea6258d494337a2907b
Gerrit-Change-Number: 23570
Gerrit-PatchSet: 1
Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Duncan Laurie <dlaurie(a)chromium.org>