summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/stout/devicetree.cb2
-rw-r--r--src/mainboard/lenovo/x131e/devicetree.cb2
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb2
-rw-r--r--src/mainboard/lenovo/x230/devicetree.cb2
-rw-r--r--src/mainboard/samsung/lumpy/devicetree.cb2
-rw-r--r--src/mainboard/samsung/stumpy/devicetree.cb2
-rw-r--r--src/northbridge/intel/sandybridge/chip.h5
-rw-r--r--src/northbridge/intel/sandybridge/raminit_common.c22
8 files changed, 3 insertions, 36 deletions
diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb
index 5461b15dd9..73dce98ed0 100644
--- a/src/mainboard/google/stout/devicetree.cb
+++ b/src/mainboard/google/stout/devicetree.cb
@@ -33,8 +33,6 @@ chip northbridge/intel/sandybridge
end
end
- register "pci_mmio_size" = "1024"
-
device domain 0 on
subsystemid 0x1ae0 0xc000 inherit
device pci 00.0 on end # host bridge
diff --git a/src/mainboard/lenovo/x131e/devicetree.cb b/src/mainboard/lenovo/x131e/devicetree.cb
index 18ed380428..2627fae5ea 100644
--- a/src/mainboard/lenovo/x131e/devicetree.cb
+++ b/src/mainboard/lenovo/x131e/devicetree.cb
@@ -26,8 +26,6 @@ chip northbridge/intel/sandybridge
end
end
- register "pci_mmio_size" = "1024"
-
device domain 0x0 on
subsystemid 0x17aa 0x21fe inherit
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
index b4d3800aa2..5f1ea6bd7f 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
+++ b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
@@ -24,8 +24,6 @@ chip northbridge/intel/sandybridge
end
end
- register "pci_mmio_size" = "1024"
-
device domain 0 on
subsystemid 0x17aa 0x21f9 inherit
diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb
index de91bbacd5..e0557ca2bf 100644
--- a/src/mainboard/lenovo/x230/devicetree.cb
+++ b/src/mainboard/lenovo/x230/devicetree.cb
@@ -27,8 +27,6 @@ chip northbridge/intel/sandybridge
end
end
- register "pci_mmio_size" = "1024"
-
device domain 0 on
subsystemid 0x17aa 0x21fa inherit
diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb
index 0f3ee5cdce..6cda62bb3d 100644
--- a/src/mainboard/samsung/lumpy/devicetree.cb
+++ b/src/mainboard/samsung/lumpy/devicetree.cb
@@ -31,8 +31,6 @@ chip northbridge/intel/sandybridge
end
end
- register "pci_mmio_size" = "1024"
-
device domain 0 on
ioapic_irq 4 INTA 0x10
ioapic_irq 4 INTB 0x11
diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb
index 20c994eb79..6f49cfe788 100644
--- a/src/mainboard/samsung/stumpy/devicetree.cb
+++ b/src/mainboard/samsung/stumpy/devicetree.cb
@@ -23,8 +23,6 @@ chip northbridge/intel/sandybridge
end
end
- register "pci_mmio_size" = "1024"
-
device domain 0 on
subsystemid 0x1ae0 0xc000 inherit
device pci 00.0 on end # host bridge
diff --git a/src/northbridge/intel/sandybridge/chip.h b/src/northbridge/intel/sandybridge/chip.h
index 824af3e11d..99d9763241 100644
--- a/src/northbridge/intel/sandybridge/chip.h
+++ b/src/northbridge/intel/sandybridge/chip.h
@@ -43,11 +43,6 @@ struct northbridge_intel_sandybridge_config {
struct i915_gpu_controller_info gfx;
- /*
- * Maximum PCI MMIO size in MiB.
- */
- u16 pci_mmio_size;
-
/* Data for RAM init */
/* DIMM SPD address. Use 8bit notation where BIT0 is always zero. */
diff --git a/src/northbridge/intel/sandybridge/raminit_common.c b/src/northbridge/intel/sandybridge/raminit_common.c
index 72621e3cab..c7273ad251 100644
--- a/src/northbridge/intel/sandybridge/raminit_common.c
+++ b/src/northbridge/intel/sandybridge/raminit_common.c
@@ -338,24 +338,6 @@ void dram_zones(ramctr_timing *ctrl, int training)
}
}
-#define DEFAULT_PCI_MMIO_SIZE 2048
-
-static unsigned int get_mmio_size(void)
-{
- const struct device *dev;
- const struct northbridge_intel_sandybridge_config *cfg = NULL;
-
- dev = pcidev_path_on_root(PCI_DEVFN(0, 0));
- if (dev)
- cfg = dev->chip_info;
-
- /* If this is zero, it just means devicetree.cb didn't set it */
- if (!cfg || cfg->pci_mmio_size == 0)
- return DEFAULT_PCI_MMIO_SIZE;
- else
- return cfg->pci_mmio_size;
-}
-
/*
* Returns the ECC mode the NB is running at. It takes precedence over ECC capability.
* The ME/PCU/.. has the ability to change this.
@@ -382,6 +364,8 @@ bool get_host_ecc_cap(void)
return !(reg32 & (1 << 25));
}
+#define DEFAULT_PCI_MMIO_SIZE 2048
+
void dram_memorymap(ramctr_timing *ctrl, int me_uma_size)
{
u32 reg, val, reclaim, tom, gfxstolen, gttsize;
@@ -389,7 +373,7 @@ void dram_memorymap(ramctr_timing *ctrl, int me_uma_size)
size_t tsegsize, touudbase, remaplimit, mestolenbase, tsegbasedelta;
uint16_t ggc;
- mmiosize = get_mmio_size();
+ mmiosize = DEFAULT_PCI_MMIO_SIZE;
ggc = pci_read_config16(HOST_BRIDGE, GGC);
if (!(ggc & 2)) {