From 2fb232af8b9522db6bb91adea1e07344069666a8 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Thu, 3 Feb 2022 15:32:10 +0530 Subject: [PATCH] soc/intel/common: Remove GPIO PAD lock config override from mainboard This patch removes mainboard capability to override GPIO PAD lock configuration using `mb_gpio_lock_config` override function as the variant GPIO pad configuration table is now capable of locking GPIO PADs. BUG=b:208827718 TEST=Able to build and boot brya. Signed-off-by: Subrata Banik Change-Id: I6769f51afaf79b007d4f199bccc532d6b1c4d435 Reviewed-on: https://review.coreboot.org/c/coreboot/+/61587 Tested-by: build bot (Jenkins) Reviewed-by: Maulik V Vaghela Reviewed-by: EricR Lai Reviewed-by: Nick Vaccaro --- .../intel/common/block/include/intelblocks/gpio.h | 6 ------ src/soc/intel/common/block/smm/smihandler.c | 15 --------------- 2 files changed, 21 deletions(-) diff --git a/src/soc/intel/common/block/include/intelblocks/gpio.h b/src/soc/intel/common/block/include/intelblocks/gpio.h index b37dd12c69..d5cc8fe9c5 100644 --- a/src/soc/intel/common/block/include/intelblocks/gpio.h +++ b/src/soc/intel/common/block/include/intelblocks/gpio.h @@ -259,12 +259,6 @@ int gpio_lock_pads(const struct gpio_lock_config *pad_list, const size_t count); */ const struct gpio_lock_config *soc_gpio_lock_config(size_t *num); -/* - * Returns an array of gpio_lock_config entries that the mainboard - * deems security risks that should be locked down. - */ -const struct gpio_lock_config *mb_gpio_lock_config(size_t *num); - /* * Returns the pmc_gpe to gpio_gpe mapping table * diff --git a/src/soc/intel/common/block/smm/smihandler.c b/src/soc/intel/common/block/smm/smihandler.c index 32de2f6cf1..0cde289912 100644 --- a/src/soc/intel/common/block/smm/smihandler.c +++ b/src/soc/intel/common/block/smm/smihandler.c @@ -317,32 +317,17 @@ __weak const struct gpio_lock_config *soc_gpio_lock_config(size_t *num) return NULL; } -__weak const struct gpio_lock_config *mb_gpio_lock_config(size_t *num) -{ - *num = 0; - return NULL; -} - static void soc_lock_gpios(void) { const struct gpio_lock_config *soc_gpios; - const struct gpio_lock_config *mb_gpios; size_t soc_gpio_num; - size_t mb_gpio_num; /* get list of gpios from SoC */ soc_gpios = soc_gpio_lock_config(&soc_gpio_num); - /* get list of gpios from mainboard */ - mb_gpios = mb_gpio_lock_config(&mb_gpio_num); - /* Lock any soc requested gpios */ if (soc_gpio_num) gpio_lock_pads(soc_gpios, soc_gpio_num); - - /* Lock any mainboard requested gpios */ - if (mb_gpio_num) - gpio_lock_pads(mb_gpios, mb_gpio_num); } static void finalize(void)