From nobody Tue Feb 10 04:13:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+79352+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+79352+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629110940; cv=none; d=zohomail.com; s=zohoarc; b=jUyQj5OfWPueCqGx6VKaOKy0yjDDMdGfuv6maCZKFix5A/l9OpcTuzY2lRdkm7Prj2OC2/AKTQ0Bv8thGlzx9fxtO3uVszVyb95JTS91ttMc7SnE8tWlUInOVao77eYXpDJoELi8wG8N23a8Fr+NuSDXiAUTCF/+vsg3N1ebFhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629110940; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Z9SzFLell8uqdJVPqclLN3e0upjItiwaDp/MCxfhouQ=; b=j5sjdju7p8U498Q+4vPWnCD+QYULwESZgEvgAOOG6rG2Ah2I7oE94MPzdzLBWhq7De8Rv+QJpiOqVcUceCf0+diY235VhRyVO9g6Y1Gmn7usXY8CQCgJQSRdIQ4SLE9FgU5AydFD6xx+Ot0LPL2nKUa0QTQaeUyCvoeu/jMSLNY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+79352+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 162911093999979.44003779505738; Mon, 16 Aug 2021 03:48:59 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ivbRYY1788612xTiZChTsfWf; Mon, 16 Aug 2021 03:48:59 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.22343.1629110937966695510 for ; Mon, 16 Aug 2021 03:48:58 -0700 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-190-GXJclhqDNvS77Guu2QKEAg-1; Mon, 16 Aug 2021 06:48:55 -0400 X-MC-Unique: GXJclhqDNvS77Guu2QKEAg-1 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 116B0EC1A1 for ; Mon, 16 Aug 2021 10:48:55 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 51D1F69CB8; Mon, 16 Aug 2021 10:48:51 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A5DE91800925; Mon, 16 Aug 2021 09:11:09 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Gerd Hoffmann Subject: [edk2-devel] [PATCH v2 3/4] OvmfPkg/VirtioMmioDeviceLib: Add default QueueNum for virtio 1.0 Date: Mon, 16 Aug 2021 09:11:08 +0200 Message-Id: <20210816071109.101122-4-kraxel@redhat.com> In-Reply-To: <20210816071109.101122-1-kraxel@redhat.com> References: <20210816071109.101122-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: Zm5ShOasIM7YLNXqUUohSlD2x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629110939; bh=17jnnvDFNTupCZwLOqk3qSCpjy96vS6/VWBO4GrbjHs=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=DziQPlUhAKy5ZXBi6vipIZO4K1aU+X9jbry4KoSBbV7wooZ4vXvWuiqE8rMcBlIql5c mHTxWTNRb3eiquMDvkwcT1nm4sWFJ2L2UG3GoiXEJFFB7QII2RgSUqEVyKHqrBeB5gkGe Y8TMvgeDE5N3jxrMPVuArXiGaHEZ3aZuDE0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629110942612100007 Content-Type: text/plain; charset="utf-8" Use QueueNumMax as QueueNum default for drivers which do not explicitly call VIRTIO_DEVICE_PROTOCOL->SetQueueSize(). Signed-off-by: Gerd Hoffmann --- .../Library/VirtioMmioDeviceLib/VirtioMmioDevice.h | 1 + .../VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h b/OvmfP= kg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h index 8b19996b716f..232393bb9114 100644 --- a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h +++ b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h @@ -27,6 +27,7 @@ typedef struct { UINT32 Signature; UINT32 Version; + UINT16 QueueNum; VIRTIO_DEVICE_PROTOCOL VirtioDevice; PHYSICAL_ADDRESS BaseAddress; } VIRTIO_MMIO_DEVICE; diff --git a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.= c b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c index bf8523a6fb3b..c7a22c1e1cc4 100644 --- a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c +++ b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c @@ -83,7 +83,11 @@ VirtioMmioSetQueueSize ( =20 Device =3D VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This); =20 - VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_NUM, QueueSize); + if (Device->Version =3D=3D 1) { + Device->QueueNum =3D QueueSize; + } else { + VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_NUM, QueueSize); + } =20 return EFI_SUCCESS; } @@ -171,6 +175,10 @@ VirtioMmioSetQueueSel ( =20 VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_SEL, Sel); =20 + if (Device->Version =3D=3D 1) { + Device->QueueNum =3D VIRTIO_CFG_READ (Device, VIRTIO_MMIO_OFFSET_QUEUE= _NUM_MAX) & 0xFFFF; + } + return EFI_SUCCESS; } =20 @@ -193,6 +201,8 @@ VirtioMmioSetQueueAddress ( VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_PFN, (UINT32)((UINTN)Ring->Base >> EFI_PAGE_SHIFT)); } else { + VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_NUM, Device->QueueN= um); + Address =3D (UINT64)Ring->Base; VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_DESC_LO, (UINT32)Address); --=20 2.31.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#79352): https://edk2.groups.io/g/devel/message/79352 Mute This Topic: https://groups.io/mt/84920347/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-