From patchwork Fri Oct 2 00:49:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 525343 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 680A6140D6D for ; Fri, 2 Oct 2015 10:51:01 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=yxY64sIq; dkim-atps=neutral Received: from localhost ([::1]:56836 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhoYt-0005zm-G8 for incoming@patchwork.ozlabs.org; Thu, 01 Oct 2015 20:50:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhoXb-00044C-3k for qemu-devel@nongnu.org; Thu, 01 Oct 2015 20:49:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZhoXa-0000eM-1N for qemu-devel@nongnu.org; Thu, 01 Oct 2015 20:49:39 -0400 Received: from mail-pa0-x22c.google.com ([2607:f8b0:400e:c03::22c]:33881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhoXZ-0000eG-RZ for qemu-devel@nongnu.org; Thu, 01 Oct 2015 20:49:37 -0400 Received: by padhy16 with SMTP id hy16so90119850pad.1 for ; Thu, 01 Oct 2015 17:49:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lck+hL2UjXnn4+fBscaJO/UCtCAJyBSL9nrNT9WnmQ0=; b=yxY64sIqfafWYYVaCgF/igkxqiPWeWZzV3wJckULwPdiMH9ci+veADVm+gPtvz6+XG alBr6Q2G3SCnpC0nWfZXSwDeer33H2zwQh4+YRZBMcuvPmBjIh5WjFyiMMmJMd3fxIMt wiyjkn0rU/9HowqEktjBLxmUOYp67p5rocQyYZeyhDbFVdNnP829331XMQyseMWe7FDs 0eTIpN1T+oqU/czr9+UAyFhQ9LMefmCZf9tT6r69aLaPBCvOVW/TWyzy7jwFD2QBVtgl 55wQPwR9yZQ1JYF1DXImS3swXweM4hjvz/UfhSJPQnLKkkA2XkXcDAlg1MHoTSLZ6Nx+ LNkQ== X-Received: by 10.66.140.70 with SMTP id re6mr16197604pab.31.1443746977468; Thu, 01 Oct 2015 17:49:37 -0700 (PDT) Received: from localhost (ec2-52-8-89-49.us-west-1.compute.amazonaws.com. [52.8.89.49]) by smtp.gmail.com with ESMTPSA id ja4sm9020889pbb.19.2015.10.01.17.49.36 (version=TLS1_2 cipher=AES128-SHA256 bits=128/128); Thu, 01 Oct 2015 17:49:37 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Thu, 1 Oct 2015 17:49:23 -0700 Message-Id: <1443746968-9389-4-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443746968-9389-1-git-send-email-edgar.iglesias@gmail.com> References: <1443746968-9389-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22c Cc: edgar.iglesias@xilinx.com, serge.fdrv@gmail.com, alex.bennee@linaro.org, agraf@suse.de Subject: [Qemu-devel] [PATCH v2 3/8] target-arm: Add support for S2 page-table protection bits 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 From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- target-arm/helper.c | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 16a0701..2701788 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -6015,6 +6015,28 @@ simple_ap_to_rw_prot(CPUARMState *env, ARMMMUIdx mmu_idx, int ap) return simple_ap_to_rw_prot_is_user(ap, regime_is_user(env, mmu_idx)); } +/* Translate S2 section/page access permissions to protection flags + * + * @env: CPUARMState + * @s2ap: The 2-bit stage2 access permissions (S2AP) + * @xn: XN (execute-never) bit + */ +static int get_S2prot(CPUARMState *env, int s2ap, int xn) +{ + int prot = 0; + + if (s2ap & 1) { + prot |= PAGE_READ; + } + if (s2ap & 2) { + prot |= PAGE_WRITE; + } + if (!xn) { + prot |= PAGE_EXEC; + } + return prot; +} + /* Translate section/page access permissions to protection flags * * @env: CPUARMState @@ -6624,9 +6646,15 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address, */ page_size = (1ULL << ((granule_sz * (4 - level)) + 3)); descaddr |= (address & (page_size - 1)); - /* Extract attributes from the descriptor and merge with table attrs */ + /* Extract attributes from the descriptor */ attrs = extract64(descriptor, 2, 10) | (extract64(descriptor, 52, 12) << 10); + + if (mmu_idx == ARMMMUIdx_S2NS) { + /* Stage 2 table descriptors do not include any attribute fields */ + break; + } + /* Merge in attributes from table descriptors */ attrs |= extract32(tableattrs, 0, 2) << 11; /* XN, PXN */ attrs |= extract32(tableattrs, 3, 1) << 5; /* APTable[1] => AP[2] */ /* The sense of AP[1] vs APTable[0] is reversed, as APTable[0] == 1 @@ -6648,11 +6676,16 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address, } ap = extract32(attrs, 4, 2); - ns = extract32(attrs, 3, 1); xn = extract32(attrs, 12, 1); - pxn = extract32(attrs, 11, 1); - *prot = get_S1prot(env, mmu_idx, va_size == 64, ap, ns, xn, pxn); + if (mmu_idx == ARMMMUIdx_S2NS) { + ns = true; + *prot = get_S2prot(env, ap, xn); + } else { + ns = extract32(attrs, 3, 1); + pxn = extract32(attrs, 11, 1); + *prot = get_S1prot(env, mmu_idx, va_size == 64, ap, ns, xn, pxn); + } fault_type = permission_fault; if (!(*prot & (1 << access_type))) {