LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: ivybridge: Add more debugging for failures 

Add various debug() messages in places where errors occur. This aids with
debugging.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2017-01-16 07:03:38 -07:00 committed by Bin Meng
parent 05af050e9f
commit 8d8f3acda9
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/cpu/ivybridge/cpu.c
View File

@ -169,8 +169,10 @@ int print_cpuinfo(void)
/* Enable SPD ROMs and DDR-III DRAM */ /* Enable SPD ROMs and DDR-III DRAM */
ret = uclass_first_device_err(UCLASS_I2C, &dev); ret = uclass_first_device_err(UCLASS_I2C, &dev);
if (ret) if (ret) {
debug("%s: Failed to get I2C (ret=%d)\n", __func__, ret);
return ret; return ret;
}
/* Prepare USB controller early in S3 resume */ /* Prepare USB controller early in S3 resume */
if (boot_mode == PEI_BOOT_RESUME) { if (boot_mode == PEI_BOOT_RESUME) {

37
arch/x86/cpu/ivybridge/sdram.c
View File

@ -207,8 +207,10 @@ static int copy_spd(struct udevice *dev, struct pei_data *peid)
int ret; int ret;
ret = mrc_locate_spd(dev, sizeof(peid->spd_data[0]), &data); ret = mrc_locate_spd(dev, sizeof(peid->spd_data[0]), &data);
if (ret) if (ret) {
debug("%s: Could not locate SPD (ret=%d)\n", __func__, ret);
return ret; return ret;
}
memcpy(peid->spd_data[0], data, sizeof(peid->spd_data[0])); memcpy(peid->spd_data[0], data, sizeof(peid->spd_data[0]));
@ -460,18 +462,27 @@ int dram_init(void)
/* We need the pinctrl set up early */ /* We need the pinctrl set up early */
ret = syscon_get_by_driver_data(X86_SYSCON_PINCONF, &dev); ret = syscon_get_by_driver_data(X86_SYSCON_PINCONF, &dev);
if (ret) if (ret) {
debug("%s: Could not get pinconf (ret=%d)\n", __func__, ret);
return ret; return ret;
}
ret = uclass_first_device_err(UCLASS_NORTHBRIDGE, &dev); ret = uclass_first_device_err(UCLASS_NORTHBRIDGE, &dev);
if (ret) if (ret) {
debug("%s: Could not get northbridge (ret=%d)\n", __func__,
ret);
return ret; return ret;
}
ret = syscon_get_by_driver_data(X86_SYSCON_ME, &me_dev); ret = syscon_get_by_driver_data(X86_SYSCON_ME, &me_dev);
if (ret) if (ret) {
debug("%s: Could not get ME (ret=%d)\n", __func__, ret);
return ret; return ret;
}
ret = copy_spd(dev, pei_data); ret = copy_spd(dev, pei_data);
if (ret) if (ret) {
debug("%s: Could not get SPD (ret=%d)\n", __func__, ret);
return ret; return ret;
}
pei_data->boot_mode = gd->arch.pei_boot_mode; pei_data->boot_mode = gd->arch.pei_boot_mode;
debug("Boot mode %d\n", gd->arch.pei_boot_mode); debug("Boot mode %d\n", gd->arch.pei_boot_mode);
debug("mrc_input %p\n", pei_data->mrc_input); debug("mrc_input %p\n", pei_data->mrc_input);
@ -498,19 +509,27 @@ int dram_init(void)
/* Wait for ME to be ready */ /* Wait for ME to be ready */
ret = intel_early_me_init(me_dev); ret = intel_early_me_init(me_dev);
if (ret) if (ret) {
debug("%s: Could not init ME (ret=%d)\n", __func__, ret);
return ret; return ret;
}
ret = intel_early_me_uma_size(me_dev); ret = intel_early_me_uma_size(me_dev);
if (ret < 0) if (ret < 0) {
debug("%s: Could not get UMA size (ret=%d)\n", __func__, ret);
return ret; return ret;
}
ret = mrc_common_init(dev, pei_data, false); ret = mrc_common_init(dev, pei_data, false);
if (ret) if (ret) {
debug("%s: mrc_common_init() failed (ret=%d)\n", __func__, ret);
return ret; return ret;
}
ret = sdram_find(dev); ret = sdram_find(dev);
if (ret) if (ret) {
debug("%s: sdram_find() failed (ret=%d)\n", __func__, ret);
return ret; return ret;
}
gd->ram_size = gd->arch.meminfo.total_32bit_memory; gd->ram_size = gd->arch.meminfo.total_32bit_memory;
debug("MRC output data length %#x at %p\n", pei_data->mrc_output_len, debug("MRC output data length %#x at %p\n", pei_data->mrc_output_len,