Received: by 2002:a19:c345:0:0:0:0:0 with SMTP id t66csp4678439lff; Mon, 16 Dec 2019 07:17:25 -0800 (PST) X-Google-Smtp-Source: APXvYqx5BcagQ0wQG/4/KOFTSF7hhxzr3DXODkNtFhiMvW22Ghn7nk+6b1qQnf5zno3cZgMUwPRe X-Received: by 2002:a05:6830:1b78:: with SMTP id d24mr30633224ote.174.1576509445768; Mon, 16 Dec 2019 07:17:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576509445; cv=none; d=google.com; s=arc-20160816; b=aZzmV4CvARKKdGPdPCQbsCPo32JddqVnu/5wox2W3GgcXHTj+xIXTZBh6wNJweU//R DPOP+kAUIrKdHMEaMG3CfFdoaf/7N9NF/CXhVxlyhSSlPZRBWxfWPDRB0iducuDcATB/ 19ak1k2MdPwUrja3DxKFUnJuM3flRG0uwAY5YTsum3UKsuzBGcpEELqsivpXBhbhhoCg uBFMTHLaBksZpI9kmuhDFLC/X6R/m+CmmcjWEWPV2NURYLNpREv0pH7Y07AjGWZmoT0G Nl7Q2E9plWxwoFAQAXHubfYoP0Rc1uiRjNNNdpK2r5Xj5rPU9ssSWKqeK64zZ2J1b8LS 3ozQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:dkim-signature; bh=syWV6RethZ9zkiIkM27Et4g5OSvaauBfpbT1hVu+9aY=; b=WUtgYgR3hbVup370Wt+emvStX4wbqo0DFAHuH9W8WEpxZFwLHTW2rlzaq5E7g0Pbb0 oOQvpVDC4IYQ+oJ0WVnmDR6j8K5YRF4n5fvBt2ddMtDSgHtTcvBDlMdmYuv1bJpaULf/ nZZJpgAGZ8xPAFgdn4cj/qR7lYSXpR5CHKboZ51dpRti9juZIzHj6ebzYtpjodSwVT89 P5LOEMsjZbW6YOVZiWpO0Se3UYfWCmlsqb3yaMmHf3PNgW0eAf2rG7NprVbtFlvtZr1c TphnNFK9WpbjapMSClQbCw9wzgtEf1USPqmgdt/R7HKwM/hXB6GV3IsvjAgA+fg/bQWM RK8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.de header.s=amazon201209 header.b=p2UuQMvE; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.de Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f187si10655953oia.218.2019.12.16.07.17.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Dec 2019 07:17:25 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.de header.s=amazon201209 header.b=p2UuQMvE; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.de Received: from localhost ([::1]:55390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igs7f-0003aq-Th for alex.bennee@linaro.org; Mon, 16 Dec 2019 10:17:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54260) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igs7M-0003VS-V5 for qemu-arm@nongnu.org; Mon, 16 Dec 2019 10:17:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igs7L-0001YA-VR for qemu-arm@nongnu.org; Mon, 16 Dec 2019 10:17:04 -0500 Received: from smtp-fw-9102.amazon.com ([207.171.184.29]:58507) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1igs7L-0001X4-NW; Mon, 16 Dec 2019 10:17:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1576509424; x=1608045424; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=syWV6RethZ9zkiIkM27Et4g5OSvaauBfpbT1hVu+9aY=; b=p2UuQMvElHSlnLKSkedp7iu6zc1Te87fsWnxqjSJq9H+x2KqHJSNVQLp 1JeFevw+OrcFM9h1uslLZjPRWEgTqws5XlnEXt0i7TRTCzRVLOhH2qwry bw0BbR9R0PpbFmn3nDQCEsfh7IaC9sOT38z7RAe2/EvfZdlHIOBKnEq2q E=; IronPort-SDR: d2aUp2IqMXXURcCZGkgJ6eC2IDAbm4psYZDe8xXWk8OubI7jUG94fqjYgRQRkm4r5ScrAmXpHI U33CvYSon9hw== X-IronPort-AV: E=Sophos;i="5.69,322,1571702400"; d="scan'208";a="13787925" Received: from sea32-co-svc-lb4-vlan3.sea.corp.amazon.com (HELO email-inbound-relay-1e-27fb8269.us-east-1.amazon.com) ([10.47.23.38]) by smtp-border-fw-out-9102.sea19.amazon.com with ESMTP; 16 Dec 2019 15:16:51 +0000 Received: from sveith-desktop.aka.corp.amazon.com (iad7-ws-svc-lb50-vlan3.amazon.com [10.0.93.214]) by email-inbound-relay-1e-27fb8269.us-east-1.amazon.com (Postfix) with ESMTPS id BBA31A1F8B; Mon, 16 Dec 2019 15:16:48 +0000 (UTC) Received: from sveith-desktop.aka.corp.amazon.com (localhost [127.0.0.1]) by sveith-desktop.aka.corp.amazon.com (8.15.2/8.15.2/Debian-3) with ESMTP id xBGFGkar013914; Mon, 16 Dec 2019 16:16:46 +0100 Received: (from sveith@localhost) by sveith-desktop.aka.corp.amazon.com (8.15.2/8.15.2/Submit) id xBGFGjQT013913; Mon, 16 Dec 2019 16:16:45 +0100 From: Simon Veith To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: Simon Veith , Eric Auger Subject: [PATCH v3 1/6] hw/arm/smmuv3: Apply address mask to linear strtab base address Date: Mon, 16 Dec 2019 16:15:07 +0100 Message-Id: <1576509312-13083-2-git-send-email-sveith@amazon.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1576509312-13083-1-git-send-email-sveith@amazon.de> References: <1576509312-13083-1-git-send-email-sveith@amazon.de> Precedence: Bulk X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 207.171.184.29 X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: mULoQAKYzVu+ In the SMMU_STRTAB_BASE register, the stream table base address only occupies bits [51:6]. Other bits, such as RA (bit [62]), must be masked out to obtain the base address. The branch for 2-level stream tables correctly applies this mask by way of SMMU_BASE_ADDR_MASK, but the one for linear stream tables does not. Apply the missing mask in that case as well so that the correct stream base address is used by guests which configure a linear stream table. Linux guests are unaffected by this change because they choose a 2-level stream table layout for the QEMU SMMUv3, based on the size of its stream ID space. ref. ARM IHI 0070C, section 6.3.23. Signed-off-by: Simon Veith Cc: Eric Auger Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Acked-by: Eric Auger --- hw/arm/smmuv3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index e2fbb83..eef9a18 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -429,7 +429,7 @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, STE *ste, } addr = l2ptr + l2_ste_offset * sizeof(*ste); } else { - addr = s->strtab_base + sid * sizeof(*ste); + addr = (s->strtab_base & SMMU_BASE_ADDR_MASK) + sid * sizeof(*ste); } if (smmu_get_ste(s, addr, ste, event)) { -- 2.7.4