]> git.sur5r.net Git - u-boot/blobdiff - arch/x86/cpu/ivybridge/cpu.c
MAINTAINERS: board: qcom: db410c, db820c: update email.
[u-boot] / arch / x86 / cpu / ivybridge / cpu.c
index 5d7640b526f198978ea450d9b8f15e0f747ec064..099cb94e5d280969afdbae977f1250724e81d6ce 100644 (file)
@@ -4,6 +4,7 @@
  * Graeme Russ, graeme.russ@gmail.com.
  *
  * Some portions from coreboot src/mainboard/google/link/romstage.c
+ * and src/cpu/intel/model_206ax/bootblock.c
  * Copyright (C) 2007-2010 coresystems GmbH
  * Copyright (C) 2011 Google Inc.
  *
  */
 
 #include <common.h>
+#include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <pch.h>
 #include <asm/cpu.h>
+#include <asm/cpu_common.h>
+#include <asm/intel_regs.h>
+#include <asm/io.h>
+#include <asm/lapic.h>
+#include <asm/lpc_common.h>
+#include <asm/microcode.h>
+#include <asm/msr.h>
+#include <asm/mtrr.h>
 #include <asm/pci.h>
 #include <asm/post.h>
 #include <asm/processor.h>
+#include <asm/arch/model_206ax.h>
 #include <asm/arch/pch.h>
+#include <asm/arch/sandybridge.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+static int set_flex_ratio_to_tdp_nominal(void)
+{
+       /* Minimum CPU revision for configurable TDP support */
+       if (cpuid_eax(1) < IVB_CONFIG_TDP_MIN_CPUID)
+               return -EINVAL;
+
+       return cpu_set_flex_ratio_to_tdp_nominal();
+}
+
 int arch_cpu_init(void)
 {
-       const void *blob = gd->fdt_blob;
+       post_code(POST_CPU_INIT);
+
+       return x86_cpu_init_f();
+}
+
+int arch_cpu_init_dm(void)
+{
        struct pci_controller *hose;
-       int node;
+       struct udevice *bus, *dev;
        int ret;
 
-       post_code(POST_CPU_INIT);
-       timer_set_base(rdtsc());
-
-       ret = x86_cpu_init_f();
+       post_code(0x70);
+       ret = uclass_get_device(UCLASS_PCI, 0, &bus);
+       post_code(0x71);
        if (ret)
                return ret;
+       post_code(0x72);
+       hose = dev_get_uclass_priv(bus);
 
-       ret = pci_early_init_hose(&hose);
+       /* TODO(sjg@chromium.org): Get rid of gd->hose */
+       gd->hose = hose;
+
+       ret = uclass_first_device_err(UCLASS_LPC, &dev);
        if (ret)
                return ret;
 
-       node = fdtdec_next_compatible(blob, 0, COMPAT_INTEL_LPC);
-       if (node < 0)
-               return -ENOENT;
-       ret = lpc_early_init(gd->fdt_blob, node, PCH_LPC_DEV);
+       /*
+        * We should do as little as possible before the serial console is
+        * up. Perhaps this should move to later. Our next lot of init
+        * happens in checkcpu() when we have a console
+        */
+       ret = set_flex_ratio_to_tdp_nominal();
        if (ret)
                return ret;
 
        return 0;
 }
 
+#define PCH_EHCI0_TEMP_BAR0 0xe8000000
+#define PCH_EHCI1_TEMP_BAR0 0xe8000400
+#define PCH_XHCI_TEMP_BAR0  0xe8001000
+
+/*
+ * Setup USB controller MMIO BAR to prevent the reference code from
+ * resetting the controller.
+ *
+ * The BAR will be re-assigned during device enumeration so these are only
+ * temporary.
+ *
+ * This is used to speed up the resume path.
+ */
+static void enable_usb_bar(struct udevice *bus)
+{
+       pci_dev_t usb0 = PCH_EHCI1_DEV;
+       pci_dev_t usb1 = PCH_EHCI2_DEV;
+       pci_dev_t usb3 = PCH_XHCI_DEV;
+       ulong cmd;
+
+       /* USB Controller 1 */
+       pci_bus_write_config(bus, usb0, PCI_BASE_ADDRESS_0,
+                            PCH_EHCI0_TEMP_BAR0, PCI_SIZE_32);
+       pci_bus_read_config(bus, usb0, PCI_COMMAND, &cmd, PCI_SIZE_32);
+       cmd |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
+       pci_bus_write_config(bus, usb0, PCI_COMMAND, cmd, PCI_SIZE_32);
+
+       /* USB Controller 2 */
+       pci_bus_write_config(bus, usb1, PCI_BASE_ADDRESS_0,
+                            PCH_EHCI1_TEMP_BAR0, PCI_SIZE_32);
+       pci_bus_read_config(bus, usb1, PCI_COMMAND, &cmd, PCI_SIZE_32);
+       cmd |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
+       pci_bus_write_config(bus, usb1, PCI_COMMAND, cmd, PCI_SIZE_32);
+
+       /* USB3 Controller 1 */
+       pci_bus_write_config(bus, usb3, PCI_BASE_ADDRESS_0,
+                            PCH_XHCI_TEMP_BAR0, PCI_SIZE_32);
+       pci_bus_read_config(bus, usb3, PCI_COMMAND, &cmd, PCI_SIZE_32);
+       cmd |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
+       pci_bus_write_config(bus, usb3, PCI_COMMAND, cmd, PCI_SIZE_32);
+}
+
+int checkcpu(void)
+{
+       enum pei_boot_mode_t boot_mode = PEI_BOOT_NONE;
+       struct udevice *dev, *lpc;
+       uint32_t pm1_cnt;
+       uint16_t pm1_sts;
+       int ret;
+
+       /* TODO: cmos_post_init() */
+       if (readl(MCHBAR_REG(SSKPD)) == 0xCAFE) {
+               debug("soft reset detected\n");
+               boot_mode = PEI_BOOT_SOFT_RESET;
+
+               /* System is not happy after keyboard reset... */
+               debug("Issuing CF9 warm reset\n");
+               reset_cpu(0);
+       }
+
+       ret = cpu_common_init();
+       if (ret) {
+               debug("%s: cpu_common_init() failed\n", __func__);
+               return ret;
+       }
+
+       /* Check PM1_STS[15] to see if we are waking from Sx */
+       pm1_sts = inw(DEFAULT_PMBASE + PM1_STS);
+
+       /* Read PM1_CNT[12:10] to determine which Sx state */
+       pm1_cnt = inl(DEFAULT_PMBASE + PM1_CNT);
+
+       if ((pm1_sts & WAK_STS) && ((pm1_cnt >> 10) & 7) == 5) {
+               debug("Resume from S3 detected, but disabled.\n");
+       } else {
+               /*
+                * TODO: An indication of life might be possible here (e.g.
+                * keyboard light)
+                */
+       }
+       post_code(POST_EARLY_INIT);
+
+       /* Enable SPD ROMs and DDR-III DRAM */
+       ret = uclass_first_device_err(UCLASS_I2C, &dev);
+       if (ret) {
+               debug("%s: Failed to get I2C (ret=%d)\n", __func__, ret);
+               return ret;
+       }
+
+       /* Prepare USB controller early in S3 resume */
+       if (boot_mode == PEI_BOOT_RESUME) {
+               uclass_first_device(UCLASS_LPC, &lpc);
+               enable_usb_bar(pci_get_controller(lpc->parent));
+       }
+
+       gd->arch.pei_boot_mode = boot_mode;
+
+       return 0;
+}
+
 int print_cpuinfo(void)
 {
        char processor_name[CPU_MAX_NAME_LEN];
@@ -58,5 +192,14 @@ int print_cpuinfo(void)
        name = cpu_get_name(processor_name);
        printf("CPU:   %s\n", name);
 
+       post_code(POST_CPU_INFO);
+
        return 0;
 }
+
+void board_debug_uart_init(void)
+{
+       /* This enables the debug UART */
+       pci_x86_write_config(NULL, PCH_LPC_DEV, LPC_EN, COMA_LPC_EN,
+                            PCI_SIZE_16);
+}