sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nt32Pkg: Fix SnpNt32 GetStatus bug

Browse Source 
According to UEFI spec, the Snp.GetStatus should
return the recycled transmit buffer address, while
the NT32 SNP always return value 1 for the Txbuffer.

Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>
This commit is contained in:
Zhang Lubo
2016-04-28 15:51:42 +08:00
committed by Jiaxin Wu
parent 50a65824c7
commit a2cc5fea44
2 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Nt32Pkg/SnpNt32Dxe/SnpNt32.c
View File

@@ -1,6 +1,6 @@
/** @file
Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2006 - 2016, 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
@@ -44,6 +44,9 @@ SNPNT32_GLOBAL_DATA gSnpNt32GlobalData = {
0,
EfiLockUninitialized
}, // Lock
NULL, // RecycledTxBuf
0, // RecycledTxBufCount
32, // MaxRecycledTxBuf
//
// Private functions
//
@@ -861,9 +864,20 @@ SnpNt32GetStatus (
OUT VOID **TxBuffer
)
{
SNPNT32_INSTANCE_DATA *Instance;
SNPNT32_GLOBAL_DATA *GlobalData;
Instance = SNP_NT32_INSTANCE_DATA_FROM_SNP_THIS (This);
GlobalData = Instance->GlobalData;
if (TxBuffer != NULL) {
*((UINT8 **) TxBuffer) = (UINT8 *)(UINTN) 1;
if (GlobalData->RecycledTxBufCount != 0) {
GlobalData->RecycledTxBufCount --;
*((UINT8 **) TxBuffer) = (UINT8 *) (UINTN)GlobalData->RecycledTxBuf[GlobalData->RecycledTxBufCount];
} else {
*((UINT8 **) TxBuffer) = NULL;
}
}
if (InterruptStatus != NULL) {
@@ -918,6 +932,7 @@ SnpNt32Transmit (
SNPNT32_INSTANCE_DATA *Instance;
SNPNT32_GLOBAL_DATA *GlobalData;
INT32 ReturnValue;
UINT64 *Tmp;
Instance = SNP_NT32_INSTANCE_DATA_FROM_SNP_THIS (This);
@@ -945,6 +960,24 @@ SnpNt32Transmit (
if (ReturnValue < 0) {
return EFI_DEVICE_ERROR;
} else {
if ((GlobalData->MaxRecycledTxBuf + SNP_TX_BUFFER_INCREASEMENT) >= SNP_MAX_TX_BUFFER_NUM) {
return EFI_NOT_READY;
}
if (GlobalData->RecycledTxBufCount < GlobalData->MaxRecycledTxBuf) {
GlobalData->RecycledTxBuf[GlobalData->RecycledTxBufCount] = (UINT64) Buffer;
GlobalData->RecycledTxBufCount ++;
} else {
Tmp = AllocatePool (sizeof (UINT64) * (GlobalData->MaxRecycledTxBuf + SNP_TX_BUFFER_INCREASEMENT));
if (Tmp == NULL) {
return EFI_DEVICE_ERROR;
}
CopyMem (Tmp, GlobalData->RecycledTxBuf, sizeof (UINT64) * GlobalData->RecycledTxBufCount);
FreePool (GlobalData->RecycledTxBuf);
GlobalData->RecycledTxBuf = Tmp;
GlobalData->MaxRecycledTxBuf += SNP_TX_BUFFER_INCREASEMENT;
}
}
return EFI_SUCCESS;
@@ -1083,6 +1116,11 @@ SnpNt32InitializeGlobalData (
InitializeListHead (&This->InstanceList);
EfiInitializeLock (&This->Lock, TPL_CALLBACK);
This->RecycledTxBuf = AllocatePool (sizeof (UINT64) * This->MaxRecycledTxBuf);
if (This->RecycledTxBuf == NULL) {
return EFI_OUT_OF_RESOURCES;
}
//
// Get the WinNT thunk
//