From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7OZy-0005bH-36 for qemu-devel@nongnu.org; Thu, 17 Nov 2016 10:26:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7OZw-00046O-Qj for qemu-devel@nongnu.org; Thu, 17 Nov 2016 10:26:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53410) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c7OZw-00046D-LN for qemu-devel@nongnu.org; Thu, 17 Nov 2016 10:26:20 -0500 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Thu, 17 Nov 2016 19:26:13 +0400 Message-Id: <20161117152613.18578-2-marcandre.lureau@redhat.com> In-Reply-To: <20161117152613.18578-1-marcandre.lureau@redhat.com> References: <20161117152613.18578-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 1/1] ivshmem: Fix 64 bit memory bar configuration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Zhuang Yanying , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Zhuang Yanying Device ivshmem property use64=3D0 is designed to make the device expose a 32 bit shared memory BAR instead of 64 bit one. The default is a 64 bit BAR, except pc-1.2 and older retain a 32 bit BAR. A 32 bit BAR can support only up to 1 GiB of shared memory. This worked as designed until commit 5400c02 accidentally flipped its sense: since then, we misinterpret use64=3D0 as use64=3D1 and vice versa. Worse, the default got flipped as well. Devices ivshmem-plain and ivshmem-doorbell are not affected. Fix by restoring the test of IVShmemState member not_legacy_32bit that got messed up in commit 5400c02. Also update its initialization for devices ivhsmem-plain and ivshmem-doorbell. Without that, they'd regress to 32 bit BARs. Signed-off-by: Zhuang Yanying Reviewed-by: Gonglei Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Markus Armbruster Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <1479385863-7648-1-git-send-email-ann.zhuangyanying@huawei.co= m> --- hw/misc/ivshmem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 230e51b..abeaf3d 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -858,7 +858,7 @@ static void ivshmem_common_realize(PCIDevice *dev, Er= ror **errp) pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->ivshmem_mmio); =20 - if (!s->not_legacy_32bit) { + if (s->not_legacy_32bit) { attr |=3D PCI_BASE_ADDRESS_MEM_TYPE_64; } =20 @@ -1045,6 +1045,7 @@ static void ivshmem_plain_init(Object *obj) ivshmem_check_memdev_is_busy, OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort); + s->not_legacy_32bit =3D 1; } =20 static void ivshmem_plain_realize(PCIDevice *dev, Error **errp) @@ -1116,6 +1117,7 @@ static void ivshmem_doorbell_init(Object *obj) =20 s->features |=3D (1 << IVSHMEM_MSI); s->legacy_size =3D SIZE_MAX; /* whatever the server sends */ + s->not_legacy_32bit =3D 1; } =20 static void ivshmem_doorbell_realize(PCIDevice *dev, Error **errp) --=20 2.10.0