From patchwork Mon Oct 9 13:23:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9993235 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 2DA4D603B5 for ; Mon, 9 Oct 2017 13:26:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F957287DA for ; Mon, 9 Oct 2017 13:26:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14959287EC; Mon, 9 Oct 2017 13:26:16 +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 C31F1287DB for ; Mon, 9 Oct 2017 13:26:15 +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 1e1Y2G-0007z5-I7; Mon, 09 Oct 2017 13:23:56 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1Y2F-0007y0-6B for xen-devel@lists.xen.org; Mon, 09 Oct 2017 13:23:55 +0000 Received: from [193.109.254.147] by server-10.bemta-6.messagelabs.com id 03/7A-03761-A687BD95; Mon, 09 Oct 2017 13:23:54 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsVysyfVTTer4na kQfd1YYslHxezODB6HN39mymAMYo1My8pvyKBNeP5553MBTv4K/ZPvsrSwPiUs4uRi0NIYDOj RMPZ7YwQzmlGiamv2li6GDk52AQ0Je58/sQEYosISEtc+3yZEcRmFoiUOPzhB3sXIweHsECox MO73CBhFgFVifetr5hBbF4BC4lVa9vAyiUE5CV2tV1kBbE5BSwlpm2eDlYjBFRz+cMO1gmM3A sYGVYxqhenFpWlFuma6iUVZaZnlOQmZuboGhqY6eWmFhcnpqfmJCYV6yXn525iBHqXAQh2ME6 /7H+IUZKDSUmUd0rB7UghvqT8lMqMxOKM+KLSnNTiQ4wyHBxKErz/y4BygkWp6akVaZk5wDCD SUtw8CiJ8IaWA6V5iwsSc4sz0yFSpxh1OTpu3v3DJMSSl5+XKiXOex1khgBIUUZpHtwIWMhfY pSVEuZlBDpKiKcgtSg3swRV/hWjOAejkjDvJ5ApPJl5JXCbXgEdwQR0BGPxDZAjShIRUlINjD LhHn+WWmRLXhb93pfV+FDqlnqSe/rDK62ude9SPOumLlDMcvVftVJjKkcZ/5IlEaeKorQZTN5 9kxRR7jvPdnR7a2+hYqznEfG8ddG7zR16VetfPfQ7V1hjU3N7+85pHGL3/8Q9Cp1/dVcl5/7U qoy/j13/+j7KMGQ/taqjSPKBw9+96xzTlViKMxINtZiLihMBEEohE3QCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1507555433!98352872!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 30768 invoked from network); 9 Oct 2017 13:23:54 -0000 Received: from usa-sjc-mx-foss1.foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-14.tower-27.messagelabs.com with SMTP; 9 Oct 2017 13:23:54 -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 9741F1529; Mon, 9 Oct 2017 06:23:53 -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 ABC013F578; Mon, 9 Oct 2017 06:23:52 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Mon, 9 Oct 2017 14:23:36 +0100 Message-Id: <20171009132341.1678-6-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171009132341.1678-1-julien.grall@arm.com> References: <20171009132341.1678-1-julien.grall@arm.com> Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v4 05/10] 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 v3: - Add Stefano's reviewed-by 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 73677902d4..39bade63f5 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",