diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2018-08-06 15:35:28 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-10-24 10:00:31 +0000 |
| commit | 17ad4598e9d3d302cc45c86a8e11aac62928c83c (patch) | |
| tree | c2f108634585b63c50822e5bdaa2ee57291d105e /src/northbridge/intel/i945 | |
| parent | 794f56bdf5acc5d153472bb583d51bb9fe56166f (diff) | |
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 <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/27871
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/northbridge/intel/i945')
| -rw-r--r-- | src/northbridge/intel/i945/northbridge.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c index 110a9efc53..de55cc35f2 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include <cbmem.h> #include <console/console.h> #include <arch/io.h> #include <stdint.h> @@ -59,7 +60,7 @@ static int get_pcie_bar(u32 *base) static void mch_domain_read_resources(struct device *dev) { - uint32_t pci_tolm, tseg_sizek; + uint32_t pci_tolm, tseg_sizek, cbmem_topk, delta_cbmem; uint8_t tolud; uint16_t reg16; unsigned long long tomk, tomk_stolen; @@ -104,6 +105,16 @@ static void mch_domain_read_resources(struct device *dev) tseg_memory_base = tomk_stolen * 1024ULL; tseg_memory_size = tseg_sizek * 1024ULL; + /* cbmem_top can be shifted downwards due to alignment. + Mark the region between cbmem_top and tomk as unusable */ + cbmem_topk = ((uint32_t)cbmem_top() >> 10); + delta_cbmem = tomk_stolen - cbmem_topk; + tomk_stolen -= delta_cbmem; + + printk(BIOS_DEBUG, "Unused RAM between cbmem_top and TOM: 0x%xK\n", + delta_cbmem); + + /* The following needs to be 2 lines, otherwise the second * number is always 0 */ @@ -115,6 +126,7 @@ static void mch_domain_read_resources(struct device *dev) ram_resource(dev, 4, 768, (tomk - 768)); uma_resource(dev, 5, uma_memory_base >> 10, uma_memory_size >> 10); mmio_resource(dev, 6, tseg_memory_base >> 10, tseg_memory_size >> 10); + uma_resource(dev, 7, cbmem_topk, delta_cbmem); } static void mch_domain_set_resources(struct device *dev) |