GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/prodrive/hermes: Encapsulate GPIO setup 

Having variants' gpio.c call the `gpio_configure_pads` function results
in an API that does not need to pass data around, which is much simpler.

Change-Id: I1064dc6258561bcf83f0e249d65b823368cf0d31
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47958
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by:  Felix Singer <felixsinger@posteo.net>
This commit is contained in:
Angel Pons 2020-11-24 15:26:10 +01:00 committed by Patrick Georgi
parent 329ebb340b
commit fe17a8cd6a
4 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mainboard/prodrive/hermes/bootblock.c
View File

@ -6,20 +6,12 @@
#include <variant/gpio.h> #include <variant/gpio.h>
#include "gpio.h" #include "gpio.h"
static void early_config_gpio(void)
{
/* This is a hack for FSP because it does things in MemoryInit()
* which it shouldn't do. We have to prepare certain gpios here
* because of the brokenness in FSP. */
size_t num = 0;
const struct pad_config *early_gpio_table = get_early_gpio_table(&num);
gpio_configure_pads(early_gpio_table, num);
}
void bootblock_mainboard_early_init(void) void bootblock_mainboard_early_init(void)
{ {
early_config_gpio(); /* This is a hack for FSP because it does things in MemoryInit()
which it shouldn't do. We have to prepare certain gpios here
because of the brokenness in FSP. */
program_early_gpio_pads();
} }
void bootblock_mainboard_init(void) void bootblock_mainboard_init(void)

5
src/mainboard/prodrive/hermes/ramstage.c
View File

@ -10,12 +10,9 @@ static fsp_params parmas_list[] = {
void mainboard_silicon_init_params(FSP_S_CONFIG *params) void mainboard_silicon_init_params(FSP_S_CONFIG *params)
{ {
size_t num = 0;
const struct pad_config *gpio_table = get_gpio_table(&num);
/* Configure pads prior to SiliconInit() in case there's any /* Configure pads prior to SiliconInit() in case there's any
dependencies during hardware initialization. */ dependencies during hardware initialization. */
gpio_configure_pads(gpio_table, num); program_gpio_pads();
params->SataLedEnable = 1; params->SataLedEnable = 1;

12
src/mainboard/prodrive/hermes/variants/baseboard/gpio.c
View File

@ -2,6 +2,8 @@
#include "include/variant/gpio.h" #include "include/variant/gpio.h"
#include <commonlib/helpers.h> #include <commonlib/helpers.h>
#include <soc/gpio.h>
#include <intelblocks/gpio_defs.h>
/* Pad configuration in ramstage */ /* Pad configuration in ramstage */
static const struct pad_config gpio_table[] = { static const struct pad_config gpio_table[] = {
@ -389,14 +391,12 @@ const struct pad_config early_gpio_table[] = {
PAD_CFG_GPO(GPP_H5, 0, DEEP), /* PCH_HBLED_n */ PAD_CFG_GPO(GPP_H5, 0, DEEP), /* PCH_HBLED_n */
}; };
const struct pad_config *get_gpio_table(size_t *num) void program_gpio_pads(void)
{ {
*num = ARRAY_SIZE(gpio_table); gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
return gpio_table;
} }
const struct pad_config *get_early_gpio_table(size_t *num) void program_early_gpio_pads(void)
{ {
*num = ARRAY_SIZE(early_gpio_table); gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table));
return early_gpio_table;
} }

7
src/mainboard/prodrive/hermes/variants/baseboard/include/variant/gpio.h
View File

@ -3,10 +3,7 @@
#ifndef PCH_GPIO_H #ifndef PCH_GPIO_H
#define PCH_GPIO_H #define PCH_GPIO_H
#include <soc/gpio.h> void program_gpio_pads(void);
#include <intelblocks/gpio_defs.h> void program_early_gpio_pads(void);
const struct pad_config *get_gpio_table(size_t *num);
const struct pad_config *get_early_gpio_table(size_t *num);
#endif /* PCH_GPIO_H */ #endif /* PCH_GPIO_H */