From 17ad4598e9d3d302cc45c86a8e11aac62928c83c Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Mon, 6 Aug 2018 15:35:28 +0200 Subject: nb/intel/*: Account for cbmem_top alignment Having cbmem floating between two ram regions is a bad idea and some payloads (e.g. tianocore) even bail out on this. To overcome this issue mark the region between tom and cbmem as uma. Change-Id: Ifab37b0003f09a680024d5b155ab0bb157920952 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/27871 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/northbridge/intel/x4x/northbridge.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/northbridge/intel/x4x/northbridge.c') diff --git a/src/northbridge/intel/x4x/northbridge.c b/src/northbridge/intel/x4x/northbridge.c index d1926b29f9..bc7a5b39ae 100644 --- a/src/northbridge/intel/x4x/northbridge.c +++ b/src/northbridge/intel/x4x/northbridge.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -35,7 +36,7 @@ static void mch_domain_read_resources(struct device *dev) { u8 index, reg8; u64 tom, touud; - u32 tomk, tseg_sizek = 0, tolud; + u32 tomk, tseg_sizek = 0, tolud, delta_cbmem; u32 pcie_config_base, pcie_config_size; u32 uma_sizek = 0; @@ -100,6 +101,15 @@ static void mch_domain_read_resources(struct device *dev) printk(BIOS_DEBUG, "%dM\n", tseg_sizek >> 10); + /* cbmem_top can be shifted downwards due to alignment. + Mark the region between cbmem_top and tomk as unusable */ + delta_cbmem = tomk - ((uint32_t)cbmem_top() >> 10); + tomk -= delta_cbmem; + uma_sizek += delta_cbmem; + + printk(BIOS_DEBUG, "Unused RAM between cbmem_top and TOM: 0x%xK\n", + delta_cbmem); + printk(BIOS_INFO, "Available memory below 4GB: %uM\n", tomk >> 10); /* Report the memory regions */ -- cgit v1.2.3