Revision: 18465
http://sourceforge.net/p/edk2/code/18465
Author: hwu1225
Date: 2015-09-15 05:45:03 +0000 (Tue, 15 Sep 2015)
Log Message:
-----------
MdeModulePkg: Change the algorithm in SNP to use the first found BAR index.
The driver binding start function in SNP.c goes through all the BARs and get
the last BAR index for use. Theoretically it should work with all valid BARs,
but we got reports some device did always use the first valid BAR, so we change
the logic in SNP to use the first found BAR index instead of the last one.
(Sync patch r18455 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <[email protected]>
Reviewed-by: Ye Ting <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/18455
Modified Paths:
--------------
branches/UDK2015/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
Modified: branches/UDK2015/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
===================================================================
--- branches/UDK2015/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
2015-09-15 05:44:39 UTC (rev 18464)
+++ branches/UDK2015/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
2015-09-15 05:45:03 UTC (rev 18465)
@@ -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 @@
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 @@
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 @@
//
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 @@
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);
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
