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

sb/intel/lynxpoint: Ensure that `dev->chip_info` is not null 

Use either a regular null check or `config_of` to avoid bugs.

Change-Id: I36a01b898c3e62423f27c2940b5f875b73e36950
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46665
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2020-10-23 00:11:26 +02:00
parent 84fa224b53
commit cbcbb6767e
4 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/southbridge/intel/lynxpoint/fadt.c
View File

@ -61,7 +61,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
ACPI_FADT_S4_RTC_WAKE | ACPI_FADT_S4_RTC_WAKE |
ACPI_FADT_PLATFORM_CLOCK; ACPI_FADT_PLATFORM_CLOCK;
if (cfg->docking_supported) if (cfg && cfg->docking_supported)
fadt->flags |= ACPI_FADT_DOCKING_SUPPORTED; fadt->flags |= ACPI_FADT_DOCKING_SUPPORTED;
fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO; fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;

20
src/southbridge/intel/lynxpoint/lpc.c
View File

@ -138,10 +138,8 @@ static void pch_pirq_init(struct device *dev)
} }
} }
static void pch_gpi_routing(struct device *dev) static void pch_gpi_routing(struct device *dev, config_t *config)
{ {
/* Get the chip configuration */
config_t *config = dev->chip_info;
u32 reg32 = 0; u32 reg32 = 0;
/* An array would be much nicer here, or some /* An array would be much nicer here, or some
@ -173,8 +171,6 @@ static void pch_power_options(struct device *dev)
u16 reg16; u16 reg16;
u32 reg32; u32 reg32;
const char *state; const char *state;
/* Get the chip configuration */
config_t *config = dev->chip_info;
u16 pmbase = get_pmbase(); u16 pmbase = get_pmbase();
int pwr_on = CONFIG_MAINBOARD_POWER_FAILURE_STATE; int pwr_on = CONFIG_MAINBOARD_POWER_FAILURE_STATE;
int nmi_option; int nmi_option;
@ -243,12 +239,15 @@ static void pch_power_options(struct device *dev)
reg16 &= ~(1 << 10); // Disable BIOS_PCI_EXP_EN for native PME reg16 &= ~(1 << 10); // Disable BIOS_PCI_EXP_EN for native PME
pci_write_config16(dev, GEN_PMCON_1, reg16); pci_write_config16(dev, GEN_PMCON_1, reg16);
if (dev->chip_info) {
config_t *config = dev->chip_info;
/* /*
* Set the board's GPI routing on LynxPoint-H. * Set the board's GPI routing on LynxPoint-H.
* This is done as part of GPIO configuration on LynxPoint-LP. * This is done as part of GPIO configuration on LynxPoint-LP.
*/ */
if (pch_is_lp()) if (pch_is_lp())
pch_gpi_routing(dev); pch_gpi_routing(dev, config);
/* GPE setup based on device tree configuration */ /* GPE setup based on device tree configuration */
enable_all_gpe(config->gpe0_en_1, config->gpe0_en_2, enable_all_gpe(config->gpe0_en_1, config->gpe0_en_2,
@ -256,6 +255,7 @@ static void pch_power_options(struct device *dev)
/* SMI setup based on device tree configuration */ /* SMI setup based on device tree configuration */
enable_alt_smi(config->alt_gp_smi_en); enable_alt_smi(config->alt_gp_smi_en);
}
/* Set up power management block and determine sleep mode */ /* Set up power management block and determine sleep mode */
reg32 = inl(pmbase + 0x04); // PM1_CNT reg32 = inl(pmbase + 0x04); // PM1_CNT
@ -345,10 +345,10 @@ static void lpt_lp_pm_init(struct device *dev)
/* Set RCBA CIR28 0x3A84 based on SATA port enables */ /* Set RCBA CIR28 0x3A84 based on SATA port enables */
data = 0x00001005; data = 0x00001005;
/* Port 3 and 2 disabled */ /* Port 3 and 2 disabled */
if ((config->sata_port_map & ((1 << 3) | (1 << 2))) == 0) if (config && (config->sata_port_map & ((1 << 3) | (1 << 2))) == 0)
data |= (1 << 24) | (1 << 26); data |= (1 << 24) | (1 << 26);
/* Port 1 and 0 disabled */ /* Port 1 and 0 disabled */
if ((config->sata_port_map & ((1 << 1) | (1 << 0))) == 0) if (config && (config->sata_port_map & ((1 << 1) | (1 << 0))) == 0)
data |= (1 << 20) | (1 << 18); data |= (1 << 20) | (1 << 18);
RCBA32(0x3a84) = data; RCBA32(0x3a84) = data;
@ -636,7 +636,6 @@ static void pch_lpc_add_gen_io_resources(struct device *dev, int reg_value,
static void pch_lpc_add_io_resources(struct device *dev) static void pch_lpc_add_io_resources(struct device *dev)
{ {
struct resource *res; struct resource *res;
config_t *config = dev->chip_info;
/* Add the default claimed IO range for the LPC device. */ /* Add the default claimed IO range for the LPC device. */
res = new_resource(dev, 0); res = new_resource(dev, 0);
@ -651,11 +650,14 @@ static void pch_lpc_add_io_resources(struct device *dev)
pch_lpc_add_io_resource(dev, get_pmbase(), 256, PMBASE); pch_lpc_add_io_resource(dev, get_pmbase(), 256, PMBASE);
/* LPC Generic IO Decode range. */ /* LPC Generic IO Decode range. */
if (dev->chip_info) {
config_t *config = dev->chip_info;
pch_lpc_add_gen_io_resources(dev, config->gen1_dec, LPC_GEN1_DEC); pch_lpc_add_gen_io_resources(dev, config->gen1_dec, LPC_GEN1_DEC);
pch_lpc_add_gen_io_resources(dev, config->gen2_dec, LPC_GEN2_DEC); pch_lpc_add_gen_io_resources(dev, config->gen2_dec, LPC_GEN2_DEC);
pch_lpc_add_gen_io_resources(dev, config->gen3_dec, LPC_GEN3_DEC); pch_lpc_add_gen_io_resources(dev, config->gen3_dec, LPC_GEN3_DEC);
pch_lpc_add_gen_io_resources(dev, config->gen4_dec, LPC_GEN4_DEC); pch_lpc_add_gen_io_resources(dev, config->gen4_dec, LPC_GEN4_DEC);
} }
}
static void pch_lpc_read_resources(struct device *dev) static void pch_lpc_read_resources(struct device *dev)
{ {

2
src/southbridge/intel/lynxpoint/serialio.c
View File

@ -131,7 +131,7 @@ static void serialio_init_once(int acpi_mode)
static void serialio_init(struct device *dev) static void serialio_init(struct device *dev)
{ {
struct southbridge_intel_lynxpoint_config *config = dev->chip_info; struct southbridge_intel_lynxpoint_config *config = config_of(dev);
struct resource *bar0, *bar1; struct resource *bar0, *bar1;
int sio_index = -1; int sio_index = -1;

2
src/southbridge/intel/lynxpoint/usb_xhci.c
View File

@ -328,7 +328,7 @@ static void usb_xhci_init(struct device *dev)
/* Reset ports that are disabled or /* Reset ports that are disabled or
* polling before returning to the OS. */ * polling before returning to the OS. */
usb_xhci_reset_usb3(dev, 0); usb_xhci_reset_usb3(dev, 0);
} else if (config->xhci_default) { } else if (config && config->xhci_default) {
/* Route all ports to XHCI */ /* Route all ports to XHCI */
apm_control(APM_CNT_ROUTE_ALL_XHCI); apm_control(APM_CNT_ROUTE_ALL_XHCI);
} }