From patchwork Sun Sep 15 08:46:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 275004 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 755FA2C013C for ; Sun, 15 Sep 2013 18:45:14 +1000 (EST) Received: from localhost ([::1]:55836 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VL7xA-0007oz-A8 for incoming@patchwork.ozlabs.org; Sun, 15 Sep 2013 04:45:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VL7wc-0007mX-Pu for qemu-devel@nongnu.org; Sun, 15 Sep 2013 04:44:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VL7wU-0002vX-Qz for qemu-devel@nongnu.org; Sun, 15 Sep 2013 04:44:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VL7wU-0002vR-JF for qemu-devel@nongnu.org; Sun, 15 Sep 2013 04:44:30 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8F8iUt0028291 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 15 Sep 2013 04:44:30 -0400 Received: from redhat.com (vpn1-4-98.ams2.redhat.com [10.36.4.98]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id r8F8iSY4020732; Sun, 15 Sep 2013 04:44:29 -0400 Date: Sun, 15 Sep 2013 11:46:39 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1379234759-31527-2-git-send-email-mst@redhat.com> References: <1379234759-31527-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1379234759-31527-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: imammedo@redhat.com Subject: [Qemu-devel] [PATCH v2 1/6] q35: make pci window address/size match guest cfg X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org For Q35, MMCFG address and size are guest configurable. Update w32 property to make it behave accordingly. Signed-off-by: Michael S. Tsirkin --- hw/pci-host/q35.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 5473504..72f6b72 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -214,6 +214,16 @@ static void mch_update_pciexbar(MCHPCIState *mch) } addr = pciexbar & addr_mask; pcie_host_mmcfg_update(pehb, enable, addr, length); + /* Leave enough space for the MCFG BAR */ + /* + * TODO: this matches current bios behaviour, but it's not a power of two, + * which means an MTRR can't cover it exactly. + */ + if (enable) { + mch->pci_info.w32.begin = addr + length; + } else { + mch->pci_info.w32.begin = MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT; + } } /* PAM */