From: Laszlo Ersek <lersek@redhat.com>
To: Brijesh Singh <brijesh.singh@amd.com>, edk2-devel@lists.01.org
Cc: Jordan Justen <jordan.l.justen@intel.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: Re: [PATCH v1 05/14] OvmfPkg/VirtioLib: Pass VirtIo instance in VringInit/Uinit()
Date: Wed, 9 Aug 2017 23:13:23 +0200 [thread overview]
Message-ID: <33f9b0d5-6450-6f87-78e4-6950fab59dbd@redhat.com> (raw)
In-Reply-To: <1502107139-412-6-git-send-email-brijesh.singh@amd.com>
(1) the subject has a typo ("Uinit()") so I suggest:
OvmfPkg/VirtioLib: take VirtIo instance in VirtioRingInit/VirtioRingUninit
(74 characters).
On 08/07/17 13:58, Brijesh Singh wrote:
> Passing the VirtIo protocol instance will allow the vring to use
> VIRTIO_DEVICE_PROTOCOL.AllocateSharedPages () to allocate vring buffer.
>
> 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>
> ---
> OvmfPkg/Include/Library/VirtioLib.h | 14 ++++++++++----
> OvmfPkg/Library/VirtioLib/VirtioLib.c | 14 ++++++++++----
> OvmfPkg/VirtioBlkDxe/VirtioBlk.c | 7 ++++---
> OvmfPkg/VirtioGpuDxe/Commands.c | 7 ++++---
> OvmfPkg/VirtioNetDxe/SnpInitialize.c | 9 +++++----
> OvmfPkg/VirtioNetDxe/SnpShutdown.c | 5 +++--
> OvmfPkg/VirtioRngDxe/VirtioRng.c | 7 ++++---
> OvmfPkg/VirtioScsiDxe/VirtioScsi.c | 7 ++++---
> 8 files changed, 44 insertions(+), 26 deletions(-)
>
> diff --git a/OvmfPkg/Include/Library/VirtioLib.h b/OvmfPkg/Include/Library/VirtioLib.h
> index fa82734f1852..610654225de7 100644
> --- a/OvmfPkg/Include/Library/VirtioLib.h
> +++ b/OvmfPkg/Include/Library/VirtioLib.h
> @@ -35,6 +35,8 @@
> - 1.1 Virtqueues,
> - 2.3 Virtqueue Configuration.
>
> + @param[in] VirtIo The virtio device which will use the ring.
> +
> @param[in] The number of descriptors to allocate for the
> virtio ring, as requested by the host.
>
> @@ -52,8 +54,9 @@
> EFI_STATUS
> EFIAPI
> VirtioRingInit (
> - IN UINT16 QueueSize,
> - OUT VRING *Ring
> + IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
> + IN UINT16 QueueSize,
> + OUT VRING *Ring
> );
>
>
> @@ -65,13 +68,16 @@ VirtioRingInit (
> invoking this function: the VSTAT_DRIVER_OK bit must be clear in
> VhdrDeviceStatus.
>
> - @param[out] Ring The virtio ring to clean up.
> + @param[in] VirtIo The virtio device which will was using the ring.
(2) s/will was/was/
> +
> + @param[out] Ring The virtio ring to clean up.
>
> **/
> VOID
> EFIAPI
> VirtioRingUninit (
> - IN OUT VRING *Ring
> + IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
> + IN OUT VRING *Ring
> );
>
>
> diff --git a/OvmfPkg/Library/VirtioLib/VirtioLib.c b/OvmfPkg/Library/VirtioLib/VirtioLib.c
> index f6b464b6cdf8..50e5ec28ea1b 100644
> --- a/OvmfPkg/Library/VirtioLib/VirtioLib.c
> +++ b/OvmfPkg/Library/VirtioLib/VirtioLib.c
> @@ -37,6 +37,8 @@
> - 1.1 Virtqueues,
> - 2.3 Virtqueue Configuration.
>
> + @param[in] VirtIo The virtio device which will use the ring.
> +
> @param[in] The number of descriptors to allocate for the
> virtio ring, as requested by the host.
>
> @@ -54,8 +56,9 @@
> EFI_STATUS
> EFIAPI
> VirtioRingInit (
> - IN UINT16 QueueSize,
> - OUT VRING *Ring
> + IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
> + IN UINT16 QueueSize,
> + OUT VRING *Ring
> )
> {
> UINTN RingSize;
> @@ -128,13 +131,16 @@ VirtioRingInit (
> invoking this function: the VSTAT_DRIVER_OK bit must be clear in
> VhdrDeviceStatus.
>
> - @param[out] Ring The virtio ring to clean up.
> + @param[in] VirtIo The virtio device which will was using the ring.
(3) Same as (2).
With these fixed:
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Thanks
Laszlo
> +
> + @param[out] Ring The virtio ring to clean up.
>
> **/
> VOID
> EFIAPI
> VirtioRingUninit (
> - IN OUT VRING *Ring
> + IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
> + IN OUT VRING *Ring
> )
> {
> FreePages (Ring->Base, Ring->NumPages);
> diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
> index 3ce72281c204..61b9cab4ff02 100644
> --- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
> +++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
> @@ -12,6 +12,7 @@
>
> Copyright (C) 2012, Red Hat, Inc.
> Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2017, AMD Inc, All rights reserved.<BR>
>
> This program and the accompanying materials are licensed and made available
> under the terms and conditions of the BSD License which accompanies this
> @@ -722,7 +723,7 @@ VirtioBlkInit (
> goto Failed;
> }
>
> - Status = VirtioRingInit (QueueSize, &Dev->Ring);
> + Status = VirtioRingInit (Dev->VirtIo, QueueSize, &Dev->Ring);
> if (EFI_ERROR (Status)) {
> goto Failed;
> }
> @@ -811,7 +812,7 @@ VirtioBlkInit (
> return EFI_SUCCESS;
>
> ReleaseQueue:
> - VirtioRingUninit (&Dev->Ring);
> + VirtioRingUninit (Dev->VirtIo, &Dev->Ring);
>
> Failed:
> //
> @@ -848,7 +849,7 @@ VirtioBlkUninit (
> //
> Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);
>
> - VirtioRingUninit (&Dev->Ring);
> + VirtioRingUninit (Dev->VirtIo, &Dev->Ring);
>
> SetMem (&Dev->BlockIo, sizeof Dev->BlockIo, 0x00);
> SetMem (&Dev->BlockIoMedia, sizeof Dev->BlockIoMedia, 0x00);
> diff --git a/OvmfPkg/VirtioGpuDxe/Commands.c b/OvmfPkg/VirtioGpuDxe/Commands.c
> index 962087cfec97..c2e4d72feb67 100644
> --- a/OvmfPkg/VirtioGpuDxe/Commands.c
> +++ b/OvmfPkg/VirtioGpuDxe/Commands.c
> @@ -3,6 +3,7 @@
> VirtIo GPU initialization, and commands (primitives) for the GPU device.
>
> Copyright (C) 2016, Red Hat, Inc.
> + Copyright (c) 2017, AMD Inc, All rights reserved.<BR>
>
> This program and the accompanying materials are licensed and made available
> under the terms and conditions of the BSD License which accompanies this
> @@ -127,7 +128,7 @@ VirtioGpuInit (
> //
> // [...] population of virtqueues [...]
> //
> - Status = VirtioRingInit (QueueSize, &VgpuDev->Ring);
> + Status = VirtioRingInit (VgpuDev->VirtIo, QueueSize, &VgpuDev->Ring);
> if (EFI_ERROR (Status)) {
> goto Failed;
> }
> @@ -148,7 +149,7 @@ VirtioGpuInit (
> return EFI_SUCCESS;
>
> ReleaseQueue:
> - VirtioRingUninit (&VgpuDev->Ring);
> + VirtioRingUninit (VgpuDev->VirtIo, &VgpuDev->Ring);
>
> Failed:
> //
> @@ -183,7 +184,7 @@ VirtioGpuUninit (
> // configuration.
> //
> VgpuDev->VirtIo->SetDeviceStatus (VgpuDev->VirtIo, 0);
> - VirtioRingUninit (&VgpuDev->Ring);
> + VirtioRingUninit (VgpuDev->VirtIo, &VgpuDev->Ring);
> }
>
> /**
> diff --git a/OvmfPkg/VirtioNetDxe/SnpInitialize.c b/OvmfPkg/VirtioNetDxe/SnpInitialize.c
> index 430670a980f2..6d9b81a9f939 100644
> --- a/OvmfPkg/VirtioNetDxe/SnpInitialize.c
> +++ b/OvmfPkg/VirtioNetDxe/SnpInitialize.c
> @@ -5,6 +5,7 @@
>
> 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>
>
> This program and the accompanying materials are licensed and made available
> under the terms and conditions of the BSD License which accompanies this
> @@ -73,7 +74,7 @@ VirtioNetInitRing (
> if (QueueSize < 2) {
> return EFI_UNSUPPORTED;
> }
> - Status = VirtioRingInit (QueueSize, Ring);
> + Status = VirtioRingInit (Dev->VirtIo, QueueSize, Ring);
> if (EFI_ERROR (Status)) {
> return Status;
> }
> @@ -103,7 +104,7 @@ VirtioNetInitRing (
> return EFI_SUCCESS;
>
> ReleaseQueue:
> - VirtioRingUninit (Ring);
> + VirtioRingUninit (Dev->VirtIo, Ring);
>
> return Status;
> }
> @@ -509,10 +510,10 @@ AbortDevice:
> Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);
>
> ReleaseTxRing:
> - VirtioRingUninit (&Dev->TxRing);
> + VirtioRingUninit (Dev->VirtIo, &Dev->TxRing);
>
> ReleaseRxRing:
> - VirtioRingUninit (&Dev->RxRing);
> + VirtioRingUninit (Dev->VirtIo, &Dev->RxRing);
>
> DeviceFailed:
> //
> diff --git a/OvmfPkg/VirtioNetDxe/SnpShutdown.c b/OvmfPkg/VirtioNetDxe/SnpShutdown.c
> index 01409c0ce714..5e84191fbbdd 100644
> --- a/OvmfPkg/VirtioNetDxe/SnpShutdown.c
> +++ b/OvmfPkg/VirtioNetDxe/SnpShutdown.c
> @@ -4,6 +4,7 @@
>
> 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>
>
> This program and the accompanying materials are licensed and made available
> under the terms and conditions of the BSD License which accompanies this
> @@ -66,8 +67,8 @@ VirtioNetShutdown (
> Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);
> VirtioNetShutdownRx (Dev);
> VirtioNetShutdownTx (Dev);
> - VirtioRingUninit (&Dev->TxRing);
> - VirtioRingUninit (&Dev->RxRing);
> + VirtioRingUninit (Dev->VirtIo, &Dev->TxRing);
> + VirtioRingUninit (Dev->VirtIo, &Dev->RxRing);
>
> Dev->Snm.State = EfiSimpleNetworkStarted;
> Status = EFI_SUCCESS;
> diff --git a/OvmfPkg/VirtioRngDxe/VirtioRng.c b/OvmfPkg/VirtioRngDxe/VirtioRng.c
> index 1a186d04082a..e20602ac7225 100644
> --- a/OvmfPkg/VirtioRngDxe/VirtioRng.c
> +++ b/OvmfPkg/VirtioRngDxe/VirtioRng.c
> @@ -6,6 +6,7 @@
>
> Copyright (C) 2012, Red Hat, Inc.
> Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2017, AMD Inc, All rights reserved.<BR>
>
> This driver:
>
> @@ -275,7 +276,7 @@ VirtioRngInit (
> goto Failed;
> }
>
> - Status = VirtioRingInit (QueueSize, &Dev->Ring);
> + Status = VirtioRingInit (Dev->VirtIo, QueueSize, &Dev->Ring);
> if (EFI_ERROR (Status)) {
> goto Failed;
> }
> @@ -331,7 +332,7 @@ VirtioRngInit (
> return EFI_SUCCESS;
>
> ReleaseQueue:
> - VirtioRingUninit (&Dev->Ring);
> + VirtioRingUninit (Dev->VirtIo, &Dev->Ring);
>
> Failed:
> //
> @@ -358,7 +359,7 @@ VirtioRngUninit (
> // the old comms area.
> //
> Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);
> - VirtioRingUninit (&Dev->Ring);
> + VirtioRingUninit (Dev->VirtIo, &Dev->Ring);
> }
>
> //
> diff --git a/OvmfPkg/VirtioScsiDxe/VirtioScsi.c b/OvmfPkg/VirtioScsiDxe/VirtioScsi.c
> index c080404330e5..c2f6f412ff40 100644
> --- a/OvmfPkg/VirtioScsiDxe/VirtioScsi.c
> +++ b/OvmfPkg/VirtioScsiDxe/VirtioScsi.c
> @@ -27,6 +27,7 @@
>
> Copyright (C) 2012, Red Hat, Inc.
> Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2017, AMD Inc, All rights reserved.<BR>
>
> This program and the accompanying materials are licensed and made available
> under the terms and conditions of the BSD License which accompanies this
> @@ -832,7 +833,7 @@ VirtioScsiInit (
> goto Failed;
> }
>
> - Status = VirtioRingInit (QueueSize, &Dev->Ring);
> + Status = VirtioRingInit (Dev->VirtIo, QueueSize, &Dev->Ring);
> if (EFI_ERROR (Status)) {
> goto Failed;
> }
> @@ -926,7 +927,7 @@ VirtioScsiInit (
> return EFI_SUCCESS;
>
> ReleaseQueue:
> - VirtioRingUninit (&Dev->Ring);
> + VirtioRingUninit (Dev->VirtIo, &Dev->Ring);
>
> Failed:
> //
> @@ -964,7 +965,7 @@ VirtioScsiUninit (
> Dev->MaxLun = 0;
> Dev->MaxSectors = 0;
>
> - VirtioRingUninit (&Dev->Ring);
> + VirtioRingUninit (Dev->VirtIo, &Dev->Ring);
>
> SetMem (&Dev->PassThru, sizeof Dev->PassThru, 0x00);
> SetMem (&Dev->PassThruMode, sizeof Dev->PassThruMode, 0x00);
>
next prev parent reply other threads:[~2017-08-09 21:11 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-07 11:58 [PATCH v1 00/14] OvmfPkg/Virtio: Add APIs to map system physical to device address Brijesh Singh
2017-08-07 11:58 ` [PATCH v1 01/14] OvmfPkg/Virtio: Introduce new member functions in VIRTIO_DEVICE_PROTOCOL Brijesh Singh
2017-08-09 14:27 ` Laszlo Ersek
2017-08-09 18:23 ` Brijesh Singh
2017-08-07 11:58 ` [PATCH v1 02/14] OvmfPkg/Virtio10Dxe: Implement new member functions Brijesh Singh
2017-08-09 16:50 ` Laszlo Ersek
2017-08-07 11:58 ` [PATCH v1 03/14] OvmfPkg/VirtioPciDeviceDxe: " Brijesh Singh
2017-08-09 17:09 ` Laszlo Ersek
2017-08-10 18:41 ` Brijesh Singh
2017-08-10 19:47 ` Laszlo Ersek
2017-08-07 11:58 ` [PATCH v1 04/14] OvmfPkg/VirtioLib: Add SharedBuffer helper functions Brijesh Singh
2017-08-09 20:30 ` Laszlo Ersek
2017-08-07 11:58 ` [PATCH v1 05/14] OvmfPkg/VirtioLib: Pass VirtIo instance in VringInit/Uinit() Brijesh Singh
2017-08-09 21:13 ` Laszlo Ersek [this message]
2017-08-07 11:58 ` [PATCH v1 06/14] OvmfPkg/VirtioLib: Add functions to map/unmap VRING Brijesh Singh
2017-08-09 23:51 ` Laszlo Ersek
2017-08-07 11:58 ` [PATCH v1 07/14] OvmfPkg/VirtioLib: Use AllocateShared() to allocate vring buffer Brijesh Singh
2017-08-10 0:02 ` Laszlo Ersek
2017-08-07 11:58 ` [PATCH v1 08/14] OvmfPkg/VirtioBlkDxe: Use DeviceAddresses in vring descriptors Brijesh Singh
2017-08-07 11:58 ` [PATCH v1 09/14] OvmfPkg/VirtioScsiDxe: " Brijesh Singh
2017-08-07 11:58 ` [PATCH v1 10/14] OvmfPkg/VirtioNetDxe: Allocate Tx and Rx ring using AllocateSharedPage() Brijesh Singh
2017-08-07 11:58 ` [PATCH v1 11/14] OvmfPkg/VirtioNetDxe: Allocate RxBuf using AllocateSharedPages() Brijesh Singh
2017-08-07 11:58 ` [PATCH v1 12/14] OvmfPkg/VirtioNetDxe: Dynamically allocate transmit header Brijesh Singh
2017-08-07 11:58 ` [PATCH v1 13/14] OvmfPkg/VirtioNetDxe: Use DeviceAddress in transmit vring descriptors Brijesh Singh
2017-08-07 11:58 ` [PATCH v1 14/14] OvmfPkg/VirtioRngDxe: Use DeviceAddresses in " Brijesh Singh
2017-08-10 0:25 ` Laszlo Ersek
2017-08-10 0:46 ` Laszlo Ersek
2017-08-09 14:39 ` [PATCH v1 00/14] OvmfPkg/Virtio: Add APIs to map system physical to device address Laszlo Ersek
2017-08-09 17:35 ` Brijesh Singh
2017-08-09 17:56 ` Laszlo Ersek
2017-08-09 19:29 ` Laszlo Ersek
2017-08-11 22:22 ` Brijesh Singh
2017-08-15 10:42 ` Laszlo Ersek
2017-08-15 19:32 ` Brijesh Singh
2017-08-15 19:48 ` Laszlo Ersek
2017-08-15 20:26 ` Brijesh Singh
2017-08-15 20:39 ` Laszlo Ersek
2017-08-15 20:44 ` Brijesh Singh
2017-08-15 21:57 ` Laszlo Ersek
2017-08-09 22:38 ` Laszlo Ersek
2017-08-09 22:44 ` Brijesh Singh
2017-08-10 9:53 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=33f9b0d5-6450-6f87-78e4-6950fab59dbd@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox