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

mb/*/chromeos.c: Fix PRE_RAM and unify style 

Change-Id: I99b9c0452ed0e6d580edb5a4f3317d776085b382
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30399
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2018-06-21 15:04:51 +03:00
parent 1de326460e
commit de7f0736a1
9 changed files with 55 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mainboard/google/beltino/chromeos.c
View File

@ -48,32 +48,32 @@ void fill_lb_gpios(struct lb_gpios *gpios)
int get_write_protect_state(void) int get_write_protect_state(void)
{ {
#ifdef __PRE_RAM__ #ifdef __SIMPLE_DEVICE__
pci_devfn_t dev; pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
dev = PCI_DEV(0, 0x1f, 2);
#else #else
struct device *dev; struct device *dev = pcidev_on_root(0x1f, 2);
dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2));
#endif #endif
return (pci_read_config32(dev, SATA_SP) >> FLAG_SPI_WP) & 1; return (pci_read_config32(dev, SATA_SP) >> FLAG_SPI_WP) & 1;
} }
int get_recovery_mode_switch(void) int get_recovery_mode_switch(void)
{ {
#ifdef __PRE_RAM__ #ifdef __SIMPLE_DEVICE__
pci_devfn_t dev; pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
dev = PCI_DEV(0, 0x1f, 2);
#else #else
struct device *dev; struct device *dev = pcidev_on_root(0x1f, 2);
dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2));
#endif #endif
return (pci_read_config32(dev, SATA_SP) >> FLAG_REC_MODE) & 1; return (pci_read_config32(dev, SATA_SP) >> FLAG_REC_MODE) & 1;
} }
#ifdef __PRE_RAM__
void init_bootmode_straps(void) void init_bootmode_straps(void)
{ {
u32 flags = 0; u32 flags = 0;
#ifdef __SIMPLE_DEVICE__
pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
#else
struct device *dev = pcidev_on_root(0x1f, 2);
#endif
/* Write Protect: GPIO58 = GPIO_SPI_WP, active high */ /* Write Protect: GPIO58 = GPIO_SPI_WP, active high */
if (get_gpio(GPIO_SPI_WP)) if (get_gpio(GPIO_SPI_WP))
@ -85,9 +85,8 @@ void init_bootmode_straps(void)
/* Developer: Virtual */ /* Developer: Virtual */
pci_write_config32(PCI_DEV(0, 0x1f, 2), SATA_SP, flags); pci_write_config32(dev, SATA_SP, flags);
} }
#endif
static const struct cros_gpio cros_gpios[] = { static const struct cros_gpio cros_gpios[] = {
CROS_GPIO_REC_AL(GPIO_REC_MODE, CROS_GPIO_DEVICE_NAME), CROS_GPIO_REC_AL(GPIO_REC_MODE, CROS_GPIO_DEVICE_NAME),

2
src/mainboard/google/butterfly/chromeos.c
View File

@ -37,7 +37,7 @@
void fill_lb_gpios(struct lb_gpios *gpios) void fill_lb_gpios(struct lb_gpios *gpios)
{ {
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f, 0)); struct device *dev = pcidev_on_root(0x1f, 0);
u16 gpio_base = pci_read_config16(dev, GPIOBASE) & 0xfffe; u16 gpio_base = pci_read_config16(dev, GPIOBASE) & 0xfffe;
int lidswitch = 0; int lidswitch = 0;

25
src/mainboard/google/jecht/chromeos.c
View File

@ -50,32 +50,32 @@ void fill_lb_gpios(struct lb_gpios *gpios)
int get_write_protect_state(void) int get_write_protect_state(void)
{ {
#ifdef __PRE_RAM__ #ifdef __SIMPLE_DEVICE__
pci_devfn_t dev; pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
dev = PCI_DEV(0, 0x1f, 2);
#else #else
struct device *dev; struct device *dev = pcidev_on_root(0x1f, 2);
dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2));
#endif #endif
return (pci_read_config32(dev, SATA_SP) >> FLAG_SPI_WP) & 1; return (pci_read_config32(dev, SATA_SP) >> FLAG_SPI_WP) & 1;
} }
int get_recovery_mode_switch(void) int get_recovery_mode_switch(void)
{ {
#ifdef __PRE_RAM__ #ifdef __SIMPLE_DEVICE__
pci_devfn_t dev; pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
dev = PCI_DEV(0, 0x1f, 2);
#else #else
struct device *dev; struct device *dev = pcidev_on_root(0x1f, 2);
dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2));
#endif #endif
return (pci_read_config32(dev, SATA_SP) >> FLAG_REC_MODE) & 1; return (pci_read_config32(dev, SATA_SP) >> FLAG_REC_MODE) & 1;
} }
#ifdef __PRE_RAM__
void init_bootmode_straps(void) void init_bootmode_straps(void)
{ {
u32 flags = 0; u32 flags = 0;
#ifdef __SIMPLE_DEVICE__
pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
#else
struct device *dev = pcidev_on_root(0x1f, 2);
#endif
/* Write Protect: GPIO58 = GPIO_SPI_WP, active high */ /* Write Protect: GPIO58 = GPIO_SPI_WP, active high */
if (get_gpio(GPIO_SPI_WP)) if (get_gpio(GPIO_SPI_WP))
@ -87,9 +87,8 @@ void init_bootmode_straps(void)
/* Developer: Virtual */ /* Developer: Virtual */
pci_write_config32(PCI_DEV(0, 0x1f, 2), SATA_SP, flags); pci_write_config32(dev, SATA_SP, flags);
} }
#endif
static const struct cros_gpio cros_gpios[] = { static const struct cros_gpio cros_gpios[] = {
CROS_GPIO_REC_AL(GPIO_REC_MODE, CROS_GPIO_DEVICE_NAME), CROS_GPIO_REC_AL(GPIO_REC_MODE, CROS_GPIO_DEVICE_NAME),

2
src/mainboard/google/parrot/chromeos.c
View File

@ -34,7 +34,7 @@
void fill_lb_gpios(struct lb_gpios *gpios) void fill_lb_gpios(struct lb_gpios *gpios)
{ {
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f, 0)); struct device *dev = pcidev_on_root(0x1f, 0);
u16 gpio_base = pci_read_config32(dev, GPIOBASE) & 0xfffe; u16 gpio_base = pci_read_config32(dev, GPIOBASE) & 0xfffe;
u16 gen_pmcon_1 = pci_read_config32(dev, GEN_PMCON_1); u16 gen_pmcon_1 = pci_read_config32(dev, GEN_PMCON_1);

2
src/mainboard/google/stout/chromeos.c
View File

@ -101,7 +101,7 @@ int get_recovery_mode_switch(void)
#else #else
static int ec_in_rec_mode = 0; static int ec_in_rec_mode = 0;
static int ec_rec_flag_good = 0; static int ec_rec_flag_good = 0;
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f, 0)); struct device *dev = pcidev_on_root(0x1f, 0);
#endif #endif
u8 ec_status = ec_read(EC_STATUS_REG); u8 ec_status = ec_read(EC_STATUS_REG);

2
src/mainboard/intel/baskingridge/chromeos.c
View File

@ -29,7 +29,7 @@
void fill_lb_gpios(struct lb_gpios *gpios) void fill_lb_gpios(struct lb_gpios *gpios)
{ {
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f, 0)); struct device *dev = pcidev_on_root(0x1f, 0);
u16 gpio_base = pci_read_config32(dev, GPIOBASE) & 0xfffe; u16 gpio_base = pci_read_config32(dev, GPIOBASE) & 0xfffe;
if (!gpio_base) if (!gpio_base)

2
src/mainboard/intel/emeraldlake2/chromeos.c
View File

@ -29,7 +29,7 @@
void fill_lb_gpios(struct lb_gpios *gpios) void fill_lb_gpios(struct lb_gpios *gpios)
{ {
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f, 0)); struct device *dev = pcidev_on_root(0x1f, 0);
u16 gpio_base = pci_read_config32(dev, GPIOBASE) & 0xfffe; u16 gpio_base = pci_read_config32(dev, GPIOBASE) & 0xfffe;
if (!gpio_base) if (!gpio_base)

29
src/mainboard/samsung/lumpy/chromeos.c
View File

@ -40,7 +40,7 @@
void fill_lb_gpios(struct lb_gpios *gpios) void fill_lb_gpios(struct lb_gpios *gpios)
{ {
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f, 0)); struct device *dev = pcidev_on_root(0x1f, 0);
u16 gen_pmcon_1 = pci_read_config32(dev, GEN_PMCON_1); u16 gen_pmcon_1 = pci_read_config32(dev, GEN_PMCON_1);
u8 lid = ec_read(0x83); u8 lid = ec_read(0x83);
@ -88,11 +88,9 @@ void fill_lb_gpios(struct lb_gpios *gpios)
int get_write_protect_state(void) int get_write_protect_state(void)
{ {
#ifdef __SIMPLE_DEVICE__ #ifdef __SIMPLE_DEVICE__
pci_devfn_t dev; pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
dev = PCI_DEV(0, 0x1f, 2);
#else #else
struct device *dev; struct device *dev = pcidev_on_root(0x1f, 2);
dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2));
#endif #endif
return (pci_read_config32(dev, SATA_SP) >> FLAG_SPI_WP) & 1; return (pci_read_config32(dev, SATA_SP) >> FLAG_SPI_WP) & 1;
} }
@ -100,11 +98,9 @@ int get_write_protect_state(void)
int get_developer_mode_switch(void) int get_developer_mode_switch(void)
{ {
#ifdef __SIMPLE_DEVICE__ #ifdef __SIMPLE_DEVICE__
pci_devfn_t dev; pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
dev = PCI_DEV(0, 0x1f, 2);
#else #else
struct device *dev; struct device *dev = pcidev_on_root(0x1f, 2);
dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2));
#endif #endif
return (pci_read_config32(dev, SATA_SP) >> FLAG_DEV_MODE) & 1; return (pci_read_config32(dev, SATA_SP) >> FLAG_DEV_MODE) & 1;
} }
@ -112,19 +108,21 @@ int get_developer_mode_switch(void)
int get_recovery_mode_switch(void) int get_recovery_mode_switch(void)
{ {
#ifdef __SIMPLE_DEVICE__ #ifdef __SIMPLE_DEVICE__
pci_devfn_t dev; pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
dev = PCI_DEV(0, 0x1f, 2);
#else #else
struct device *dev; struct device *dev = pcidev_on_root(0x1f, 2);
dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2));
#endif #endif
return (pci_read_config32(dev, SATA_SP) >> FLAG_REC_MODE) & 1; return (pci_read_config32(dev, SATA_SP) >> FLAG_REC_MODE) & 1;
} }
void init_bootmode_straps(void) void init_bootmode_straps(void)
{ {
#ifdef __PRE_RAM__
u32 flags = 0; u32 flags = 0;
#ifdef __SIMPLE_DEVICE__
pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
#else
struct device *dev = pcidev_on_root(0x1f, 2);
#endif
/* Write Protect: GPIO24 = KBC3_SPI_WP#, active high */ /* Write Protect: GPIO24 = KBC3_SPI_WP#, active high */
if (get_gpio(GPIO_SPI_WP)) if (get_gpio(GPIO_SPI_WP))
@ -136,8 +134,7 @@ void init_bootmode_straps(void)
if (get_gpio(GPIO_DEV_MODE)) if (get_gpio(GPIO_DEV_MODE))
flags |= (1 << FLAG_DEV_MODE); flags |= (1 << FLAG_DEV_MODE);
pci_write_config32(PCI_DEV(0, 0x1f, 2), SATA_SP, flags); pci_write_config32(dev, SATA_SP, flags);
#endif
} }
static const struct cros_gpio cros_gpios[] = { static const struct cros_gpio cros_gpios[] = {

29
src/mainboard/samsung/stumpy/chromeos.c
View File

@ -37,7 +37,7 @@
void fill_lb_gpios(struct lb_gpios *gpios) void fill_lb_gpios(struct lb_gpios *gpios)
{ {
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f, 0)); struct device *dev = pcidev_on_root(0x1f, 0);
u16 gen_pmcon_1 = pci_read_config32(dev, GEN_PMCON_1); u16 gen_pmcon_1 = pci_read_config32(dev, GEN_PMCON_1);
gpios->size = sizeof(*gpios) + (GPIO_COUNT * sizeof(struct lb_gpio)); gpios->size = sizeof(*gpios) + (GPIO_COUNT * sizeof(struct lb_gpio));
@ -85,11 +85,9 @@ void fill_lb_gpios(struct lb_gpios *gpios)
int get_write_protect_state(void) int get_write_protect_state(void)
{ {
#ifdef __SIMPLE_DEVICE__ #ifdef __SIMPLE_DEVICE__
pci_devfn_t dev; pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
dev = PCI_DEV(0, 0x1f, 2);
#else #else
struct device *dev; struct device *dev = pcidev_on_root(0x1f, 2);
dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2));
#endif #endif
return (pci_read_config32(dev, SATA_SP) >> FLAG_SPI_WP) & 1; return (pci_read_config32(dev, SATA_SP) >> FLAG_SPI_WP) & 1;
} }
@ -97,11 +95,9 @@ int get_write_protect_state(void)
int get_developer_mode_switch(void) int get_developer_mode_switch(void)
{ {
#ifdef __SIMPLE_DEVICE__ #ifdef __SIMPLE_DEVICE__
pci_devfn_t dev; pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
dev = PCI_DEV(0, 0x1f, 2);
#else #else
struct device *dev; struct device *dev = pcidev_on_root(0x1f, 2);
dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2));
#endif #endif
return (pci_read_config32(dev, SATA_SP) >> FLAG_DEV_MODE) & 1; return (pci_read_config32(dev, SATA_SP) >> FLAG_DEV_MODE) & 1;
} }
@ -109,19 +105,21 @@ int get_developer_mode_switch(void)
int get_recovery_mode_switch(void) int get_recovery_mode_switch(void)
{ {
#ifdef __SIMPLE_DEVICE__ #ifdef __SIMPLE_DEVICE__
pci_devfn_t dev; pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
dev = PCI_DEV(0, 0x1f, 2);
#else #else
struct device *dev; struct device *dev = pcidev_on_root(0x1f, 2);
dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2));
#endif #endif
return (pci_read_config32(dev, SATA_SP) >> FLAG_REC_MODE) & 1; return (pci_read_config32(dev, SATA_SP) >> FLAG_REC_MODE) & 1;
} }
void init_bootmode_straps(void) void init_bootmode_straps(void)
{ {
#ifdef __PRE_RAM__
u32 flags = 0; u32 flags = 0;
#ifdef __SIMPLE_DEVICE__
pci_devfn_t dev = PCI_DEV(0, 0x1f, 2);
#else
struct device *dev = pcidev_on_root(0x1f, 2);
#endif
/* Write Protect: GPIO68 = CHP3_SPI_WP, active high */ /* Write Protect: GPIO68 = CHP3_SPI_WP, active high */
if (get_gpio(GPIO_SPI_WP)) if (get_gpio(GPIO_SPI_WP))
@ -133,8 +131,7 @@ void init_bootmode_straps(void)
if (get_gpio(GPIO_DEV_MODE)) if (get_gpio(GPIO_DEV_MODE))
flags |= (1 << FLAG_DEV_MODE); flags |= (1 << FLAG_DEV_MODE);
pci_write_config32(PCI_DEV(0, 0x1f, 2), SATA_SP, flags); pci_write_config32(dev, SATA_SP, flags);
#endif
} }
static const struct cros_gpio cros_gpios[] = { static const struct cros_gpio cros_gpios[] = {