Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
Copyright (c) 2017, AMD Inc, 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
- distribution. The full text of the license may be found at\r
- http://opensource.org/licenses/bsd-license.php\r
-\r
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT\r
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+ SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
\r
#include <Library/BaseLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
#include <Library/MemoryAllocationLib.h>\r
#include <Library/UefiBootServicesTableLib.h>\r
\r
EfiSimpleNetworkInitialized state.\r
\r
@retval EFI_OUT_OF_RESOURCES Failed to allocate the stack to track the heads\r
- of free descriptor chains.\r
+ of free descriptor chains or failed to init\r
+ TxBufCollection.\r
+ @return Status codes from VIRTIO_DEVICE_PROTOCOL.\r
+ AllocateSharedPages() or\r
+ VirtioMapAllBytesInSharedBuffer()\r
@retval EFI_SUCCESS TX setup successful.\r
*/\r
\r
IN OUT VNET_DEV *Dev\r
)\r
{\r
- UINTN TxSharedReqSize;\r
- UINTN PktIdx;\r
+ UINTN TxSharedReqSize;\r
+ UINTN PktIdx;\r
+ EFI_STATUS Status;\r
+ EFI_PHYSICAL_ADDRESS DeviceAddress;\r
+ VOID *TxSharedReqBuffer;\r
\r
Dev->TxMaxPending = (UINT16) MIN (Dev->TxRing.QueueSize / 2,\r
VNET_MAX_PENDING);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
+ Dev->TxBufCollection = OrderedCollectionInit (\r
+ VirtioNetTxBufMapInfoCompare,\r
+ VirtioNetTxBufDeviceAddressCompare\r
+ );\r
+ if (Dev->TxBufCollection == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto FreeTxFreeStack;\r
+ }\r
+\r
+ //\r
+ // Allocate TxSharedReq header and map with BusMasterCommonBuffer so that it\r
+ // can be accessed equally by both processor and device.\r
+ //\r
+ Status = Dev->VirtIo->AllocateSharedPages (\r
+ Dev->VirtIo,\r
+ EFI_SIZE_TO_PAGES (sizeof *Dev->TxSharedReq),\r
+ &TxSharedReqBuffer\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ goto UninitTxBufCollection;\r
+ }\r
+\r
+ ZeroMem (TxSharedReqBuffer, sizeof *Dev->TxSharedReq);\r
+\r
+ Status = VirtioMapAllBytesInSharedBuffer (\r
+ Dev->VirtIo,\r
+ VirtioOperationBusMasterCommonBuffer,\r
+ TxSharedReqBuffer,\r
+ sizeof *(Dev->TxSharedReq),\r
+ &DeviceAddress,\r
+ &Dev->TxSharedReqMap\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ goto FreeTxSharedReqBuffer;\r
+ }\r
+\r
+ Dev->TxSharedReq = TxSharedReqBuffer;\r
+\r
+\r
//\r
// In VirtIo 1.0, the NumBuffers field is mandatory. In 0.9.5, it depends on\r
// VIRTIO_NET_F_MRG_RXBUF, which we never negotiate.\r
//\r
TxSharedReqSize = (Dev->VirtIo->Revision < VIRTIO_SPEC_REVISION (1, 0, 0)) ?\r
- sizeof Dev->TxSharedReq.V0_9_5 :\r
- sizeof Dev->TxSharedReq;\r
+ sizeof (Dev->TxSharedReq->V0_9_5) :\r
+ sizeof *Dev->TxSharedReq;\r
\r
for (PktIdx = 0; PktIdx < Dev->TxMaxPending; ++PktIdx) {\r
UINT16 DescIdx;\r
// For each possibly pending packet, lay out the descriptor for the common\r
// (unmodified by the host) virtio-net request header.\r
//\r
- Dev->TxRing.Desc[DescIdx].Addr = (UINTN) &Dev->TxSharedReq;\r
+ Dev->TxRing.Desc[DescIdx].Addr = DeviceAddress;\r
Dev->TxRing.Desc[DescIdx].Len = (UINT32) TxSharedReqSize;\r
Dev->TxRing.Desc[DescIdx].Flags = VRING_DESC_F_NEXT;\r
Dev->TxRing.Desc[DescIdx].Next = (UINT16) (DescIdx + 1);\r
//\r
// virtio-0.9.5, Appendix C, Packet Transmission\r
//\r
- Dev->TxSharedReq.V0_9_5.Flags = 0;\r
- Dev->TxSharedReq.V0_9_5.GsoType = VIRTIO_NET_HDR_GSO_NONE;\r
+ Dev->TxSharedReq->V0_9_5.Flags = 0;\r
+ Dev->TxSharedReq->V0_9_5.GsoType = VIRTIO_NET_HDR_GSO_NONE;\r
\r
//\r
// For VirtIo 1.0 only -- the field exists, but it is unused\r
//\r
- Dev->TxSharedReq.NumBuffers = 0;\r
+ Dev->TxSharedReq->NumBuffers = 0;\r
\r
//\r
// virtio-0.9.5, 2.4.2 Receiving Used Buffers From the Device\r
*Dev->TxRing.Avail.Flags = (UINT16) VRING_AVAIL_F_NO_INTERRUPT;\r
\r
return EFI_SUCCESS;\r
+\r
+FreeTxSharedReqBuffer:\r
+ Dev->VirtIo->FreeSharedPages (\r
+ Dev->VirtIo,\r
+ EFI_SIZE_TO_PAGES (sizeof *(Dev->TxSharedReq)),\r
+ TxSharedReqBuffer\r
+ );\r
+\r
+UninitTxBufCollection:\r
+ OrderedCollectionUninit (Dev->TxBufCollection);\r
+\r
+FreeTxFreeStack:\r
+ FreePool (Dev->TxFreeStack);\r
+\r
+ return Status;\r
}\r
\r
\r
ASSERT (Dev->Snm.MediaPresentSupported ==\r
!!(Features & VIRTIO_NET_F_STATUS));\r
\r
- Features &= VIRTIO_NET_F_MAC | VIRTIO_NET_F_STATUS | VIRTIO_F_VERSION_1;\r
+ Features &= VIRTIO_NET_F_MAC | VIRTIO_NET_F_STATUS | VIRTIO_F_VERSION_1 |\r
+ VIRTIO_F_IOMMU_PLATFORM;\r
\r
//\r
// In virtio-1.0, feature negotiation is expected to complete before queue\r
// step 5 -- keep only the features we want\r
//\r
if (Dev->VirtIo->Revision < VIRTIO_SPEC_REVISION (1, 0, 0)) {\r
- Features &= ~(UINT64)VIRTIO_F_VERSION_1;\r
+ Features &= ~(UINT64)(VIRTIO_F_VERSION_1 | VIRTIO_F_IOMMU_PLATFORM);\r
Status = Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features);\r
if (EFI_ERROR (Status)) {\r
goto ReleaseTxRing;\r