From mboxrd@z Thu Jan 1 00:00:00 1970 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.web11.36659.1629193725096398003 for ; Tue, 17 Aug 2021 02:48:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WxUQlAol; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629193724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0y1rJIw6r6/yv2VcPLmPavNqOaq4/OdjjXSHld7k4EA=; b=WxUQlAol3HAXODlToB7qoxE1Np9OztjUS0J99jKiWb21FBYy3m7iL0yyCl2Z+u6SIuV+Dt uLNp5p8g0lBwtk10mBs5OLudzGUPP6hx5LH3pdM3gKnKcJdTSLH3lsqMYIfndAfLJkbfX+ xF6QJ/RUjoc9Yj10Xs7DhG1XpzpdS1o= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-96-1DP5np48N9SSQDuH1QUXXg-1; Tue, 17 Aug 2021 05:48:43 -0400 X-MC-Unique: 1DP5np48N9SSQDuH1QUXXg-1 Received: by mail-wr1-f69.google.com with SMTP id z2-20020adff1c20000b0290154f60e3d2aso6363318wro.23 for ; Tue, 17 Aug 2021 02:48:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=0y1rJIw6r6/yv2VcPLmPavNqOaq4/OdjjXSHld7k4EA=; b=OK80Mvw6O9ag93352po+pcQ0IXQyiL7C30v/m6ht0Hekcb6IB53+DlB8QHGbcvHVth 1dtwHcMDhl2p8kHWmMwctIQGKF28QLhgVedaVslzwu5HEA9lzQu/rl9senvZe6J1QwZz 56LVZcK9dFIr6bvYQL8IqN0Ou+AIIXXanytELAxjcTg774b6e21aGLrjDXDB9gFWTCfp uZREhzQed20Ll+SC2BfuK/qQlmenKnXkiK3z2q0tceoEK7efNWCPgDR17Oa/FAwUkwe3 WH7/w0k4oHZonSTbl2qAi08yRJbopdLGkowvvyyK3uO6a9b+rW3YEaoQCdCDwjSgxk4Q EYQg== X-Gm-Message-State: AOAM532JgyxNvcu2mIhrqfslEndzxQq5ZQofQDcYgtd2Rl6ukWWqezES qikba2fqECLL4aWPUHfDjqvnNTya3WJrIirmCa5Z1ubHhYnoXWX6ZGyfn8AN6MEdVPABMAU4dvU qXI2iYApW3LNTcQ== X-Received: by 2002:a5d:6301:: with SMTP id i1mr2813767wru.423.1629193722067; Tue, 17 Aug 2021 02:48:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbs/Bu712BGZr/1PF6PgvXDND3zfZ2H3cKmt0EQ4GicF8YGphceeKiAu4juPKS2ixI/IVfEQ== X-Received: by 2002:a5d:6301:: with SMTP id i1mr2813743wru.423.1629193721838; Tue, 17 Aug 2021 02:48:41 -0700 (PDT) Return-Path: Received: from [192.168.1.36] (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id b15sm1771082wrq.5.2021.08.17.02.48.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Aug 2021 02:48:41 -0700 (PDT) Subject: Re: [edk2-devel] [PATCH v3 3/4] OvmfPkg/VirtioMmioDeviceLib: Add default QueueNum for virtio 1.0 To: devel@edk2.groups.io, kraxel@redhat.com References: <20210817092329.808150-1-kraxel@redhat.com> <20210817092329.808150-4-kraxel@redhat.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: <43aa4a70-a55c-e463-6603-18cc0af14523@redhat.com> Date: Tue, 17 Aug 2021 11:48:40 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210817092329.808150-4-kraxel@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 8/17/21 11:23 AM, Gerd Hoffmann wrote: > 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/OvmfPkg/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..b9ee407eddc4 100644 > --- a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c > +++ b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c > @@ -83,7 +83,11 @@ VirtioMmioSetQueueSize ( > > Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This); > > - VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_NUM, QueueSize); > + if (Device->Version == VIRTIO_MMIO_DEVICE_VERSION_0_95) { > + Device->QueueNum = QueueSize; > + } else { > + VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_NUM, QueueSize); > + } > > return EFI_SUCCESS; > } > @@ -171,6 +175,10 @@ VirtioMmioSetQueueSel ( > > VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_SEL, Sel); > > + if (Device->Version == VIRTIO_MMIO_DEVICE_VERSION_0_95) { > + Device->QueueNum = VIRTIO_CFG_READ (Device, VIRTIO_MMIO_OFFSET_QUEUE_NUM_MAX) & 0xFFFF; > + } > + > return EFI_SUCCESS; > } > > @@ -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->QueueNum); This looks like a bugfix in the previous patch... Going to revisit it. > Address = (UINT64)Ring->Base; > VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_DESC_LO, > (UINT32)Address); >