X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FSnpDxe%2FSnp.c;fp=MdeModulePkg%2FUniversal%2FNetwork%2FSnpDxe%2FSnp.c;h=db5b6267a613111bae3407cfc95c20a1e20b7699;hb=f70f52f5ed01a527047c63a8c3aeb582e0791615;hp=a63dd10b296d8b7d7a1d0332336467868e3dc253;hpb=725507b000e881d4c48d94ce0dfe77ada767aabe;p=mirror_edk2.git

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
index a63dd10b29..db5b6267a6 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
@@ -1,7 +1,7 @@
 /** @file
   Implementation of driver entry point and driver binding protocol.
 
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2015, 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
@@ -273,6 +273,8 @@ SimpleNetworkDriverStart (
   PXE_STATFLAGS                             InitStatFlags;
   EFI_PCI_IO_PROTOCOL                       *PciIo;
   EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR         *BarDesc;
+  BOOLEAN                                   FoundIoBar;
+  BOOLEAN                                   FoundMemoryBar;
   
   DEBUG ((EFI_D_NET, "\nSnpNotifyNetworkInterfaceIdentifier()  "));
 
@@ -403,7 +405,7 @@ SimpleNetworkDriverStart (
   Snp->TxRxBuffer         = NULL;
  
   if (Nii->Revision >= EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION) {
-  	Snp->IfNum = Nii->IfNum;
+    Snp->IfNum = Nii->IfNum;
 
   } else {
     Snp->IfNum = (UINT8) (Nii->IfNum & 0xFF);
@@ -463,6 +465,8 @@ SimpleNetworkDriverStart (
   //
   Snp->MemoryBarIndex = 0;
   Snp->IoBarIndex     = 1;
+  FoundMemoryBar      = FALSE;
+  FoundIoBar          = FALSE;
   for (BarIndex = 0; BarIndex < PCI_MAX_BAR; BarIndex++) {
     Status = PciIo->GetBarAttributes (
                       PciIo,
@@ -476,13 +480,19 @@ SimpleNetworkDriverStart (
       goto Error_DeleteSNP;
     }
 
-    if (BarDesc->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM) {
+    if ((!FoundMemoryBar) && (BarDesc->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM)) {
       Snp->MemoryBarIndex = BarIndex;
-    } else if (BarDesc->ResType == ACPI_ADDRESS_SPACE_TYPE_IO) {
+      FoundMemoryBar      = TRUE;
+    } else if ((!FoundIoBar) && (BarDesc->ResType == ACPI_ADDRESS_SPACE_TYPE_IO)) {
       Snp->IoBarIndex = BarIndex;
+      FoundIoBar      = TRUE;
     }
 
     FreePool (BarDesc);
+
+    if (FoundMemoryBar && FoundIoBar) {
+      break;
+    }
   }
 
   Status = PxeStart (Snp);