Sync patches r14027, r14312, r14314 and r14318 from main trunk.

1. MdeModulePkg/AtaAtapiPassThru: Not set AhciCmdC bit of CommandList when doing transaction as AHCI spec say this bit is only used to do soft reset.
2. Mallicious code may use SmmFaultTolerantWriteHandler() to update some flash area directly, like Variable region, so return EFI_ACCESS_DENIED after End Of Dxe in SmmFaultTolerantWriteHandler().
And add code to prevent InfoSize overflow.
3. Fix ping command issue in IP4 driver.
4. Fix the bug which incorrectly programs the 64bit base address register in the PCI to PCI bridge.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010.SR1@14321 6f19259b-4bc3-4df7-8a09-765794883524

7 files changed, 153 insertions, 31 deletions

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
index 7101c66..ee83092 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
@@ -548,7 +548,6 @@ AhciBuildCommand (
 

     CommandList->AhciCmdA = 1;

     CommandList->AhciCmdP = 1;

-    CommandList->AhciCmdC = (DataLength == 0) ? 1 : 0;

 

     AhciOrReg (PciIo, Offset, (EFI_AHCI_PORT_CMD_DLAE | EFI_AHCI_PORT_CMD_ATAPI));

   } else {

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
index e17f4ba..d8d988c 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
@@ -1,7 +1,7 @@
 /** @file

   PCI resouces support functions implemntation for PCI Bus module.

 

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>

 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

@@ -1472,7 +1472,14 @@ ProgramPpbApperture (
 

   case PPB_BAR_0:

   case PPB_BAR_1:

-    PciIo->Pci.Write (

+    switch ((Node->PciDev->PciBar[Node->Bar]).BarType) {

+

+      case PciBarTypeIo16:

+      case PciBarTypeIo32:

+      case PciBarTypeMem32:

+      case PciBarTypePMem32:

+

+        PciIo->Pci.Write (

                  PciIo,

                  EfiPciIoWidthUint32,

                  (Node->PciDev->PciBar[Node->Bar]).Offset,

@@ -1480,9 +1487,40 @@ ProgramPpbApperture (
                  &Address

                  );

 

-    Node->PciDev->PciBar[Node->Bar].BaseAddress = Address;

-    Node->PciDev->PciBar[Node->Bar].Length      = Node->Length;

+        Node->PciDev->PciBar[Node->Bar].BaseAddress = Address;

+        Node->PciDev->PciBar[Node->Bar].Length      = Node->Length;

+        break;

+

+      case PciBarTypeMem64:

+      case PciBarTypePMem64:

 

+        Address32 = (UINT32) (Address & 0x00000000FFFFFFFF);

+

+        PciIo->Pci.Write (

+                 PciIo,

+                 EfiPciIoWidthUint32,

+                 (Node->PciDev->PciBar[Node->Bar]).Offset,

+                 1,

+                 &Address32

+                 );

+

+        Address32 = (UINT32) RShiftU64 (Address, 32);

+

+        PciIo->Pci.Write (

+                 PciIo,

+                 EfiPciIoWidthUint32,

+                 (UINT8) ((Node->PciDev->PciBar[Node->Bar]).Offset + 4),

+                 1,

+                 &Address32

+                 );

+

+        Node->PciDev->PciBar[Node->Bar].BaseAddress = Address;

+        Node->PciDev->PciBar[Node->Bar].Length      = Node->Length;

+        break;

+

+      default:

+        break;

+    }

     break;

 

   case PPB_IO_RANGE:

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
index e7d79c1..13c7096 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
@@ -43,7 +43,7 @@
   Caution: This module requires additional review when modified.

   This driver need to make sure the CommBuffer is not in the SMRAM range. 

 

-Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>

 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        

@@ -60,12 +60,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "FaultTolerantWrite.h"

 #include "FaultTolerantWriteSmmCommon.h"

 #include <Protocol/SmmAccess2.h>

+#include <Protocol/SmmEndOfDxe.h>

 

 EFI_EVENT                                 mFvbRegistration = NULL;

 EFI_FTW_DEVICE                            *mFtwDevice      = NULL;

 EFI_SMRAM_DESCRIPTOR                      *mSmramRanges;

 UINTN                                     mSmramRangeCount;

 

+///

+/// The flag to indicate whether the platform has left the DXE phase of execution.

+///

+BOOLEAN                                   mEndOfDxe = FALSE;

 

 /**

   This function check if the address is in SMRAM.

@@ -357,6 +362,16 @@ SmmFaultTolerantWriteHandler (
   }

 

   SmmFtwFunctionHeader = (SMM_FTW_COMMUNICATE_FUNCTION_HEADER *)CommBuffer;

+

+  if (mEndOfDxe) {

+    //

+    // It will be not safe to expose the operations after End Of Dxe.

+    //

+    DEBUG ((EFI_D_ERROR, "SmmFtwHandler: Not safe to do the operation: %x after End Of Dxe, so access denied!\n", SmmFtwFunctionHeader->Function));

+    SmmFtwFunctionHeader->ReturnStatus = EFI_ACCESS_DENIED;

+    return EFI_SUCCESS;

+  }

+

   switch (SmmFtwFunctionHeader->Function) {

     case FTW_FUNCTION_GET_MAX_BLOCK_SIZE:

       SmmGetMaxBlockSizeHeader = (SMM_FTW_GET_MAX_BLOCK_SIZE_HEADER *) SmmFtwFunctionHeader->Data;

@@ -430,6 +445,13 @@ SmmFaultTolerantWriteHandler (
       

     case FTW_FUNCTION_GET_LAST_WRITE:

       SmmFtwGetLastWriteHeader = (SMM_FTW_GET_LAST_WRITE_HEADER *) SmmFtwFunctionHeader->Data;

+      if ((UINTN)(~0) - SmmFtwGetLastWriteHeader->PrivateDataSize < OFFSET_OF (SMM_FTW_GET_LAST_WRITE_HEADER, Data)){

+        //

+        // Prevent InfoSize overflow

+        //

+        Status = EFI_ACCESS_DENIED;

+        break;

+      }

       InfoSize = OFFSET_OF (SMM_FTW_GET_LAST_WRITE_HEADER, Data) + SmmFtwGetLastWriteHeader->PrivateDataSize;

 

       //

@@ -532,6 +554,27 @@ FvbNotificationEvent (
   return EFI_SUCCESS;

 }

 

+/**

+  SMM END_OF_DXE protocol notification event handler.

+ 

+  @param  Protocol   Points to the protocol's unique identifier

+  @param  Interface  Points to the interface instance

+  @param  Handle     The handle on which the interface was installed

+

+  @retval EFI_SUCCESS   SmmEndOfDxeCallback runs successfully

+

+**/

+EFI_STATUS

+EFIAPI

+SmmEndOfDxeCallback (

+  IN CONST EFI_GUID                       *Protocol,

+  IN VOID                                 *Interface,

+  IN EFI_HANDLE                           Handle

+  )

+{

+  mEndOfDxe = TRUE;

+  return EFI_SUCCESS;

+}

 

 /**

   This function is the entry point of the Fault Tolerant Write driver.

@@ -555,7 +598,8 @@ SmmFaultTolerantWriteInitialize (
   EFI_HANDLE                              FtwHandle;

   EFI_SMM_ACCESS2_PROTOCOL                *SmmAccess;

   UINTN                                   Size;

-  

+  VOID                                    *SmmEndOfDxeRegistration;

+

   //

   // Allocate private data structure for SMM FTW protocol and do some initialization

   //

@@ -587,6 +631,16 @@ SmmFaultTolerantWriteInitialize (
   mSmramRangeCount = Size / sizeof (EFI_SMRAM_DESCRIPTOR);

 

   //

+  // Register EFI_SMM_END_OF_DXE_PROTOCOL_GUID notify function.

+  //

+  Status = gSmst->SmmRegisterProtocolNotify (

+                    &gEfiSmmEndOfDxeProtocolGuid,

+                    SmmEndOfDxeCallback,

+                    &SmmEndOfDxeRegistration

+                    );

+  ASSERT_EFI_ERROR (Status);

+

+  //

   // Register FvbNotificationEvent () notify function.

   // 

   Status = gSmst->SmmRegisterProtocolNotify (

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
index ec33465..20c43cf 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
@@ -4,7 +4,7 @@
 #   depends on the full functionality SMM FVB protocol that support read, write/erase 

 #   flash access.

 #

-# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -58,6 +58,7 @@
   gEfiSmmFirmwareVolumeBlockProtocolGuid           ## CONSUMES

   gEfiSmmFaultTolerantWriteProtocolGuid            ## PRODUCES

   gEfiSmmAccess2ProtocolGuid                       ## CONSUMES

+  gEfiSmmEndOfDxeProtocolGuid                      ## CONSUMES

 

 [FeaturePcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdFullFtwServiceEnable

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
index 35aff05..1432cc3 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
@@ -1,8 +1,11 @@
 ## @file

-# This module is the Runtime DXE part corresponding to SMM Fault Tolerant Write (FTW) module. 

+# This module is the DXE part corresponding to SMM Fault Tolerant Write (FTW) module.

 # It installs FTW protocol and works with SMM FTW module together.

+# The FTW protocol will not work after End Of Dxe because it will be not safe to expose

+# the related operations in SMM handler in SMM FTW module. You can use the FTW protocol

+# before End Of Dxe or use FaultTolerantWriteDxe module instead if you really want to.

 #

-# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
index 4a3d342..73b4e24 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
@@ -1,7 +1,7 @@
 /** @file

   The driver binding and service binding protocol for IP4 driver.

 

-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2013, Intel Corporation. All rights reserved.<BR>

 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

@@ -572,6 +572,8 @@ Ip4DriverBindingStop (
   INTN                                     State;

   LIST_ENTRY                               *List;

   IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;

+  IP4_INTERFACE                            *IpIf;

+  IP4_ROUTE_TABLE                          *RouteTable;

 

   //

   // IP4 driver opens the MNP child, ARP children or the IP4_CONFIG protocol

@@ -681,6 +683,35 @@ Ip4DriverBindingStop (
                &Context,

                NULL

                );

+  } else if (IpSb->DefaultInterface->ArpHandle == ControllerHandle) {

+    //

+    // The ARP protocol for the default interface is being uninstalled and all

+    // its IP child handles should have been destroyed before. So, release the

+    // default interface and route table, create a new one and mark it as not started.

+    //

+    Ip4CancelReceive (IpSb->DefaultInterface);

+    Ip4FreeInterface (IpSb->DefaultInterface, NULL);

+    Ip4FreeRouteTable (IpSb->DefaultRouteTable);

+    

+    IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);

+    if (IpIf == NULL) {

+      goto ON_ERROR;

+    }

+    RouteTable = Ip4CreateRouteTable ();

+    if (RouteTable == NULL) {

+      Ip4FreeInterface (IpIf, NULL);

+      goto ON_ERROR;;

+    }

+    

+    IpSb->DefaultInterface  = IpIf;

+    InsertHeadList (&IpSb->Interfaces, &IpIf->Link);

+    IpSb->DefaultRouteTable = RouteTable;

+    Ip4ReceiveFrame (IpIf, NULL, Ip4AccpetFrame, IpSb);

+

+    if (IpSb->Ip4Config != NULL && IpSb->State != IP4_SERVICE_DESTROY) {

+      IpSb->Ip4Config->Stop (IpSb->Ip4Config);

+    }

+    IpSb->State = IP4_SERVICE_UNSTARTED;

   } else if (IsListEmpty (&IpSb->Children)) {

     State           = IpSb->State;

     IpSb->State     = IP4_SERVICE_DESTROY;

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index 6711636..e4ab17a 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -740,11 +740,24 @@ Ip4FreeInterface (
   //

   Ip4CancelFrames (Interface, EFI_ABORTED, Ip4CancelInstanceFrame, IpInstance);

 

+  if (--Interface->RefCnt > 0) {

+    return EFI_SUCCESS;

+  }

+

   //

-  // Destroy the ARP instance if this is the last IP instance that

-  // has the address.

+  // Destroy the interface if this is the last IP instance that

+  // has the address. Remove all the system transmitted packets

+  // from this interface, cancel the receive request if there is

+  // one, and destroy the ARP requests.

   //

-  if (Interface->Arp != NULL && IsListEmpty (&Interface->IpInstances)) {

+  Ip4CancelFrames (Interface, EFI_ABORTED, Ip4CancelInstanceFrame, NULL);

+  Ip4CancelReceive (Interface);

+

+  ASSERT (IsListEmpty (&Interface->IpInstances));

+  ASSERT (IsListEmpty (&Interface->ArpQues));

+  ASSERT (IsListEmpty (&Interface->SentFrames));

+

+  if (Interface->Arp != NULL) {

     gBS->CloseProtocol (

           Interface->ArpHandle,

           &gEfiArpProtocolGuid,

@@ -758,25 +771,8 @@ Ip4FreeInterface (
       &gEfiArpServiceBindingProtocolGuid,

       Interface->ArpHandle

       );

-    Interface->Arp = NULL;

-  }

-  

-  if (--Interface->RefCnt > 0) {

-    return EFI_SUCCESS;

   }

 

-  //

-  // Destroy the interface if it is not referenced by any IP instance (for common Interface)

-  // or the IP service (for the DefaultInterface). Remove all the system transmitted packets

-  // from this interface, cancel the receive request if there is one.

-  //

-  Ip4CancelFrames (Interface, EFI_ABORTED, Ip4CancelInstanceFrame, NULL);

-  Ip4CancelReceive (Interface);

-

-  ASSERT (IsListEmpty (&Interface->IpInstances));

-  ASSERT (IsListEmpty (&Interface->ArpQues));

-  ASSERT (IsListEmpty (&Interface->SentFrames));

-

   RemoveEntryList (&Interface->Link);

   FreePool (Interface);