Marshall Dawson (marshalldawson3rd(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17846
-gerrit
commit d18b87181e78b29dea3c9b5b70b49016848248e8
Author: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Date: Thu Oct 20 12:43:15 2016 -0400
amd/gardenia: Clean up GPIO ASL
Remove the unused Name field. Its previous design generates an FWTS
error and a recommendation for changing it to Serialized.
Original-Signed-off-by: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Original-Reviewed-by: Marc Jones <marcj303(a)gmail.com>
(cherry picked from commit 1d970f1aa16c647e56a08c83f5719041882a2fc0)
Change-Id: I27748a4f84286e80043f516564ef64350ef3fef9
Signed-off-by: Marshall Dawson <marshalldawson3rd(a)gmail.com>
---
src/mainboard/amd/gardenia/acpi/carrizo_fch.asl | 30 +++++--------------------
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/src/mainboard/amd/gardenia/acpi/carrizo_fch.asl b/src/mainboard/amd/gardenia/acpi/carrizo_fch.asl
index 79f5420..a177306 100644
--- a/src/mainboard/amd/gardenia/acpi/carrizo_fch.asl
+++ b/src/mainboard/amd/gardenia/acpi/carrizo_fch.asl
@@ -1,7 +1,7 @@
/*
* This file is part of the coreboot project.
*
- * Copyright (C) 2015 Advanced Micro Devices, Inc.
+ * Copyright (C) 2015-2016 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
@@ -18,31 +18,13 @@ Device(GPIO) {
Name (_CID, "AMD0030")
Name(_UID, 0)
- Method (_CRS, 0x0, NotSerialized) {
- Name (RBUF, ResourceTemplate () {
- //
- // Interrupt resource. In this example, banks 0 & 1 share the same
- // interrupt to the parent controller and similarly banks 2 & 3.
- //
- // N.B. The definition below is chosen for an arbitrary
- // test platform. It needs to be changed to reflect the hardware
- // configuration of the actual platform
- //
- Interrupt(ResourceConsumer, Level, ActiveLow, Shared, , , ) {7}
-
- //
- // Memory resource. The definition below is chosen for an arbitrary
- // test platform. It needs to be changed to reflect the hardware
- // configuration of the actual platform.
- //
- Memory32Fixed(ReadWrite, 0xFED81500, 0x300)
- })
-
- Return (RBUF)
- }
+ Name(_CRS, ResourceTemplate() {
+ Interrupt(ResourceConsumer, Level, ActiveLow, Shared, , , ) {7}
+ Memory32Fixed(ReadWrite, 0xFED81500, 0x300)
+ })
Method (_STA, 0x0, NotSerialized) {
- Return (0x0F)
+ Return (0x0F)
}
}
Marshall Dawson (marshalldawson3rd(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17227
-gerrit
commit 8eab962fb5dafb03436d26efcdc3c4659a163085
Author: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Date: Tue Oct 11 14:19:07 2016 -0400
amd/gardenia: Enable LPC decodes
Turn on LPC decoding in romstage.
Original-Signed-off-by: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Original-Reviewed-by: Marc Jones <marcj303(a)gmail.com>
(cherry picked from commit 5d9dae5a1fdab1bf6c418dc7e6de28069bd342dc)
Change-Id: I937eb5c5b6c6a9f7a13ebd0bec7fcc8d789427ce
Signed-off-by: Marc Jones <marcj303(a)gmail.com>
---
src/mainboard/amd/gardenia/romstage.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mainboard/amd/gardenia/romstage.c b/src/mainboard/amd/gardenia/romstage.c
index c3e2aa4..eca9d3b 100644
--- a/src/mainboard/amd/gardenia/romstage.c
+++ b/src/mainboard/amd/gardenia/romstage.c
@@ -1,7 +1,7 @@
/*
* This file is part of the coreboot project.
*
- * Copyright (C) 2015 Advanced Micro Devices, Inc.
+ * Copyright (C) 2015-2016 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
@@ -33,8 +33,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
#endif
amd_initmmio();
-
hudson_lpc_port80();
+ hudson_lpc_decode();
if (!cpu_init_detectedx && boot_cpu()) {
post_code(0x30);
Marshall Dawson (marshalldawson3rd(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17223
-gerrit
commit d42e5ed088b35d9b6f8359621c20a40fa00e2f13
Author: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Date: Thu Oct 13 11:41:50 2016 -0400
amd/gardenia: Update xHCI configuration
Remove a duplicated check and setting for xHCI during the
AMD_INIT_RESET callout. This is handled by the wrapper. Also
remove nearby commented code. EcChannel0 is not a member of
FCH_RESET_DATA_BLOCK.
Leave the check in AMD_INIT_ENV. Although AGESA honors what
was previously requested, additional settings depend on the
state of Usb.Xhci0Enable.
Original-Signed-off-by: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Original-Reviewed-by: Marc Jones <marcj303(a)gmail.com>
(cherry picked from commit ca862fbacbe80b1345ad6f23262a9769f05c50fd)
Change-Id: I45a5123e158cd7399d6d286999371d4a0e0fa963
Signed-off-by: Marc Jones <marcj303(a)gmail.com>
---
src/mainboard/amd/gardenia/BiosCallOuts.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/mainboard/amd/gardenia/BiosCallOuts.c b/src/mainboard/amd/gardenia/BiosCallOuts.c
index df9139f..32b1fec 100644
--- a/src/mainboard/amd/gardenia/BiosCallOuts.c
+++ b/src/mainboard/amd/gardenia/BiosCallOuts.c
@@ -76,9 +76,6 @@ AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
if (StdHeader->Func == AMD_INIT_RESET) {
FCH_RESET_DATA_BLOCK *FchParams_reset = (FCH_RESET_DATA_BLOCK *)FchData;
printk(BIOS_DEBUG, "Fch OEM config in INIT RESET ");
- //FchParams_reset->EcChannel0 = TRUE; /* logical devicd 3 */
- FchParams_reset->FchReset.Xhci0Enable = IS_ENABLED(CONFIG_HUDSON_XHCI_ENABLE);
- FchParams_reset->FchReset.Xhci1Enable = FALSE;
FchParams_reset->EarlyOemGpioTable = oem_gardenia_gpio;
} else if (StdHeader->Func == AMD_INIT_ENV) {
FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;
Marshall Dawson (marshalldawson3rd(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17221
-gerrit
commit af1809aa421471938faaf2bd062cb5e3de24a179
Author: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Date: Sat Oct 8 10:14:14 2016 -0600
amd/gardenia: Remove board ID capability
Remove the last bit of Bettong board_id checking from Gardenia.
Original-Signed-off-by: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Original-Reviewed-by: Marc Jones <marcj303(a)gmail.com>
(cherry picked from commit b617823d1d2860a3f6d766a40ae95e5486739a5c)
Change-Id: Ibc56dbbfa1b15b21ebadb9f6c9c54936566a2986
Signed-off-by: Marc Jones <marcj303(a)gmail.com>
---
src/mainboard/amd/gardenia/Makefile.inc | 2 --
src/mainboard/amd/gardenia/boardid.c | 48 ---------------------------------
2 files changed, 50 deletions(-)
diff --git a/src/mainboard/amd/gardenia/Makefile.inc b/src/mainboard/amd/gardenia/Makefile.inc
index 99159e8..0994a70 100644
--- a/src/mainboard/amd/gardenia/Makefile.inc
+++ b/src/mainboard/amd/gardenia/Makefile.inc
@@ -15,11 +15,9 @@
romstage-y += BiosCallOuts.c
romstage-y += OemCustomize.c
-romstage-y += boardid.c
ramstage-y += BiosCallOuts.c
ramstage-y += OemCustomize.c
ifeq ($(CONFIG_HUDSON_IMC_FWM), y)
ramstage-y += fchec.c
endif
-ramstage-y += boardid.c
diff --git a/src/mainboard/amd/gardenia/boardid.c b/src/mainboard/amd/gardenia/boardid.c
deleted file mode 100644
index e2e8162..0000000
--- a/src/mainboard/amd/gardenia/boardid.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2015 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
- * 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.
- */
-
-#include <stdint.h>
-#include <arch/io.h>
-#include <boardid.h>
-
-/**
- *Gardenia uses 3 GPIO(5-7) pins to identify board.
- *The GPIO ports are mapped to MMIO space.
- *The GPIO value and board version are mapped as follow:
- *GPIO5 GPIO6 GPIO7 Version
- * 0 0 0 A
- * 0 0 1 B
- * ......
- * 1 1 1 H
- */
-uint8_t board_id(void)
-{
- void *gpiommioaddr;
- u8 value = 0;
- u8 boardrev = 0;
- char boardid;
-
- gpiommioaddr = (void *)0xfed80000ul + 0x1500;
- value = read8(gpiommioaddr + (7 << 2) + 2); /* agpio7: board_id2 */
- boardrev = value & 1;
- value = read8(gpiommioaddr + (6 << 2) + 2); /* agpio6: board_id1 */
- boardrev |= (value & 1) << 1;
- value = read8(gpiommioaddr + (5 << 2) + 2); /* agpio5: board_id0 */
- boardrev |= (value & 1) << 2;
-
- boardid = 'A' + boardrev;
-
- return boardid;
-}