Changeset 89503 in vbox for trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/E1kNetDxe/SnpInitialize.c

Timestamp:

Jun 4, 2021 10:38:21 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

144860

Message:

EFI/E1kNetDxe: Updates, the basic receive and transmit operations are functional and PXE booting seems to work with the limited testing done, include the driver in our image

File:

• trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/E1kNetDxe/SnpInitialize.c (modified) (6 diffs)

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/E1kNetDxe/SnpInitialize.c

@@ -4 +4 @@
   any.
 
+  Copyright (c) 2021, Oracle and/or its affiliates.
+  Copyright (c) 2017, AMD Inc, All rights reserved.
   Copyright (C) 2013, Red Hat, Inc.
   Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-  Copyright (c) 2017, AMD Inc, All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -146 +147 @@
   EFI_STATUS            Status;
   UINTN                 RxBufSize;
-  UINT16                RxAlwaysPending;
   UINTN                 PktIdx;
   UINTN                 NumBytes;
@@ -161 +161 @@
 
   //
-  // Limit the number of pending RX packets if the queue is big. The division
-  // by two is due to the above "two descriptors per packet" trait.
-  //
-  RxAlwaysPending = E1K_NET_MAX_PENDING;
-
-  //
   // The RxBuf is shared between guest and hypervisor, use
   // AllocateSharedPages() to allocate this memory region and map it with
@@ -172 +166 @@
   // hypervisor.
   //
-  NumBytes = RxAlwaysPending * RxBufSize;
+  NumBytes = E1K_NET_MAX_PENDING * RxBufSize;
   Dev->RxBufNrPages = EFI_SIZE_TO_PAGES (NumBytes);
   Status = Dev->PciIo->AllocateBuffer (
@@ -201 +195 @@
 
   Dev->RxRing = RxBuffer;
-  Dev->RxBuf  = (UINT8 *)RxBuffer + sizeof(*Dev->RxRing) * RxAlwaysPending;
+  Dev->RxBuf  = (UINT8 *)RxBuffer + sizeof(*Dev->RxRing) * E1K_NET_MAX_PENDING;
   Dev->RdhLastSeen = 0;
 
   // Set up the RX descriptors.
-  Dev->RxBufDeviceBase = Dev->RxDeviceBase + sizeof(*Dev->RxRing) * RxAlwaysPending;
+  Dev->RxBufDeviceBase = Dev->RxDeviceBase + sizeof(*Dev->RxRing) * E1K_NET_MAX_PENDING;
   RxBufDeviceAddress = Dev->RxBufDeviceBase;
-  for (PktIdx = 0; PktIdx < RxAlwaysPending; ++PktIdx) {
+  for (PktIdx = 0; PktIdx < E1K_NET_MAX_PENDING; ++PktIdx) {
     Dev->RxRing[PktIdx].AddrBufferLow  = (UINT32)RxBufDeviceAddress;
     Dev->RxRing[PktIdx].AddrBufferHigh = (UINT32)RShiftU64(RxBufDeviceAddress, 32);
@@ -278 +272 @@
   EFI_STATUS  Status;
 
+  DEBUG((DEBUG_INFO, "E1kNetInitialize:\n"));
+
   if (This == NULL) {
     return EFI_INVALID_PARAMETER;