diff options
| author | Brijesh Singh <brijesh.singh@amd.com> | 2017-09-14 16:22:40 -0500 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2017-09-14 23:53:46 +0200 |
| commit | 55dd5a673bd7142e3a95a5a597db40bdf385a24c (patch) | |
| tree | 9fcdbf053ab0637b38c069a09a28de4151f64827 /OvmfPkg | |
| parent | b30abe7df464d91b84a42763e61bb3c85bfd80c9 (diff) | |
| download | edk2-55dd5a673bd7142e3a95a5a597db40bdf385a24c.tar.gz edk2-55dd5a673bd7142e3a95a5a597db40bdf385a24c.tar.bz2 edk2-55dd5a673bd7142e3a95a5a597db40bdf385a24c.zip | |
OvmfPkg/VirtioNetDxe: add helper VirtioNetUninitRing()
Consolidate the virtio VRING resource cleanup into VirtioNetUninitRing().
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Regression-tested-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'OvmfPkg')
| -rw-r--r-- | OvmfPkg/VirtioNetDxe/SnpInitialize.c | 4 | ||||
| -rw-r--r-- | OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c | 16 | ||||
| -rw-r--r-- | OvmfPkg/VirtioNetDxe/SnpShutdown.c | 4 | ||||
| -rw-r--r-- | OvmfPkg/VirtioNetDxe/TechNotes.txt | 5 | ||||
| -rw-r--r-- | OvmfPkg/VirtioNetDxe/VirtioNet.h | 7 |
5 files changed, 30 insertions, 6 deletions
diff --git a/OvmfPkg/VirtioNetDxe/SnpInitialize.c b/OvmfPkg/VirtioNetDxe/SnpInitialize.c index 0ecfe044a9..637c978709 100644 --- a/OvmfPkg/VirtioNetDxe/SnpInitialize.c +++ b/OvmfPkg/VirtioNetDxe/SnpInitialize.c @@ -510,10 +510,10 @@ AbortDevice: Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);
ReleaseTxRing:
- VirtioRingUninit (Dev->VirtIo, &Dev->TxRing);
+ VirtioNetUninitRing (Dev, &Dev->TxRing);
ReleaseRxRing:
- VirtioRingUninit (Dev->VirtIo, &Dev->RxRing);
+ VirtioNetUninitRing (Dev, &Dev->RxRing);
DeviceFailed:
//
diff --git a/OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c b/OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c index 9fedb72fdb..5b75eabc7a 100644 --- a/OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c +++ b/OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c @@ -51,3 +51,19 @@ VirtioNetShutdownTx ( {
FreePool (Dev->TxFreeStack);
}
+
+/**
+ Release TX and RX VRING resources.
+
+ @param[in,out] Dev The VNET_DEV driver instance which was using the ring.
+ @param[in,out] Ring The virtio ring to clean up.
+*/
+VOID
+EFIAPI
+VirtioNetUninitRing (
+ IN OUT VNET_DEV *Dev,
+ IN OUT VRING *Ring
+ )
+{
+ VirtioRingUninit (Dev->VirtIo, Ring);
+}
diff --git a/OvmfPkg/VirtioNetDxe/SnpShutdown.c b/OvmfPkg/VirtioNetDxe/SnpShutdown.c index 5e84191fbb..432e0691d4 100644 --- a/OvmfPkg/VirtioNetDxe/SnpShutdown.c +++ b/OvmfPkg/VirtioNetDxe/SnpShutdown.c @@ -67,8 +67,8 @@ VirtioNetShutdown ( Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);
VirtioNetShutdownRx (Dev);
VirtioNetShutdownTx (Dev);
- VirtioRingUninit (Dev->VirtIo, &Dev->TxRing);
- VirtioRingUninit (Dev->VirtIo, &Dev->RxRing);
+ VirtioNetUninitRing (Dev, &Dev->TxRing);
+ VirtioNetUninitRing (Dev, &Dev->RxRing);
Dev->Snm.State = EfiSimpleNetworkStarted;
Status = EFI_SUCCESS;
diff --git a/OvmfPkg/VirtioNetDxe/TechNotes.txt b/OvmfPkg/VirtioNetDxe/TechNotes.txt index 9c1dfe6a77..86b91f5614 100644 --- a/OvmfPkg/VirtioNetDxe/TechNotes.txt +++ b/OvmfPkg/VirtioNetDxe/TechNotes.txt @@ -70,8 +70,9 @@ faithfully indented) that implement the transition. VirtioNetInitialize | | VirtioNetShutdown
VirtioNetInitRing {Rx, Tx} | | VirtioNetShutdownRx [SnpSharedHelpers.c]
VirtioRingInit | | VirtioNetShutdownTx [SnpSharedHelpers.c]
- VirtioNetInitTx | | VirtioRingUninit {Tx, Rx}
- VirtioNetInitRx | |
+ VirtioNetInitTx | | VirtioNetUninitRing [SnpSharedHelpers.c]
+ VirtioNetInitRx | | {Tx, Rx}
+ | | VirtioRingUninit
v |
+-----------------------------+
| EfiSimpleNetworkInitialized |
diff --git a/OvmfPkg/VirtioNetDxe/VirtioNet.h b/OvmfPkg/VirtioNetDxe/VirtioNet.h index 710859bc61..87a0f06e01 100644 --- a/OvmfPkg/VirtioNetDxe/VirtioNet.h +++ b/OvmfPkg/VirtioNetDxe/VirtioNet.h @@ -263,6 +263,13 @@ VirtioNetShutdownTx ( IN OUT VNET_DEV *Dev
);
+VOID
+EFIAPI
+VirtioNetUninitRing (
+ IN OUT VNET_DEV *Dev,
+ IN OUT VRING *Ring
+ );
+
//
// event callbacks
//
|