Josie Nordrum has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45045 )
Change subject: soc/amd/picasso: Move DRAM end to after transfer buffer
......................................................................
soc/amd/picasso: Move DRAM end to after transfer buffer
Move PSP_SHAREDMEM_DRAM_END after _etransfer_buffer to ensure that the
transfer buffer actually lives within the 32KiB that is supported to be
transferred
BUG=b:167243965
BRANCH=None
TEST=checked 'cbmem -1' for FMAP error after ec reboot
Change-Id: I9b482aced5deb40bd87d19d9c42585d8a6db5fc0
---
M src/soc/amd/picasso/memlayout_x86.ld
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/45045/1
diff --git a/src/soc/amd/picasso/memlayout_x86.ld b/src/soc/amd/picasso/memlayout_x86.ld
index 7930793..65c6cab 100644
--- a/src/soc/amd/picasso/memlayout_x86.ld
+++ b/src/soc/amd/picasso/memlayout_x86.ld
@@ -78,7 +78,6 @@
_transfer_buffer = .;
REGION(transfer_info, ., TRANSFER_INFO_SIZE, 4)
VBOOT2_WORK(., VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE)
- PSP_SHAREDMEM_DRAM_END(CONFIG_PSP_SHAREDMEM_BASE + CONFIG_PSP_SHAREDMEM_SIZE)
#endif
PRERAM_CBMEM_CONSOLE(., CONFIG_PRERAM_CBMEM_CONSOLE_SIZE)
@@ -86,6 +85,7 @@
FMAP_CACHE(., FMAP_SIZE)
#if CONFIG(VBOOT)
_etransfer_buffer = .;
+ PSP_SHAREDMEM_DRAM_END(CONFIG_PSP_SHAREDMEM_BASE + CONFIG_PSP_SHAREDMEM_SIZE)
#endif
_ = ASSERT((CONFIG_BOOTBLOCK_ADDR + CONFIG_C_ENV_BOOTBLOCK_SIZE - 0x10) == CONFIG_X86_RESET_VECTOR, "Reset vector should be -0x10 from end of bootblock");
_ = ASSERT(CONFIG_BOOTBLOCK_ADDR == ((CONFIG_BOOTBLOCK_ADDR + 0xFFFF) & 0xFFFF0000), "Bootblock must be 16 bit aligned");
--
To view, visit https://review.coreboot.org/c/coreboot/+/45045
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I9b482aced5deb40bd87d19d9c42585d8a6db5fc0
Gerrit-Change-Number: 45045
Gerrit-PatchSet: 1
Gerrit-Owner: Josie Nordrum <josienordrum(a)google.com>
Gerrit-MessageType: newchange
Hello build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth, Tim Wawrzynczak, Angel Pons, Arthur Heymans, Balaji Manigandan, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/44857
to look at the new patch set (#4).
Change subject: soc/intel/alderlake/bootblock: Do initial SoC commit till bootblock
......................................................................
soc/intel/alderlake/bootblock: Do initial SoC commit till bootblock
List of changes:
1. Add required SoC programming till bootblock
2. Include only required headers into include/soc
3. Add CPU/PCH/SA EDS document number and chapter number
4. Include ADL-P related DID, BDF
Signed-off-by: Subrata Banik <subrata.banik(a)intel.com>
Change-Id: I204e692fabb84fce297bebee465f4ca624c6fe56
---
A src/soc/intel/alderlake/Kconfig
A src/soc/intel/alderlake/Makefile.inc
A src/soc/intel/alderlake/bootblock/bootblock.c
A src/soc/intel/alderlake/bootblock/cpu.c
A src/soc/intel/alderlake/bootblock/pch.c
A src/soc/intel/alderlake/bootblock/report_platform.c
A src/soc/intel/alderlake/include/soc/bootblock.h
A src/soc/intel/alderlake/include/soc/espi.h
A src/soc/intel/alderlake/include/soc/iomap.h
A src/soc/intel/alderlake/include/soc/p2sb.h
A src/soc/intel/alderlake/include/soc/pch.h
A src/soc/intel/alderlake/include/soc/pci_devs.h
A src/soc/intel/alderlake/include/soc/pcr_ids.h
A src/soc/intel/alderlake/include/soc/pm.h
A src/soc/intel/alderlake/include/soc/smbus.h
15 files changed, 1,136 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/44857/4
--
To view, visit https://review.coreboot.org/c/coreboot/+/44857
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I204e692fabb84fce297bebee465f4ca624c6fe56
Gerrit-Change-Number: 44857
Gerrit-PatchSet: 4
Gerrit-Owner: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Balaji Manigandan <balaji.manigandan(a)intel.com>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Tim Wawrzynczak <twawrzynczak(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Subrata Banik <subi.banik(a)gmail.com>
Gerrit-MessageType: newpatchset
Hello Matthias Kaehlcke, Philip Chen, mturney mturney,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/44744
to review the following change.
Change subject: trogdor: Assert EN_PP3300_HUB
......................................................................
trogdor: Assert EN_PP3300_HUB
Some Trogdor variants power their USB hub from a PMIC LDO that is
already enabled by QcLib, and some have a discrete LDO that is
controlled by GPIO_84. For the latter, let's make sure we assert that
GPIO on boot.
Signed-off-by: Julius Werner <jwerner(a)chromium.org>
Change-Id: I9d206cd7154ded3bf179e68c2b1421d0a8ee89f2
---
M src/mainboard/google/trogdor/mainboard.c
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/44744/1
diff --git a/src/mainboard/google/trogdor/mainboard.c b/src/mainboard/google/trogdor/mainboard.c
index c82eaa0..4d6e352 100644
--- a/src/mainboard/google/trogdor/mainboard.c
+++ b/src/mainboard/google/trogdor/mainboard.c
@@ -12,6 +12,9 @@
static void setup_usb(void)
{
+ /* Assert EN_PP3300_HUB for those board variants that use it. */
+ gpio_output(GPIO(84), 1);
+
setup_usb_host0(&usb0_board_data);
}
--
To view, visit https://review.coreboot.org/c/coreboot/+/44744
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I9d206cd7154ded3bf179e68c2b1421d0a8ee89f2
Gerrit-Change-Number: 44744
Gerrit-PatchSet: 1
Gerrit-Owner: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Matthias Kaehlcke <mka(a)chromium.org>
Gerrit-Reviewer: Philip Chen <philipchen(a)chromium.org>
Gerrit-Reviewer: mturney mturney <mturney(a)codeaurora.org>
Gerrit-MessageType: newchange
Hello Philip Chen,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/44949
to review the following change.
Change subject: trogdor: Shuffle RAM and SKU ID pins (again)
......................................................................
trogdor: Shuffle RAM and SKU ID pins (again)
We're moving a lot of pins around on Trogdor again. For firmware this
only affects the RAM and SKU strapping ID pins. Since there are quite a
few of the old devices in circulation this time and some people seem to
care about mosys RAM information working, let's actually check the board
revision and support both cases this time.
Signed-off-by: Julius Werner <jwerner(a)chromium.org>
Change-Id: If7728d8ea4b7f6e7ff6721ade90f975f6efd5ddd
---
M src/mainboard/google/trogdor/boardid.c
1 file changed, 25 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/44949/1
diff --git a/src/mainboard/google/trogdor/boardid.c b/src/mainboard/google/trogdor/boardid.c
index c1a4892..f60dddbe 100644
--- a/src/mainboard/google/trogdor/boardid.c
+++ b/src/mainboard/google/trogdor/boardid.c
@@ -2,6 +2,7 @@
#include <boardid.h>
#include <gpio.h>
+#include <types.h>
uint32_t board_id(void)
{
@@ -15,14 +16,27 @@
return id;
}
+/* Whether a revision was built before or after the great pin migration of August 2020. */
+static bool use_old_pins(void)
+{
+ return ((CONFIG(BOARD_GOOGLE_TROGDOR) && board_id() < 2) ||
+ (CONFIG(BOARD_GOOGLE_LAZOR) && board_id() < 3) ||
+ (CONFIG(BOARD_GOOGLE_POMPOM) && board_id() < 1));
+}
+
uint32_t ram_code(void)
{
static uint32_t id = UNDEFINED_STRAPPING_ID;
- const gpio_t pins[] = {[2] = GPIO(13), [1] = GPIO(19), [0] = GPIO(29)};
+ const gpio_t old_pins[] = {[2] = GPIO(13), [1] = GPIO(19), [0] = GPIO(29)};
+ const gpio_t pins[] = {[2] = GPIO(5), [1] = GPIO(3), [0] = GPIO(1)};
- if (id == UNDEFINED_STRAPPING_ID)
- id = gpio_base2_value(pins, ARRAY_SIZE(pins));
+ if (id == UNDEFINED_STRAPPING_ID) {
+ if (use_old_pins())
+ id = gpio_base2_value(old_pins, ARRAY_SIZE(old_pins));
+ else
+ id = gpio_base2_value(pins, ARRAY_SIZE(pins));
+ }
return id;
}
@@ -31,10 +45,15 @@
{
static uint32_t id = UNDEFINED_STRAPPING_ID;
- const gpio_t pins[] = {[2] = GPIO(20), [1] = GPIO(90), [0] = GPIO(105)};
+ const gpio_t old_pins[] = {[2] = GPIO(20), [1] = GPIO(90), [0] = GPIO(105)};
+ const gpio_t pins[] = {[2] = GPIO(2), [1] = GPIO(90), [0] = GPIO(58)};
- if (id == UNDEFINED_STRAPPING_ID)
- id = gpio_base2_value(pins, ARRAY_SIZE(pins));
+ if (id == UNDEFINED_STRAPPING_ID) {
+ if (use_old_pins())
+ id = gpio_base2_value(old_pins, ARRAY_SIZE(old_pins));
+ else
+ id = gpio_base2_value(pins, ARRAY_SIZE(pins));
+ }
return id;
}
--
To view, visit https://review.coreboot.org/c/coreboot/+/44949
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: If7728d8ea4b7f6e7ff6721ade90f975f6efd5ddd
Gerrit-Change-Number: 44949
Gerrit-PatchSet: 1
Gerrit-Owner: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Philip Chen <philipchen(a)chromium.org>
Gerrit-MessageType: newchange