WhitleyOpenBoardPkg: Fix GCC unused variables that are set warnings

Fixed issues caused by variables initialized but not used. Cc: Nate DeSimone <[email protected]> Cc: Chasel Chiu <[email protected]> Signed-off-by: Isaac Oram <[email protected]> Reviewed-by: Nate DeSimone <[email protected]>
hsuc1x · Jul 20, 2022 · 4c9b69e · 4c9b69e
1 parent ccfc200
commit 4c9b69e
Show file tree

Hide file tree

Showing 37 changed files with 28 additions and 150 deletions.
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/AcpiTablePcds.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/AcpiTablePcds.c
@@ -27,7 +27,6 @@ TypeAowandaPlatformUpdateAcpiTablePcds (
   EFI_STATUS  Status;
 
   EFI_HOB_GUID_TYPE  *GuidHob;
-  EFI_PLATFORM_INFO  *PlatformInfo;
 
   DEBUG ((DEBUG_INFO, "Uba Callback: PlatformAowandaUpdateAcpiTablePcds entered\n"));
 
@@ -37,7 +36,6 @@ TypeAowandaPlatformUpdateAcpiTablePcds (
     return EFI_NOT_FOUND;
   }
 
-  PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
   // #
   // #ACPI items
   // #

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c
@@ -65,16 +65,13 @@ TypeAowandaInstallKtiEparamData (
 {
   EFI_STATUS         Status;
   EFI_HOB_GUID_TYPE  *GuidHob;
-  EFI_PLATFORM_INFO  *PlatformInfo;
 
   GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
   ASSERT (GuidHob != NULL);
   if (GuidHob == NULL) {
     return EFI_NOT_FOUND;
   }
 
-  PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
-
   Status = UbaConfigPpi->AddData (
                                   UbaConfigPpi,
                                   &gPlatformKtiEparamUpdateDataGuid,

diff --git a/...Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/AcpiTablePcds.c b/...Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/AcpiTablePcds.c
@@ -26,7 +26,6 @@ TypeBoardPortTemplatePlatformUpdateAcpiTablePcds (
   EFI_STATUS Status;
 
   EFI_HOB_GUID_TYPE                     *GuidHob;
-  EFI_PLATFORM_INFO                     *PlatformInfo;
 
   DEBUG ((DEBUG_INFO, "Uba Callback: PlatformUpdateAcpiTablePcds entered\n"));
 
@@ -35,7 +34,7 @@ TypeBoardPortTemplatePlatformUpdateAcpiTablePcds (
   if (GuidHob == NULL) {
     return EFI_NOT_FOUND;
   }
-  PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
+
   //#
   //#ACPI items
   //#

diff --git a/.../Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/IioBifurInit.c b/.../Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/IioBifurInit.c
@@ -182,19 +182,17 @@ TypeBoardPortTemplateIioPortBifurcationInit (
   IN UBA_CONFIG_DATABASE_PPI    *UbaConfigPpi
 )
 {
-  EFI_STATUS                         Status;
-  EFI_HOB_GUID_TYPE                  *GuidHob;
-  EFI_PLATFORM_INFO                  *PlatformInfo;
+  EFI_STATUS                            Status;
+  EFI_HOB_GUID_TYPE                     *GuidHob;
   PLATFORM_IIO_CONFIG_UPDATE_TABLE_EX   *PlatformIioInfoPtr;
-  UINTN                              PlatformIioInfoSize;
+  UINTN                                 PlatformIioInfoSize;
 
 
   GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
   ASSERT (GuidHob != NULL);
   if (GuidHob == NULL) {
     return EFI_NOT_FOUND;
   }
-  PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
 
   //
   // This is config for ICX

diff --git a/...orm/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/KtiEparam.c b/...orm/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/KtiEparam.c
@@ -48,14 +48,12 @@ TypeBoardPortTemplateInstallKtiEparamData (
 {
   EFI_STATUS                            Status;
   EFI_HOB_GUID_TYPE                     *GuidHob;
-  EFI_PLATFORM_INFO                     *PlatformInfo;
 
   GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
   ASSERT (GuidHob != NULL);
   if (GuidHob == NULL) {
     return EFI_NOT_FOUND;
   }
-  PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
 
   Status = UbaConfigPpi->AddData (
                                  UbaConfigPpi,

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c
@@ -395,7 +395,6 @@ AcpiPlatformEarlyAcpiTablesInstall (
 {
   EFI_STATUS                    Status;
   EFI_STATUS                    AcpiStatus;
-  BOOLEAN                       Installed;
   EFI_ACPI_TABLE_PROTOCOL       *AcpiTable;
   EFI_FIRMWARE_VOLUME2_PROTOCOL  *FwVol;
   INTN                          Instance = 0;
@@ -435,7 +434,6 @@ AcpiPlatformEarlyAcpiTablesInstall (
     CurrentTable = NULL;
     TableVersion = EFI_ACPI_TABLE_VERSION_NONE;
     TableHandle = 0;
-    Installed = FALSE;
 
     Status = FwVol->ReadSection (
                       FwVol,
@@ -478,9 +476,9 @@ AcpiPlatformEarlyAcpiTablesInstall (
               //
               AcpiStatus = AcpiTable->InstallAcpiTable (AcpiTable, CurrentTable, CurrentTable->Length, &TableHandle);
               if (!EFI_ERROR (AcpiStatus)) {
-                Installed = TRUE;
+                ASSERT_EFI_ERROR (AcpiStatus);
+                return AcpiStatus;
               }
-              ASSERT_EFI_ERROR (AcpiStatus);
             }
           }
         }
@@ -541,7 +539,6 @@ PmSsdtEarlyAcpiTablesInstall (
 {
   EFI_STATUS                    Status;
   EFI_STATUS                    AcpiStatus;
-  BOOLEAN                       Installed;
   EFI_ACPI_TABLE_PROTOCOL       *AcpiTable;
   EFI_FIRMWARE_VOLUME2_PROTOCOL *FwVol;
   INTN                          Instance = 0;
@@ -581,7 +578,6 @@ PmSsdtEarlyAcpiTablesInstall (
     CurrentTable = NULL;
     TableVersion = EFI_ACPI_TABLE_VERSION_NONE;
     TableHandle = 0;
-    Installed = FALSE;
 
     Status = FwVol->ReadSection (
                       FwVol,
@@ -617,9 +613,9 @@ PmSsdtEarlyAcpiTablesInstall (
               //
               AcpiStatus = AcpiTable->InstallAcpiTable (AcpiTable, CurrentTable, CurrentTable->Length, &TableHandle);
               if (!EFI_ERROR (AcpiStatus)) {
-                Installed = TRUE;
+                ASSERT_EFI_ERROR (AcpiStatus);
+                return AcpiStatus;
               }
-              ASSERT_EFI_ERROR (AcpiStatus);
             }
           }
         }

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c
@@ -255,7 +255,6 @@ InstallXhciAcpiTable (
   VOID
   )
 {
-  EFI_HANDLE                    *HandleBuffer;
   EFI_STATUS                    Status;
   EFI_FIRMWARE_VOLUME2_PROTOCOL *FwVol;
   EFI_ACPI_COMMON_HEADER        *CurrentTable;
@@ -269,7 +268,6 @@ InstallXhciAcpiTable (
   UINT64                        *XhciAcpiTablePtr;
   UINT64                        TempOemTableId;
 
-  HandleBuffer  = 0;
   Instance      = 0;
   TableHandle   = 0;
   CurrentTable  = NULL;

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c
@@ -716,7 +716,6 @@ BuildDRHDForStack (
   UINT8                       PortIndex;
   UINT8                       MaxPortNumberPerSocket;
   UINT8                       CBIndex;
-  UINT64                      VtdMmioExtCap;
   UINT32                      VtdBase;
   UINT32                      VidDid;
   DMAR_ATSR                   *pAtsr = NULL;
@@ -745,7 +744,6 @@ BuildDRHDForStack (
     return EFI_UNSUPPORTED;
   }
 
-  VtdMmioExtCap = *(volatile UINT64*)((UINTN)VtdBase + R_VTD_EXT_CAP_LOW);
   mDrhd.RegisterBase = VtdBase;
 
   DevIndex                      = 00;
@@ -882,7 +880,7 @@ ReportDmar (
   )
 {
   EFI_STATUS                      Status = EFI_SUCCESS;
-  UINT8                           SocketIndex, IioBusBase, Bus;
+  UINT8                           SocketIndex, Bus;
   UINT8                           Dev, Func;
   UINT8                           DevIndex;
   UINT8                           PciNodeIndex;
@@ -1067,7 +1065,6 @@ ReportDmar (
       ZeroMem (DevScope, MEMORY_SIZE * sizeof (DEVICE_SCOPE));
       ZeroMem (PciNode, MEMORY_SIZE * sizeof (PCI_NODE));
 
-      IioBusBase = mCpuCsrAccessVarPtr ->StackBus[SocketIndex][Stack]; // Stack 0
       mDrhd.Flags = 1;
 
       DEBUG ((DEBUG_INFO, "[ACPI](DMAR) InterruptRemap is %aabled (%d & %d)\n",
@@ -1191,8 +1188,6 @@ ReportDmar (
         continue;
       }
 
-      IioBusBase = mIioUds2->IioUdsPtr->PlatformData.IIO_resource[SocketIndex].BusBase;
-
       if (mIioUds2->IioUdsPtr->PlatformData.CpuQpiInfo[SocketIndex].PcieSegment >= MAX_SOCKET) {
         return EFI_INVALID_PARAMETER;
       }

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c
@@ -911,9 +911,6 @@ RootBridgeIoPciRead (
   UINT32                    PciExtReg;
   USRA_ADDRESS              EndPointPciAddress;
   UINT8                     *pData8 = Buffer;
-  UINT8                     Size;
-
-  Size = 1 << (Width & 0x3);
 
   if (Buffer == NULL) {
     return EFI_INVALID_PARAMETER;
@@ -978,9 +975,6 @@ RootBridgeIoPciWrite (
   UINT32                    PciExtReg;
   USRA_ADDRESS              EndPointPciAddress;
   UINT8                     *pData8 = Buffer;
-  UINT8                     Size;
-
-  Size = 1 << (Width & 0x3);
 
   if (Buffer == NULL) {
     return EFI_INVALID_PARAMETER;

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc
@@ -145,7 +145,7 @@ DEFINE EDKII_DSC_FEATURE_BUILD_OPTIONS = $(EDKII_DSC_FEATURE_BUILD_OPTIONS) $(ME
    MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
 
 [BuildOptions]
-  GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable -mabi=ms
+  GCC:*_GCC5_*_CC_FLAGS = -mabi=ms
   GCC:*_GCC5_IA32_DLINK_FLAGS = -z common-page-size=0x20 -z muldefs
   GCC:*_GCC5_X64_DLINK_FLAGS  = -z common-page-size=0x20 -z muldefs
   MSFT:*_*_*_CC_FLAGS = /FAsc
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/AcpiTablePcds.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/AcpiTablePcds.c
@@ -27,7 +27,6 @@ TypeJunctionCityPlatformUpdateAcpiTablePcds (
   EFI_STATUS Status;
 
   EFI_HOB_GUID_TYPE                     *GuidHob;
-  EFI_PLATFORM_INFO                     *PlatformInfo;
 
   DEBUG ((DEBUG_INFO, "Uba Callback: PlatformUpdateAcpiTablePcds entered\n"));
 
@@ -36,7 +35,7 @@ TypeJunctionCityPlatformUpdateAcpiTablePcds (
   if (GuidHob == NULL) {
     return EFI_NOT_FOUND;
   }
-  PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
+
   //#
   //#ACPI items
   //#
@@ -51,4 +50,3 @@ TypeJunctionCityPlatformUpdateAcpiTablePcds (
 
   return Status;
 }
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/IioBifurInit.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/IioBifurInit.c
@@ -180,17 +180,14 @@ TypeJunctionCityIioPortBifurcationInit (
 {
   EFI_STATUS                         Status;
   EFI_HOB_GUID_TYPE                  *GuidHob;
-  EFI_PLATFORM_INFO                  *PlatformInfo;
   PLATFORM_IIO_CONFIG_UPDATE_TABLE_EX   *PlatformIioInfoPtr;
   UINTN                              PlatformIioInfoSize;
 
-
   GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
   ASSERT (GuidHob != NULL);
   if (GuidHob == NULL) {
     return EFI_NOT_FOUND;
   }
-  PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
 
   //
   // This is config for ICX

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/KtiEparam.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/KtiEparam.c
@@ -49,15 +49,12 @@ TypeJunctionCityInstallKtiEparamData (
 {
   EFI_STATUS                            Status;
   EFI_HOB_GUID_TYPE                     *GuidHob;
-  EFI_PLATFORM_INFO                     *PlatformInfo;
 
   GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
   ASSERT (GuidHob != NULL);
   if (GuidHob == NULL) {
     return EFI_NOT_FOUND;
   }
-  PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
-
   Status = UbaConfigPpi->AddData (
                                  UbaConfigPpi,
                                  &gPlatformKtiEparamUpdateDataGuid,

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c
@@ -305,7 +305,6 @@ PlatformUpdateTables (
 {
   EFI_ACPI_DESCRIPTION_HEADER               *TableHeader;
   EFI_STATUS                                Status;
-  ACPI_APIC_STRUCTURE_PTR                   *ProcessorLocalApicEntry;
   UINT64                                    TempOemTableId;
   UINT32                                    Data32;
 
@@ -318,8 +317,6 @@ PlatformUpdateTables (
   }
 
   TableHeader             = NULL;
-
-  ProcessorLocalApicEntry = NULL;
   Status = EFI_SUCCESS;
 
   //

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
@@ -183,7 +183,6 @@ SortCpuLocalApicInTable (
 {
   EFI_STATUS                                Status;
   EFI_PROCESSOR_INFORMATION                 ProcessorInfoBuffer;
-  UINTN                                     BufferSize;
   UINT32                                    Index;
   UINT32                                    Socket;
   UINT32                                    CurrProcessor;
@@ -197,7 +196,6 @@ SortCpuLocalApicInTable (
   CPU_ID_ORDER_MAP                          TempEntry;
   BOOLEAN                                   SecondThreadExistent;
 
-  BufferSize = 0;
   Index      = 0;
   Status     = EFI_SUCCESS;
 

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibDsdt.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibDsdt.c
@@ -191,7 +191,6 @@ PatchDsdtTable (
   EFI_STATUS Status;
   UINT8                         *DsdtPointer;
   UINT32                        *Signature;
-  UINT32                        *Signature2;
   UINT32                        Fixes;
   UINT32                        NodeIndex;
   UINT8                         Counter;
@@ -322,7 +321,6 @@ PatchDsdtTable (
       // Last 4 chars of AmlOffsetTable.Pathname has FIX tag.
       //
       Signature = (UINT32 *) (mAmlOffsetTablePointer[i].Pathname + AsciiStrLen(mAmlOffsetTablePointer[i].Pathname) - 4);
-      Signature2 = (UINT32 *) (mAmlOffsetTablePointer[i].Pathname + AsciiStrLen(mAmlOffsetTablePointer[i].Pathname) - 9);
       switch (*Signature) {
         //
         // "FIX1" BUS resource for PCXX in Acpi\AcpiTables\Dsdt\SysBus.asi and PCXX.asi
@@ -451,7 +449,6 @@ PatchDsdtTable (
       // Last 4 chars of AmlOffsetTable.Pathname has FIX tag.
       //
       Signature = (UINT32 *) (mAmlOffsetTablePointer[i].Pathname + AsciiStrLen(mAmlOffsetTablePointer[i].Pathname) - 4);
-      Signature2 = (UINT32 *) (mAmlOffsetTablePointer[i].Pathname + AsciiStrLen(mAmlOffsetTablePointer[i].Pathname) - 9);
       switch (*Signature) {
         //
         // "FIX3" PCI32 resource for PCXX in Acpi\AcpiTables\Dsdt\SysBus.asi and PCXX.asi
@@ -515,7 +512,6 @@ PatchDsdtTable (
       // Last 4 chars of AmlOffsetTable.Pathname has FIX tag.
       //
       Signature = (UINT32 *) (mAmlOffsetTablePointer[i].Pathname + AsciiStrLen(mAmlOffsetTablePointer[i].Pathname) - 4);
-      Signature2 = (UINT32 *) (mAmlOffsetTablePointer[i].Pathname + AsciiStrLen(mAmlOffsetTablePointer[i].Pathname) - 9);
       switch (*Signature) {
         //
         // "FIX4" PCI64 resource for PCXX in Acpi\AcpiTables\Dsdt\SysBus.asi and PCXX.asi

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c
@@ -568,7 +568,6 @@ ProcessSocketsLinks (
   ACPI_SYSTEM_LOCALITY_INFORMATION_TABLE  *SlitAcpiTable;
   UINT8                                   SourceNode;
   UINT8                                   SourceSocket;
-  UINT8                                   SourceCluster;
   UINT8                                   TargetSocket;
 
   if (NULL == Table) {
@@ -582,7 +581,6 @@ ProcessSocketsLinks (
 
   for (SourceNode = 0; SourceNode < (NodeCount - PmemNodeCount - FpgaCount); SourceNode++) {
     SourceSocket = SourceNode / NumClusters;
-    SourceCluster = SourceNode % NumClusters;
     for (TargetSocket = 0; TargetSocket < NumCpus; TargetSocket++) {
       if (SocketsLinked (GetSocketPhysicalId (SourceSocket), GetSocketPhysicalId (TargetSocket))) {
         SetMem (&SlitAcpiTable->NumSlit[(SourceNode * NodeCount) + (TargetSocket * NumClusters)].Entry,
@@ -622,7 +620,6 @@ ProcessMixedModeSocketsLinks (
   UINT16                                  EntryIdx2LM;
   UINT8                                   SourceNode;
   UINT8                                   SourceSocket;
-  UINT8                                   SourceCluster;
   UINT8                                   TargetSocket;
   UINT8                                   TargetCluster;
   BOOLEAN                                 Is2LM;
@@ -639,7 +636,6 @@ ProcessMixedModeSocketsLinks (
   for (SourceNode = 0; SourceNode < (NodeCount - PmemNodeCount - FpgaCount); SourceNode++) {
     Is2LM = (SourceNode >= NumCpus * NumClusters) ? TRUE : FALSE;
     SourceSocket = (SourceNode - NumCpus * NumClusters * (Is2LM ? 1 : 0)) / NumClusters;
-    SourceCluster = (SourceNode - NumCpus * NumClusters * (Is2LM ? 1 : 0)) % NumClusters;
 
     for (TargetSocket = 0; TargetSocket < NumCpus; TargetSocket++) {
       if (SocketsLinked (GetSocketPhysicalId (SourceSocket), GetSocketPhysicalId (TargetSocket))) {
@@ -1103,12 +1099,9 @@ InstallSlitTable (
 {
   ACPI_SYSTEM_LOCALITY_INFORMATION_TABLE *Table;
   UINTN                                  TableSize;
-  UINT8                                  NumClusters;
   UINTN                                  TableHandle = 0;
   EFI_STATUS                             Status;
 
-  NumClusters = GetNumClusters ();
-
   TableSize = sizeof (EFI_ACPI_6_2_SYSTEM_LOCALITY_DISTANCE_INFORMATION_TABLE_HEADER) +
               sizeof (ACPI_SYSTEM_LOCALITIES_STRUCTURE) * EFI_ACPI_SYSTEM_LOCALITIES_ENTRY_COUNT;