[coreboot] New patch to review for coreboot: 7cf8522 SMM: rename tseg_fixup to tseg_relocate and export

[Stefan Reinauer]

Stefan Reinauer ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1310

-gerrit

commit 7cf85225010e340e9afef275ac1fdc0627e8e2fd
Author: Duncan Laurie 
Date:   Sat Jun 23 15:29:59 2012 -0700

SMM: rename tseg_fixup to tseg_relocate and export

This function is exported so it can be used in other
    places that need similar relocation due to TSEG.

Change-Id: I68b78ca32d58d1a414965404e38d71977c3da347
    Signed-off-by: Duncan Laurie 
---
 src/include/cpu/x86/smm.h                  |    3 +++
 src/southbridge/intel/bd82x6x/smihandler.c |   12 +++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h
index ccce2cb..82a5a1a 100644
--- a/src/include/cpu/x86/smm.h
+++ b/src/include/cpu/x86/smm.h
@@ -376,9 +376,12 @@ void __attribute__((weak)) mainboard_smi_sleep(u8 slp_typ);

#if !CONFIG_SMM_TSEG
 void smi_release_lock(void);
+#define tseg_relocate(ptr)
 #else
 /* Return address of TSEG base */
 u32 smi_get_tseg_base(void);
+/* Adjust pointer with TSEG base */
+void tseg_relocate(void **ptr);
 #endif

#endif
diff --git a/src/southbridge/intel/bd82x6x/smihandler.c b/src/southbridge/intel/bd82x6x/smihandler.c
index f5780cd..2c3bf67 100644
--- a/src/southbridge/intel/bd82x6x/smihandler.c
+++ b/src/southbridge/intel/bd82x6x/smihandler.c
@@ -60,14 +60,12 @@ u32 smi_get_tseg_base(void)
    	tseg_base = pcie_read_config32(PCI_DEV(0, 0, 0), TSEG) & ~1;
    return tseg_base;
 }
-static inline void tseg_fixup(void **ptr)
+void tseg_relocate(void **ptr)
 {
    /* Adjust pointer with TSEG base */
    if (*ptr)
-		*ptr = (void *)(((u8*)*ptr) + tseg_base);
+		*ptr = (void *)(((u8*)*ptr) + smi_get_tseg_base());
 }
-#else
-#define tseg_fixup(x) do {} while(0)
 #endif

/**
@@ -343,7 +341,7 @@ static void southbridge_smi_sleep(unsigned int node, smm_state_save_area_t *stat
    slp_typ = (reg32 >> 10) & 7;

/* Do any mainboard sleep handling */
-	tseg_fixup((void **)&mainboard_sleep);
+	tseg_relocate((void **)&mainboard_sleep);
    if (mainboard_sleep)
    	mainboard_sleep(slp_typ);

@@ -456,7 +454,7 @@ static void southbridge_smi_apmc(unsigned int node, smm_state_save_area_t *state
    	break;
    }

-	tseg_fixup((void **)&mainboard_apmc);
+	tseg_relocate((void **)&mainboard_apmc);
    if (mainboard_apmc)
    	mainboard_apmc(reg8);
 }
@@ -496,7 +494,7 @@ static void southbridge_smi_gpi(unsigned int node, smm_state_save_area_t *state_

reg16 &= inw(pmbase + ALT_GP_SMI_EN);

-	tseg_fixup((void **)&mainboard_gpi);
+	tseg_relocate((void **)&mainboard_gpi);
    if (mainboard_gpi) {
    	mainboard_gpi(reg16);
    } else {