Vladimir Serbinenko (phcoder@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10354
-gerrit
commit be858a0edbff4280918d05c81573442d0fa666c3 Author: Vladimir Serbinenko phcoder@gmail.com Date: Thu May 28 21:06:24 2015 +0200
Remove leftover tseg_relocate
Change-Id: I534f992ed479c7cdc049bd598259b1f1cf2953b9 Signed-off-by: Vladimir Serbinenko phcoder@gmail.com --- src/drivers/spi/spi_flash.c | 17 ----------------- src/include/cpu/x86/smm.h | 4 ---- 2 files changed, 21 deletions(-)
diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c index d2a3c66..b0558bb 100644 --- a/src/drivers/spi/spi_flash.c +++ b/src/drivers/spi/spi_flash.c @@ -349,10 +349,6 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs) /* search the table for matches in shift and id */ for (i = 0; i < ARRAY_SIZE(flashes); ++i) if (flashes[i].shift == shift && flashes[i].idcode == *idp) { -#if CONFIG_SMM_TSEG && defined(__SMM__) - /* Need to relocate this function */ - tseg_relocate((void **)&flashes[i].probe); -#endif /* we have a match, call probe */ flash = flashes[i].probe(spi, idp); if (flash) @@ -360,10 +356,6 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs) }
if (!flash && spi->programmer_specific_probe) { -#if CONFIG_SMM_TSEG && defined(__SMM__) - /* Need to relocate this function */ - tseg_relocate((void **)&spi->programmer_specific_probe); -#endif flash = spi->programmer_specific_probe (spi); } if (!flash) { @@ -372,15 +364,6 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs) }
flash_detected: -#if CONFIG_SMM_TSEG && defined(__SMM__) - /* Ensure flash handlers are valid for TSEG */ - tseg_relocate((void **)&flash->read); - tseg_relocate((void **)&flash->write); - tseg_relocate((void **)&flash->erase); - tseg_relocate((void **)&flash->status); - tseg_relocate((void **)&flash->name); -#endif - printk(BIOS_INFO, "SF: Detected %s with sector size 0x%x, total 0x%x\n", flash->name, flash->sector_size, flash->size);
diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index 6992774..56e9a65 100644 --- a/src/include/cpu/x86/smm.h +++ b/src/include/cpu/x86/smm.h @@ -487,15 +487,11 @@ void mainboard_smi_sleep(u8 slp_typ);
#if !CONFIG_SMM_TSEG void smi_release_lock(void); -#define tseg_relocate(ptr) #elif CONFIG_SMM_MODULES -#define tseg_relocate(ptr) #define smi_get_tseg_base() 0 #else /* Return address of TSEG base */ u32 smi_get_tseg_base(void); -/* Adjust pointer with TSEG base */ -void tseg_relocate(void **ptr); #endif
/* Get PMBASE address */