GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/intel/gm45: Enable 64bit support 

This patch does the following:
- Allow selecting 64bit from Kconfig
- Fix up integer to pointer conversion that gcc complains about
- Add a buildtest target in configs

Tested on Thinkpad X200: boots fine to the payload

Change-Id: Icb9c31a28ee231b87109b19c00ce2f8b48b5aefe
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/64095
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Arthur Heymans 2022-05-06 12:22:32 +02:00
parent cc0b4527a6
commit 98435ed07a
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/config.lenovo_t400_vboot_and_debug
View File

@ -12,3 +12,4 @@ CONFIG_DEBUG_BOOT_STATE=y
CONFIG_DEBUG_ADA_CODE=y CONFIG_DEBUG_ADA_CODE=y
CONFIG_H8_FN_KEY_AS_VBOOT_RECOVERY_SW=y CONFIG_H8_FN_KEY_AS_VBOOT_RECOVERY_SW=y
CONFIG_VBOOT=y CONFIG_VBOOT=y
CONFIG_USE_EXP_X86_64_SUPPORT=y

1
src/northbridge/intel/gm45/Kconfig
View File

@ -12,6 +12,7 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS
select INTEL_EDID select INTEL_EDID
select INTEL_GMA_ACPI select INTEL_GMA_ACPI
select INTEL_GMA_SSC_ALTERNATE_REF select INTEL_GMA_SSC_ALTERNATE_REF
select HAVE_EXP_X86_64_SUPPORT
config VBOOT config VBOOT
select VBOOT_STARTS_IN_BOOTBLOCK select VBOOT_STARTS_IN_BOOTBLOCK

2
src/northbridge/intel/gm45/northbridge.c
View File

@ -92,7 +92,7 @@ static void mch_domain_read_resources(struct device *dev)
/* cbmem_top can be shifted downwards due to alignment. /* cbmem_top can be shifted downwards due to alignment.
Mark the region between cbmem_top and tomk as unusable */ Mark the region between cbmem_top and tomk as unusable */
delta_cbmem = tomk - ((uint32_t)cbmem_top() >> 10); delta_cbmem = tomk - ((uintptr_t)cbmem_top() >> 10);
tomk -= delta_cbmem; tomk -= delta_cbmem;
uma_sizek += delta_cbmem; uma_sizek += delta_cbmem;

10
src/northbridge/intel/gm45/raminit.c
View File

@ -1577,15 +1577,15 @@ static void jedec_init(const timings_t *const timings,
const u32 rankaddr = raminit_get_rank_addr(ch, r); const u32 rankaddr = raminit_get_rank_addr(ch, r);
printk(BIOS_DEBUG, "JEDEC init @0x%08x\n", rankaddr); printk(BIOS_DEBUG, "JEDEC init @0x%08x\n", rankaddr);
mchbar_clrsetbits32(DCC_MCHBAR, DCC_SET_EREG_MASK, DCC_SET_EREGx(2)); mchbar_clrsetbits32(DCC_MCHBAR, DCC_SET_EREG_MASK, DCC_SET_EREGx(2));
read32((u32 *)(rankaddr | WL)); read32p(rankaddr | WL);
mchbar_clrsetbits32(DCC_MCHBAR, DCC_SET_EREG_MASK, DCC_SET_EREGx(3)); mchbar_clrsetbits32(DCC_MCHBAR, DCC_SET_EREG_MASK, DCC_SET_EREGx(3));
read32((u32 *)rankaddr); read32p(rankaddr);
mchbar_clrsetbits32(DCC_MCHBAR, DCC_SET_EREG_MASK, DCC_SET_EREGx(1)); mchbar_clrsetbits32(DCC_MCHBAR, DCC_SET_EREG_MASK, DCC_SET_EREGx(1));
read32((u32 *)(rankaddr | ODT_120OHMS | ODS_34OHMS)); read32p(rankaddr | ODT_120OHMS | ODS_34OHMS);
mchbar_clrsetbits32(DCC_MCHBAR, DCC_CMD_MASK, DCC_SET_MREG); mchbar_clrsetbits32(DCC_MCHBAR, DCC_CMD_MASK, DCC_SET_MREG);
read32((u32 *)(rankaddr | WR | DLL1 | CAS | INTERLEAVED)); read32p(rankaddr | WR | DLL1 | CAS | INTERLEAVED);
mchbar_clrsetbits32(DCC_MCHBAR, DCC_CMD_MASK, DCC_SET_MREG); mchbar_clrsetbits32(DCC_MCHBAR, DCC_CMD_MASK, DCC_SET_MREG);
read32((u32 *)(rankaddr | WR | CAS | INTERLEAVED)); read32p(rankaddr | WR | CAS | INTERLEAVED);
} }
} }

12
src/northbridge/intel/gm45/raminit_read_write_training.c
View File

@ -96,7 +96,7 @@ static int read_training_test(const int channel, const int lane,
for (i = 0; i < addresses->count; ++i) { for (i = 0; i < addresses->count; ++i) {
unsigned int offset; unsigned int offset;
for (offset = lane_offset; offset < 320; offset += 8) { for (offset = lane_offset; offset < 320; offset += 8) {
const u32 read = read32((u32 *)(addresses->addr[i] + offset)); const u32 read = read32p(addresses->addr[i] + offset);
const u32 good = read_training_schedule[offset >> 3]; const u32 good = read_training_schedule[offset >> 3];
if ((read & lane_mask) != (good & lane_mask)) if ((read & lane_mask) != (good & lane_mask))
return 0; return 0;
@ -211,7 +211,7 @@ static void perform_read_training(const dimminfo_t *const dimms)
/* Write test pattern. */ /* Write test pattern. */
unsigned int offset; unsigned int offset;
for (offset = 0; offset < 320; offset += 4) for (offset = 0; offset < 320; offset += 4)
write32((u32 *)(addresses.addr[i] + offset), write32p(addresses.addr[i] + offset,
read_training_schedule[offset >> 3]); read_training_schedule[offset >> 3]);
} }
@ -419,18 +419,18 @@ static int write_training_test(const address_bunch_t *const addresses,
unsigned int off; unsigned int off;
for (off = 0; off < 640; off += 8) { for (off = 0; off < 640; off += 8) {
const u32 pattern = write_training_schedule[off >> 3]; const u32 pattern = write_training_schedule[off >> 3];
write32((u32 *)(addr + off), pattern); write32p(addr + off, pattern);
write32((u32 *)(addr + off + 4), pattern); write32p(addr + off + 4, pattern);
} }
mchbar_setbits8(0x78, 1); mchbar_setbits8(0x78, 1);
for (off = 0; off < 640; off += 8) { for (off = 0; off < 640; off += 8) {
const u32 good = write_training_schedule[off >> 3]; const u32 good = write_training_schedule[off >> 3];
const u32 read1 = read32((u32 *)(addr + off)); const u32 read1 = read32p(addr + off);
if ((read1 & masks[0]) != (good & masks[0])) if ((read1 & masks[0]) != (good & masks[0]))
goto _bad_timing_out; goto _bad_timing_out;
const u32 read2 = read32((u32 *)(addr + off + 4)); const u32 read2 = read32p(addr + off + 4);
if ((read2 & masks[1]) != (good & masks[1])) if ((read2 & masks[1]) != (good & masks[1]))
goto _bad_timing_out; goto _bad_timing_out;
} }

2
src/northbridge/intel/gm45/raminit_receive_enable_calibration.c
View File

@ -128,7 +128,7 @@ static int read_dqs_level(const int channel, const int lane)
mchbar_setbits32(mchbar, 1 << 9); mchbar_setbits32(mchbar, 1 << 9);
/* Read from this channel. */ /* Read from this channel. */
read32((u32 *)raminit_get_rank_addr(channel, 0)); read32p(raminit_get_rank_addr(channel, 0));
mchbar = 0x14b0 + (channel * 0x0100) + ((7 - lane) * 4); mchbar = 0x14b0 + (channel * 0x0100) + ((7 - lane) * 4);
return mchbar_read32(mchbar) & (1 << 30); return mchbar_read32(mchbar) & (1 << 30);