From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45405)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <JBeulich@suse.com>) id 1YtEvs-00007a-0u
	for qemu-devel@nongnu.org; Fri, 15 May 2015 08:41:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <JBeulich@suse.com>) id 1YtEvo-0005U8-Rt
	for qemu-devel@nongnu.org; Fri, 15 May 2015 08:41:39 -0400
Received: from mail.emea.novell.com ([130.57.118.101]:58536)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <JBeulich@suse.com>) id 1YtEvo-0005Ty-Ia
	for qemu-devel@nongnu.org; Fri, 15 May 2015 08:41:36 -0400
Message-Id: <5556059F020000780007A8D0@mail.emea.novell.com>
Date: Fri, 15 May 2015 13:41:35 +0100
From: "Jan Beulich" <JBeulich@suse.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Subject: [Qemu-devel] [PATCH] xen/pass-through: ROM BAR handling adjustments
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: xen-devel <xen-devel@lists.xenproject.org>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>

Expecting the ROM BAR to be written with an all ones value when sizing
the region is wrong - the low bit has another meaning (enable/disable)
and bits 1..10 are reserved. The PCI spec also mandates writing all
ones to just the address portion of the register.

Use suitable constants also for initializing the ROM BAR register field
description.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -248,7 +248,9 @@ static void xen_pt_pci_write_config(PCID
=20
     /* check unused BAR register */
     index =3D xen_pt_bar_offset_to_index(addr);
-    if ((index >=3D 0) && (val > 0 && val < XEN_PT_BAR_ALLF) &&
+    if ((index >=3D 0) && (val !=3D 0) &&
+        (((index !=3D PCI_ROM_SLOT) ?
+          val : (val | (uint32_t)~PCI_ROM_ADDRESS_MASK)) !=3D XEN_PT_BAR_A=
LLF) &&
         (s->bases[index].bar_flag =3D=3D XEN_PT_BAR_FLAG_UNUSED)) {
         XEN_PT_WARN(d, "Guest attempt to set address to unused Base =
Address "
                     "Register. (addr: 0x%02x, len: %d)\n", addr, len);
--- a/hw/xen/xen_pt_config_init.c
+++ b/hw/xen/xen_pt_config_init.c
@@ -726,8 +726,8 @@ static XenPTRegInfo xen_pt_emu_reg_heade
         .offset     =3D PCI_ROM_ADDRESS,
         .size       =3D 4,
         .init_val   =3D 0x00000000,
-        .ro_mask    =3D 0x000007FE,
-        .emu_mask   =3D 0xFFFFF800,
+        .ro_mask    =3D ~PCI_ROM_ADDRESS_MASK & ~PCI_ROM_ADDRESS_ENABLE,
+        .emu_mask   =3D (uint32_t)PCI_ROM_ADDRESS_MASK,
         .init       =3D xen_pt_bar_reg_init,
         .u.dw.read  =3D xen_pt_long_reg_read,
         .u.dw.write =3D xen_pt_exp_rom_bar_reg_write,