From nobody Sat Sep 21 02:40:37 2024 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+79558+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+79558+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629357939; cv=none; d=zohomail.com; s=zohoarc; b=SnUE1KCYUL4g2Bmof3uN/6SIeDTQIvc4UYIbnjbVBONtMTdu9DNkFJxgAER5HGFN93ztgMI0CTgVnwwTnFurjxGdZa3NMBlayE0PCCEwFlG5tRZWu1/aO6367lGcUeR3YVgs9/TESHZz+t6Hm82gEKj7Q2dYbbz7kVdQnnsHSv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629357939; 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=A123I1wnP3TnU1sjiErIcB8o++fz5CNge2R8FgO1S80=; b=kESctktTJeiPPpUSXuajjOMsNWFJQ86YJwUDDpDrpVYMkQA3pOYzXgyUpsldBcs13Q32zJvvarUa7R4uLUVVtXfi+wHpr98nAZ+US8h5QDBVyGJUgAkqWELQGjA8f/uJ7Nw7WKCHMXZDQDQ9/bEOEJEYgMMrNzlRmiNS0QcCM8g= 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+79558+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 16293579394866.198346213292666; Thu, 19 Aug 2021 00:25:39 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id OeZqYY1788612xexHtq65bbf; Thu, 19 Aug 2021 00:25:39 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.groups.io with SMTP id smtpd.web10.66597.1629357938593485754 for ; Thu, 19 Aug 2021 00:25:38 -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-277-hUVAIIu0MtmnwFhJTvCHIQ-1; Thu, 19 Aug 2021 03:25:36 -0400 X-MC-Unique: hUVAIIu0MtmnwFhJTvCHIQ-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 98F47423C6 for ; Thu, 19 Aug 2021 07:25:35 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7C1A21059141; Thu, 19 Aug 2021 07:25:31 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B9B6218007A5; Thu, 19 Aug 2021 09:25:17 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Gerd Hoffmann Subject: [edk2-devel] [PATCH v4 5/7] OvmfPkg/VirtioMmioDeviceLib: virtio 1.0: Add default QueueNum Date: Thu, 19 Aug 2021 09:25:15 +0200 Message-Id: <20210819072517.1565797-6-kraxel@redhat.com> In-Reply-To: <20210819072517.1565797-1-kraxel@redhat.com> References: <20210819072517.1565797-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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: O275u2Omy0lysHIEeYO3WjYux1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629357939; bh=pREK6oKQQAAIC7+Kqkt9DVS3h9FbQsncG0DGY2IQqqI=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=lNQuuibLDPBmOxUtTJbPyPx9MmjkwzLMV0dMKSK5nNtZt2sgqrVKwgcd8hIYqesfTow YvSyJDl2tHreHj+oqO50Kh/Rh3cbm8dh0zsCHY3TUF/vU4ne7pbH0ffg6CJswF9u2XPF1 qo8GT+q5lPJOZYSiFBVi6FXfC30nOsX6/aY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629357940406100006 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 0c2f99633c46..5ad951f4154a 100644 --- a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h +++ b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h @@ -30,6 +30,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 a0ee8e5f3c86..b4711f9b42e6 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 VIRTIO_MMIO_DEVICE_VERSION_0_95) { + VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_NUM, QueueSize); + } else { + Device->QueueNum =3D 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 VIRTIO_MMIO_DEVICE_VERSION_0_95) { + 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 (#79558): https://edk2.groups.io/g/devel/message/79558 Mute This Topic: https://groups.io/mt/84991751/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-