diff options
| -rw-r--r-- | src/northbridge/intel/i945/i945.h | 1 | ||||
| -rw-r--r-- | src/northbridge/intel/i945/northbridge.c | 35 | ||||
| -rw-r--r-- | src/northbridge/intel/i945/ram_calc.c | 38 |
3 files changed, 29 insertions, 45 deletions
diff --git a/src/northbridge/intel/i945/i945.h b/src/northbridge/intel/i945/i945.h index 5929a1d01c..cc5f08791f 100644 --- a/src/northbridge/intel/i945/i945.h +++ b/src/northbridge/intel/i945/i945.h @@ -365,6 +365,7 @@ void dump_spd_registers(void); void dump_mem(unsigned int start, unsigned int end); u32 decode_igd_memory_size(u32 gms); +u32 decode_tseg_size(const u8 esmramc); #endif /* __ACPI__ */ diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c index eb8e321f31..b8a225562b 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -59,8 +59,8 @@ static int get_pcie_bar(u32 *base) static void pci_domain_set_resources(struct device *dev) { - uint32_t pci_tolm; - uint8_t tolud, reg8; + uint32_t pci_tolm, tseg_sizek; + uint8_t tolud; uint16_t reg16; unsigned long long tomk, tomk_stolen; uint64_t uma_memory_base = 0, uma_memory_size = 0; @@ -95,31 +95,12 @@ static void pci_domain_set_resources(struct device *dev) uma_memory_size = uma_size * 1024ULL; } - reg8 = pci_read_config8(dev_find_slot(0, PCI_DEVFN(0, 0)), ESMRAMC); - if (reg8 & 1) { - int tseg_size = 0; - printk(BIOS_DEBUG, "TSEG decoded, subtracting "); - reg8 >>= 1; - reg8 &= 3; - switch (reg8) { - case 0: - tseg_size = 1024; - break; /* TSEG = 1M */ - case 1: - tseg_size = 2048; - break; /* TSEG = 2M */ - case 2: - tseg_size = 8192; - break; /* TSEG = 8M */ - } - - printk(BIOS_DEBUG, "%dM\n", tseg_size >> 10); - tomk_stolen -= tseg_size; - - /* For reserving TSEG memory in the memory map */ - tseg_memory_base = tomk_stolen * 1024ULL; - tseg_memory_size = tseg_size * 1024ULL; - } + tseg_sizek = decode_tseg_size(pci_read_config8(dev_find_slot(0, + PCI_DEVFN(0, 0)), ESMRAMC)) >> 10; + printk(BIOS_DEBUG, "TSEG decoded, subtracting %dM\n", tseg_sizek >> 10); + tomk_stolen -= tseg_sizek; + tseg_memory_base = tomk_stolen * 1024ULL; + tseg_memory_size = tseg_sizek * 1024ULL; /* The following needs to be 2 lines, otherwise the second * number is always 0 diff --git a/src/northbridge/intel/i945/ram_calc.c b/src/northbridge/intel/i945/ram_calc.c index a106d117f2..15ba7f4527 100644 --- a/src/northbridge/intel/i945/ram_calc.c +++ b/src/northbridge/intel/i945/ram_calc.c @@ -25,6 +25,24 @@ #include <cpu/x86/mtrr.h> #include <program_loading.h> +/* Decodes TSEG region size to bytes. */ +u32 decode_tseg_size(const u8 esmramc) +{ + if (!(esmramc & 1)) + return 0; + switch ((esmramc >> 1) & 3) { + case 0: + return 1 << 20; + case 1: + return 2 << 20; + case 2: + return 8 << 20; + case 3: + default: + die("Bad TSEG setting.\n"); + } +} + static uintptr_t smm_region_start(void) { uintptr_t tom; @@ -35,24 +53,8 @@ static uintptr_t smm_region_start(void) else tom = (pci_read_config8(PCI_DEV(0, 0, 0), TOLUD) & 0xf7) << 24; - /* if TSEG enabled subtract size */ - switch (pci_read_config8(PCI_DEV(0, 0, 0), ESMRAMC) & 0x07) { - case 0x01: - /* 1MB TSEG */ - tom -= 0x100000; - break; - case 0x03: - /* 2MB TSEG */ - tom -= 0x200000; - break; - case 0x05: - /* 8MB TSEG */ - tom -= 0x800000; - break; - default: - /* TSEG either disabled or invalid */ - break; - } + /* subsctract TSEG size */ + tom -= decode_tseg_size(pci_read_config8(PCI_DEV(0, 0, 0), ESMRAMC)); return tom; } |