[coreboot-gerrit] Change in coreboot[master]: nb/intel/haswell: Drop ASM to call into MRC

[Angel Pons (Code Review)]

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46370 )

Change subject: nb/intel/haswell: Drop ASM to call into MRC
......................................................................

nb/intel/haswell: Drop ASM to call into MRC

Commit c2ee680 (sandybridge: Use calls rather than asm to call to MRC.)
did it for Sandy Bridge, and this commit does it for Haswell. The
original assembly is identical for both platforms, so this should work.

Change-Id: Ic915ae2a30f99805b2c87df8f9a9586a74a40c29
Signed-off-by: Angel Pons 
---
M src/northbridge/intel/haswell/raminit.c
1 file changed, 4 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/46370/1

diff --git a/src/northbridge/intel/haswell/raminit.c b/src/northbridge/intel/haswell/raminit.c
index 6db5e71..ea3e0a7 100644
--- a/src/northbridge/intel/haswell/raminit.c
+++ b/src/northbridge/intel/haswell/raminit.c
@@ -105,7 +105,8 @@
  */
 void sdram_initialize(struct pei_data *pei_data)
 {
-	unsigned long entry;
+	int (*entry)(struct pei_data *pei_data) __attribute__((regparm(1)));
+
    uint32_t type = CBFS_TYPE_MRC;
    struct cbfsf f;

@@ -134,11 +135,9 @@
    	die("mrc.bin not found!");

/* We don't care about leaking the mapping */
-	entry = (unsigned long)rdev_mmap_full(&f.data);
+	entry = rdev_mmap_full(&f.data);
    if (entry) {
-		int rv;
-		asm volatile ("call *%%ecx\n\t"
-			      :"=a" (rv) : "c" (entry), "a" (pei_data));
+		int rv = entry(pei_data);

/* The mrc.bin reconfigures USB, so usbdebug needs to be reinitialized */
    	if (CONFIG(USBDEBUG_IN_PRE_RAM))