mirror of
https://github.com/acidanthera/audk.git
synced 2025-07-29 16:44:10 +02:00
OvmfPkg/Virtio: take RingBaseShift in SetQueueAddress()
For the case when an IOMMU is used for translating system physical addresses to DMA bus master addresses, the transport-independent virtio device drivers will be required to map their VRING areas to bus addresses with VIRTIO_DEVICE_PROTOCOL.MapSharedBuffer() calls. - MMIO and legacy virtio transport do not support IOMMU to translate the addresses hence RingBaseShift will always be set to zero. - modern virtio transport supports IOMMU to translate the address, in next patch we will update the Virtio10Dxe to use RingBaseShift offset. Suggested-by: Laszlo Ersek <lersek@redhat.com> 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> [lersek@redhat.com: remove commit msg paragraph with VirtioLib reference] [lersek@redhat.com: fix typo in VIRTIO_SET_QUEUE_ADDRESS comment block] Reviewed-by: Laszlo Ersek <lersek@redhat.com> Regression-tested-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
parent
fc2c1543e5
commit
53a4c6047f
@ -156,7 +156,21 @@ EFI_STATUS
|
||||
@param[in] This This instance of VIRTIO_DEVICE_PROTOCOL
|
||||
|
||||
@param[in] Ring The initialized VRING object to take the
|
||||
addresses from.
|
||||
addresses from. The caller is responsible for
|
||||
ensuring that on input, all Ring->NumPages pages,
|
||||
starting at Ring->Base, have been successfully
|
||||
mapped with a single call to
|
||||
This->MapSharedBuffer() for CommonBuffer bus
|
||||
master operation.
|
||||
|
||||
@param[in] RingBaseShift Adding this value using UINT64 arithmetic to the
|
||||
addresses found in Ring translates them from
|
||||
system memory to bus addresses. The caller shall
|
||||
calculate RingBaseShift as
|
||||
(DeviceAddress - (UINT64)(UINTN)HostAddress),
|
||||
where DeviceAddress and HostAddress (i.e.,
|
||||
Ring->Base) were output and input parameters of
|
||||
This->MapSharedBuffer(), respectively.
|
||||
|
||||
@retval EFI_SUCCESS The data was written successfully.
|
||||
@retval EFI_UNSUPPORTED The underlying IO device doesn't support the
|
||||
@ -166,7 +180,8 @@ typedef
|
||||
EFI_STATUS
|
||||
(EFIAPI *VIRTIO_SET_QUEUE_ADDRESS) (
|
||||
IN VIRTIO_DEVICE_PROTOCOL *This,
|
||||
IN VRING *Ring
|
||||
IN VRING *Ring,
|
||||
IN UINT64 RingBaseShift
|
||||
);
|
||||
|
||||
/**
|
||||
|
@ -115,7 +115,8 @@ VirtioMmioSetQueueSel (
|
||||
EFI_STATUS
|
||||
VirtioMmioSetQueueAddress (
|
||||
IN VIRTIO_DEVICE_PROTOCOL *This,
|
||||
IN VRING *Ring
|
||||
IN VRING *Ring,
|
||||
IN UINT64 RingBaseShift
|
||||
);
|
||||
|
||||
EFI_STATUS
|
||||
|
@ -181,11 +181,14 @@ VirtioMmioSetQueueSel (
|
||||
EFI_STATUS
|
||||
VirtioMmioSetQueueAddress (
|
||||
IN VIRTIO_DEVICE_PROTOCOL *This,
|
||||
IN VRING *Ring
|
||||
IN VRING *Ring,
|
||||
IN UINT64 RingBaseShift
|
||||
)
|
||||
{
|
||||
VIRTIO_MMIO_DEVICE *Device;
|
||||
|
||||
ASSERT (RingBaseShift == 0);
|
||||
|
||||
Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);
|
||||
|
||||
VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_PFN,
|
||||
|
@ -489,7 +489,8 @@ EFI_STATUS
|
||||
EFIAPI
|
||||
Virtio10SetQueueAddress (
|
||||
IN VIRTIO_DEVICE_PROTOCOL *This,
|
||||
IN VRING *Ring
|
||||
IN VRING *Ring,
|
||||
IN UINT64 RingBaseShift
|
||||
)
|
||||
{
|
||||
VIRTIO_1_0_DEV *Dev;
|
||||
@ -497,6 +498,8 @@ Virtio10SetQueueAddress (
|
||||
UINT64 Address;
|
||||
UINT16 Enable;
|
||||
|
||||
ASSERT (RingBaseShift == 0);
|
||||
|
||||
Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);
|
||||
|
||||
Address = (UINTN)Ring->Desc;
|
||||
|
@ -745,7 +745,7 @@ VirtioBlkInit (
|
||||
//
|
||||
// step 4c -- Report GPFN (guest-physical frame number) of queue.
|
||||
//
|
||||
Status = Dev->VirtIo->SetQueueAddress (Dev->VirtIo, &Dev->Ring);
|
||||
Status = Dev->VirtIo->SetQueueAddress (Dev->VirtIo, &Dev->Ring, 0);
|
||||
if (EFI_ERROR (Status)) {
|
||||
goto ReleaseQueue;
|
||||
}
|
||||
|
@ -132,7 +132,11 @@ VirtioGpuInit (
|
||||
if (EFI_ERROR (Status)) {
|
||||
goto Failed;
|
||||
}
|
||||
Status = VgpuDev->VirtIo->SetQueueAddress (VgpuDev->VirtIo, &VgpuDev->Ring);
|
||||
Status = VgpuDev->VirtIo->SetQueueAddress (
|
||||
VgpuDev->VirtIo,
|
||||
&VgpuDev->Ring,
|
||||
0
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
goto ReleaseQueue;
|
||||
}
|
||||
|
@ -96,7 +96,7 @@ VirtioNetInitRing (
|
||||
//
|
||||
// step 4c -- report GPFN (guest-physical frame number) of queue
|
||||
//
|
||||
Status = Dev->VirtIo->SetQueueAddress (Dev->VirtIo, Ring);
|
||||
Status = Dev->VirtIo->SetQueueAddress (Dev->VirtIo, Ring, 0);
|
||||
if (EFI_ERROR (Status)) {
|
||||
goto ReleaseQueue;
|
||||
}
|
||||
|
@ -126,7 +126,8 @@ EFI_STATUS
|
||||
EFIAPI
|
||||
VirtioPciSetQueueAddress (
|
||||
IN VIRTIO_DEVICE_PROTOCOL *This,
|
||||
IN VRING *Ring
|
||||
IN VRING *Ring,
|
||||
IN UINT64 RingBaseShift
|
||||
);
|
||||
|
||||
EFI_STATUS
|
||||
|
@ -183,11 +183,14 @@ EFI_STATUS
|
||||
EFIAPI
|
||||
VirtioPciSetQueueAddress (
|
||||
IN VIRTIO_DEVICE_PROTOCOL *This,
|
||||
IN VRING *Ring
|
||||
IN VRING *Ring,
|
||||
IN UINT64 RingBaseShift
|
||||
)
|
||||
{
|
||||
VIRTIO_PCI_DEVICE *Dev;
|
||||
|
||||
ASSERT (RingBaseShift == 0);
|
||||
|
||||
Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);
|
||||
|
||||
return VirtioPciIoWrite (Dev, VIRTIO_PCI_OFFSET_QUEUE_ADDRESS, sizeof (UINT32),
|
||||
|
@ -298,7 +298,7 @@ VirtioRngInit (
|
||||
//
|
||||
// step 4c -- Report GPFN (guest-physical frame number) of queue.
|
||||
//
|
||||
Status = Dev->VirtIo->SetQueueAddress (Dev->VirtIo, &Dev->Ring);
|
||||
Status = Dev->VirtIo->SetQueueAddress (Dev->VirtIo, &Dev->Ring, 0);
|
||||
if (EFI_ERROR (Status)) {
|
||||
goto ReleaseQueue;
|
||||
}
|
||||
|
@ -855,7 +855,7 @@ VirtioScsiInit (
|
||||
//
|
||||
// step 4c -- Report GPFN (guest-physical frame number) of queue.
|
||||
//
|
||||
Status = Dev->VirtIo->SetQueueAddress (Dev->VirtIo, &Dev->Ring);
|
||||
Status = Dev->VirtIo->SetQueueAddress (Dev->VirtIo, &Dev->Ring, 0);
|
||||
if (EFI_ERROR (Status)) {
|
||||
goto ReleaseQueue;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user