UefiCpuPkg/CpuDxe: Enable protection for newly added page table

[mirror_edk2.git] / OvmfPkg / VirtioNetDxe / SnpReceive.c

diff --git a/OvmfPkg/VirtioNetDxe/SnpReceive.c b/OvmfPkg/VirtioNetDxe/SnpReceive.c
index dcff6a09fc785b55cc87f4ea01100ff952e2a48f..c42489636ea0b0d1c107c9e1c48fdaf127e2c511 100644 (file)
--- a/OvmfPkg/VirtioNetDxe/SnpReceive.c
+++ b/OvmfPkg/VirtioNetDxe/SnpReceive.c
@@ -3,7 +3,7 @@
   Implementation of the SNP.Receive() function and its private helpers if any.\r
 \r
   Copyright (C) 2013, Red Hat, Inc.\r
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials are licensed and made available\r
   under the terms and conditions of the BSD License which accompanies this\r
@@ -82,6 +82,7 @@ VirtioNetReceive (
   UINT8      *RxPtr;\r
   UINT16     AvailIdx;\r
   EFI_STATUS NotifyStatus;\r
+  UINTN      RxBufOffset;\r
 \r
   if (This == NULL || BufferSize == NULL || Buffer == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -105,6 +106,7 @@ VirtioNetReceive (
   //\r
   MemoryFence ();\r
   RxCurUsed = *Dev->RxRing.Used.Idx;\r
+  MemoryFence ();\r
 \r
   if (Dev->RxLastUsed == RxCurUsed) {\r
     Status = EFI_NOT_READY;\r
@@ -142,18 +144,20 @@ VirtioNetReceive (
     *HeaderSize = Dev->Snm.MediaHeaderSize;\r
   }\r
 \r
-  RxPtr = (UINT8 *)Dev->RxRing.Desc[DescIdx + 1].Addr;\r
+  RxBufOffset = (UINTN)(Dev->RxRing.Desc[DescIdx + 1].Addr -\r
+                        Dev->RxBufDeviceBase);\r
+  RxPtr = Dev->RxBuf + RxBufOffset;\r
   CopyMem (Buffer, RxPtr, RxLen);\r
 \r
   if (DestAddr != NULL) {\r
-    CopyMem (DestAddr, RxPtr, SIZE_OF_VNET (VhdrMac));\r
+    CopyMem (DestAddr, RxPtr, SIZE_OF_VNET (Mac));\r
   }\r
-  RxPtr += SIZE_OF_VNET (VhdrMac);\r
+  RxPtr += SIZE_OF_VNET (Mac);\r
 \r
   if (SrcAddr != NULL) {\r
-    CopyMem (SrcAddr, RxPtr, SIZE_OF_VNET (VhdrMac));\r
+    CopyMem (SrcAddr, RxPtr, SIZE_OF_VNET (Mac));\r
   }\r
-  RxPtr += SIZE_OF_VNET (VhdrMac);\r
+  RxPtr += SIZE_OF_VNET (Mac);\r
 \r
   if (Protocol != NULL) {\r
     *Protocol = (UINT16) ((RxPtr[0] << 8) | RxPtr[1]);\r
@@ -176,9 +180,7 @@ RecycleDesc:
   *Dev->RxRing.Avail.Idx = AvailIdx;\r
 \r
   MemoryFence ();\r
-  NotifyStatus = VIRTIO_CFG_WRITE (Dev, Generic.VhdrQueueNotify,\r
-                   VIRTIO_NET_Q_RX);\r
-\r
+  NotifyStatus = Dev->VirtIo->SetQueueNotify (Dev->VirtIo, VIRTIO_NET_Q_RX);\r
   if (!EFI_ERROR (Status)) { // earlier error takes precedence\r
     Status = NotifyStatus;\r
   }\r