From patchwork Fri May 10 15:11:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 16859 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 14F27238F6 for ; Fri, 10 May 2013 15:12:53 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id k15sf5009274qcv.5 for ; Fri, 10 May 2013 08:12:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=5/mFe1l58PNR+5vZ6nhYcH+p1vE2gfjfTdq7EHh3BTA=; b=ixT45lk+kGp9JS+/FcDW9g8cvl2fYymDGoHZ7ZvPTAP9QJ+8QNr0I+XTA7j8IDHdbV okxDDaojG3sA9XNAQ5XCoSrERBIIwa0gcVXjVy6SC0YZ8PjLy6NfFsBopjjI4Fb4aIr/ OamuwL2uRhdwezspa5Av6V/ktKgoHsMWXDg6aL7d4LlST4A4rbMHf6lMIMhgh1Xqxzb/ 6eoG/7QQr2om2eOtm9a9wYM2ubFG3Bg9STLN9QrUhluZeqNXlOoe2EZ5epBlkow31jut HXWIRPC0prRqzhSUcOHbNHLCEnqKbCBSs+z88uZBrocGVwqFTFzSeU60ntmSm8yns9wL C5PA== X-Received: by 10.224.130.195 with SMTP id u3mr12315552qas.1.1368198746545; Fri, 10 May 2013 08:12:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.13.40 with SMTP id e8ls2003615qec.77.gmail; Fri, 10 May 2013 08:12:26 -0700 (PDT) X-Received: by 10.220.109.207 with SMTP id k15mr11333723vcp.34.1368198746363; Fri, 10 May 2013 08:12:26 -0700 (PDT) Received: from mail-vb0-x232.google.com (mail-vb0-x232.google.com [2607:f8b0:400c:c02::232]) by mx.google.com with ESMTPS id u8si1486242vck.29.2013.05.10.08.12.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 May 2013 08:12:25 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::232 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::232; Received: by mail-vb0-f50.google.com with SMTP id w16so3528270vbb.23 for ; Fri, 10 May 2013 08:12:25 -0700 (PDT) X-Received: by 10.52.69.109 with SMTP id d13mr9705288vdu.75.1368198745886; Fri, 10 May 2013 08:12:25 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.217.15 with SMTP id hk15csp59253vcb; Fri, 10 May 2013 08:12:25 -0700 (PDT) X-Received: by 10.194.62.80 with SMTP id w16mr14285544wjr.16.1368198744731; Fri, 10 May 2013 08:12:24 -0700 (PDT) Received: from mail-wg0-x22b.google.com (mail-wg0-x22b.google.com [2a00:1450:400c:c00::22b]) by mx.google.com with ESMTPS id vd10si782248wjc.73.2013.05.10.08.12.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 May 2013 08:12:24 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c00::22b is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=2a00:1450:400c:c00::22b; Received: by mail-wg0-f43.google.com with SMTP id c11so4064785wgh.34 for ; Fri, 10 May 2013 08:12:24 -0700 (PDT) X-Received: by 10.194.133.166 with SMTP id pd6mr2766528wjb.19.1368198744272; Fri, 10 May 2013 08:12:24 -0700 (PDT) Received: from belegaer.uk.xensource.com. (firewall.ctxuk.citrix.com. [46.33.159.2]) by mx.google.com with ESMTPSA id e8sm4080359wic.5.2013.05.10.08.12.22 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 May 2013 08:12:23 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Cc: Stefano.Stabellini@eu.citrix.com, ian.campbell@citrix.com, patches@linaro.org, Julien Grall Subject: [PATCH V4 01/32] xen/arm: Extend create_xen_entries prototype to take mapping attribute Date: Fri, 10 May 2013 16:11:53 +0100 Message-Id: <1368198723-24639-2-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1368198723-24639-1-git-send-email-julien.grall@linaro.org> References: <1368198723-24639-1-git-send-email-julien.grall@linaro.org> X-Gm-Message-State: ALoCoQnb2x6WpyDpgjouH3Sx8/axsnYTzHnKeRy6woxlISLQKwL1zxlzIDTZtgJPe2M/tfJ23w/J X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::232 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Signed-off-by: Julien Grall Acked-by: Ian Campbell Changes in v4: - use "ai" instead of "flags" to reflect field which it goes in. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 2836cbb..bd7eb1a 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -631,7 +631,8 @@ enum xenmap_operation { static int create_xen_entries(enum xenmap_operation op, unsigned long virt, unsigned long mfn, - unsigned long nr_mfns) + unsigned long nr_mfns, + unsigned int ai) { int rc; unsigned long addr = virt, addr_end = addr + nr_mfns * PAGE_SIZE; @@ -664,6 +665,7 @@ static int create_xen_entries(enum xenmap_operation op, } pte = mfn_to_xen_entry(mfn); pte.pt.table = 1; + pte.pt.ai = ai; write_pte(&third[third_table_offset(addr)], pte); break; case REMOVE: @@ -693,12 +695,11 @@ int map_pages_to_xen(unsigned long virt, unsigned long nr_mfns, unsigned int flags) { - ASSERT(flags == PAGE_HYPERVISOR); - return create_xen_entries(INSERT, virt, mfn, nr_mfns); + return create_xen_entries(INSERT, virt, mfn, nr_mfns, flags); } void destroy_xen_mappings(unsigned long v, unsigned long e) { - create_xen_entries(REMOVE, v, 0, (e - v) >> PAGE_SHIFT); + create_xen_entries(REMOVE, v, 0, (e - v) >> PAGE_SHIFT, 0); } enum mg { mg_clear, mg_ro, mg_rw, mg_rx };