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

soc/intel/baytrail/southcluster.c: Align with Braswell 

This reduces the differences between Bay Trail and Braswell.

Tested with BUILD_TIMELESS=1, Google Ninja remains identical.

Change-Id: I49e9cef1dfaa62dcfbd1260cec459ff5910ad5da
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43202
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2020-07-07 19:00:07 +02:00
parent ea07702f62
commit c4d4b54314
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/soc/intel/baytrail/southcluster.c
View File

@ -28,9 +28,8 @@
#include "chip.h" #include "chip.h"
#include <acpi/acpigen.h> #include <acpi/acpigen.h>
static inline void static inline void add_mmio_resource(struct device *dev, int i, unsigned long addr,
add_mmio_resource(struct device *dev, int i, unsigned long addr, unsigned long size)
unsigned long size)
{ {
mmio_resource(dev, i, addr >> 10, size >> 10); mmio_resource(dev, i, addr >> 10, size >> 10);
} }
@ -58,8 +57,7 @@ static inline int io_range_in_default(int base, int size)
return 0; return 0;
/* Is it entirely contained? */ /* Is it entirely contained? */
if (base >= LPC_DEFAULT_IO_RANGE_LOWER && if (base >= LPC_DEFAULT_IO_RANGE_LOWER && (base + size) < LPC_DEFAULT_IO_RANGE_UPPER)
(base + size) < LPC_DEFAULT_IO_RANGE_UPPER)
return 1; return 1;
/* This will return not in range for partial overlaps */ /* This will return not in range for partial overlaps */
@ -70,8 +68,7 @@ static inline int io_range_in_default(int base, int size)
* Note: this function assumes there is no overlap with the default LPC device's * Note: this function assumes there is no overlap with the default LPC device's
* claimed range: LPC_DEFAULT_IO_RANGE_LOWER -> LPC_DEFAULT_IO_RANGE_UPPER. * claimed range: LPC_DEFAULT_IO_RANGE_LOWER -> LPC_DEFAULT_IO_RANGE_UPPER.
*/ */
static void sc_add_io_resource(struct device *dev, int base, int size, static void sc_add_io_resource(struct device *dev, int base, int size, int index)
int index)
{ {
struct resource *res; struct resource *res;
@ -113,11 +110,6 @@ static void sc_read_resources(struct device *dev)
sc_add_io_resources(dev); sc_add_io_resources(dev);
} }
static void sc_rtc_init(void)
{
cmos_init(rtc_failure());
}
/* /*
* The UART hardware loses power while in suspend. Because of this the kernel * The UART hardware loses power while in suspend. Because of this the kernel
* can hang because it doesn't re-initialize serial ports it is using for * can hang because it doesn't re-initialize serial ports it is using for
@ -176,15 +168,14 @@ static void sc_init(struct device *dev)
/* Route SCI to IRQ9 */ /* Route SCI to IRQ9 */
write32(actl, (read32(actl) & ~SCIS_MASK) | SCIS_IRQ9); write32(actl, (read32(actl) & ~SCIS_MASK) | SCIS_IRQ9);
sc_rtc_init(); cmos_init(rtc_failure());
if (config->disable_slp_x_stretch_sus_fail) { if (config->disable_slp_x_stretch_sus_fail) {
printk(BIOS_DEBUG, "Disabling slp_x stretching.\n"); printk(BIOS_DEBUG, "Disabling slp_x stretching.\n");
write32(gen_pmcon1, write32(gen_pmcon1, read32(gen_pmcon1) | DIS_SLP_X_STRCH_SUS_UP);
read32(gen_pmcon1) | DIS_SLP_X_STRCH_SUS_UP);
} else { } else {
write32(gen_pmcon1, write32(gen_pmcon1, read32(gen_pmcon1) & ~DIS_SLP_X_STRCH_SUS_UP);
read32(gen_pmcon1) & ~DIS_SLP_X_STRCH_SUS_UP);
} }
if (acpi_is_wakeup_s3()) if (acpi_is_wakeup_s3())
@ -200,7 +191,7 @@ static void sc_disable_devfn(struct device *dev)
{ {
void *func_dis = (void *)(PMC_BASE_ADDRESS + FUNC_DIS); void *func_dis = (void *)(PMC_BASE_ADDRESS + FUNC_DIS);
void *func_dis2 = (void *)(PMC_BASE_ADDRESS + FUNC_DIS2); void *func_dis2 = (void *)(PMC_BASE_ADDRESS + FUNC_DIS2);
uint32_t mask = 0; uint32_t mask = 0;
uint32_t mask2 = 0; uint32_t mask2 = 0;
switch (dev->path.pci.devfn) { switch (dev->path.pci.devfn) {
@ -475,8 +466,7 @@ void southcluster_enable_dev(struct device *dev)
/* Ensure memory, io, and bus master are all disabled */ /* Ensure memory, io, and bus master are all disabled */
reg16 = pci_read_config16(dev, PCI_COMMAND); reg16 = pci_read_config16(dev, PCI_COMMAND);
reg16 &= ~(PCI_COMMAND_MASTER | reg16 &= ~(PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO);
PCI_COMMAND_MEMORY | PCI_COMMAND_IO);
pci_write_config16(dev, PCI_COMMAND, reg16); pci_write_config16(dev, PCI_COMMAND, reg16);
/* Place device in D3Hot */ /* Place device in D3Hot */
@ -522,7 +512,7 @@ static struct device_operations device_ops = {
.read_resources = sc_read_resources, .read_resources = sc_read_resources,
.set_resources = pci_dev_set_resources, .set_resources = pci_dev_set_resources,
.acpi_inject_dsdt = southcluster_inject_dsdt, .acpi_inject_dsdt = southcluster_inject_dsdt,
.write_acpi_tables = acpi_write_hpet, .write_acpi_tables = acpi_write_hpet,
.init = sc_init, .init = sc_init,
.enable = southcluster_enable_dev, .enable = southcluster_enable_dev,
.scan_bus = scan_static_bus, .scan_bus = scan_static_bus,
@ -546,7 +536,7 @@ static void finalize_chipset(void *unused)
void *gcs = (void *)(RCBA_BASE_ADDRESS + GCS); void *gcs = (void *)(RCBA_BASE_ADDRESS + GCS);
void *gen_pmcon2 = (void *)(PMC_BASE_ADDRESS + GEN_PMCON2); void *gen_pmcon2 = (void *)(PMC_BASE_ADDRESS + GEN_PMCON2);
void *etr = (void *)(PMC_BASE_ADDRESS + ETR); void *etr = (void *)(PMC_BASE_ADDRESS + ETR);
u8 *spi = (u8 *)SPI_BASE_ADDRESS; uint8_t *spi = (uint8_t *)SPI_BASE_ADDRESS;
struct spi_config cfg; struct spi_config cfg;
/* Set the lock enable on the BIOS control register */ /* Set the lock enable on the BIOS control register */