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

soc/braswell: Fix issues found during static code analysis 

TEST=Build, boot to OS

Original-Reviewed-on: https://chromium-review.googlesource.com/299483
Original-Reviewed-by: Aaron Durbin <adurbin@google.com>

Change-Id: I738003b8dfff6a5255085d39e378e18d6ad36bcf
Signed-off-by: Ravi Sarawadi <ravishankar.sarawadi@intel.com>
Reviewed-on: https://review.coreboot.org/12738
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Ravi Sarawadi 2015-09-09 14:12:16 -07:00 committed by Martin Roth
parent 9657f3bb09
commit d077b58c61
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mainboard/google/cyan/spd/spd.c
View File

@ -162,6 +162,9 @@ static void set_dimm_info(uint32_t chips, uint8_t *spd, struct dimm_info *dimm)
case 8: case 8:
log2_chips = 3; log2_chips = 3;
break; break;
default:
log2_chips = 0;
} }
dimm->bus_width = (uint8_t)(log2_chips + (spd[7] & 7) + 2 - 3); dimm->bus_width = (uint8_t)(log2_chips + (spd[7] & 7) + 2 - 3);
} }

11
src/soc/intel/braswell/chip.c
View File

@ -84,7 +84,16 @@ static void enable_dev(device_t dev)
void soc_silicon_init_params(SILICON_INIT_UPD *params) void soc_silicon_init_params(SILICON_INIT_UPD *params)
{ {
device_t dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC)); device_t dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC));
struct soc_intel_braswell_config *config = dev->chip_info; struct soc_intel_braswell_config *config;
if (!dev) {
printk(BIOS_ERR,
"Error! Device (%s) not found, "
"soc_silicon_init_params!\n", dev_path(dev));
return;
}
config = dev->chip_info;
/* Set the parameters for SiliconInit */ /* Set the parameters for SiliconInit */
printk(BIOS_DEBUG, "Updating UPD values for SiliconInit\n"); printk(BIOS_DEBUG, "Updating UPD values for SiliconInit\n");

13
src/soc/intel/braswell/pmutil.c
View File

@ -68,11 +68,6 @@ static void print_num_status_bits(int num_bits, uint32_t status,
} }
} }
static void print_status_bits(uint32_t status, const char * const bit_names[])
{
print_num_status_bits(32, status, bit_names);
}
static uint32_t print_smi_status(uint32_t smi_sts) static uint32_t print_smi_status(uint32_t smi_sts)
{ {
static const char * const smi_sts_bits[] = { static const char * const smi_sts_bits[] = {
@ -99,7 +94,7 @@ static uint32_t print_smi_status(uint32_t smi_sts)
return 0; return 0;
printk(BIOS_DEBUG, "SMI_STS: "); printk(BIOS_DEBUG, "SMI_STS: ");
print_status_bits(smi_sts, smi_sts_bits); print_num_status_bits(30, smi_sts, smi_sts_bits);
printk(BIOS_DEBUG, "\n"); printk(BIOS_DEBUG, "\n");
return smi_sts; return smi_sts;
@ -175,7 +170,7 @@ static uint16_t print_pm1_status(uint16_t pm1_sts)
return 0; return 0;
printk(BIOS_SPEW, "PM1_STS: "); printk(BIOS_SPEW, "PM1_STS: ");
print_status_bits(pm1_sts, pm1_sts_bits); print_num_status_bits(16, pm1_sts, pm1_sts_bits);
printk(BIOS_SPEW, "\n"); printk(BIOS_SPEW, "\n");
return pm1_sts; return pm1_sts;
@ -202,7 +197,7 @@ static uint32_t print_tco_status(uint32_t tco_sts)
return 0; return 0;
printk(BIOS_DEBUG, "TCO_STS: "); printk(BIOS_DEBUG, "TCO_STS: ");
print_status_bits(tco_sts, tco_sts_bits); print_num_status_bits(18, tco_sts, tco_sts_bits);
printk(BIOS_DEBUG, "\n"); printk(BIOS_DEBUG, "\n");
return tco_sts; return tco_sts;
@ -289,7 +284,7 @@ static uint32_t print_gpe_sts(uint32_t gpe_sts)
return gpe_sts; return gpe_sts;
printk(BIOS_DEBUG, "GPE0a_STS: "); printk(BIOS_DEBUG, "GPE0a_STS: ");
print_status_bits(gpe_sts, gpe_sts_bits); print_num_status_bits(32, gpe_sts, gpe_sts_bits);
printk(BIOS_DEBUG, "\n"); printk(BIOS_DEBUG, "\n");
return gpe_sts; return gpe_sts;

8
src/soc/intel/braswell/romstage/romstage.c
View File

@ -200,6 +200,14 @@ void soc_memory_init_params(struct romstage_params *params,
/* Set the parameters for MemoryInit */ /* Set the parameters for MemoryInit */
dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC)); dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC));
if (!dev) {
printk(BIOS_ERR,
"Error! Device (PCI:0:%02x.%01x) not found, "
"soc_memory_init_params!\n", LPC_DEV, LPC_FUNC);
return;
}
config = dev->chip_info; config = dev->chip_info;
printk(BIOS_DEBUG, "Updating UPD values for MemoryInit\n"); printk(BIOS_DEBUG, "Updating UPD values for MemoryInit\n");
upd->PcdMrcInitTsegSize = IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) ? upd->PcdMrcInitTsegSize = IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) ?