[U-Boot] [PATCH v2 22/55] x86: ivybridge: Move early init code into northbridge.c

[Simon Glass]

This code is now part of the northbridge driver, so move it into the same
place.

Signed-off-by: Simon Glass <sjg at chromium.org>
Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
---

Changes in v2: None

 arch/x86/cpu/ivybridge/Makefile      |  1 -
 arch/x86/cpu/ivybridge/early_init.c  | 81 ------------------------------------
 arch/x86/cpu/ivybridge/northbridge.c | 67 +++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 82 deletions(-)
 delete mode 100644 arch/x86/cpu/ivybridge/early_init.c

diff --git a/arch/x86/cpu/ivybridge/Makefile b/arch/x86/cpu/ivybridge/Makefile
index 0c7efae..bdbd3fa 100644
--- a/arch/x86/cpu/ivybridge/Makefile
+++ b/arch/x86/cpu/ivybridge/Makefile
@@ -7,7 +7,6 @@
 obj-y += bd82x6x.o
 obj-y += car.o
 obj-y += cpu.o
-obj-y += early_init.o
 obj-y += early_me.o
 obj-y += gma.o
 obj-y += lpc.o
diff --git a/arch/x86/cpu/ivybridge/early_init.c b/arch/x86/cpu/ivybridge/early_init.c
deleted file mode 100644
index 5b16abc..0000000
--- a/arch/x86/cpu/ivybridge/early_init.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * From Coreboot
- *
- * Copyright (C) 2007-2010 coresystems GmbH
- * Copyright (C) 2011 Google Inc
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <common.h>
-#include <dm.h>
-#include <asm/io.h>
-#include <asm/pci.h>
-#include <asm/arch/pch.h>
-#include <asm/arch/sandybridge.h>
-
-static void sandybridge_setup_northbridge_bars(struct udevice *dev)
-{
-	/* Set up all hardcoded northbridge BARs */
-	debug("Setting up static registers\n");
-	dm_pci_write_config32(dev, EPBAR, DEFAULT_EPBAR | 1);
-	dm_pci_write_config32(dev, EPBAR + 4, (0LL + DEFAULT_EPBAR) >> 32);
-	dm_pci_write_config32(dev, MCHBAR, DEFAULT_MCHBAR | 1);
-	dm_pci_write_config32(dev, MCHBAR + 4, (0LL + DEFAULT_MCHBAR) >> 32);
-	/* 64MB - busses 0-63 */
-	dm_pci_write_config32(dev, PCIEXBAR, DEFAULT_PCIEXBAR | 5);
-	dm_pci_write_config32(dev, PCIEXBAR + 4,
-			      (0LL + DEFAULT_PCIEXBAR) >> 32);
-	dm_pci_write_config32(dev, DMIBAR, DEFAULT_DMIBAR | 1);
-	dm_pci_write_config32(dev, DMIBAR + 4, (0LL + DEFAULT_DMIBAR) >> 32);
-
-	/* Set C0000-FFFFF to access RAM on both reads and writes */
-	dm_pci_write_config8(dev, PAM0, 0x30);
-	dm_pci_write_config8(dev, PAM1, 0x33);
-	dm_pci_write_config8(dev, PAM2, 0x33);
-	dm_pci_write_config8(dev, PAM3, 0x33);
-	dm_pci_write_config8(dev, PAM4, 0x33);
-	dm_pci_write_config8(dev, PAM5, 0x33);
-	dm_pci_write_config8(dev, PAM6, 0x33);
-}
-
-static int bd82x6x_northbridge_probe(struct udevice *dev)
-{
-	const int chipset_type = SANDYBRIDGE_MOBILE;
-	u32 capid0_a;
-	u8 reg8;
-
-	if (gd->flags & GD_FLG_RELOC)
-		return 0;
-
-	/* Device ID Override Enable should be done very early */
-	dm_pci_read_config32(dev, 0xe4, &capid0_a);
-	if (capid0_a & (1 << 10)) {
-		dm_pci_read_config8(dev, 0xf3, &reg8);
-		reg8 &= ~7; /* Clear 2:0 */
-
-		if (chipset_type == SANDYBRIDGE_MOBILE)
-			reg8 |= 1; /* Set bit 0 */
-
-		dm_pci_write_config8(dev, 0xf3, reg8);
-	}
-
-	sandybridge_setup_northbridge_bars(dev);
-
-	/* Device Enable */
-	dm_pci_write_config32(dev, DEVEN, DEVEN_HOST | DEVEN_IGD);
-
-	return 0;
-}
-
-static const struct udevice_id bd82x6x_northbridge_ids[] = {
-	{ .compatible = "intel,bd82x6x-northbridge" },
-	{ }
-};
-
-U_BOOT_DRIVER(bd82x6x_northbridge_drv) = {
-	.name		= "bd82x6x_northbridge",
-	.id		= UCLASS_NORTHBRIDGE,
-	.of_match	= bd82x6x_northbridge_ids,
-	.probe		= bd82x6x_northbridge_probe,
-};
diff --git a/arch/x86/cpu/ivybridge/northbridge.c b/arch/x86/cpu/ivybridge/northbridge.c
index e3d8c13..6b00d31 100644
--- a/arch/x86/cpu/ivybridge/northbridge.c
+++ b/arch/x86/cpu/ivybridge/northbridge.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <asm/msr.h>
 #include <asm/acpi.h>
 #include <asm/cpu.h>
@@ -170,3 +171,69 @@ void northbridge_init(pci_dev_t dev)
 void northbridge_enable(pci_dev_t dev)
 {
 }
+
+static void sandybridge_setup_northbridge_bars(struct udevice *dev)
+{
+	/* Set up all hardcoded northbridge BARs */
+	debug("Setting up static registers\n");
+	dm_pci_write_config32(dev, EPBAR, DEFAULT_EPBAR | 1);
+	dm_pci_write_config32(dev, EPBAR + 4, (0LL + DEFAULT_EPBAR) >> 32);
+	dm_pci_write_config32(dev, MCHBAR, DEFAULT_MCHBAR | 1);
+	dm_pci_write_config32(dev, MCHBAR + 4, (0LL + DEFAULT_MCHBAR) >> 32);
+	/* 64MB - busses 0-63 */
+	dm_pci_write_config32(dev, PCIEXBAR, DEFAULT_PCIEXBAR | 5);
+	dm_pci_write_config32(dev, PCIEXBAR + 4,
+			      (0LL + DEFAULT_PCIEXBAR) >> 32);
+	dm_pci_write_config32(dev, DMIBAR, DEFAULT_DMIBAR | 1);
+	dm_pci_write_config32(dev, DMIBAR + 4, (0LL + DEFAULT_DMIBAR) >> 32);
+
+	/* Set C0000-FFFFF to access RAM on both reads and writes */
+	dm_pci_write_config8(dev, PAM0, 0x30);
+	dm_pci_write_config8(dev, PAM1, 0x33);
+	dm_pci_write_config8(dev, PAM2, 0x33);
+	dm_pci_write_config8(dev, PAM3, 0x33);
+	dm_pci_write_config8(dev, PAM4, 0x33);
+	dm_pci_write_config8(dev, PAM5, 0x33);
+	dm_pci_write_config8(dev, PAM6, 0x33);
+}
+
+static int bd82x6x_northbridge_probe(struct udevice *dev)
+{
+	const int chipset_type = SANDYBRIDGE_MOBILE;
+	u32 capid0_a;
+	u8 reg8;
+
+	if (gd->flags & GD_FLG_RELOC)
+		return 0;
+
+	/* Device ID Override Enable should be done very early */
+	dm_pci_read_config32(dev, 0xe4, &capid0_a);
+	if (capid0_a & (1 << 10)) {
+		dm_pci_read_config8(dev, 0xf3, &reg8);
+		reg8 &= ~7; /* Clear 2:0 */
+
+		if (chipset_type == SANDYBRIDGE_MOBILE)
+			reg8 |= 1; /* Set bit 0 */
+
+		dm_pci_write_config8(dev, 0xf3, reg8);
+	}
+
+	sandybridge_setup_northbridge_bars(dev);
+
+	/* Device Enable */
+	dm_pci_write_config32(dev, DEVEN, DEVEN_HOST | DEVEN_IGD);
+
+	return 0;
+}
+
+static const struct udevice_id bd82x6x_northbridge_ids[] = {
+	{ .compatible = "intel,bd82x6x-northbridge" },
+	{ }
+};
+
+U_BOOT_DRIVER(bd82x6x_northbridge_drv) = {
+	.name		= "bd82x6x_northbridge",
+	.id		= UCLASS_NORTHBRIDGE,
+	.of_match	= bd82x6x_northbridge_ids,
+	.probe		= bd82x6x_northbridge_probe,
+};
-- 
2.6.0.rc2.230.g3dd15c0