From patchwork Thu Nov 7 10:41:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 289283 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 5AB442C00B7 for ; Thu, 7 Nov 2013 21:46:47 +1100 (EST) Received: from localhost ([::1]:39513 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeN6q-0004Qu-Ld for incoming@patchwork.ozlabs.org; Thu, 07 Nov 2013 05:46:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeN5h-0003dH-L0 for qemu-devel@nongnu.org; Thu, 07 Nov 2013 05:45:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VeN5Y-0000DH-UC for qemu-devel@nongnu.org; Thu, 07 Nov 2013 05:45:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeN5Y-0000DA-FC for qemu-devel@nongnu.org; Thu, 07 Nov 2013 05:45:24 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rA7AiJ1v029850 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 7 Nov 2013 05:44:19 -0500 Received: from localhost.localdomain.com (vpn-200-52.tlv.redhat.com [10.35.200.52]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rA7Ai5qW015341; Thu, 7 Nov 2013 05:44:15 -0500 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Thu, 7 Nov 2013 12:41:18 +0200 Message-Id: <1383820884-29596-3-git-send-email-marcel.a@redhat.com> In-Reply-To: <1383820884-29596-1-git-send-email-marcel.a@redhat.com> References: <1383820884-29596-1-git-send-email-marcel.a@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, ehabkost@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, agraf@suse.de, lcapitulino@redhat.com, aliguori@amazon.com, pbonzini@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH for-1.7 v2 2/8] hw/alpha: limit iommu-typhoon memory size 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 The page table logic in exec.c assumes that memory addresses are at most TARGET_PHYS_ADDR_SPACE_BITS. Limit iommu-typhoon accordingly. Signed-off-by: Marcel Apfelbaum --- hw/alpha/typhoon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 59e1bb8..ba88dd9 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -888,7 +888,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, /* Host memory as seen from the PCI side, via the IOMMU. */ memory_region_init_iommu(&s->pchip.iommu, OBJECT(s), &typhoon_iommu_ops, - "iommu-typhoon", UINT64_MAX); + "iommu-typhoon", TARGET_PHYS_ADDR_SPACE_MAX); address_space_init(&s->pchip.iommu_as, &s->pchip.iommu, "pchip0-pci"); pci_setup_iommu(b, typhoon_pci_dma_iommu, s);