diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-06-23 02:50:00 +0300 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-06-28 21:49:18 +0000 |
| commit | b0ae42b5bb7fe7c9f6e8301bff8fbabe95294c62 (patch) | |
| tree | 30c8ecd9f58b4fdaa25f7375a408457415b2554a /src/mainboard/amd | |
| parent | 19edbf640bad4a8f5337c14814a8f7014d83e094 (diff) | |
AGESA fam14: Use AMD_ACPIMMIO_GPIO_BASE_100
Use the pre-defined constant address directly.
Change-Id: I29fbc82fffc69b864adb4ddbda1425db98e2e48a
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42708
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/mainboard/amd')
| -rw-r--r-- | src/mainboard/amd/inagua/BiosCallOuts.c | 8 | ||||
| -rw-r--r-- | src/mainboard/amd/persimmon/BiosCallOuts.c | 10 | ||||
| -rw-r--r-- | src/mainboard/amd/south_station/BiosCallOuts.c | 9 | ||||
| -rw-r--r-- | src/mainboard/amd/union_station/BiosCallOuts.c | 9 |
4 files changed, 9 insertions, 27 deletions
diff --git a/src/mainboard/amd/inagua/BiosCallOuts.c b/src/mainboard/amd/inagua/BiosCallOuts.c index 07b9ebd4c3..16058b6d6b 100644 --- a/src/mainboard/amd/inagua/BiosCallOuts.c +++ b/src/mainboard/amd/inagua/BiosCallOuts.c @@ -30,7 +30,6 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigP AGESA_STATUS Status; UINTN FcnData; MEM_DATA_STRUCT *MemData; - UINT32 AcpiMmioAddr; UINT32 GpioMmioAddr; UINT8 Data8; UINT8 TempData8; @@ -39,8 +38,7 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigP MemData = ConfigPtr; Status = AGESA_SUCCESS; - AcpiMmioAddr = AMD_SB_ACPI_MMIO_ADDR; - GpioMmioAddr = AcpiMmioAddr + GPIO_BASE; + GpioMmioAddr = ACPIMMIO_GPIO_BASE_100; Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); Data8 &= ~BIT5; @@ -107,13 +105,11 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi PCIe_SLOT_RESET_INFO *ResetInfo; UINT32 GpioMmioAddr; - UINT32 AcpiMmioAddr; UINT8 Data8; FcnData = Data; ResetInfo = ConfigPtr; - AcpiMmioAddr = AMD_SB_ACPI_MMIO_ADDR; - GpioMmioAddr = AcpiMmioAddr + GPIO_BASE; + GpioMmioAddr = ACPIMMIO_GPIO_BASE_100; Status = AGESA_UNSUPPORTED; switch (ResetInfo->ResetId) { case 4: diff --git a/src/mainboard/amd/persimmon/BiosCallOuts.c b/src/mainboard/amd/persimmon/BiosCallOuts.c index 4a6653e367..1734bc9303 100644 --- a/src/mainboard/amd/persimmon/BiosCallOuts.c +++ b/src/mainboard/amd/persimmon/BiosCallOuts.c @@ -40,20 +40,12 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi PCIe_SLOT_RESET_INFO *ResetInfo; UINT32 GpioMmioAddr; - UINT32 AcpiMmioAddr; UINT8 Data8; - UINT16 Data16; FcnData = Data; ResetInfo = ConfigPtr; - // Get SB800 MMIO Base (AcpiMmioAddr) - Data8 = pm_io_read8(0x27); - Data16 = Data8 << 8; - Data8 = pm_io_read8(0x26); - Data16 |= Data8; - AcpiMmioAddr = (UINT32)Data16 << 16; Status = AGESA_UNSUPPORTED; - GpioMmioAddr = AcpiMmioAddr + GPIO_BASE; + GpioMmioAddr = ACPIMMIO_GPIO_BASE_100; switch (ResetInfo->ResetId) { case 46: // GPIO50 = SBGPIO_PCIE_RST# affects LAN0, LAN1, PCIe slot diff --git a/src/mainboard/amd/south_station/BiosCallOuts.c b/src/mainboard/amd/south_station/BiosCallOuts.c index 3e619be1a1..a4438f5fe7 100644 --- a/src/mainboard/amd/south_station/BiosCallOuts.c +++ b/src/mainboard/amd/south_station/BiosCallOuts.c @@ -30,7 +30,6 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigP AGESA_STATUS Status; UINTN FcnData; MEM_DATA_STRUCT *MemData; - UINT32 AcpiMmioAddr; UINT32 GpioMmioAddr; UINT8 Data8; UINT8 TempData8; @@ -39,8 +38,7 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigP MemData = ConfigPtr; Status = AGESA_SUCCESS; - AcpiMmioAddr = AMD_SB_ACPI_MMIO_ADDR; - GpioMmioAddr = AcpiMmioAddr + GPIO_BASE; + GpioMmioAddr = ACPIMMIO_GPIO_BASE_100; Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); Data8 &= ~BIT5; @@ -106,13 +104,12 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi UINTN FcnData; PCIe_SLOT_RESET_INFO *ResetInfo; UINT32 GpioMmioAddr; - UINT32 AcpiMmioAddr; UINT8 Data8; + GpioMmioAddr = ACPIMMIO_GPIO_BASE_100; + FcnData = Data; ResetInfo = ConfigPtr; - AcpiMmioAddr = AMD_SB_ACPI_MMIO_ADDR; - GpioMmioAddr = AcpiMmioAddr + GPIO_BASE; Status = AGESA_UNSUPPORTED; switch (ResetInfo->ResetId) { case 4: diff --git a/src/mainboard/amd/union_station/BiosCallOuts.c b/src/mainboard/amd/union_station/BiosCallOuts.c index a5634ecfd0..deb6176faf 100644 --- a/src/mainboard/amd/union_station/BiosCallOuts.c +++ b/src/mainboard/amd/union_station/BiosCallOuts.c @@ -30,7 +30,6 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigP AGESA_STATUS Status; UINTN FcnData; MEM_DATA_STRUCT *MemData; - UINT32 AcpiMmioAddr; UINT32 GpioMmioAddr; UINT8 Data8; UINT8 TempData8; @@ -39,8 +38,7 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigP MemData = ConfigPtr; Status = AGESA_SUCCESS; - AcpiMmioAddr = AMD_SB_ACPI_MMIO_ADDR; - GpioMmioAddr = AcpiMmioAddr + GPIO_BASE; + GpioMmioAddr = ACPIMMIO_GPIO_BASE_100; Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); Data8 &= ~BIT5; @@ -106,13 +104,12 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi UINTN FcnData; PCIe_SLOT_RESET_INFO *ResetInfo; UINT32 GpioMmioAddr; - UINT32 AcpiMmioAddr; UINT8 Data8; + GpioMmioAddr = ACPIMMIO_GPIO_BASE_100; + FcnData = Data; ResetInfo = ConfigPtr; - AcpiMmioAddr = AMD_SB_ACPI_MMIO_ADDR; - GpioMmioAddr = AcpiMmioAddr + GPIO_BASE; Status = AGESA_UNSUPPORTED; switch (ResetInfo->ResetId) { case 4: |