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

soc/amd/picasso: Remove SATA from AOAC registers 

SATA is no longer defined in AOAC so remove its definitions.

Change-Id: Ief0ab6b5f69f2d17c11d8e2ee40941ac56c077f6
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36112
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Marshall Dawson 2019-09-17 11:22:31 -06:00 committed by Martin Roth
parent 39a4ac1502
commit 5f3c46579e
4 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/soc/amd/picasso/acpi/globalnvs.asl
View File

@ -55,9 +55,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve)
, 1, , 1,
UT0E, 1, // UART0, 11 UT0E, 1, // UART0, 11
UT1E, 1, // UART1, 12 UT1E, 1, // UART1, 12
, 2, , 14,
ST_E, 1, // SATA, 15
, 11,
ESPI, 1, // ESPI, 27 ESPI, 1, // ESPI, 27
/* ChromeOS stuff (0x100 -> 0xfff, size 0xeff) */ /* ChromeOS stuff (0x100 -> 0xfff, size 0xeff) */
Offset (0x100), Offset (0x100),

11
src/soc/amd/picasso/acpi/sb_pci0_fch.asl
View File

@ -236,13 +236,6 @@ Field( SMIC, ByteAcc, NoLock, Preserve) {
offset (0x1e59), /* UART1 D3 State */ offset (0x1e59), /* UART1 D3 State */
U1DS, 3, U1DS, 3,
offset (0x1e5e), /* SATA D3 Control */
SATD, 2,
, 1,
SAPD, 1,
offset (0x1e5f), /* SATA D3 State */
SADS, 3,
offset (0x1e71), /* SD D3 State */ offset (0x1e71), /* SD D3 State */
SDDS, 3, SDDS, 3,
@ -315,7 +308,7 @@ Field(FCFG, DwordAcc, NoLock, Preserve)
/* /*
* Arg0:device: * Arg0:device:
* 5=I2C0, 6=I2C1, 7=I2C2, 8=I2C3, 11=UART0, 12=UART1, * 5=I2C0, 6=I2C1, 7=I2C2, 8=I2C3, 11=UART0, 12=UART1,
* 15=SATA, 18=EHCI, 23=xHCI, 24=SD * 18=EHCI, 23=xHCI, 24=SD
* Arg1:D-state * Arg1:D-state
*/ */
Mutex (FDAS, 0) /* FCH Device AOAC Semophore */ Mutex (FDAS, 0) /* FCH Device AOAC Semophore */
@ -382,7 +375,6 @@ Method(FDDC, 2, Serialized)
Store(U1DS, Local0) Store(U1DS, Local0)
} }
} }
/* todo Case(15) { STD0()} */ /* SATA */
} }
} else { } else {
/* put device into D3cold */ /* put device into D3cold */
@ -435,7 +427,6 @@ Method(FDDC, 2, Serialized)
} }
Store(0x03, U1TD) Store(0x03, U1TD)
} }
/* todo Case(15) { STD3()} */ /* SATA */
} }
if(LEqual(I1TD, 3)) { if(LEqual(I1TD, 3)) {
if(LEqual(I2TD, 3)) { if(LEqual(I2TD, 3)) {

4
src/soc/amd/picasso/include/soc/southbridge.h
View File

@ -294,9 +294,7 @@ typedef struct aoac_devs {
unsigned int :1; unsigned int :1;
unsigned int ut0e:1; /* 11: UART0 */ unsigned int ut0e:1; /* 11: UART0 */
unsigned int ut1e:1; /* 12: UART1 */ unsigned int ut1e:1; /* 12: UART1 */
unsigned int :2; unsigned int :14;
unsigned int st_e:1; /* 15: SATA */
unsigned int :11;
unsigned int espi:1; /* 27: ESPI */ unsigned int espi:1; /* 27: ESPI */
unsigned int :4; unsigned int :4;
} __packed aoac_devs_t; } __packed aoac_devs_t;

5
src/soc/amd/picasso/southbridge.c
View File

@ -454,8 +454,6 @@ void southbridge_init(void *chip_info)
static void set_sb_final_nvs(void) static void set_sb_final_nvs(void)
{ {
const struct device *sata;
struct global_nvs_t *gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS); struct global_nvs_t *gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS);
if (gnvs == NULL) if (gnvs == NULL)
return; return;
@ -465,9 +463,6 @@ static void set_sb_final_nvs(void)
gnvs->aoac.ic4e = is_aoac_device_enabled(FCH_AOAC_DEV_I2C4); gnvs->aoac.ic4e = is_aoac_device_enabled(FCH_AOAC_DEV_I2C4);
gnvs->aoac.ut0e = is_aoac_device_enabled(FCH_AOAC_DEV_UART0); gnvs->aoac.ut0e = is_aoac_device_enabled(FCH_AOAC_DEV_UART0);
gnvs->aoac.ut1e = is_aoac_device_enabled(FCH_AOAC_DEV_UART1); gnvs->aoac.ut1e = is_aoac_device_enabled(FCH_AOAC_DEV_UART1);
/* Rely on these being in sync with devicetree */
sata = pcidev_path_on_root(SATA_DEVFN);
gnvs->aoac.st_e = sata && sata->enabled ? 1 : 0;
gnvs->aoac.espi = 1; gnvs->aoac.espi = 1;
} }