From 261b893b7c82839e997c4310e5214a4388b3a62c Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Fri, 22 Dec 2017 13:41:35 +0530 Subject: soc/intel/{apollolake, cannonlake, common, skylake}: Add _soc_ prefix in weak function This patch ensures all soc function name is having _soc_ prefix in it. TEST=Able to compile SMM common code for all supported SOC. Change-Id: Iab1b2f51eaad87906e35dbb9e90272590974e145 Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/22973 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- .../common/block/include/intelblocks/smihandler.h | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'src/soc/intel/common/block/include/intelblocks/smihandler.h') diff --git a/src/soc/intel/common/block/include/intelblocks/smihandler.h b/src/soc/intel/common/block/include/intelblocks/smihandler.h index f1e3ecf9cb..df2d17c9e2 100644 --- a/src/soc/intel/common/block/include/intelblocks/smihandler.h +++ b/src/soc/intel/common/block/include/intelblocks/smihandler.h @@ -62,9 +62,6 @@ extern const smi_handler_t southbridge_smi[32]; #define SMI_HANDLER_SCI_EN(__bit) (1 << (__bit)) -/* SMI handlers that should be serviced in SCI mode too. */ -uint32_t smi_handler_get_sci_mask(void); - /* * This function should be implemented in SOC specific code to handle * the SMI event on SLP_EN. The default functionality is provided in @@ -143,22 +140,30 @@ void smihandler_southbridge_gpi( */ void smihandler_southbridge_espi( const struct smm_save_state_ops *save_state_ops); + +/* + * Returns gnvs pointer within SMM context + */ +struct global_nvs_t *smm_get_gnvs(void); + +/* SoC overrides. */ + /* * This function returns a 1 or 0 depending on whether disable_busmaster * needs to be done for the specified device on S5 entry */ -int smihandler_disable_busmaster(device_t dev); +int smihandler_soc_disable_busmaster(device_t dev); + +/* SMI handlers that should be serviced in SCI mode too. */ +uint32_t smihandler_soc_get_sci_mask(void); /* * SoC needs to implement the mechanism to know if an illegal attempt * has been made to write to the BIOS area. */ -void smihandler_check_illegal_access(uint32_t tco_sts); +void smihandler_soc_check_illegal_access(uint32_t tco_sts); -/* - * Returns gnvs pointer within SMM context - */ -struct global_nvs_t *smm_get_gnvs(void); +/* Mainboard overrides. */ /* Mainboard handler for GPI SMIs */ void mainboard_smi_gpi_handler(const struct gpi_status *sts); -- cgit v1.2.3