nb/intel/i945: Make pci_mmio_size a devicetree parameter

Instead of hardcoding pci_mmio_size in the raminit code,
this makes it a parameter in the devicetree.

A safe minimum of 768M is also defined since using anything
less causes problems (if 4G of ram is used).

Change-Id: If004c861464162d5dbbc61836a3a205d1619dfd5
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/16856
Tested-by: build bot (Jenkins)
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Arthur Heymans 2016-10-03 17:16:48 +02:00 committed by Nico Huber
parent 43e9c93eba
commit 885c289bba
11 changed files with 37 additions and 3 deletions

View File

@ -30,6 +30,8 @@ chip northbridge/intel/i945
end
end
register "pci_mmio_size" = "768"
device domain 0 on
device pci 00.0 on # Host bridge
subsystemid 0x8086 0x7270

View File

@ -25,6 +25,8 @@ chip northbridge/intel/i945
end
end
register "pci_mmio_size" = "768"
device domain 0 on
device pci 00.0 on end # host bridge
device pci 01.0 off end # i945 PCIe root port

View File

@ -25,6 +25,8 @@ chip northbridge/intel/i945
end
end
register "pci_mmio_size" = "768"
device domain 0 on
device pci 00.0 on # host bridge
subsystemid 0x1458 0x5000

View File

@ -9,6 +9,8 @@ chip northbridge/intel/i945
end
end
register "pci_mmio_size" = "768"
device domain 0 on
device pci 00.0 on end # host bridge
device pci 01.0 off end # i945 PCIe root port

View File

@ -21,6 +21,8 @@ chip northbridge/intel/i945
end
end
register "pci_mmio_size" = "768"
device domain 0 on
subsystemid 0x8086 0x464c inherit
device pci 00.0 on end # host bridge

View File

@ -9,6 +9,8 @@ chip northbridge/intel/i945
end
end
register "pci_mmio_size" = "768"
device domain 0 on
device pci 00.0 on end # host bridge
device pci 01.0 off end # i945 PCIe root port

View File

@ -30,6 +30,8 @@ chip northbridge/intel/i945
end
end
register "pci_mmio_size" = "768"
device domain 0 on
device pci 00.0 on # Host bridge
subsystemid 0x17aa 0x2015

View File

@ -30,6 +30,8 @@ chip northbridge/intel/i945
end
end
register "pci_mmio_size" = "768"
device domain 0 on
device pci 00.0 on # Host bridge
subsystemid 0x17aa 0x2017

View File

@ -25,6 +25,8 @@ chip northbridge/intel/i945
end
end
register "pci_mmio_size" = "768"
device domain 0 on
subsystemid 0x4352 0x6886 inherit
device pci 00.0 on end # host bridge

View File

@ -8,6 +8,7 @@ struct northbridge_intel_i945_config {
u32 gpu_backlight;
int gpu_lvds_use_spread_spectrum_clock;
struct i915_gpu_controller_info gfx;
int pci_mmio_size;
};
#endif /* NORTHBRIDGE_INTEL_I945_CHIP_H */

View File

@ -16,6 +16,8 @@
#include <console/console.h>
#include <cpu/x86/mtrr.h>
#include <cpu/x86/cache.h>
#include <device/pci_def.h>
#include <device/device.h>
#include <lib.h>
#include <pc80/mc146818rtc.h>
#include <spd.h>
@ -25,6 +27,7 @@
#include <lib.h>
#include "raminit.h"
#include "i945.h"
#include "chip.h"
#include <cbmem.h>
/* Debugging macros. */
@ -48,6 +51,7 @@
#define RAM_EMRS_2 (0x1 << 21)
#define RAM_EMRS_3 (0x2 << 21)
#define DEFAULT_PCI_MMIO_SIZE 768
static int get_dimm_spd_address(struct sys_info *sysinfo, int device)
{
if (sysinfo->spd_addresses)
@ -1495,7 +1499,9 @@ static void sdram_detect_dimm_size(struct sys_info * sysinfo)
static int sdram_program_row_boundaries(struct sys_info *sysinfo)
{
int i;
int cum0, cum1, tolud, tom;
int cum0, cum1, tolud, tom, pci_mmio_size;
const struct device *dev;
const struct northbridge_intel_i945_config *cfg = NULL;
printk(BIOS_DEBUG, "Setting RAM size...\n");
@ -1534,8 +1540,17 @@ static int sdram_program_row_boundaries(struct sys_info *sysinfo)
tom = tolud >> 3;
/* Limit the value of TOLUD to leave some space for PCI memory. */
if (tolud > 0xd0)
tolud = 0xd0; /* 3.25GB : 0.75GB */
dev = dev_find_slot(0, PCI_DEVFN(0, 0));
if (dev)
cfg = dev->chip_info;
/* Don't use pci mmio sizes smaller than 768M */
if (!cfg || cfg->pci_mmio_size <= DEFAULT_PCI_MMIO_SIZE)
pci_mmio_size = DEFAULT_PCI_MMIO_SIZE;
else
pci_mmio_size = cfg->pci_mmio_size;
tolud = MIN(((4096 - pci_mmio_size) / 128) << 3, tolud);
pci_write_config8(PCI_DEV(0,0,0), TOLUD, tolud);