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

MdeModulePkg/NvmExpressDxe: Correct Prp list creation algorithm.

Browse Source 
The number of the Prp lists and the number of the entries in last Prp list may be calculated wrongly.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Baban Devkate <baban.devkate@seagate.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17208 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Feng Tian 2015-04-27 05:36:16 +00:00 committed by erictian
parent 5956af2bba
commit 769402ef68
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
View File

@ -3,7 +3,7 @@
NVM Express specification. NVM Express specification.
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR> (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2013, Intel Corporation. All rights reserved.<BR> Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -256,9 +256,15 @@ NvmeCreatePrpList (
// //
// Calculate total PrpList number. // Calculate total PrpList number.
// //
*PrpListNo = (UINTN)DivU64x64Remainder ((UINT64)Pages, (UINT64)PrpEntryNo, &Remainder); *PrpListNo = (UINTN)DivU64x64Remainder ((UINT64)Pages, (UINT64)PrpEntryNo - 1, &Remainder);
if (Remainder != 0) { if (*PrpListNo == 0) {
*PrpListNo = 1;
} else if (Remainder != 0) && (Remainder != 1) {
*PrpListNo += 1; *PrpListNo += 1;
} else if (Remainder == 1) {
Remainder = PrpEntryNo;
} else if (Remainder == 0) {
Remainder = PrpEntryNo - 1;
} }
Status = PciIo->AllocateBuffer ( Status = PciIo->AllocateBuffer (
@ -293,7 +299,7 @@ NvmeCreatePrpList (
// //
ZeroMem (*PrpListHost, Bytes); ZeroMem (*PrpListHost, Bytes);
for (PrpListIndex = 0; PrpListIndex < *PrpListNo - 1; ++PrpListIndex) { for (PrpListIndex = 0; PrpListIndex < *PrpListNo - 1; ++PrpListIndex) {
PrpListBase = *(UINT8*)PrpListHost + PrpListIndex * EFI_PAGE_SIZE; PrpListBase = *(UINT64*)PrpListHost + PrpListIndex * EFI_PAGE_SIZE;
for (PrpEntryIndex = 0; PrpEntryIndex < PrpEntryNo; ++PrpEntryIndex) { for (PrpEntryIndex = 0; PrpEntryIndex < PrpEntryNo; ++PrpEntryIndex) {
if (PrpEntryIndex != PrpEntryNo - 1) { if (PrpEntryIndex != PrpEntryNo - 1) {
@ -314,7 +320,7 @@ NvmeCreatePrpList (
// Fill last PRP list. // Fill last PRP list.
// //
PrpListBase = *(UINT64*)PrpListHost + PrpListIndex * EFI_PAGE_SIZE; PrpListBase = *(UINT64*)PrpListHost + PrpListIndex * EFI_PAGE_SIZE;
for (PrpEntryIndex = 0; PrpEntryIndex < ((Remainder != 0) ? Remainder : PrpEntryNo); ++PrpEntryIndex) { for (PrpEntryIndex = 0; PrpEntryIndex < Remainder; ++PrpEntryIndex) {
*((UINT64*)(UINTN)PrpListBase + PrpEntryIndex) = PhysicalAddr; *((UINT64*)(UINTN)PrpListBase + PrpEntryIndex) = PhysicalAddr;
PhysicalAddr += EFI_PAGE_SIZE; PhysicalAddr += EFI_PAGE_SIZE;
} }