Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/51474 )
Change subject: mb/google/kahlee: remove get_gpe_table ......................................................................
mb/google/kahlee: remove get_gpe_table
Since no board overrides the weak get_gpe_table function, gpe_configure_sci wasn't called for any variant, so drop the function.
TEST=none
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: I3de204cc808449b625e1fa1e79fe653608e4b88a Reviewed-on: https://review.coreboot.org/c/coreboot/+/51474 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Furquan Shaikh furquan@google.com Reviewed-by: Mathew King mathewk@chromium.org --- M src/mainboard/google/kahlee/mainboard.c M src/mainboard/google/kahlee/variants/baseboard/gpio.c M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h 3 files changed, 0 insertions(+), 28 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Mathew King: Looks good to me, approved
diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c index a4dd0f4..ad38b2d 100644 --- a/src/mainboard/google/kahlee/mainboard.c +++ b/src/mainboard/google/kahlee/mainboard.c @@ -7,13 +7,11 @@ #include <acpi/acpi.h> #include <amdblocks/agesawrapper.h> #include <amdblocks/amd_pci_util.h> -#include <amdblocks/smi.h> #include <baseboard/variants.h> #include <boardid.h> #include <smbios.h> #include <soc/pci_devs.h> #include <soc/southbridge.h> -#include <soc/smi.h> #include <amdblocks/acpimmio.h> #include <variant/ec.h> #include <variant/thermal.h> @@ -102,8 +100,6 @@
static void mainboard_init(void *chip_info) { - const struct sci_source *gpes; - size_t num; int boardid = board_id(); size_t num_gpios; const struct soc_amd_gpio *gpios; @@ -115,17 +111,6 @@ gpios = variant_gpio_table(&num_gpios); program_gpios(gpios, num_gpios);
- /* - * Some platforms use SCI not generated by a GPIO pin (event above 23). - * For these boards, gpe_configure_sci() is still needed, but all GPIO - * generated events (23-0) must be removed from gpe_table[]. - * For boards that only have GPIO generated events, table gpe_table[] - * must be removed, and get_gpe_table() should return NULL. - */ - gpes = get_gpe_table(&num); - if (gpes != NULL) - gpe_configure_sci(gpes, num); - /* Initialize i2c busses that were not initialized in bootblock */ i2c_soc_init();
diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c index 22d8bb8..f2848f9 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c +++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c @@ -268,18 +268,6 @@ return gpio_set_stage_ram; }
-/* - * This function is still needed for boards that sets gevents above 23 - * that will generate SCI or SMI, such as kahlee. Normally this function - * points to a table of gevents and what needs to be set. The code that - * calls it was modified so that when this function returns NULL then the - * caller does nothing. - */ -const __weak struct sci_source *get_gpe_table(size_t *num) -{ - return NULL; -} - int __weak variant_get_xhci_oc_map(uint16_t *map) { *map = USB_OC0 << OC_PORT0_SHIFT; /* USB-C Port0/4 = OC0 */ diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h index f4f91ae..3469aa6 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h @@ -6,7 +6,6 @@ #include <stddef.h> #include <soc/southbridge.h>
-const struct sci_source *get_gpe_table(size_t *num); uint8_t variant_memory_sku(void); /* Return board SKU. Limited to uint8_t, so it fits into 3 decimal digits */ uint8_t variant_board_sku(void);