1) Use FeatureFlag PcdPciBusHotplugDeviceSupport to merge LightPciLib.c with PcdLib.c.

2) Correct some minor bugs: when invoking gRT->GetVariable the Attributes field can be optianal.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2090 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverConfiguration.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverConfiguration.c
index dfe134a2ee860a74fcf2b95689372a942aa3d422..75794f81253487d821d77bb33f004c32e7d17676 100644 (file)
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverConfiguration.c
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverConfiguration.c
@@ -161,7 +161,6 @@ IDEBusDriverConfigurationSetOptions (
   UINT8       NewValue;\r
   UINTN       DataSize;\r
   UINTN       Index;\r
   UINT8       NewValue;\r
   UINTN       DataSize;\r
   UINTN       Index;\r

-  UINT32      Attributes;\r

 \r
   if (ChildHandle != NULL) {\r
     return EFI_UNSUPPORTED;\r
 \r
   if (ChildHandle != NULL) {\r
     return EFI_UNSUPPORTED;\r


@@ -173,7 +172,7 @@ IDEBusDriverConfigurationSetOptions (
   Status = gRT->GetVariable (\r
                   L"Configuration",\r
                   &gEfiCallerIdGuid,\r
   Status = gRT->GetVariable (\r
                   L"Configuration",\r
                   &gEfiCallerIdGuid,\r

-                  &Attributes,\r
+                  NULL,\r

                   &DataSize,\r
                   &Value\r
                   );\r
                   &DataSize,\r
                   &Value\r
                   );\r


@@ -255,7 +254,6 @@ IDEBusDriverConfigurationOptionsValid (
   EFI_STATUS  Status;\r
   UINT8       Value;\r
   UINTN       DataSize;\r
   EFI_STATUS  Status;\r
   UINT8       Value;\r
   UINTN       DataSize;\r

-  UINT32      Attributes;\r

 \r
   if (ChildHandle != NULL) {\r
     return EFI_UNSUPPORTED;\r
 \r
   if (ChildHandle != NULL) {\r
     return EFI_UNSUPPORTED;\r


@@ -265,7 +263,7 @@ IDEBusDriverConfigurationOptionsValid (
   Status = gRT->GetVariable (\r
                   L"Configuration",\r
                   &gEfiCallerIdGuid,\r
   Status = gRT->GetVariable (\r
                   L"Configuration",\r
                   &gEfiCallerIdGuid,\r

-                  &Attributes,\r
+                  NULL,\r

                   &DataSize,\r
                   &Value\r
                   );\r
                   &DataSize,\r
                   &Value\r
                   );\r

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
index 83dd5510e4e84d6e07b56fa9dea4f3b80c31162c..d17ce5f07d0516b0add819d38c3d9282f1e430c2 100644 (file)
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
@@ -181,7 +181,6 @@ IDEBusDriverBindingStart (
   UINT16                            CommandBlockBaseAddr;\r
   UINT16                            ControlBlockBaseAddr;\r
   UINTN                             DataSize;\r
   UINT16                            CommandBlockBaseAddr;\r
   UINT16                            ControlBlockBaseAddr;\r
   UINTN                             DataSize;\r

-  UINT32                            Attributes;\r

   IDE_BUS_DRIVER_PRIVATE_DATA       *IdeBusDriverPrivateData;\r
 \r
   //\r
   IDE_BUS_DRIVER_PRIVATE_DATA       *IdeBusDriverPrivateData;\r
 \r
   //\r


@@ -316,7 +315,7 @@ IDEBusDriverBindingStart (
   Status = gRT->GetVariable (\r
                   (CHAR16 *) L"Configuration",\r
                   &gEfiCallerIdGuid,\r
   Status = gRT->GetVariable (\r
                   (CHAR16 *) L"Configuration",\r
                   &gEfiCallerIdGuid,\r

-                  &Attributes,\r
+                  NULL,\r

                   &DataSize,\r
                   &ConfigurationOptions\r
                   );\r
                   &DataSize,\r
                   &ConfigurationOptions\r
                   );\r

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
index 855fdd7591f2b598630ae1f87a2a0c0556d9d4d0..b8e15f9fb38c35987e95fc2ddcadd65dc53f6819 100644 (file)
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
@@ -6,18 +6,15 @@
     <GuidValue>93B80004-9FB3-11d4-9A3A-0090273FC14D</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for PciBus module.</Abstract>\r
     <GuidValue>93B80004-9FB3-11d4-9A3A-0090273FC14D</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for PciBus module.</Abstract>\r

-    <Description>PCI bus driver. This module will probe all PCI devices and allocate MMIO and IO
-       space for these devices.\r
-       LightPcdLib.c tagged with "ToolCode="DUMMY"" is light weight verison for PCI library\r
-       function. This version provide simple implementation and do not support hot plug. Only one\r
-       between PcdLib.c and LightPcdLib.c can be choosed. \r
-    </Description>\r
+    <Description>PCI bus driver. This module will probe all PCI devices and allocate MMIO and IO\r
+       space for these devices. Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable\r
+       support hot plug.</Description>\r

     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r

-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    <License>All rights reserved. This program and the accompanying materials\r
+      are licensed and made available under the terms and conditions of the BSD License\r
+      which accompanies this distribution.  The full text of the license may be found at\r
+      http://opensource.org/licenses/bsd-license.php\r
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r


@@ -93,7 +90,6 @@
     <Filename>pcibus.c</Filename>\r
     <Filename>PciIo.c</Filename>\r
     <Filename>PciLib.c</Filename>\r
     <Filename>pcibus.c</Filename>\r
     <Filename>PciIo.c</Filename>\r
     <Filename>PciLib.c</Filename>\r

-    <Filename ToolCode="DUMMY">LightPciLib.c</Filename>\r

   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r


@@ -178,5 +174,11 @@
       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>Whether VGA decoding is enabled on this platform so we should avoid those aliased resources</HelpText>\r
     </PcdEntry>\r
       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>Whether VGA decoding is enabled on this platform so we should avoid those aliased resources</HelpText>\r
     </PcdEntry>\r

+    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">\r
+      <C_Name>PcdPciBusHotplugDeviceSupport</C_Name>\r
+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DefaultValue>TRUE</DefaultValue>\r
+      <HelpText>If TRUE, the PCI bus driver will support hot plug device. If not hot plug device is supported, this feature flag can be set to FALSE to save size.</HelpText>\r
+    </PcdEntry>\r

   </PcdCoded>\r
 </ModuleSurfaceArea>
\ No newline at end of file
   </PcdCoded>\r
 </ModuleSurfaceArea>
\ No newline at end of file

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c
index 11a0c2921070aa30cdee9692806246fef2124516..a4d3577d353b21f7cbcfec0579a991ef2c592a72 100644 (file)
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c
@@ -25,7 +25,7 @@ Revision History
 \r
 #include "pcibus.h"\r
 \r
 \r
 #include "pcibus.h"\r
 \r

-EFI_PCI_HOTPLUG_REQUEST_PROTOCOL gPciHotPlugRequest = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_PCI_HOTPLUG_REQUEST_PROTOCOL gPciHotPlugRequest = {\r

   PciHotPlugRequestNotify\r
 };\r
 \r
   PciHotPlugRequestNotify\r
 };\r
 \r


@@ -49,6 +49,10 @@ Returns:
 {\r
   EFI_HANDLE  Handle;\r
 \r
 {\r
   EFI_HANDLE  Handle;\r
 \r

+  if (!FeaturePcdGet (PcdPciBusHotplugDeviceSupport)) {\r
+    return;\r
+  }\r
+\r

   Handle = NULL;\r
   *Status = gBS->InstallProtocolInterface (\r
                   &Handle,\r
   Handle = NULL;\r
   *Status = gBS->InstallProtocolInterface (\r
                   &Handle,\r


@@ -78,6 +82,10 @@ Returns:
 {\r
   EFI_STATUS  Status;\r
 \r
 {\r
   EFI_STATUS  Status;\r
 \r

+  if (!FeaturePcdGet (PcdPciBusHotplugDeviceSupport)) {\r
+    return;\r
+  }\r
+\r

   if (IS_CARDBUS_BRIDGE (&PciIoDevice->Parent->Pci)) {\r
 \r
     Status = gBS->InstallProtocolInterface (\r
   if (IS_CARDBUS_BRIDGE (&PciIoDevice->Parent->Pci)) {\r
 \r
     Status = gBS->InstallProtocolInterface (\r


@@ -109,6 +117,10 @@ Returns:
 {\r
   EFI_STATUS  Status;\r
 \r
 {\r
   EFI_STATUS  Status;\r
 \r

+  if (!FeaturePcdGet (PcdPciBusHotplugDeviceSupport)) {\r
+    return;\r
+  }\r
+\r

   Status = gBS->OpenProtocol (\r
                   PciIoDevice->Handle,\r
                   &gEfiPciHotplugDeviceGuid,\r
   Status = gBS->OpenProtocol (\r
                   PciIoDevice->Handle,\r
                   &gEfiPciHotplugDeviceGuid,\r


@@ -152,6 +164,10 @@ Returns:
 {\r
   UINT32  Address;\r
 \r
 {\r
   UINT32  Address;\r
 \r

+  if (!FeaturePcdGet (PcdPciBusHotplugDeviceSupport)) {\r
+    return;\r
+  }\r
+\r

   //\r
   // Read PciBar information from the bar register\r
   //\r
   //\r
   // Read PciBar information from the bar register\r
   //\r


@@ -239,6 +255,10 @@ Returns:
   LIST_ENTRY      *CurrentLink;\r
   LIST_ENTRY      *LastLink;\r
 \r
   LIST_ENTRY      *CurrentLink;\r
   LIST_ENTRY      *LastLink;\r
 \r

+  if (!FeaturePcdGet (PcdPciBusHotplugDeviceSupport)) {\r
+    return EFI_SUCCESS;\r
+  }\r
+\r

   CurrentLink = Bridge->ChildList.ForwardLink;\r
 \r
   while (CurrentLink && CurrentLink != &Bridge->ChildList) {\r
   CurrentLink = Bridge->ChildList.ForwardLink;\r
 \r
   while (CurrentLink && CurrentLink != &Bridge->ChildList) {\r


@@ -286,6 +306,396 @@ EFI_STATUS
 PciHostBridgeResourceAllocator (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r
   )\r
 PciHostBridgeResourceAllocator (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r
   )\r

+{\r
+  if (FeaturePcdGet (PcdPciBusHotplugDeviceSupport)) {\r
+    return PciHostBridgeResourceAllocator_WithHotPlugDeviceSupport (\r
+             PciResAlloc\r
+             );\r
+  } else {\r
+    return PciHostBridgeResourceAllocator_WithoutHotPlugDeviceSupport (\r
+             PciResAlloc\r
+             );\r
+  }  \r
+}\r
+\r
+\r
+EFI_STATUS\r
+PciHostBridgeResourceAllocator_WithoutHotPlugDeviceSupport (\r
+  IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+Arguments:\r
+\r
+Returns:\r
+\r
+  None\r
+\r
+--*/\r
+// TODO:    PciResAlloc - add argument and description to function comment\r
+// TODO:    EFI_NOT_FOUND - add return value to function comment\r
+// TODO:    EFI_OUT_OF_RESOURCES - add return value to function comment\r
+// TODO:    EFI_NOT_FOUND - add return value to function comment\r
+// TODO:    EFI_SUCCESS - add return value to function comment\r
+{\r
+  PCI_IO_DEVICE                   *RootBridgeDev;\r
+  EFI_HANDLE                      RootBridgeHandle;\r
+  VOID                            *AcpiConfig;\r
+  EFI_STATUS                      Status;\r
+  UINT64                          IoBase;\r
+  UINT64                          Mem32Base;\r
+  UINT64                          PMem32Base;\r
+  UINT64                          Mem64Base;\r
+  UINT64                          PMem64Base;\r
+  UINT64                          MaxOptionRomSize;\r
+  PCI_RESOURCE_NODE               *IoBridge;\r
+  PCI_RESOURCE_NODE               *Mem32Bridge;\r
+  PCI_RESOURCE_NODE               *PMem32Bridge;\r
+  PCI_RESOURCE_NODE               *Mem64Bridge;\r
+  PCI_RESOURCE_NODE               *PMem64Bridge;\r
+  PCI_RESOURCE_NODE               IoPool;\r
+  PCI_RESOURCE_NODE               Mem32Pool;\r
+  PCI_RESOURCE_NODE               PMem32Pool;\r
+  PCI_RESOURCE_NODE               Mem64Pool;\r
+  PCI_RESOURCE_NODE               PMem64Pool;\r
+  REPORT_STATUS_CODE_LIBRARY_DEVICE_HANDLE_EXTENDED_DATA  ExtendedData;\r
+\r
+  //\r
+  // Initialize resource pool\r
+  //\r
+  \r
+  InitializeResourcePool (&IoPool, PciBarTypeIo16);\r
+  InitializeResourcePool (&Mem32Pool, PciBarTypeMem32);\r
+  InitializeResourcePool (&PMem32Pool, PciBarTypePMem32);\r
+  InitializeResourcePool (&Mem64Pool, PciBarTypeMem64);\r
+  InitializeResourcePool (&PMem64Pool, PciBarTypePMem64);\r
+\r
+  RootBridgeDev     = NULL;\r
+  RootBridgeHandle  = 0;\r
+\r
+  while (PciResAlloc->GetNextRootBridge (PciResAlloc, &RootBridgeHandle) == EFI_SUCCESS) {\r
+    //\r
+    // Get RootBridg Device by handle\r
+    //\r
+    RootBridgeDev = GetRootBridgeByHandle (RootBridgeHandle);\r
+\r
+    if (RootBridgeDev == NULL) {\r
+      return EFI_NOT_FOUND;\r
+    }\r
+\r
+    //\r
+    // Get host bridge handle for status report\r
+    //\r
+    ExtendedData.Handle = RootBridgeDev->PciRootBridgeIo->ParentHandle;\r
+\r
+    //\r
+    // Create the entire system resource map from the information collected by\r
+    // enumerator. Several resource tree was created\r
+    //\r
+\r
+    IoBridge = CreateResourceNode (\r
+                RootBridgeDev,\r
+                0,\r
+                0xFFF,\r
+                0,\r
+                PciBarTypeIo16,\r
+                PciResUsageTypical\r
+                );\r
+\r
+    Mem32Bridge = CreateResourceNode (\r
+                    RootBridgeDev,\r
+                    0,\r
+                    0xFFFFF,\r
+                    0,\r
+                    PciBarTypeMem32,\r
+                    PciResUsageTypical\r
+                    );\r
+\r
+    PMem32Bridge = CreateResourceNode (\r
+                    RootBridgeDev,\r
+                    0,\r
+                    0xFFFFF,\r
+                    0,\r
+                    PciBarTypePMem32,\r
+                    PciResUsageTypical\r
+                    );\r
+\r
+    Mem64Bridge = CreateResourceNode (\r
+                    RootBridgeDev,\r
+                    0,\r
+                    0xFFFFF,\r
+                    0,\r
+                    PciBarTypeMem64,\r
+                    PciResUsageTypical\r
+                    );\r
+\r
+    PMem64Bridge = CreateResourceNode (\r
+                    RootBridgeDev,\r
+                    0,\r
+                    0xFFFFF,\r
+                    0,\r
+                    PciBarTypePMem64,\r
+                    PciResUsageTypical\r
+                    );\r
+\r
+    //\r
+    // Create resourcemap by going through all the devices subject to this root bridge\r
+    //\r
+    Status = CreateResourceMap (\r
+              RootBridgeDev,\r
+              IoBridge,\r
+              Mem32Bridge,\r
+              PMem32Bridge,\r
+              Mem64Bridge,\r
+              PMem64Bridge\r
+              );\r
+\r
+    //\r
+    // Get the max ROM size that the root bridge can process\r
+    //\r
+    RootBridgeDev->RomSize = Mem32Bridge->Length;\r
+\r
+    //\r
+    // Get Max Option Rom size for current root bridge\r
+    //\r
+    MaxOptionRomSize = GetMaxOptionRomSize (RootBridgeDev);\r
+\r
+    //\r
+    // Enlarger the mem32 resource to accomdate the option rom\r
+    // if the mem32 resource is not enough to hold the rom\r
+    //\r
+    if (MaxOptionRomSize > Mem32Bridge->Length) {\r
+\r
+      Mem32Bridge->Length     = MaxOptionRomSize;\r
+      RootBridgeDev->RomSize  = MaxOptionRomSize;\r
+\r
+      //\r
+      // Alignment should be adjusted as well\r
+      //\r
+      if (Mem32Bridge->Alignment < MaxOptionRomSize - 1) {\r
+        Mem32Bridge->Alignment = MaxOptionRomSize - 1;\r
+      }\r
+    }\r
+    \r
+    //\r
+    // Based on the all the resource tree, contruct ACPI resource node to\r
+    // submit the resource aperture to pci host bridge protocol\r
+    //\r
+    Status = ConstructAcpiResourceRequestor (\r
+              RootBridgeDev,\r
+              IoBridge,\r
+              Mem32Bridge,\r
+              PMem32Bridge,\r
+              Mem64Bridge,\r
+              PMem64Bridge,\r
+              &AcpiConfig\r
+              );\r
+\r
+    //\r
+    // Insert these resource nodes into the database\r
+    //\r
+    InsertResourceNode (&IoPool, IoBridge);\r
+    InsertResourceNode (&Mem32Pool, Mem32Bridge);\r
+    InsertResourceNode (&PMem32Pool, PMem32Bridge);\r
+    InsertResourceNode (&Mem64Pool, Mem64Bridge);\r
+    InsertResourceNode (&PMem64Pool, PMem64Bridge);\r
+\r
+    if (Status == EFI_SUCCESS) {\r
+      //\r
+      // Submit the resource requirement\r
+      //\r
+      Status = PciResAlloc->SubmitResources (\r
+                              PciResAlloc,\r
+                              RootBridgeDev->Handle,\r
+                              AcpiConfig\r
+                              );\r
+    }\r
+    //\r
+    // Free acpi resource node\r
+    //\r
+    if (AcpiConfig) {\r
+      gBS->FreePool (AcpiConfig);\r
+    }\r
+\r
+    if (EFI_ERROR (Status)) {\r
+      //\r
+      // Destroy all the resource tree\r
+      //\r
+      DestroyResourceTree (&IoPool);\r
+      DestroyResourceTree (&Mem32Pool);\r
+      DestroyResourceTree (&PMem32Pool);\r
+      DestroyResourceTree (&Mem64Pool);\r
+      DestroyResourceTree (&PMem64Pool);\r
+      return Status;\r
+    }\r
+  }\r
+  //\r
+  // End while\r
+  //\r
+\r
+  //\r
+  // Notify pci bus driver starts to program the resource\r
+  //\r
+  Status = NotifyPhase (PciResAlloc, EfiPciHostBridgeAllocateResources);\r
+\r
+  if (EFI_ERROR (Status)) {\r
+    //\r
+    // Allocation failed, then return\r
+    //\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+  //\r
+  // Raise the EFI_IOB_PCI_RES_ALLOC status code\r
+  //\r
+  REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
+        EFI_PROGRESS_CODE,\r
+        EFI_IO_BUS_PCI | EFI_IOB_PCI_PC_RES_ALLOC,\r
+        (VOID *) &ExtendedData,\r
+        sizeof (ExtendedData)\r
+        );\r
+\r
+  //\r
+  // Notify pci bus driver starts to program the resource\r
+  //\r
+  NotifyPhase (PciResAlloc, EfiPciHostBridgeSetResources);\r
+\r
+  RootBridgeDev     = NULL;\r
+\r
+  RootBridgeHandle  = 0;\r
+\r
+  while (PciResAlloc->GetNextRootBridge (PciResAlloc, &RootBridgeHandle) == EFI_SUCCESS) {\r
+    //\r
+    // Get RootBridg Device by handle\r
+    //\r
+    RootBridgeDev = GetRootBridgeByHandle (RootBridgeHandle);\r
+\r
+    if (RootBridgeDev == NULL) {\r
+      return EFI_NOT_FOUND;\r
+    }\r
+    \r
+    //\r
+    // Get acpi resource node for all the resource types\r
+    //\r
+    AcpiConfig = NULL;\r
+    Status = PciResAlloc->GetProposedResources (\r
+                            PciResAlloc,\r
+                            RootBridgeDev->Handle,\r
+                            &AcpiConfig\r
+                            );\r
+\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
+\r
+    //\r
+    // Get the resource base by interpreting acpi resource node\r
+    //\r
+    //\r
+    GetResourceBase (\r
+      AcpiConfig,\r
+      &IoBase,\r
+      &Mem32Base,\r
+      &PMem32Base,\r
+      &Mem64Base,\r
+      &PMem64Base\r
+      );\r
+\r
+    //\r
+    // Process option rom for this root bridge\r
+    //\r
+    Status = ProcessOptionRom (RootBridgeDev, Mem32Base, RootBridgeDev->RomSize);\r
+\r
+    //\r
+    // Create the entire system resource map from the information collected by\r
+    // enumerator. Several resource tree was created\r
+    //\r
+    Status = GetResourceMap (\r
+              RootBridgeDev,\r
+              &IoBridge,\r
+              &Mem32Bridge,\r
+              &PMem32Bridge,\r
+              &Mem64Bridge,\r
+              &PMem64Bridge,\r
+              &IoPool,\r
+              &Mem32Pool,\r
+              &PMem32Pool,\r
+              &Mem64Pool,\r
+              &PMem64Pool\r
+              );\r
+\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
+\r
+    //\r
+    // Program IO resources\r
+    //\r
+    ProgramResource (\r
+      IoBase,\r
+      IoBridge\r
+      );\r
+\r
+    //\r
+    // Program Mem32 resources\r
+    //\r
+    ProgramResource (\r
+      Mem32Base,\r
+      Mem32Bridge\r
+      );\r
+\r
+    //\r
+    // Program PMem32 resources\r
+    //\r
+    ProgramResource (\r
+      PMem32Base,\r
+      PMem32Bridge\r
+      );\r
+\r
+    //\r
+    // Program Mem64 resources\r
+    //\r
+    ProgramResource (\r
+      Mem64Base,\r
+      Mem64Bridge\r
+      );\r
+\r
+    //\r
+    // Program PMem64 resources\r
+    //\r
+    ProgramResource (\r
+      PMem64Base,\r
+      PMem64Bridge\r
+      );\r
+\r
+    if (AcpiConfig != NULL) {\r
+      gBS->FreePool (AcpiConfig);\r
+    }\r
+  }\r
+\r
+  //\r
+  // Destroy all the resource tree\r
+  //\r
+  DestroyResourceTree (&IoPool);\r
+  DestroyResourceTree (&Mem32Pool);\r
+  DestroyResourceTree (&PMem32Pool);\r
+  DestroyResourceTree (&Mem64Pool);\r
+  DestroyResourceTree (&PMem64Pool);\r
+\r
+  //\r
+  // Notify the resource allocation phase is to end\r
+  //\r
+  NotifyPhase (PciResAlloc, EfiPciHostBridgeEndResourceAllocation);\r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+\r
+EFI_STATUS\r
+PciHostBridgeResourceAllocator_WithHotPlugDeviceSupport (\r
+  IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r
+  )\r

 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r


@@ -787,6 +1197,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

+\r

 EFI_STATUS\r
 PciScanBus (\r
   IN PCI_IO_DEVICE                      *Bridge,\r
 EFI_STATUS\r
 PciScanBus (\r
   IN PCI_IO_DEVICE                      *Bridge,\r


@@ -794,6 +1205,204 @@ PciScanBus (
   OUT UINT8                             *SubBusNumber,\r
   OUT UINT8                             *PaddedBusRange\r
   )\r
   OUT UINT8                             *SubBusNumber,\r
   OUT UINT8                             *PaddedBusRange\r
   )\r

+{\r
+  if (FeaturePcdGet (PcdPciBusHotplugDeviceSupport)) {\r
+    return PciScanBus_WithHotPlugDeviceSupport (\r
+      Bridge, \r
+      StartBusNumber, \r
+      SubBusNumber, \r
+      PaddedBusRange\r
+      );\r
+  } else {\r
+    return PciScanBus_WithoutHotPlugDeviceSupport (\r
+      Bridge, \r
+      StartBusNumber, \r
+      SubBusNumber, \r
+      PaddedBusRange\r
+      );\r
+  }\r
+}\r
+\r
+\r
+EFI_STATUS\r
+PciScanBus_WithoutHotPlugDeviceSupport (\r
+  IN PCI_IO_DEVICE                      *Bridge,\r
+  IN UINT8                              StartBusNumber,\r
+  OUT UINT8                             *SubBusNumber,\r
+  OUT UINT8                             *PaddedBusRange\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  This routine is used to assign bus number to the given PCI bus system\r
+\r
+Arguments:\r
+\r
+Returns:\r
+\r
+  None\r
+\r
+--*/\r
+// TODO:    Bridge - add argument and description to function comment\r
+// TODO:    StartBusNumber - add argument and description to function comment\r
+// TODO:    SubBusNumber - add argument and description to function comment\r
+// TODO:    PaddedBusRange - add argument and description to function comment\r
+// TODO:    EFI_DEVICE_ERROR - add return value to function comment\r
+// TODO:    EFI_SUCCESS - add return value to function comment\r
+{\r
+  EFI_STATUS                      Status;\r
+  PCI_TYPE00                      Pci;\r
+  UINT8                           Device;\r
+  UINT8                           Func;\r
+  UINT64                          Address;\r
+  UINTN                           SecondBus;\r
+  UINT16                          Register;\r
+  PCI_IO_DEVICE                   *PciDevice;\r
+  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *PciRootBridgeIo;\r
+\r
+  PciRootBridgeIo = Bridge->PciRootBridgeIo;\r
+  SecondBus       = 0;\r
+  Register        = 0;\r
+\r
+  ResetAllPpbBusReg (Bridge, StartBusNumber);\r
+\r
+  for (Device = 0; Device <= PCI_MAX_DEVICE; Device++) {\r
+    for (Func = 0; Func <= PCI_MAX_FUNC; Func++) {\r
+\r
+      //\r
+      // Check to see whether a pci device is present\r
+      //\r
+      Status = PciDevicePresent (\r
+                PciRootBridgeIo,\r
+                &Pci,\r
+                StartBusNumber,\r
+                Device,\r
+                Func\r
+                );\r
+\r
+      if (!EFI_ERROR (Status)   && \r
+          (IS_PCI_BRIDGE (&Pci) ||\r
+          IS_CARDBUS_BRIDGE (&Pci))) {\r
+\r
+        //\r
+        // Get the bridge information\r
+        //\r
+        Status = PciSearchDevice (\r
+                  Bridge,\r
+                  &Pci,\r
+                  StartBusNumber,\r
+                  Device,\r
+                  Func,\r
+                  &PciDevice\r
+                  );\r
+\r
+        if (EFI_ERROR (Status)) {\r
+          return Status;\r
+        }\r
+\r
+        (*SubBusNumber)++;\r
+\r
+        SecondBus = (*SubBusNumber);\r
+\r
+        Register  = (UINT16) ((SecondBus << 8) | (UINT16) StartBusNumber);\r
+\r
+        Address   = EFI_PCI_ADDRESS (StartBusNumber, Device, Func, 0x18);\r
+\r
+        Status = PciRootBridgeIo->Pci.Write (\r
+                                        PciRootBridgeIo,\r
+                                        EfiPciWidthUint16,\r
+                                        Address,\r
+                                        1,\r
+                                        &Register\r
+                                        );\r
+\r
+        //\r
+        // Initialize SubBusNumber to SecondBus\r
+        //\r
+        Address = EFI_PCI_ADDRESS (StartBusNumber, Device, Func, 0x1A);\r
+        Status = PciRootBridgeIo->Pci.Write (\r
+                                        PciRootBridgeIo,\r
+                                        EfiPciWidthUint8,\r
+                                        Address,\r
+                                        1,\r
+                                        SubBusNumber\r
+                                        );\r
+        //\r
+        // If it is PPB, resursively search down this bridge\r
+        //\r
+        if (IS_PCI_BRIDGE (&Pci)) {\r
+          //\r
+          // Temporarily initialize SubBusNumber to maximum bus number to ensure the\r
+          // PCI configuration transaction to go through any PPB\r
+          //\r
+          Address   = EFI_PCI_ADDRESS (StartBusNumber, Device, Func, 0x1A);\r
+          Register  = 0xFF;\r
+          Status = PciRootBridgeIo->Pci.Write (\r
+                                          PciRootBridgeIo,\r
+                                          EfiPciWidthUint8,\r
+                                          Address,\r
+                                          1,\r
+                                          &Register\r
+                                          );\r
+\r
+          PreprocessController (\r
+            PciDevice,\r
+            PciDevice->BusNumber,\r
+            PciDevice->DeviceNumber,\r
+            PciDevice->FunctionNumber,\r
+            EfiPciBeforeChildBusEnumeration\r
+            );\r
+\r
+          Status = PciScanBus (\r
+                    PciDevice,\r
+                    (UINT8) (SecondBus),\r
+                    SubBusNumber,\r
+                    PaddedBusRange\r
+                    );\r
+\r
+          if (EFI_ERROR (Status)) {\r
+            return EFI_DEVICE_ERROR;\r
+          }\r
+        }\r
+\r
+        //\r
+        // Set the current maximum bus number under the PPB\r
+        //\r
+\r
+        Address = EFI_PCI_ADDRESS (StartBusNumber, Device, Func, 0x1A);\r
+\r
+        Status = PciRootBridgeIo->Pci.Write (\r
+                                        PciRootBridgeIo,\r
+                                        EfiPciWidthUint8,\r
+                                        Address,\r
+                                        1,\r
+                                        SubBusNumber\r
+                                        );\r
+\r
+      }\r
+\r
+      if (Func == 0 && !IS_PCI_MULTI_FUNC (&Pci)) {\r
+\r
+        //\r
+        // Skip sub functions, this is not a multi function device\r
+        //\r
+\r
+        Func = PCI_MAX_FUNC;\r
+      }\r
+    }\r
+  }\r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+EFI_STATUS\r
+PciScanBus_WithHotPlugDeviceSupport (\r
+  IN PCI_IO_DEVICE                      *Bridge,\r
+  IN UINT8                              StartBusNumber,\r
+  OUT UINT8                             *SubBusNumber,\r
+  OUT UINT8                             *PaddedBusRange\r
+  )\r

 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r


@@ -1175,6 +1784,10 @@ Returns:
   PCI_IO_DEVICE *RootBridgeDev;\r
   EFI_STATUS    Status;\r
 \r
   PCI_IO_DEVICE *RootBridgeDev;\r
   EFI_STATUS    Status;\r
 \r

+  if (!FeaturePcdGet (PcdPciBusHotplugDeviceSupport)) {\r
+    return EFI_SUCCESS;\r
+  }\r
+\r

   RootBridgeHandle = NULL;\r
 \r
   while (PciResAlloc->GetNextRootBridge (PciResAlloc, &RootBridgeHandle) == EFI_SUCCESS) {\r
   RootBridgeHandle = NULL;\r
 \r
   while (PciResAlloc->GetNextRootBridge (PciResAlloc, &RootBridgeHandle) == EFI_SUCCESS) {\r


@@ -1271,55 +1884,63 @@ Returns:
     //\r
   }\r
 \r
     //\r
   }\r
 \r

-  //                                                            \r
-  // Notify the bus allocation phase is finished for the first time\r
-  //                                                            \r
-  NotifyPhase (PciResAlloc, EfiPciHostBridgeEndBusAllocation);\r
-    \r
-                  \r
-  if (gPciHotPlugInit != NULL) {\r
-    //\r
-    // Wait for all HPC initialized\r
-    //\r
-    Status = AllRootHPCInitialized (STALL_1_SECOND * 15);\r
-\r
-    if (EFI_ERROR (Status)) {\r
-      return Status;\r
-    }\r
-\r
-    //\r
-    // Notify the bus allocation phase is about to start for the 2nd time\r
-    //\r
-    NotifyPhase (PciResAlloc, EfiPciHostBridgeBeginBusAllocation);\r
-  \r
-    RootBridgeHandle = NULL;\r
-    while (PciResAlloc->GetNextRootBridge (PciResAlloc, &RootBridgeHandle) == EFI_SUCCESS) {\r
+  if (FeaturePcdGet (PcdPciBusHotplugDeviceSupport)) {\r

 \r
 \r

+    //                                                            \r
+    // Notify the bus allocation phase is finished for the first time\r
+    //                                                            \r
+    NotifyPhase (PciResAlloc, EfiPciHostBridgeEndBusAllocation);\r
+      \r
+                    \r
+    if (gPciHotPlugInit != NULL) {\r

       //\r
       //\r

-      // if a root bridge instance is found, create root bridge device for it\r
+      // Wait for all HPC initialized\r

       //\r
       //\r

+      Status = AllRootHPCInitialized (STALL_1_SECOND * 15);\r

 \r
 \r

-      RootBridgeDev = CreateRootBridge (RootBridgeHandle);\r
-\r
-      if (RootBridgeDev == NULL) {\r
-        return EFI_OUT_OF_RESOURCES;\r
+      if (EFI_ERROR (Status)) {\r
+        return Status;\r

       }\r
 \r
       //\r
       }\r
 \r
       //\r

-      // Enumerate all the buses under this root bridge\r
+      // Notify the bus allocation phase is about to start for the 2nd time\r

       //\r
       //\r

+      NotifyPhase (PciResAlloc, EfiPciHostBridgeBeginBusAllocation);\r
+    \r
+      RootBridgeHandle = NULL;\r
+      while (PciResAlloc->GetNextRootBridge (PciResAlloc, &RootBridgeHandle) == EFI_SUCCESS) {\r

 \r
 \r

-      Status = PciRootBridgeEnumerator (\r
-                PciResAlloc,\r
-                RootBridgeDev\r
-                );\r
+        //\r
+        // if a root bridge instance is found, create root bridge device for it\r
+        //\r

 \r
 \r

-      DestroyRootBridge (RootBridgeDev);\r
-      if (EFI_ERROR (Status)) {\r
-        return Status;\r
+        RootBridgeDev = CreateRootBridge (RootBridgeHandle);\r
+\r
+        if (RootBridgeDev == NULL) {\r
+          return EFI_OUT_OF_RESOURCES;\r
+        }\r
+\r
+        //\r
+        // Enumerate all the buses under this root bridge\r
+        //\r
+\r
+        Status = PciRootBridgeEnumerator (\r
+                  PciResAlloc,\r
+                  RootBridgeDev\r
+                  );\r
+\r
+        DestroyRootBridge (RootBridgeDev);\r
+        if (EFI_ERROR (Status)) {\r
+          return Status;\r
+        }\r

       }\r
       }\r

+        \r
+      //\r
+      // Notify the bus allocation phase is to end\r
+      //\r
+      NotifyPhase (PciResAlloc, EfiPciHostBridgeEndBusAllocation);\r

     }\r
     }\r

-      \r
+  } else {\r

     //\r
     // Notify the bus allocation phase is to end\r
     //\r
     //\r
     // Notify the bus allocation phase is to end\r
     //\r

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.h b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.h
index 1e89445df6434c797549255984c87edb1096363c..f8e88375d7a50a64c9d555de3d02c94823aebfae 100644 (file)
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.h
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.h
@@ -15,9 +15,9 @@ Module Name:
   \r
 Abstract:\r
 \r
   \r
 Abstract:\r
 \r

-  PCI Bus Driver Lib header file\r
-  It abstracts some functions that can be different \r
-  between light PCI bus driver and full PCI bus driver\r
+  PCI Bus Driver Lib header file.\r
+  Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable\r
+  support hot plug.\r

 \r
 Revision History\r
 \r
 \r
 Revision History\r
 \r


@@ -154,6 +154,18 @@ Returns:
 --*/\r
 ;\r
 \r
 --*/\r
 ;\r
 \r

+EFI_STATUS\r
+PciHostBridgeResourceAllocator_WithoutHotPlugDeviceSupport (\r
+  IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r
+  )\r
+;\r
+\r
+EFI_STATUS\r
+PciHostBridgeResourceAllocator_WithHotPlugDeviceSupport (\r
+  IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r
+  )\r
+;\r
+\r

 EFI_STATUS\r
 PciScanBus (\r
   IN PCI_IO_DEVICE                      *Bridge,\r
 EFI_STATUS\r
 PciScanBus (\r
   IN PCI_IO_DEVICE                      *Bridge,\r


@@ -181,6 +193,24 @@ Returns:
 --*/\r
 ;\r
 \r
 --*/\r
 ;\r
 \r

+EFI_STATUS\r
+PciScanBus_WithHotPlugDeviceSupport (\r
+  IN PCI_IO_DEVICE                      *Bridge,\r
+  IN UINT8                              StartBusNumber,\r
+  OUT UINT8                             *SubBusNumber,\r
+  OUT UINT8                             *PaddedBusRange\r
+  )\r
+;\r
+\r
+EFI_STATUS\r
+PciScanBus_WithoutHotPlugDeviceSupport (\r
+  IN PCI_IO_DEVICE                      *Bridge,\r
+  IN UINT8                              StartBusNumber,\r
+  OUT UINT8                             *SubBusNumber,\r
+  OUT UINT8                             *PaddedBusRange\r
+  )\r
+;\r
+\r

 EFI_STATUS\r
 PciRootBridgeP2CProcess (\r
   IN PCI_IO_DEVICE *Bridge\r
 EFI_STATUS\r
 PciRootBridgeP2CProcess (\r
   IN PCI_IO_DEVICE *Bridge\r

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 78c46fd05477a43983bd190252e97220c054291c..7ed449c1af4de90b18061a3aa39c98daea3e40dd 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -3698,6 +3698,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>FALSE</Value>\r
         </PcdData>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>FALSE</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdPciBusHotplugDeviceSupport</C_Name>\r
+          <Token>0x0001003d</Token>\r
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>TRUE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r


@@ -8991,6 +8999,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>FALSE</Value>\r
         </PcdData>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>FALSE</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdPciBusHotplugDeviceSupport</C_Name>\r
+          <Token>0x0001003d</Token>\r
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>TRUE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r


@@ -13262,6 +13278,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>FALSE</Value>\r
         </PcdData>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>FALSE</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdPciBusHotplugDeviceSupport</C_Name>\r
+          <Token>0x0001003d</Token>\r
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>TRUE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r


@@ -17180,6 +17204,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>FALSE</Value>\r
         </PcdData>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>FALSE</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdPciBusHotplugDeviceSupport</C_Name>\r
+          <Token>0x0001003d</Token>\r
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>TRUE</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index e63427f95552d6e172ca3e9be831605e558d33c5..db8be51a649315be6e5227d65678d831e02b32ca 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -7,11 +7,11 @@
     <Abstract>Edk Module Package Reference Implementations</Abstract>\r
     <Description>This Module provides standard reference information for EFI/Tiano implementations.</Description>\r
     <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
     <Abstract>Edk Module Package Reference Implementations</Abstract>\r
     <Description>This Module provides standard reference information for EFI/Tiano implementations.</Description>\r
     <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r

-    <License>All rights reserved.
-      This program and the accompanying materials are licensed and made available 
-      under the terms and conditions of the BSD License which accompanies this distribution.
-      The full text of the license may be found at http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES
+    <License>All rights reserved.\r
+      This program and the accompanying materials are licensed and made available \r
+      under the terms and conditions of the BSD License which accompanies this distribution.\r
+      The full text of the license may be found at http://opensource.org/licenses/bsd-license.php\r
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES\r

       OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </SpdHeader>\r
       OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </SpdHeader>\r


@@ -452,7 +452,7 @@
     <Entry Name="GenericPlatformTokenSpace">\r
       <C_Name>gEfiGenericPlatformTokenSpaceGuid</C_Name>\r
       <GuidValue>18D15EA6-9E14-40a1-B39C-59C44DA9D891</GuidValue>\r
     <Entry Name="GenericPlatformTokenSpace">\r
       <C_Name>gEfiGenericPlatformTokenSpaceGuid</C_Name>\r
       <GuidValue>18D15EA6-9E14-40a1-B39C-59C44DA9D891</GuidValue>\r

-      <HelpText>This is the token space GUID for platform generic PCD definitions.
+      <HelpText>This is the token space GUID for platform generic PCD definitions.\r

         Now FlashLayout and Platform CPU belong to this space.</HelpText>\r
     </Entry>\r
     <Entry Name="EdkModulePkgTokenSpace">\r
         Now FlashLayout and Platform CPU belong to this space.</HelpText>\r
     </Entry>\r
     <Entry Name="EdkModulePkgTokenSpace">\r


@@ -903,7 +903,7 @@
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>0x08</DefaultValue>\r
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>0x08</DefaultValue>\r

-      <HelpText>The maximum number of callback function, which will be triggered when 
+      <HelpText>The maximum number of callback function, which will be triggered when \r

         a PCD entry is been set, can be registered for a single PCD entry in PEI phase.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
         a PCD entry is been set, can be registered for a single PCD entry in PEI phase.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r


@@ -913,7 +913,7 @@
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>0x0</DefaultValue>\r
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>0x0</DefaultValue>\r

-      <HelpText>The base address of the VPD (Vital Product Data) region. It is 
+      <HelpText>The base address of the VPD (Vital Product Data) region. It is \r

         normally a region reserved on flash.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
         normally a region reserved on flash.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r


@@ -950,7 +950,7 @@
       <DatumType>BOOLEAN</DatumType>\r
       <ValidUsage>FEATURE_FLAG</ValidUsage>\r
       <DefaultValue>TRUE</DefaultValue>\r
       <DatumType>BOOLEAN</DatumType>\r
       <ValidUsage>FEATURE_FLAG</ValidUsage>\r
       <DefaultValue>TRUE</DefaultValue>\r

-      <HelpText>This feature flag can be used to enable or disable the Pcd PEIM database 
+      <HelpText>This feature flag can be used to enable or disable the Pcd PEIM database \r

         traverse capability. Disable it can reduce the size of final image generated.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
         traverse capability. Disable it can reduce the size of final image generated.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r


@@ -960,7 +960,7 @@
       <DatumType>BOOLEAN</DatumType>\r
       <ValidUsage>FEATURE_FLAG</ValidUsage>\r
       <DefaultValue>TRUE</DefaultValue>\r
       <DatumType>BOOLEAN</DatumType>\r
       <ValidUsage>FEATURE_FLAG</ValidUsage>\r
       <DefaultValue>TRUE</DefaultValue>\r

-      <HelpText>This feature flag can be used to enable or disable the Pcd DXE database 
+      <HelpText>This feature flag can be used to enable or disable the Pcd DXE database \r

         traverse capability. Disable it can reduce the size of final image generated.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
         traverse capability. Disable it can reduce the size of final image generated.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r


@@ -1260,5 +1260,14 @@
       <DefaultValue>FALSE</DefaultValue>\r
       <HelpText>If this feature is enabled, DXE IPL will build a series of HOBs to share code with DXE Core.</HelpText>\r
     </PcdEntry>\r
       <DefaultValue>FALSE</DefaultValue>\r
       <HelpText>If this feature is enabled, DXE IPL will build a series of HOBs to share code with DXE Core.</HelpText>\r
     </PcdEntry>\r

+    <PcdEntry>\r
+      <C_Name>PcdPciBusHotplugDeviceSupport</C_Name>\r
+      <Token>0x0001003d</Token>\r
+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>TRUE</DefaultValue>\r
+      <HelpText>If TRUE, the PCI bus driver will support hot plug device. If not hot plug device is supported, this feature flag can be set to FALSE to save size.</HelpText>\r
+    </PcdEntry>\r

   </PcdDeclarations>\r
 </PackageSurfaceArea>
\ No newline at end of file
   </PcdDeclarations>\r
 </PackageSurfaceArea>
\ No newline at end of file

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index ff93ef54211730baac5a83fb5ade8ca1df473f8b..a4b19878a59fd64bedac70ddb568549e21fad3c9 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -767,7 +767,7 @@ SetHiiVariable (
   Status = gRT->GetVariable (\r
     (UINT16 *)VariableName,\r
     VariableGuid,\r
   Status = gRT->GetVariable (\r
     (UINT16 *)VariableName,\r
     VariableGuid,\r

-    &Attribute,\r
+    NULL,\r

     &Size,\r
     NULL\r
     );\r
     &Size,\r
     NULL\r
     );\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/MemoryTest.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/MemoryTest.c
index af6c1ab2176cd370cba90417c012c02f535b59a4..d4e5bc50efc0dad52310450c9e6271713ac9d756 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/MemoryTest.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/MemoryTest.c
@@ -240,7 +240,6 @@ Returns:
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL     Color;\r
   UINT8                             Value;\r
   UINTN                             DataSize;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL     Color;\r
   UINT8                             Value;\r
   UINTN                             DataSize;\r

-  UINT32                            Attributes;\r

 \r
   ReturnStatus = EFI_SUCCESS;\r
   ZeroMem (&Key, sizeof (EFI_INPUT_KEY));\r
 \r
   ReturnStatus = EFI_SUCCESS;\r
   ZeroMem (&Key, sizeof (EFI_INPUT_KEY));\r


@@ -412,7 +411,7 @@ Done:
   Status = gRT->GetVariable (\r
                   L"BootState",\r
                   &gEfiBootStateGuid,\r
   Status = gRT->GetVariable (\r
                   L"BootState",\r
                   &gEfiBootStateGuid,\r

-                  &Attributes,\r
+                  NULL,\r

                   &DataSize,\r
                   &Value\r
                   );\r
                   &DataSize,\r
                   &Value\r
                   );\r