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

google/cyan: Clean up write_protect_state() 

The commentary was wrong, write_protect_state() is only called
in ramstage at the moment, and only if MRC_SETTINGS_PROTECT is
selected.

Implementation of get_gpio() eventually does the MMIO read, so
BOARD_GOOGLE_CYAN was not a special case.

Change-Id: I96ca871110bcf2fc1485bd042ed137d51b822a20
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59014
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Kyösti Mälkki 2021-11-08 13:11:51 +02:00 committed by Arthur Heymans
parent 90e2adf0d3
commit 8a80cc8dd0
2 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mainboard/google/cyan/chromeos.c
View File

@ -8,14 +8,7 @@
#include <types.h> #include <types.h>
#include <vendorcode/google/chromeos/chromeos.h> #include <vendorcode/google/chromeos/chromeos.h>
/* The WP status pin lives on MF_ISH_GPIO_4 */ #include "onboard.h"
#define WP_STATUS_PAD_CFG0 0x4838
#define WP_STATUS_PAD_CFG1 0x483C
#define WP_GPIO GP_E_22
#define ACTIVE_LOW 0
#define ACTIVE_HIGH 1
void fill_lb_gpios(struct lb_gpios *gpios) void fill_lb_gpios(struct lb_gpios *gpios)
{ {
@ -29,30 +22,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
int get_write_protect_state(void) int get_write_protect_state(void)
{ {
/* return !!gpio_get(WP_GPIO);
* The vboot loader queries this function in romstage. The GPIOs have
* not been set up yet as that configuration is done in ramstage.
* Configuring this GPIO as input so that there isn't any ambiguity
* in the reading.
*/
#if ENV_ROMSTAGE
if (CONFIG(BOARD_GOOGLE_CYAN)) {
write32((void *)(COMMUNITY_GPEAST_BASE + WP_STATUS_PAD_CFG0),
(PAD_PULL_UP_20K | PAD_GPIO_ENABLE | PAD_CONFIG0_GPI_DEFAULT));
write32((void *)(COMMUNITY_GPEAST_BASE + WP_STATUS_PAD_CFG1),
PAD_CONFIG1_DEFAULT0);
} else {
gpio_input_pullup(WP_GPIO);
}
#endif
/* WP is enabled when the pin is reading high. */
if (CONFIG(BOARD_GOOGLE_CYAN)) {
return (read32((void *)(COMMUNITY_GPEAST_BASE + WP_STATUS_PAD_CFG0))
& PAD_VAL_HIGH);
} else {
return !!gpio_get(WP_GPIO);
}
} }
static const struct cros_gpio cros_gpios[] = { static const struct cros_gpio cros_gpios[] = {

9
src/mainboard/google/cyan/onboard.h Normal file
View File

@ -0,0 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef CYAN_ONBOARD_H
#define CYAN_ONBOARD_H
/* Write protect active high. */
#define WP_GPIO GP_E_22
#endif