From patchwork Mon Oct 2 17:31:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 114634 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp924650qgn; Mon, 2 Oct 2017 10:34:09 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBUS52oOCK/jqTbrmBgCGg133k/JuWy+zONB2EKxYySxQg3FApS0tOXAD4WnNWIeY3cfhGX X-Received: by 10.107.28.138 with SMTP id c132mr24581318ioc.233.1506965649770; Mon, 02 Oct 2017 10:34:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506965649; cv=none; d=google.com; s=arc-20160816; b=pIJllkWhb6RzEgJnUG+Umrp5VSBLQw8fMxLmkvIjyLF/7IJpQgzkucotOYuWAjJY7w o8hw0snIWxU7jnYN4B70nMUG3fMCvOSkWztYWXuJSjYMmu5dX5pHl83mITvJlrDtU8tT vV/YgCsJJkAL9AVqXN3ccP19JnLYLIySyoNKgZrmQRUSlPHhHFKYQhdK7ERa/T9QljtH 0wiThvTBmpiOifUzYQ73UUjjztqeuF017jXPirjwCmA52ePUPXIAcTafimPQxCSNTlnR yZipU7AG9CwTk/8VoU59MN4m8MuiSkx2blBe2QpliasPPpbP/J++AhYa5Dt3UL8A2MNK 8AJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:arc-authentication-results; bh=zw6LojWN1Lo/3OcdlHi6R9DqbAcqMNnpMYy5otuqS18=; b=ug1d62AmCKnOTXDTjx4/hcyauhQjKd7qQ4ifJM5rcFrea1WF+GIDVtn7jHB2CTjlGb 7zuZPUYv5VXG1FBT61dWizxl2em4ndP5H99Kv0xpHPFrb+Ovq27FEVoz4TxKUExWroJn MZrsgdxo/9YScXv3JR7HSqPMuPGjAPQT0ajkJFWx35SANe/ET8FSd0wV3VFkExlLvmKk E8U/ATcxA8x9kFlxasCyRK7d1+Yiw8SlV8DafpSmqgfR8pUfucFQKV1knnyq9GBznMYU g2MMSOLzr5cEgHy3M4yVauFPY9mCJ2AMR0UimGbHxUYeoHnXa0pkQBI4bII3gooKdCk8 rcCw== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id v7si9315854iod.413.2017.10.02.10.34.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Oct 2017 10:34:09 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dz4Za-0003bA-7U; Mon, 02 Oct 2017 17:32:06 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dz4ZY-0003aJ-Tm for xen-devel@lists.xen.org; Mon, 02 Oct 2017 17:32:05 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id E5/7A-03414-41872D95; Mon, 02 Oct 2017 17:32:04 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVysyfVTVe44lK kwfyjmhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bzzzuZC3bwV+yffJWlgfEpZxcjF4eQwGZG ieVnj7NDOKcZJe7fusvcxcjJwSagKXHn8ycmEFtEQFri2ufLjCA2s0CkxOEPP9hBbGGBYIlTT bPA4iwCqhKLfm9gAbF5BSwkFn86zQpiSwjIS+xquwhmcwpYStx+cghsvhBQzenXM5gmMHIvYG RYxahenFpUllqka6yXVJSZnlGSm5iZo2toYKaXm1pcnJiempOYVKyXnJ+7iRHoXwYg2MHY8c/ pEKMkB5OSKK93/qVIIb6k/JTKjMTijPii0pzU4kOMMhwcShK8CeVAOcGi1PTUirTMHGCgwaQl OHiURHgjQdK8xQWJucWZ6RCpU4y6HB037/5hEmLJy89LlRLnNQIpEgApyijNgxsBC/pLjLJSw ryMQEcJ8RSkFuVmlqDKv2IU52BUEub9UwY0hSczrwRu0yugI5iAjpjTdQHkiJJEhJRUA2OBgI kC7+PGGOsoY7NfqWvC1SOnc3k8uHfb+v/cI8/qbhsv0zycFcK37kj5H6a0jbbbNSR9HrYa38n Z/++cReSKhw9DI80cqqexibvnW7okXbo817f9gDsnb4DZHxf3eYf/1Yaq/v12PDHn/DMngZ3G B/4smLAp8pnaytjQxbaRKTYdd5qStZVYijMSDbWYi4oTAU1MlW91AgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1506965523!85536619!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 59702 invoked from network); 2 Oct 2017 17:32:03 -0000 Received: from usa-sjc-mx-foss1.foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-9.tower-21.messagelabs.com with SMTP; 2 Oct 2017 17:32:03 -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 F36741596; Mon, 2 Oct 2017 10:32:02 -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 13DFB3F483; Mon, 2 Oct 2017 10:32:01 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Mon, 2 Oct 2017 18:31:46 +0100 Message-Id: <20171002173150.5404-6-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171002173150.5404-1-julien.grall@arm.com> References: <20171002173150.5404-1-julien.grall@arm.com> Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v3 5/9] 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" 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",