V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

x86: ivybridge: Convert sdram_initialise() to use DM PCI API 

Convert this function to use the the driver model PCI API. We just need
to pass in the northbridge device.

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:48 -07:00 committed by Bin Meng
parent 2588e71132
commit 1641bb8cc7
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,9 +283,10 @@ static int recovery_mode_enabled(void)
/** /**
* Find the PEI executable in the ROM and execute it. * Find the PEI executable in the ROM and execute it.
* *
* @param pei_data: configuration data for UEFI PEI reference code * @dev: Northbridge device
* @pei_data: configuration data for UEFI PEI reference code
*/ */
int sdram_initialise(struct pei_data *pei_data) int sdram_initialise(struct udevice *dev, struct pei_data *pei_data)
{ {
unsigned version; unsigned version;
const char *data; const char *data;
@ -374,7 +375,7 @@ int sdram_initialise(struct pei_data *pei_data)
* Send ME init done for SandyBridge here. This is done inside the * Send ME init done for SandyBridge here. This is done inside the
* SystemAgent binary on IvyBridge * SystemAgent binary on IvyBridge
*/ */
done = x86_pci_read_config32(PCH_DEV, PCI_DEVICE_ID); dm_pci_read_config16(dev, PCI_DEVICE_ID, &done);
done &= BASE_REV_MASK; done &= BASE_REV_MASK;
if (BASE_REV_SNB == done) if (BASE_REV_SNB == done)
intel_early_me_init_done(ME_INIT_STATUS_SUCCESS); intel_early_me_init_done(ME_INIT_STATUS_SUCCESS);
@ -732,12 +733,17 @@ int dram_init(void)
struct udevice *dev; struct udevice *dev;
int ret; int ret;
ret = uclass_first_device(UCLASS_NORTHBRIDGE, &dev);
if (ret)
return ret;
if (!dev)
return -ENODEV;
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);
pei_data.boot_mode = gd->arch.pei_boot_mode; pei_data.boot_mode = gd->arch.pei_boot_mode;
ret = copy_spd(&pei_data); ret = copy_spd(&pei_data);
if (!ret) if (!ret)
ret = sdram_initialise(&pei_data); ret = sdram_initialise(dev, &pei_data);
if (ret) if (ret)
return ret; return ret;
@ -748,11 +754,6 @@ int dram_init(void)
post_code(POST_DRAM); post_code(POST_DRAM);
ret = uclass_first_device(UCLASS_NORTHBRIDGE, &dev);
if (ret)
return ret;
if (!dev)
return -ENODEV;
ret = sdram_find(dev); ret = sdram_find(dev);
if (ret) if (ret)
return ret; return ret;