Skip to content

small virtio serial update #11841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kraxel wants to merge 4 commits into
base: master
Choose a base branch
from
Open

small virtio serial update #11841

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0534a40
OvmfPkg/VirtioSerialDxe: drop Get/SetControl logging
kraxel Dec 3, 2025
b753157
OvmfPkg/VirtioSerialDxe: explitly clear return value in GetControl
kraxel Dec 4, 2025
70dac0f
OvmfPkg/VirtioSerialDxe: factor out VirtioSerialIoWriteFlush
kraxel Dec 4, 2025
0d8d6b0
OvmfPkg/VirtioSerialDxe: set EFI_SERIAL_INPUT_BUFFER_EMPTY
kraxel Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 49 additions & 17 deletions OvmfPkg/VirtioSerialDxe/VirtioSerialPort.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,31 @@ VirtioSerialIoReset (
return EFI_SUCCESS;
}

STATIC
VOID
VirtioSerialIoWriteFlush (
IN EFI_SERIAL_IO_PROTOCOL *This
)
{
VIRTIO_SERIAL_IO_PROTOCOL *SerialIo = (VIRTIO_SERIAL_IO_PROTOCOL *)This;
EFI_TPL OldTpl;

OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
if (SerialIo->WriteOffset) {
DEBUG ((DEBUG_VERBOSE, "%a:%d: WriteFlush %d\n", __func__, __LINE__, SerialIo->WriteOffset));
VirtioSerialRingSendBuffer (
SerialIo->Dev,
PortTx (SerialIo->PortId),
SerialIo->WriteBuffer,
SerialIo->WriteOffset,
TRUE
);
SerialIo->WriteOffset = 0;
}

gBS->RestoreTPL (OldTpl);
}

STATIC
EFI_STATUS
EFIAPI
Expand Down Expand Up @@ -121,7 +146,6 @@ VirtioSerialIoSetControl (
IN UINT32 Control
)
{
DEBUG ((DEBUG_INFO, "%a:%d: Control 0x%x\n", __func__, __LINE__, Control));
return EFI_SUCCESS;
}

Expand All @@ -133,7 +157,29 @@ VirtioSerialIoGetControl (
OUT UINT32 *Control
)
{
DEBUG ((DEBUG_VERBOSE, "%a:%d: Control 0x%x\n", __func__, __LINE__, *Control));
VIRTIO_SERIAL_IO_PROTOCOL *SerialIo = (VIRTIO_SERIAL_IO_PROTOCOL *)This;
BOOLEAN HaveData = FALSE;

VirtioSerialIoWriteFlush (This);

*Control = 0;

if (SerialIo->ReadOffset < SerialIo->ReadSize) {
// have unread data in current buffer
HaveData = TRUE;
} else if (VirtioSerialRingHasBuffer (
SerialIo->Dev,
PortRx (SerialIo->PortId)
))
{
// have unread buffers in rx ring
HaveData = TRUE;
}

if (!HaveData) {
*Control |= EFI_SERIAL_INPUT_BUFFER_EMPTY;
}

return EFI_SUCCESS;
}

Expand Down Expand Up @@ -195,26 +241,12 @@ VirtioSerialIoRead (
VIRTIO_SERIAL_PORT *Port = SerialIo->Dev->Ports + SerialIo->PortId;
BOOLEAN HasData;
UINT32 Length;
EFI_TPL OldTpl;

if (!Port->DeviceOpen) {
goto NoData;
}

OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
if (SerialIo->WriteOffset) {
DEBUG ((DEBUG_VERBOSE, "%a:%d: WriteFlush %d\n", __func__, __LINE__, SerialIo->WriteOffset));
VirtioSerialRingSendBuffer (
SerialIo->Dev,
PortTx (SerialIo->PortId),
SerialIo->WriteBuffer,
SerialIo->WriteOffset,
TRUE
);
SerialIo->WriteOffset = 0;
}

gBS->RestoreTPL (OldTpl);
VirtioSerialIoWriteFlush (This);

if (SerialIo->ReadOffset == SerialIo->ReadSize) {
HasData = VirtioSerialRingGetBuffer (
Expand Down
Loading