sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

x86: ivybridge: Move CPU init code into the driver 

Use the CPU driver's probe() method to perform the CPU init. This will happen
automatically when the first CPU is probed.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2016-01-17 16:11:24 -07:00 committed by Bin Meng
parent bba22a97a7
commit 9d156b5725
3 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/cpu/ivybridge/bd82x6x.c
View File

@ -61,7 +61,6 @@ static int bd82x6x_probe(struct udevice *dev)
{
const void *blob = gd->fdt_blob;
struct pci_controller *hose;
struct x86_cpu_priv *cpu;
int sata_node, gma_node;
int ret;
@ -81,11 +80,6 @@ static int bd82x6x_probe(struct udevice *dev)
bd82x6x_usb_ehci_init(PCH_EHCI1_DEV);
bd82x6x_usb_ehci_init(PCH_EHCI2_DEV);
cpu = calloc(1, sizeof(*cpu));
if (!cpu)
return -ENOMEM;
model_206ax_init(cpu);
gma_node = fdtdec_next_compatible(blob, 0, COMPAT_INTEL_GMA);
if (gma_node < 0) {
debug("%s: Cannot find GMA node\n", __func__);

5
arch/x86/cpu/ivybridge/model_206ax.c
View File

@ -403,7 +403,7 @@ static void configure_mca(void)
static unsigned ehci_debug_addr;
#endif
int model_206ax_init(struct x86_cpu_priv *cpu)
static int model_206ax_init(void)
{
int ret;
@ -480,6 +480,9 @@ static int model_206ax_get_count(struct udevice *dev)
static int cpu_x86_model_206ax_probe(struct udevice *dev)
{
if (dev->seq == 0)
model_206ax_init();
return 0;
}

15
arch/x86/include/asm/arch-ivybridge/bd82x6x.h
View File

@ -15,19 +15,4 @@ void bd82x6x_usb_xhci_init(pci_dev_t dev);
int gma_func0_init(struct udevice *dev, const void *blob, int node);
int bd82x6x_init_extra(void);
/**
* struct x86_cpu_priv - Information about a single CPU
*
* @apic_id: Advanced Programmable Interrupt Controller Identifier, which is
* just a number representing the CPU core
*
* TODO: Move this to driver model once lifecycle is understood
*/
struct x86_cpu_priv {
int apic_id;
int start_err;
};
int model_206ax_init(struct x86_cpu_priv *cpu);
#endif