From patchwork Mon Aug 14 14:24:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9899037 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 674B76038C for ; Mon, 14 Aug 2017 14:27:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58FDE2842E for ; Mon, 14 Aug 2017 14:27:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DFDE284D1; Mon, 14 Aug 2017 14:27:23 +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 BC16B2860F for ; Mon, 14 Aug 2017 14:27:18 +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 1dhGIb-0000kG-Gg; Mon, 14 Aug 2017 14:24:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhGIZ-0000fc-Rm for xen-devel@lists.xen.org; Mon, 14 Aug 2017 14:24:55 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 68/1A-01862-7B2B1995; Mon, 14 Aug 2017 14:24:55 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsVysyfVTXfbpom RBstvKVgs+biYxYHR4+ju30wBjFGsmXlJ+RUJrBkHts1mK9jEWzFvcjN7A+M+ri5GLg4hgc2M EsevPGKFcE4zSlzduompi5GTg01AU+LO509gtoiAtMS1z5cZQWxmgUiJwx9+sIPYwgLREg0H3 7KA2CwCqhKndv4As3kFrCTWzOgFq5EQkJfY1XaRFcTmBIp33t0JViMkYClxYvVstgmM3AsYGV YxahSnFpWlFukameslFWWmZ5TkJmbm6BoaGOvlphYXJ6an5iQmFesl5+duYgR6uJ6BgXEHY8t ev0OMkhxMSqK8CT69kUJ8SfkplRmJxRnxRaU5qcWHGGU4OJQkeFM3TowUEixKTU+tSMvMAYYa TFqCg0dJhHftBqA0b3FBYm5xZjpE6hSjLserCf+/MQmx5OXnpUqJ874CKRIAKcoozYMbAQv7S 4yyUsK8jAwMDEI8BalFuZklqPKvGMU5GJWEeZ1ALuHJzCuB2/QK6AgmoCP6QO7nLS5JREhJNT CW5EQtKpmyJr5nwuGVzqevta1bpDe1w6d9a9mzc6Gl212F2jfN/TZJbe5BdYnVrZf2K8bE9M5 lcr3zcdJh30cLDlu4rLSNPCLhYaZxU2DVQy6r82WBZy3vxVkvXbM6g2WZmL5XhsrN1xvdatdO YW6Kevn8+yKGn8umFQZm3VrhWrV8XfobgXNsSizFGYmGWsxFxYkACSPpJnYCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1502720693!110025035!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6632 invoked from network); 14 Aug 2017 14:24:53 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-8.tower-31.messagelabs.com with SMTP; 14 Aug 2017 14:24:53 -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 BEDC51991; Mon, 14 Aug 2017 07:24:52 -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 D33C03F483; Mon, 14 Aug 2017 07:24:51 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Mon, 14 Aug 2017 15:24:07 +0100 Message-Id: <20170814142418.13267-17-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170814142418.13267-1-julien.grall@arm.com> References: <20170814142418.13267-1-julien.grall@arm.com> Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH 16/27] xen/arm: page: Remove unused attributes DEV_NONSHARED and DEV_CACHED 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 They were imported from non-LPAE Linux, but Xen is LPAE only. It is time to do some clean-up in the memory attribute and keep only what make sense for Xen. Follow-up patch will do more clean-up. Also, update the comment saying our attribute matches Linux. Signed-off-by: Julien Grall Reviewed-by: Andre Przywara --- xen/include/asm-arm/page.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index cef2f28914..465300c6e5 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -21,9 +21,9 @@ #define LPAE_SH_OUTER 0x2 #define LPAE_SH_INNER 0x3 -/* LPAE Memory region attributes, to match Linux's (non-LPAE) choices. - * Indexed by the AttrIndex bits of a LPAE entry; - * the 8-bit fields are packed little-endian into MAIR0 and MAIR1 +/* + * LPAE Memory region attributes. Indexed by the AttrIndex bits of a + * LPAE entry; the 8-bit fields are packed little-endian into MAIR0 and MAIR1. * * ai encoding * UNCACHED 000 0000 0000 -- Strongly Ordered @@ -35,9 +35,7 @@ * reserved 110 * WRITEALLOC 111 1111 1111 -- Write-back write-allocate * - * DEV_NONSHARED 100 (== DEV_SHARED) * DEV_WC 001 (== BUFFERABLE) - * DEV_CACHED 011 (== WRITEBACK) */ #define MAIR0VAL 0xeeaa4400 #define MAIR1VAL 0xff000004 @@ -57,9 +55,7 @@ #define WRITEBACK 0x3 #define DEV_SHARED 0x4 #define WRITEALLOC 0x7 -#define DEV_NONSHARED DEV_SHARED #define DEV_WC BUFFERABLE -#define DEV_CACHED WRITEBACK #define PAGE_HYPERVISOR (WRITEALLOC) #define PAGE_HYPERVISOR_NOCACHE (DEV_SHARED)