From bb5ccbd42fd3e702f71017dd186ae98278ffeeac Mon Sep 17 00:00:00 2001 From: Elyes Haouas Date: Sat, 16 Jul 2022 09:33:06 +0200 Subject: [PATCH] mb/amd/*/BiosCallOuts.c: Fix some white spaces issues Signed-off-by: Elyes Haouas Change-Id: I37ed13e1fa318ca0f8381f5b1b409bf80fa4da11 Reviewed-on: https://review.coreboot.org/c/coreboot/+/65888 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/mainboard/amd/inagua/BiosCallOuts.c | 80 +++++++++---------- src/mainboard/amd/persimmon/BiosCallOuts.c | 16 ++-- .../amd/south_station/BiosCallOuts.c | 80 +++++++++---------- .../amd/union_station/BiosCallOuts.c | 80 +++++++++---------- 4 files changed, 128 insertions(+), 128 deletions(-) diff --git a/src/mainboard/amd/inagua/BiosCallOuts.c b/src/mainboard/amd/inagua/BiosCallOuts.c index e7de9e3b86..5eff97d726 100644 --- a/src/mainboard/amd/inagua/BiosCallOuts.c +++ b/src/mainboard/amd/inagua/BiosCallOuts.c @@ -7,8 +7,8 @@ #include #include -static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigPtr); -static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *ConfigPtr); +static AGESA_STATUS board_BeforeDramInit(UINT32 Func, UINTN Data, VOID *ConfigPtr); +static AGESA_STATUS board_GnbPcieSlotReset(UINT32 Func, UINTN Data, VOID *ConfigPtr); const BIOS_CALLOUT_STRUCT BiosCallouts[] = { @@ -25,7 +25,7 @@ const BIOS_CALLOUT_STRUCT BiosCallouts[] = const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts); /* Call the host environment interface to provide a user hook opportunity. */ -static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigPtr) +static AGESA_STATUS board_BeforeDramInit(UINT32 Func, UINTN Data, VOID *ConfigPtr) { AGESA_STATUS Status; MEM_DATA_STRUCT *MemData; @@ -38,65 +38,65 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigP Status = AGESA_SUCCESS; GpioMmioAddr = (uintptr_t)acpimmio_gpio_100; - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); Data8 &= ~BIT5; - TempData8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + TempData8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); TempData8 &= 0x03; TempData8 |= Data8; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, TempData8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, TempData8); - Data8 |= BIT2+BIT3; + Data8 |= BIT2 + BIT3; Data8 &= ~BIT4; - TempData8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + TempData8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); TempData8 &= 0x23; TempData8 |= Data8; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, TempData8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, TempData8); - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); Data8 &= ~BIT5; - TempData8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + TempData8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); TempData8 &= 0x03; TempData8 |= Data8; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, TempData8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, TempData8); - Data8 |= BIT2+BIT3; + Data8 |= BIT2 + BIT3; Data8 &= ~BIT4; - TempData8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + TempData8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); TempData8 &= 0x23; TempData8 |= Data8; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, TempData8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, TempData8); switch (MemData->ParameterListPtr->DDR3Voltage) { case VOLT1_35: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); Data8 &= ~(UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, Data8); - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, Data8); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); Data8 |= (UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, Data8); break; case VOLT1_25: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); Data8 &= ~(UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, Data8); - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, Data8); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); Data8 &= ~(UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, Data8); break; case VOLT1_5: default: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); Data8 |= (UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, Data8); - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, Data8); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); Data8 &= ~(UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, Data8); } return Status; } /* PCIE slot reset control */ -static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *ConfigPtr) +static AGESA_STATUS board_GnbPcieSlotReset(UINT32 Func, UINTN Data, VOID *ConfigPtr) { AGESA_STATUS Status; PCIe_SLOT_RESET_INFO *ResetInfo; @@ -111,17 +111,17 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi case 4: switch (ResetInfo->ResetControl) { case AssertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG21); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG21); Data8 &= ~(UINT8)BIT6; /* MXM_GPIO0. GPIO21 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG21, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG21, Data8); Status = AGESA_SUCCESS; break; case DeassertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG21); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG21); Data8 |= BIT6; /* MXM_GPIO0. GPIO21 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG21, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG21, Data8); Status = AGESA_SUCCESS; break; } @@ -129,17 +129,17 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi case 6: switch (ResetInfo->ResetControl) { case AssertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG25); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG25); Data8 &= ~(UINT8)BIT6; /* PCIE_RST#_LAN, GPIO25 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG25, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG25, Data8); Status = AGESA_SUCCESS; break; case DeassertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG25); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG25); Data8 |= BIT6; /* PCIE_RST#_LAN, GPIO25 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG25, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG25, Data8); Status = AGESA_SUCCESS; break; } @@ -147,17 +147,17 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi case 7: switch (ResetInfo->ResetControl) { case AssertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG02); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG02); Data8 &= ~(UINT8)BIT6; /* MPCIE_RST0, GPIO02 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG02, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG02, Data8); Status = AGESA_SUCCESS; break; case DeassertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG02); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG02); Data8 |= BIT6; /* MPCIE_RST0, GPIO02 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG02, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG02, Data8); Status = AGESA_SUCCESS; break; } diff --git a/src/mainboard/amd/persimmon/BiosCallOuts.c b/src/mainboard/amd/persimmon/BiosCallOuts.c index 46a33087dc..fb978b8287 100644 --- a/src/mainboard/amd/persimmon/BiosCallOuts.c +++ b/src/mainboard/amd/persimmon/BiosCallOuts.c @@ -6,8 +6,8 @@ #include #include -static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigPtr); -static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *ConfigPtr); +static AGESA_STATUS board_BeforeDramInit(UINT32 Func, UINTN Data, VOID *ConfigPtr); +static AGESA_STATUS board_GnbPcieSlotReset(UINT32 Func, UINTN Data, VOID *ConfigPtr); const BIOS_CALLOUT_STRUCT BiosCallouts[] = { @@ -24,7 +24,7 @@ const BIOS_CALLOUT_STRUCT BiosCallouts[] = const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts); /* Call the host environment interface to provide a user hook opportunity. */ -static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigPtr) +static AGESA_STATUS board_BeforeDramInit(UINT32 Func, UINTN Data, VOID *ConfigPtr) { // Unlike e.g. AMD Inagua, Persimmon is unable to vary the RAM voltage. // Make sure the right speed settings are selected. @@ -33,7 +33,7 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigP } /* PCIE slot reset control */ -static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *ConfigPtr) +static AGESA_STATUS board_GnbPcieSlotReset(UINT32 Func, UINTN Data, VOID *ConfigPtr) { AGESA_STATUS Status; PCIe_SLOT_RESET_INFO *ResetInfo; @@ -49,15 +49,15 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi case 46: // GPIO50 = SBGPIO_PCIE_RST# affects LAN0, LAN1, PCIe slot switch (ResetInfo->ResetControl) { case AssertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG50); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG50); Data8 &= ~(UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG50, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG50, Data8); Status = AGESA_SUCCESS; break; case DeassertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG50); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG50); Data8 |= BIT6; - Write64Mem8 (GpioMmioAddr+SB_GPIO_REG50, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG50, Data8); Status = AGESA_SUCCESS; break; } diff --git a/src/mainboard/amd/south_station/BiosCallOuts.c b/src/mainboard/amd/south_station/BiosCallOuts.c index 83f79ddd3a..fb4e4d14aa 100644 --- a/src/mainboard/amd/south_station/BiosCallOuts.c +++ b/src/mainboard/amd/south_station/BiosCallOuts.c @@ -7,8 +7,8 @@ #include #include -static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigPtr); -static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *ConfigPtr); +static AGESA_STATUS board_BeforeDramInit(UINT32 Func, UINTN Data, VOID *ConfigPtr); +static AGESA_STATUS board_GnbPcieSlotReset(UINT32 Func, UINTN Data, VOID *ConfigPtr); const BIOS_CALLOUT_STRUCT BiosCallouts[] = { @@ -25,7 +25,7 @@ const BIOS_CALLOUT_STRUCT BiosCallouts[] = const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts); /* Call the host environment interface to provide a user hook opportunity. */ -static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigPtr) +static AGESA_STATUS board_BeforeDramInit(UINT32 Func, UINTN Data, VOID *ConfigPtr) { AGESA_STATUS Status; MEM_DATA_STRUCT *MemData; @@ -38,65 +38,65 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigP Status = AGESA_SUCCESS; GpioMmioAddr = (uintptr_t)acpimmio_gpio_100; - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); Data8 &= ~BIT5; - TempData8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + TempData8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); TempData8 &= 0x03; TempData8 |= Data8; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, TempData8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, TempData8); - Data8 |= BIT2+BIT3; + Data8 |= BIT2 + BIT3; Data8 &= ~BIT4; - TempData8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + TempData8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); TempData8 &= 0x23; TempData8 |= Data8; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, TempData8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, TempData8); - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); Data8 &= ~BIT5; - TempData8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + TempData8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); TempData8 &= 0x03; TempData8 |= Data8; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, TempData8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, TempData8); - Data8 |= BIT2+BIT3; + Data8 |= BIT2 + BIT3; Data8 &= ~BIT4; - TempData8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + TempData8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); TempData8 &= 0x23; TempData8 |= Data8; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, TempData8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, TempData8); switch (MemData->ParameterListPtr->DDR3Voltage) { case VOLT1_35: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); Data8 &= ~(UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, Data8); - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, Data8); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); Data8 |= (UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, Data8); break; case VOLT1_25: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); Data8 &= ~(UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, Data8); - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, Data8); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); Data8 &= ~(UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, Data8); break; case VOLT1_5: default: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); Data8 |= (UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, Data8); - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, Data8); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); Data8 &= ~(UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, Data8); } return Status; } /* PCIE slot reset control */ -static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *ConfigPtr) +static AGESA_STATUS board_GnbPcieSlotReset(UINT32 Func, UINTN Data, VOID *ConfigPtr) { AGESA_STATUS Status; PCIe_SLOT_RESET_INFO *ResetInfo; @@ -111,17 +111,17 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi case 4: switch (ResetInfo->ResetControl) { case AssertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG21); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG21); Data8 &= ~(UINT8)BIT6; /* MXM_GPIO0. GPIO21 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG21, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG21, Data8); Status = AGESA_SUCCESS; break; case DeassertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG21); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG21); Data8 |= BIT6; /* MXM_GPIO0. GPIO21 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG21, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG21, Data8); Status = AGESA_SUCCESS; break; } @@ -129,17 +129,17 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi case 6: switch (ResetInfo->ResetControl) { case AssertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG25); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG25); Data8 &= ~(UINT8)BIT6; /* PCIE_RST#_LAN, GPIO25 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG25, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG25, Data8); Status = AGESA_SUCCESS; break; case DeassertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG25); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG25); Data8 |= BIT6; /* PCIE_RST#_LAN, GPIO25 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG25, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG25, Data8); Status = AGESA_SUCCESS; break; } @@ -147,17 +147,17 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi case 7: switch (ResetInfo->ResetControl) { case AssertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG02); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG02); Data8 &= ~(UINT8)BIT6; /* MPCIE_RST0, GPIO02 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG02, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG02, Data8); Status = AGESA_SUCCESS; break; case DeassertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG02); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG02); Data8 |= BIT6; /* MPCIE_RST0, GPIO02 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG02, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG02, Data8); Status = AGESA_SUCCESS; break; } diff --git a/src/mainboard/amd/union_station/BiosCallOuts.c b/src/mainboard/amd/union_station/BiosCallOuts.c index 0ae60b4c65..2d8fb22d5c 100644 --- a/src/mainboard/amd/union_station/BiosCallOuts.c +++ b/src/mainboard/amd/union_station/BiosCallOuts.c @@ -7,8 +7,8 @@ #include #include -static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigPtr); -static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *ConfigPtr); +static AGESA_STATUS board_BeforeDramInit(UINT32 Func, UINTN Data, VOID *ConfigPtr); +static AGESA_STATUS board_GnbPcieSlotReset(UINT32 Func, UINTN Data, VOID *ConfigPtr); const BIOS_CALLOUT_STRUCT BiosCallouts[] = { @@ -25,7 +25,7 @@ const BIOS_CALLOUT_STRUCT BiosCallouts[] = const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts); /* Call the host environment interface to provide a user hook opportunity. */ -static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigPtr) +static AGESA_STATUS board_BeforeDramInit(UINT32 Func, UINTN Data, VOID *ConfigPtr) { AGESA_STATUS Status; MEM_DATA_STRUCT *MemData; @@ -38,65 +38,65 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigP Status = AGESA_SUCCESS; GpioMmioAddr = (uintptr_t)acpimmio_gpio_100; - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); Data8 &= ~BIT5; - TempData8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + TempData8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); TempData8 &= 0x03; TempData8 |= Data8; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, TempData8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, TempData8); - Data8 |= BIT2+BIT3; + Data8 |= BIT2 + BIT3; Data8 &= ~BIT4; - TempData8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + TempData8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); TempData8 &= 0x23; TempData8 |= Data8; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, TempData8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, TempData8); - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); Data8 &= ~BIT5; - TempData8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + TempData8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); TempData8 &= 0x03; TempData8 |= Data8; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, TempData8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, TempData8); - Data8 |= BIT2+BIT3; + Data8 |= BIT2 + BIT3; Data8 &= ~BIT4; - TempData8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + TempData8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); TempData8 &= 0x23; TempData8 |= Data8; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, TempData8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, TempData8); switch (MemData->ParameterListPtr->DDR3Voltage) { case VOLT1_35: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); Data8 &= ~(UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, Data8); - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, Data8); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); Data8 |= (UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, Data8); break; case VOLT1_25: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); Data8 &= ~(UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, Data8); - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, Data8); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); Data8 &= ~(UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, Data8); break; case VOLT1_5: default: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG178); Data8 |= (UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG178, Data8); - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG179); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG178, Data8); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG179); Data8 &= ~(UINT8)BIT6; - Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG179, Data8); } return Status; } /* PCIE slot reset control */ -static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *ConfigPtr) +static AGESA_STATUS board_GnbPcieSlotReset(UINT32 Func, UINTN Data, VOID *ConfigPtr) { AGESA_STATUS Status; PCIe_SLOT_RESET_INFO *ResetInfo; @@ -111,17 +111,17 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi case 4: switch (ResetInfo->ResetControl) { case AssertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG21); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG21); Data8 &= ~(UINT8)BIT6; /* MXM_GPIO0. GPIO21 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG21, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG21, Data8); Status = AGESA_SUCCESS; break; case DeassertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG21); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG21); Data8 |= BIT6; /* MXM_GPIO0. GPIO21 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG21, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG21, Data8); Status = AGESA_SUCCESS; break; } @@ -129,17 +129,17 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi case 6: switch (ResetInfo->ResetControl) { case AssertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG25); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG25); Data8 &= ~(UINT8)BIT6; /* PCIE_RST#_LAN, GPIO25 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG25, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG25, Data8); Status = AGESA_SUCCESS; break; case DeassertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG25); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG25); Data8 |= BIT6; /* PCIE_RST#_LAN, GPIO25 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG25, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG25, Data8); Status = AGESA_SUCCESS; break; } @@ -147,17 +147,17 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi case 7: switch (ResetInfo->ResetControl) { case AssertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG02); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG02); Data8 &= ~(UINT8)BIT6; /* MPCIE_RST0, GPIO02 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG02, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG02, Data8); Status = AGESA_SUCCESS; break; case DeassertSlotReset: - Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG02); + Data8 = Read64Mem8(GpioMmioAddr + SB_GPIO_REG02); Data8 |= BIT6; /* MPCIE_RST0, GPIO02 */ - Write64Mem8(GpioMmioAddr+SB_GPIO_REG02, Data8); + Write64Mem8(GpioMmioAddr + SB_GPIO_REG02, Data8); Status = AGESA_SUCCESS; break; }