From patchwork Tue Sep 12 10:03:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9948911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DEABC60360 for ; Tue, 12 Sep 2017 10:07:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD2BE28DCF for ; Tue, 12 Sep 2017 10:07:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C21DC28DD3; Tue, 12 Sep 2017 10:07:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1594928E55 for ; Tue, 12 Sep 2017 10:07:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dri35-0003MH-NK; Tue, 12 Sep 2017 10:04:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dri34-0003Hq-1C for xen-devel@lists.xen.org; Tue, 12 Sep 2017 10:04:06 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id D7/DF-01812-511B7B95; Tue, 12 Sep 2017 10:04:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsVysyfVTVdk4/Z Ig48npC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1ozlq3+zFJzgq3ix6x9zA2MPZxcjF4eQwGZG ie75J9ggnNOMErebuhm7GDk52AQ0Je58/sQEYosISEtc+3wZLM4sEClx+MMPdhBbWCBUYnvLL 6AaDg4WAVWJCWfiQMK8ApYS81duYAWxJQTkJXa1XQSzOYHiKz7+YgOxhQQsJL6//ME4gZF7AS PDKkb14tSistQiXRO9pKLM9IyS3MTMHF1DA2O93NTi4sT01JzEpGK95PzcTYxA7zIAwQ7Gxi9 OhxglOZiURHmPrN8eKcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mCt2oDUE6wKDU9tSItMwcYZjBp CQ4eJRHeAJA0b3FBYm5xZjpE6hSjLkfHzbt/mIRY8vLzUqXEed+AzBcAKcoozYMbAQv5S4yyU sK8jEBHCfEUpBblZpagyr9iFOdgVBLmDQVZxZOZVwK36RXQEUxAR/Bc2gJyREkiQkqqgXGm4E ZP3x1VE/Z9nbxs54V9lm67p7J4MO5aFXdul+ImwXtMl3+Vftzz9P48zT8BM3ynLHrgzqlRuX7 di+6zE/M/R2bnnAhVmv/IjN/lmMmTJRPPi+iV/fItu9HZmyDnc/fPC/YTh21vPjZe+aqEbzPv 43u5RYm7TedETX/6aon4Lm1+6ZqpfonxSizFGYmGWsxFxYkAhS4+4nQCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1505210643!111127297!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22072 invoked from network); 12 Sep 2017 10:04:04 -0000 Received: from usa-sjc-mx-foss1.foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-5.tower-31.messagelabs.com with SMTP; 12 Sep 2017 10:04:04 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A52FA1682; Tue, 12 Sep 2017 03:04:03 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B704D3F578; Tue, 12 Sep 2017 03:04:02 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 12 Sep 2017 11:03:26 +0100 Message-Id: <20170912100330.2168-21-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170912100330.2168-1-julien.grall@arm.com> References: <20170912100330.2168-1-julien.grall@arm.com> Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v2 20/24] xen/arm: mm: Rename 'ai' into 'flags' in create_xen_entries X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The parameter 'ai' is used either for attribute index or for permissions. Follow-up patch will rework that parameters to carry more information. So rename the parameter to 'flags'. Signed-off-by: Julien Grall Reviewed-by: Andre Przywara Reviewed-by: Stefano Stabellini --- Changes in v2: - Add Andre's reviewed-by --- xen/arch/arm/mm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index b3286b4a89..3379d29f8a 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -986,7 +986,7 @@ static int create_xen_entries(enum xenmap_operation op, unsigned long virt, mfn_t mfn, unsigned long nr_mfns, - unsigned int ai) + unsigned int flags) { int rc; unsigned long addr = virt, addr_end = addr + nr_mfns * PAGE_SIZE; @@ -1021,7 +1021,7 @@ static int create_xen_entries(enum xenmap_operation op, } if ( op == RESERVE ) break; - pte = mfn_to_xen_entry(mfn, ai); + pte = mfn_to_xen_entry(mfn, flags); pte.pt.table = 1; write_pte(entry, pte); break; @@ -1038,8 +1038,8 @@ static int create_xen_entries(enum xenmap_operation op, else { pte = *entry; - pte.pt.ro = PTE_RO_MASK(ai); - pte.pt.xn = PTE_NX_MASK(ai); + pte.pt.ro = PTE_RO_MASK(flags); + pte.pt.xn = PTE_NX_MASK(flags); if ( !pte.pt.ro && !pte.pt.xn ) { printk("%s: Incorrect combination for addr=%lx\n",