diff options
| -rw-r--r-- | src/soc/amd/common/block/pi/def_callouts.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/lpc.c | 1 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/northbridge.c | 8 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/southbridge.c | 3 |
4 files changed, 5 insertions, 9 deletions
diff --git a/src/soc/amd/common/block/pi/def_callouts.c b/src/soc/amd/common/block/pi/def_callouts.c index 0fffaf345b..693c7c58e3 100644 --- a/src/soc/amd/common/block/pi/def_callouts.c +++ b/src/soc/amd/common/block/pi/def_callouts.c @@ -116,10 +116,8 @@ AGESA_STATUS agesa_Reset(uint32_t Func, uintptr_t Data, void *ConfigPtr) { AGESA_STATUS Status; uintptr_t ResetType; - AMD_CONFIG_PARAMS *StdHeader; ResetType = Data; - StdHeader = ConfigPtr; /* * This should perform the RESET based upon the ResetType, but coreboot diff --git a/src/soc/amd/stoneyridge/lpc.c b/src/soc/amd/stoneyridge/lpc.c index 317574b36c..efc948d69e 100644 --- a/src/soc/amd/stoneyridge/lpc.c +++ b/src/soc/amd/stoneyridge/lpc.c @@ -145,6 +145,7 @@ static void lpc_read_resources(struct device *dev) /* Allocate ACPI NVS in CBMEM */ gnvs = cbmem_add(CBMEM_ID_ACPI_GNVS, sizeof(global_nvs_t)); + printk(BIOS_DEBUG, "ACPI GNVS at %p\n", gnvs); } static void lpc_set_resources(struct device *dev) diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c index 749eefe1b7..4a856a9fa2 100644 --- a/src/soc/amd/stoneyridge/northbridge.c +++ b/src/soc/amd/stoneyridge/northbridge.c @@ -232,9 +232,9 @@ static unsigned long agesa_write_acpi_tables(struct device *device, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current, acpi_fill_hest); + acpi_write_hest(hest, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); - current += ((acpi_header_t *)current)->length; + current += hest->header.length; /* BERT */ if (IS_ENABLED(CONFIG_ACPI_BERT) && bert_errors_present()) { @@ -250,9 +250,9 @@ static unsigned long agesa_write_acpi_tables(struct device *device, } else { current = ALIGN(current, 8); bert = (acpi_bert_t *)current; - acpi_write_bert((void *)current, (uintptr_t)rgn, size); + acpi_write_bert(bert, (uintptr_t)rgn, size); acpi_add_table(rsdp, (void *)current); - current += ((acpi_header_t *)current)->length; + current += bert->header.length; } } diff --git a/src/soc/amd/stoneyridge/southbridge.c b/src/soc/amd/stoneyridge/southbridge.c index fa9e48325d..5aea825b0c 100644 --- a/src/soc/amd/stoneyridge/southbridge.c +++ b/src/soc/amd/stoneyridge/southbridge.c @@ -217,13 +217,10 @@ uint16_t sb_wideio_size(int index) */ int sb_find_wideio_range(uint16_t start, uint16_t size) { - uint32_t enable_register; int i, index = WIDEIO_RANGE_ERROR; uint16_t end, current_size, start_wideio, end_wideio; end = start + size; - enable_register = pci_read_config32(SOC_LPC_DEV, - LPC_IO_OR_MEM_DECODE_ENABLE); for (i = 0; i < TOTAL_WIDEIO_PORTS; i++) { current_size = sb_wideio_size(i); if (current_size == 0) |