From 2bbc3dc28d94fc437e3d3c1d613f47143b0d1280 Mon Sep 17 00:00:00 2001 From: Richard Spiegel Date: Wed, 6 Dec 2017 16:14:58 -0700 Subject: soc/amd/common: Move files to common/block The following files need to be moved: amd_pci_util.c, amd_pci_util.h and spi.c. The remaining files are AGESA related and will be part of a separate issue/commit. BUG=b:62240201 TEST=Build with no error gardenia and kahlee (no code change, just folder reorg). Change-Id: I3f965afa21124d4874d3b7bfe0f404a58b070e23 Signed-off-by: Richard Spiegel Reviewed-on: https://review.coreboot.org/22765 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/soc/amd/common/Makefile.inc | 3 +- src/soc/amd/common/amd_pci_util.c | 229 --------------------- src/soc/amd/common/amd_pci_util.h | 48 ----- .../common/block/include/amdblocks/amd_pci_util.h | 48 +++++ src/soc/amd/common/block/pci/Kconfig | 6 + src/soc/amd/common/block/pci/Makefile.inc | 5 + src/soc/amd/common/block/pci/amd_pci_util.c | 229 +++++++++++++++++++++ src/soc/amd/common/block/s3/Kconfig | 5 + src/soc/amd/common/block/s3/Makefile.inc | 5 + src/soc/amd/common/block/s3/spi.c | 39 ++++ src/soc/amd/common/spi.c | 39 ---- src/soc/amd/stoneyridge/Kconfig | 2 + src/soc/amd/stoneyridge/southbridge.c | 2 +- 13 files changed, 341 insertions(+), 319 deletions(-) delete mode 100644 src/soc/amd/common/amd_pci_util.c delete mode 100644 src/soc/amd/common/amd_pci_util.h create mode 100644 src/soc/amd/common/block/include/amdblocks/amd_pci_util.h create mode 100644 src/soc/amd/common/block/pci/Kconfig create mode 100644 src/soc/amd/common/block/pci/Makefile.inc create mode 100644 src/soc/amd/common/block/pci/amd_pci_util.c create mode 100644 src/soc/amd/common/block/s3/Kconfig create mode 100644 src/soc/amd/common/block/s3/Makefile.inc create mode 100644 src/soc/amd/common/block/s3/spi.c delete mode 100644 src/soc/amd/common/spi.c (limited to 'src/soc/amd') diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc index 22eb0d6f74..b485bb3479 100644 --- a/src/soc/amd/common/Makefile.inc +++ b/src/soc/amd/common/Makefile.inc @@ -12,10 +12,9 @@ romstage-y += heapmanager.c ramstage-y += agesawrapper.c ramstage-y += amd_late_init.c -ramstage-y += amd_pci_util.c ramstage-y += def_callouts.c ramstage-y += heapmanager.c -ramstage-$(CONFIG_SPI_FLASH) += spi.c + subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK) += block endif diff --git a/src/soc/amd/common/amd_pci_util.c b/src/soc/amd/common/amd_pci_util.c deleted file mode 100644 index ca022fbdbb..0000000000 --- a/src/soc/amd/common/amd_pci_util.c +++ /dev/null @@ -1,229 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 Sage Electronic Engineering, LLC. - * Copyright (C) 2017 Advanced Micro Devices, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include -#include -#include -#include - -const struct pirq_struct *pirq_data_ptr; -u32 pirq_data_size; -const u8 *intr_data_ptr; -const u8 *picr_data_ptr; - -/* - * Read the FCH PCI_INTR registers 0xC00/0xC01 at a - * given index and a given PIC (0) or IOAPIC (1) mode - */ -u8 read_pci_int_idx(u8 index, int mode) -{ - outb((mode << 7) | index, PCI_INTR_INDEX); - return inb(PCI_INTR_DATA); -} - -/* - * Write a value to the FCH PCI_INTR registers 0xC00/0xC01 - * at a given index and PIC (0) or IOAPIC (1) mode - */ -void write_pci_int_idx(u8 index, int mode, u8 data) -{ - outb((mode << 7) | index, PCI_INTR_INDEX); - outb(data, PCI_INTR_DATA); -} - -/* - * Write the FCH PCI_INTR registers 0xC00/0xC01 with values - * given in global variables intr_data and picr_data. - * These variables are defined in mainboard.c - */ -void write_pci_int_table(void) -{ - uint8_t byte; - size_t i, limit; - const struct irq_idx_name *idx_name; - - idx_name = sb_get_apic_reg_association(&limit); - if (picr_data_ptr == NULL || idx_name == NULL) { - printk(BIOS_ERR, "Warning: Can't write PCI_INTR 0xC00/0xC01" - " registers because\n" - "'mainboard_picr_data' or" - " irq_association' tables are NULL\n"); - return; - } - - /* PIC IRQ routine */ - printk(BIOS_DEBUG, "PCI_INTR tables: Writing registers C00/C01 for" - " PCI IRQ routing:\n" - "\tPCI_INTR_INDEX\t\tPIC mode" - "\tAPIC mode\n"); - /* - * Iterate table idx_name, indexes outside the table are ignored - * (assumed not connected within the chip). For each iteration, - * get the register index "byte" and the name of the associated - * IRQ source for printing. - */ - for (i = 0 ; i < limit; i++) { - byte = idx_name[i].index; - write_pci_int_idx(byte, 0, (u8) picr_data_ptr[byte]); - printk(BIOS_DEBUG, "\t0x%02X %s\t0x%02X\t\t", - byte, idx_name[i].name, - read_pci_int_idx(byte, 0)); - write_pci_int_idx(byte, 1, (u8) intr_data_ptr[byte]); - printk(BIOS_DEBUG, "0x%02X\n", read_pci_int_idx(byte, 1)); - } -} - -/* - * Function to write the PCI config space Interrupt - * registers based on the values given in PCI_INTR - * table at I/O port 0xC00/0xC01 - */ -void write_pci_cfg_irqs(void) -{ - device_t dev = NULL; /* Our current device to route IRQs */ - device_t target_dev = NULL; /* to bridge a device may be connected to */ - u16 int_pin = 0; /* Value of the INT_PIN register 0x3D */ - u16 target_pin = 0; /* Pin we will search our tables for */ - u16 int_line = 0; /* IRQ # read from PCI_INTR tbl and write to 3C */ - u16 pci_intr_idx = 0; /* Index into PCI_INTR table, 0xC00/0xC01 */ - u8 bus = 0; /* A PCI Device Bus number */ - u16 devfn = 0; /* A PCI Device and Function number */ - u8 bridged_device = 0; /* This device is on a PCI bridge */ - u32 i = 0; - size_t limit; - const struct irq_idx_name *idx_name; - - idx_name = sb_get_apic_reg_association(&limit); - if (pirq_data_ptr == NULL) { - printk(BIOS_WARNING, "Warning: Can't write PCI IRQ assignments" - " because 'mainboard_pirq_data' structure does" - " not exist\n"); - return; - } - - /* Populate the PCI cfg space header with the IRQ assignment */ - printk(BIOS_DEBUG, "PCI_CFG IRQ: Write PCI config space IRQ" - " assignments\n"); - - for (dev = all_devices ; dev ; dev = dev->next) { - /* - * Step 1: Get INT_PIN and device structure to look for in the - * PCI_INTR table pirq_data - */ - target_dev = NULL; - target_pin = get_pci_irq_pins(dev, &target_dev); - if (target_dev == NULL) - continue; - - if (target_pin < 1) - continue; - - /* Get the original INT_PIN for record keeping */ - int_pin = pci_read_config8(dev, PCI_INTERRUPT_PIN); - if (int_pin < 1 || int_pin > 4) - continue; /* Device has invalid INT_PIN - skip */ - - bus = target_dev->bus->secondary; - devfn = target_dev->path.pci.devfn; - - /* - * Step 2: Use the INT_PIN and DevFn number to find the PCI_INTR - * register (0xC00) index for this device - */ - pci_intr_idx = 0xbad; /* Will check to make sure it changed */ - for (i = 0 ; i < pirq_data_size ; i++) { - if (pirq_data_ptr[i].devfn != devfn) - continue; - - /* PIN_A is idx0 in pirq_data array but 1 in PCI reg */ - pci_intr_idx = pirq_data_ptr[i].PIN[target_pin - 1]; - printk(BIOS_SPEW, "\tFound this device in pirq_data" - " table entry %d\n", i); - break; - } - - /* - * Step 3: Make sure we got a valid index and use it to get - * the IRQ number from the PCI_INTR register table - */ - if (pci_intr_idx == 0xbad) { - /* Not on a bridge or in pirq_data table, skip it */ - printk(BIOS_SPEW, "PCI Devfn (0x%x) not found in" - " pirq_data table\n", devfn); - continue; - } else if (pci_intr_idx == 0x1f) { - /* Index found is not defined */ - printk(BIOS_SPEW, "Got index 0x1F (Not Connected)," - " perhaps this device was" - " defined wrong?\n"); - continue; - } - /* - * Find the name associated with register [pci_intr_idx] - * and print information. - */ - for (i = 0; i < limit; i++) { - if (idx_name[i].index == pci_intr_idx) - break; - } - if (i == limit) { - printk(BIOS_SPEW, "Got register index 0x%02x" - " undefined in table irq_idx_name,\n" - " perhaps this device was" - " defined wrong?\n", pci_intr_idx); - continue; - } - - /* Find the value to program into the INT_LINE register from - * the PCI_INTR registers - */ - int_line = read_pci_int_idx(pci_intr_idx, 0); - if (int_line == PIRQ_NC) { /* The IRQ found is disabled */ - printk(BIOS_SPEW, "Got IRQ 0x1F (disabled), perhaps" - " this device was defined wrong?\n"); - continue; - } - - /* - * Step 4: Program the INT_LINE register in this device's - * PCI config space with the IRQ number we found in step 3 - * and make it Level Triggered - */ - pci_write_config8(dev, PCI_INTERRUPT_LINE, int_line); - - /* Set IRQ to level triggered since used by a PCI device */ - i8259_configure_irq_trigger(int_line, IRQ_LEVEL_TRIGGERED); - - /* - * Step 5: Print out debug info and move on to next device - */ - printk(BIOS_SPEW, "\tOrig INT_PIN\t: %d (%s)\n", - int_pin, pin_to_str(int_pin)); - if (bridged_device) - printk(BIOS_SPEW, "\tSwizzled to\t: %d (%s)\n", - target_pin, pin_to_str(target_pin)); - - printk(BIOS_SPEW, "\tPCI_INTR idx\t: 0x%02x (%s)\n" - "\tINT_LINE\t: 0x%X (IRQ %d)\n", - pci_intr_idx, idx_name[i].name, - int_line, int_line); - } /* for (dev = all_devices) */ - printk(BIOS_DEBUG, "PCI_CFG IRQ: Finished writing PCI config space" - " IRQ assignments\n"); -} diff --git a/src/soc/amd/common/amd_pci_util.h b/src/soc/amd/common/amd_pci_util.h deleted file mode 100644 index 92d27dcca7..0000000000 --- a/src/soc/amd/common/amd_pci_util.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 Sage Electronic Engineering, LLC. - * Copyright (C) 2017 Advanced Micro Devices, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __AMD_PCI_UTIL_H__ -#define __AMD_PCI_UTIL_H__ - -#include -#include - -/* FCH index/data registers */ -#define PCI_INTR_INDEX 0xc00 -#define PCI_INTR_DATA 0xc01 - -struct pirq_struct { - u8 devfn; - u8 PIN[4]; /* PINA/B/C/D are index 0/1/2/3 */ -}; - -struct irq_idx_name { - uint8_t index; - const char * const name; -}; - -extern const struct pirq_struct *pirq_data_ptr; -extern u32 pirq_data_size; -extern const u8 *intr_data_ptr; -extern const u8 *picr_data_ptr; - -u8 read_pci_int_idx(u8 index, int mode); -void write_pci_int_idx(u8 index, int mode, u8 data); -void write_pci_cfg_irqs(void); -void write_pci_int_table(void); -const struct irq_idx_name *sb_get_apic_reg_association(size_t *size); - -#endif /* __AMD_PCI_UTIL_H__ */ diff --git a/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h b/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h new file mode 100644 index 0000000000..92d27dcca7 --- /dev/null +++ b/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h @@ -0,0 +1,48 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Sage Electronic Engineering, LLC. + * Copyright (C) 2017 Advanced Micro Devices, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __AMD_PCI_UTIL_H__ +#define __AMD_PCI_UTIL_H__ + +#include +#include + +/* FCH index/data registers */ +#define PCI_INTR_INDEX 0xc00 +#define PCI_INTR_DATA 0xc01 + +struct pirq_struct { + u8 devfn; + u8 PIN[4]; /* PINA/B/C/D are index 0/1/2/3 */ +}; + +struct irq_idx_name { + uint8_t index; + const char * const name; +}; + +extern const struct pirq_struct *pirq_data_ptr; +extern u32 pirq_data_size; +extern const u8 *intr_data_ptr; +extern const u8 *picr_data_ptr; + +u8 read_pci_int_idx(u8 index, int mode); +void write_pci_int_idx(u8 index, int mode, u8 data); +void write_pci_cfg_irqs(void); +void write_pci_int_table(void); +const struct irq_idx_name *sb_get_apic_reg_association(size_t *size); + +#endif /* __AMD_PCI_UTIL_H__ */ diff --git a/src/soc/amd/common/block/pci/Kconfig b/src/soc/amd/common/block/pci/Kconfig new file mode 100644 index 0000000000..74ea69784d --- /dev/null +++ b/src/soc/amd/common/block/pci/Kconfig @@ -0,0 +1,6 @@ +config SOC_AMD_COMMON_BLOCK_PCI + bool + default n + help + This option builds functions used to program PCI interrupt + routing, both PIC and APIC modes. diff --git a/src/soc/amd/common/block/pci/Makefile.inc b/src/soc/amd/common/block/pci/Makefile.inc new file mode 100644 index 0000000000..fc40c9d478 --- /dev/null +++ b/src/soc/amd/common/block/pci/Makefile.inc @@ -0,0 +1,5 @@ +ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_PCI),y) + +ramstage-y += amd_pci_util.c + +endif diff --git a/src/soc/amd/common/block/pci/amd_pci_util.c b/src/soc/amd/common/block/pci/amd_pci_util.c new file mode 100644 index 0000000000..d30adf4134 --- /dev/null +++ b/src/soc/amd/common/block/pci/amd_pci_util.c @@ -0,0 +1,229 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Sage Electronic Engineering, LLC. + * Copyright (C) 2017 Advanced Micro Devices, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include + +const struct pirq_struct *pirq_data_ptr; +u32 pirq_data_size; +const u8 *intr_data_ptr; +const u8 *picr_data_ptr; + +/* + * Read the FCH PCI_INTR registers 0xC00/0xC01 at a + * given index and a given PIC (0) or IOAPIC (1) mode + */ +u8 read_pci_int_idx(u8 index, int mode) +{ + outb((mode << 7) | index, PCI_INTR_INDEX); + return inb(PCI_INTR_DATA); +} + +/* + * Write a value to the FCH PCI_INTR registers 0xC00/0xC01 + * at a given index and PIC (0) or IOAPIC (1) mode + */ +void write_pci_int_idx(u8 index, int mode, u8 data) +{ + outb((mode << 7) | index, PCI_INTR_INDEX); + outb(data, PCI_INTR_DATA); +} + +/* + * Write the FCH PCI_INTR registers 0xC00/0xC01 with values + * given in global variables intr_data and picr_data. + * These variables are defined in mainboard.c + */ +void write_pci_int_table(void) +{ + uint8_t byte; + size_t i, limit; + const struct irq_idx_name *idx_name; + + idx_name = sb_get_apic_reg_association(&limit); + if (picr_data_ptr == NULL || idx_name == NULL) { + printk(BIOS_ERR, "Warning: Can't write PCI_INTR 0xC00/0xC01" + " registers because\n" + "'mainboard_picr_data' or" + " irq_association' tables are NULL\n"); + return; + } + + /* PIC IRQ routine */ + printk(BIOS_DEBUG, "PCI_INTR tables: Writing registers C00/C01 for" + " PCI IRQ routing:\n" + "\tPCI_INTR_INDEX\t\tPIC mode" + "\tAPIC mode\n"); + /* + * Iterate table idx_name, indexes outside the table are ignored + * (assumed not connected within the chip). For each iteration, + * get the register index "byte" and the name of the associated + * IRQ source for printing. + */ + for (i = 0 ; i < limit; i++) { + byte = idx_name[i].index; + write_pci_int_idx(byte, 0, (u8) picr_data_ptr[byte]); + printk(BIOS_DEBUG, "\t0x%02X %s\t0x%02X\t\t", + byte, idx_name[i].name, + read_pci_int_idx(byte, 0)); + write_pci_int_idx(byte, 1, (u8) intr_data_ptr[byte]); + printk(BIOS_DEBUG, "0x%02X\n", read_pci_int_idx(byte, 1)); + } +} + +/* + * Function to write the PCI config space Interrupt + * registers based on the values given in PCI_INTR + * table at I/O port 0xC00/0xC01 + */ +void write_pci_cfg_irqs(void) +{ + device_t dev = NULL; /* Our current device to route IRQs */ + device_t target_dev = NULL; /* to bridge a device may be connected to */ + u16 int_pin = 0; /* Value of the INT_PIN register 0x3D */ + u16 target_pin = 0; /* Pin we will search our tables for */ + u16 int_line = 0; /* IRQ # read from PCI_INTR tbl and write to 3C */ + u16 pci_intr_idx = 0; /* Index into PCI_INTR table, 0xC00/0xC01 */ + u8 bus = 0; /* A PCI Device Bus number */ + u16 devfn = 0; /* A PCI Device and Function number */ + u8 bridged_device = 0; /* This device is on a PCI bridge */ + u32 i = 0; + size_t limit; + const struct irq_idx_name *idx_name; + + idx_name = sb_get_apic_reg_association(&limit); + if (pirq_data_ptr == NULL) { + printk(BIOS_WARNING, "Warning: Can't write PCI IRQ assignments" + " because 'mainboard_pirq_data' structure does" + " not exist\n"); + return; + } + + /* Populate the PCI cfg space header with the IRQ assignment */ + printk(BIOS_DEBUG, "PCI_CFG IRQ: Write PCI config space IRQ" + " assignments\n"); + + for (dev = all_devices ; dev ; dev = dev->next) { + /* + * Step 1: Get INT_PIN and device structure to look for in the + * PCI_INTR table pirq_data + */ + target_dev = NULL; + target_pin = get_pci_irq_pins(dev, &target_dev); + if (target_dev == NULL) + continue; + + if (target_pin < 1) + continue; + + /* Get the original INT_PIN for record keeping */ + int_pin = pci_read_config8(dev, PCI_INTERRUPT_PIN); + if (int_pin < 1 || int_pin > 4) + continue; /* Device has invalid INT_PIN - skip */ + + bus = target_dev->bus->secondary; + devfn = target_dev->path.pci.devfn; + + /* + * Step 2: Use the INT_PIN and DevFn number to find the PCI_INTR + * register (0xC00) index for this device + */ + pci_intr_idx = 0xbad; /* Will check to make sure it changed */ + for (i = 0 ; i < pirq_data_size ; i++) { + if (pirq_data_ptr[i].devfn != devfn) + continue; + + /* PIN_A is idx0 in pirq_data array but 1 in PCI reg */ + pci_intr_idx = pirq_data_ptr[i].PIN[target_pin - 1]; + printk(BIOS_SPEW, "\tFound this device in pirq_data" + " table entry %d\n", i); + break; + } + + /* + * Step 3: Make sure we got a valid index and use it to get + * the IRQ number from the PCI_INTR register table + */ + if (pci_intr_idx == 0xbad) { + /* Not on a bridge or in pirq_data table, skip it */ + printk(BIOS_SPEW, "PCI Devfn (0x%x) not found in" + " pirq_data table\n", devfn); + continue; + } else if (pci_intr_idx == 0x1f) { + /* Index found is not defined */ + printk(BIOS_SPEW, "Got index 0x1F (Not Connected)," + " perhaps this device was" + " defined wrong?\n"); + continue; + } + /* + * Find the name associated with register [pci_intr_idx] + * and print information. + */ + for (i = 0; i < limit; i++) { + if (idx_name[i].index == pci_intr_idx) + break; + } + if (i == limit) { + printk(BIOS_SPEW, "Got register index 0x%02x" + " undefined in table irq_idx_name,\n" + " perhaps this device was" + " defined wrong?\n", pci_intr_idx); + continue; + } + + /* Find the value to program into the INT_LINE register from + * the PCI_INTR registers + */ + int_line = read_pci_int_idx(pci_intr_idx, 0); + if (int_line == PIRQ_NC) { /* The IRQ found is disabled */ + printk(BIOS_SPEW, "Got IRQ 0x1F (disabled), perhaps" + " this device was defined wrong?\n"); + continue; + } + + /* + * Step 4: Program the INT_LINE register in this device's + * PCI config space with the IRQ number we found in step 3 + * and make it Level Triggered + */ + pci_write_config8(dev, PCI_INTERRUPT_LINE, int_line); + + /* Set IRQ to level triggered since used by a PCI device */ + i8259_configure_irq_trigger(int_line, IRQ_LEVEL_TRIGGERED); + + /* + * Step 5: Print out debug info and move on to next device + */ + printk(BIOS_SPEW, "\tOrig INT_PIN\t: %d (%s)\n", + int_pin, pin_to_str(int_pin)); + if (bridged_device) + printk(BIOS_SPEW, "\tSwizzled to\t: %d (%s)\n", + target_pin, pin_to_str(target_pin)); + + printk(BIOS_SPEW, "\tPCI_INTR idx\t: 0x%02x (%s)\n" + "\tINT_LINE\t: 0x%X (IRQ %d)\n", + pci_intr_idx, idx_name[i].name, + int_line, int_line); + } /* for (dev = all_devices) */ + printk(BIOS_DEBUG, "PCI_CFG IRQ: Finished writing PCI config space" + " IRQ assignments\n"); +} diff --git a/src/soc/amd/common/block/s3/Kconfig b/src/soc/amd/common/block/s3/Kconfig new file mode 100644 index 0000000000..85863ca42f --- /dev/null +++ b/src/soc/amd/common/block/s3/Kconfig @@ -0,0 +1,5 @@ +config SOC_AMD_COMMON_BLOCK_S3 + bool + default n + help + Select this option to add S3 related functions to the build. diff --git a/src/soc/amd/common/block/s3/Makefile.inc b/src/soc/amd/common/block/s3/Makefile.inc new file mode 100644 index 0000000000..f19cb2e3b4 --- /dev/null +++ b/src/soc/amd/common/block/s3/Makefile.inc @@ -0,0 +1,5 @@ +ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_S3),y) + +ramstage-$(CONFIG_HAVE_ACPI_RESUME) += spi.c + +endif diff --git a/src/soc/amd/common/block/s3/spi.c b/src/soc/amd/common/block/s3/spi.c new file mode 100644 index 0000000000..f72416ad97 --- /dev/null +++ b/src/soc/amd/common/block/s3/spi.c @@ -0,0 +1,39 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2012 Advanced Micro Devices, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include + +void spi_SaveS3info(u32 pos, u32 size, u8 *buf, u32 len) +{ + struct spi_flash flash; + + spi_init(); + if (spi_flash_probe(0, 0, &flash)) { + printk(BIOS_DEBUG, "Could not find SPI device\n"); + /* Dont make flow stop. */ + return; + } + + spi_flash_volatile_group_begin(&flash); + + spi_flash_erase(&flash, pos, size); + spi_flash_write(&flash, pos, sizeof(len), &len); + spi_flash_write(&flash, pos + sizeof(len), len, buf); + + spi_flash_volatile_group_end(&flash); +} diff --git a/src/soc/amd/common/spi.c b/src/soc/amd/common/spi.c deleted file mode 100644 index f72416ad97..0000000000 --- a/src/soc/amd/common/spi.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 Advanced Micro Devices, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include - -void spi_SaveS3info(u32 pos, u32 size, u8 *buf, u32 len) -{ - struct spi_flash flash; - - spi_init(); - if (spi_flash_probe(0, 0, &flash)) { - printk(BIOS_DEBUG, "Could not find SPI device\n"); - /* Dont make flow stop. */ - return; - } - - spi_flash_volatile_group_begin(&flash); - - spi_flash_erase(&flash, pos, size); - spi_flash_write(&flash, pos, sizeof(len), &len); - spi_flash_write(&flash, pos + sizeof(len), len, buf); - - spi_flash_volatile_group_end(&flash); -} diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index dd95b85677..8b9111e81e 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -46,8 +46,10 @@ config CPU_SPECIFIC_OPTIONS select SOC_AMD_PI select SOC_AMD_COMMON select SOC_AMD_COMMON_BLOCK + select SOC_AMD_COMMON_BLOCK_PCI select SOC_AMD_COMMON_BLOCK_PSP select SOC_AMD_COMMON_BLOCK_CAR + select SOC_AMD_COMMON_BLOCK_S3 select C_ENVIRONMENT_BOOTBLOCK select BOOTBLOCK_CONSOLE select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH diff --git a/src/soc/amd/stoneyridge/southbridge.c b/src/soc/amd/stoneyridge/southbridge.c index f8e06b3c5e..ed1d10a591 100644 --- a/src/soc/amd/stoneyridge/southbridge.c +++ b/src/soc/amd/stoneyridge/southbridge.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.3