Re: [U-Boot] [PATCH v2 11/55] x86: ivybridge: Move northbridge init into the probe() method

[Bin Meng]

On Mon, Jan 18, 2016 at 7:11 AM, Simon Glass  wrote:
> Now that we have a proper driver for the nortbridge, set it up in by probing
> it, and move the early init code into the probe() method.
>
> Signed-off-by: Simon Glass 
> Reviewed-by: Bin Meng 
> ---
>
> Changes in v2: None
>
>  arch/x86/cpu/ivybridge/cpu.c|  2 ++
>  arch/x86/cpu/ivybridge/early_init.c | 33 +++--
>  2 files changed, 21 insertions(+), 14 deletions(-)
>

applied to u-boot-x86/master, thanks!
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v2 11/55] x86: ivybridge: Move northbridge init into the probe() method

[Simon Glass]

Now that we have a proper driver for the nortbridge, set it up in by probing
it, and move the early init code into the probe() method.

Signed-off-by: Simon Glass 
Reviewed-by: Bin Meng 
---

Changes in v2: None

 arch/x86/cpu/ivybridge/cpu.c|  2 ++
 arch/x86/cpu/ivybridge/early_init.c | 33 +++--
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index 2a15fc0..f32b4a1 100644
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -243,6 +243,8 @@ int print_cpuinfo(void)
}
 
/* Early chipset init required before RAM init can work */
+   uclass_first_device(UCLASS_NORTHBRIDGE, );
+
ret = uclass_first_device(UCLASS_PCH, );
if (ret)
return ret;
diff --git a/arch/x86/cpu/ivybridge/early_init.c 
b/arch/x86/cpu/ivybridge/early_init.c
index 945ae2d..c629f5b 100644
--- a/arch/x86/cpu/ivybridge/early_init.c
+++ b/arch/x86/cpu/ivybridge/early_init.c
@@ -123,20 +123,6 @@ void sandybridge_early_init(int chipset_type)
pci_dev_t pch_dev = PCH_DEV;
pci_dev_t video_dev = PCH_VIDEO_DEV;
pci_dev_t lpc_dev = PCH_LPC_DEV;
-   u32 capid0_a;
-   u8 reg8;
-
-   /* Device ID Override Enable should be done very early */
-   capid0_a = x86_pci_read_config32(pch_dev, 0xe4);
-   if (capid0_a & (1 << 10)) {
-   reg8 = x86_pci_read_config8(pch_dev, 0xf3);
-   reg8 &= ~7; /* Clear 2:0 */
-
-   if (chipset_type == SANDYBRIDGE_MOBILE)
-   reg8 |= 1; /* Set bit 0 */
-
-   x86_pci_write_config8(pch_dev, 0xf3, reg8);
-   }
 
/* Setup all BARs required for early PCIe and raminit */
sandybridge_setup_bars(pch_dev, lpc_dev);
@@ -149,6 +135,25 @@ void sandybridge_early_init(int chipset_type)
 
 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, _a);
+   if (capid0_a & (1 << 10)) {
+   dm_pci_read_config8(dev, 0xf3, );
+   reg8 &= ~7; /* Clear 2:0 */
+
+   if (chipset_type == SANDYBRIDGE_MOBILE)
+   reg8 |= 1; /* Set bit 0 */
+
+   dm_pci_write_config8(dev, 0xf3, reg8);
+   }
+
return 0;
 }
 
-- 
2.6.0.rc2.230.g3dd15c0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot