From patchwork Mon Oct 9 13:23:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 115209 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2557203qgn; Mon, 9 Oct 2017 06:25:55 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDtKh0NKFhoKBqH6Mo8y4I85lJZt+uZQydg5FmaCqLg0NTxUO6q+hezt9xzfMydVpx+D/OU X-Received: by 10.107.104.3 with SMTP id d3mr13279764ioc.105.1507555555089; Mon, 09 Oct 2017 06:25:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507555555; cv=none; d=google.com; s=arc-20160816; b=Pw0B+XS00G9UcmZi9rECrjilcRmTEWNoW+bphbGlSF1+MRa8SudzOmCrc1hglgEpG7 c71rcTlcxLFEItkJYO+vQs1KOpjTeda/3I6VXt6gX9y5BEOfghBiZi+YMlNCSROyx99R cheo8wvkRJiIU2luomWPlu/LVuQ+SznxoOLknp6oW8hutTThx6YIid5Kz4owEp3PqOpK 110JZpc4wrpyIdRQxp0PUgorrS1Jz52DM5gDPWmn7H8+SbGRVp19XoNmyCC0v6gAh8VV 5EvDujPv61wJQmQC0FluGLU6vdYBM+M5oJ6akp1JZM0DH/BRSrWsshX4r5AZl8tqHf/e OogQ== 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=68hNK+TYfYg71QxrK8HpG7+VhKU6xxUIv237B091CSU=; b=I13AO8KzIEDUHhx4CxIEnIHwDVgeCfEe+NaAF1DmG7BMIlBhLoJDHfPFplq9zj4JAi oy9sYOYOsABEssEMeFaROdZ/NgVGAyfruXNvHBjJXAAs79FoOlq1wSjzfFqsmaxF+mc7 qwMCp1Byz+nAwEZKmXbf2kALGcwnwEVA9LchF2qDjTs+u3f2Pomez++0Nn5YhgeNysIc 5Yd0RJHL6OM6XwvGKIs57IyDVy30UFv9rlbNM36gssnRB4xU8tLlEUSY7JmN5mCRhzUJ by1hHuIFO8yXjgMyUu3wGTKzpe3qjBnQBTvx/aP5Tpko0/9L0II4U5sv0miThZzJDPey O6Aw== 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 16si2035382iom.58.2017.10.09.06.25.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Oct 2017 06:25:55 -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 1e1Y2J-00080e-Bx; Mon, 09 Oct 2017 13:23:59 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1Y2I-00080F-LT for xen-devel@lists.xen.org; Mon, 09 Oct 2017 13:23:58 +0000 Received: from [193.109.254.147] by server-9.bemta-6.messagelabs.com id 69/F4-03428-E687BD95; Mon, 09 Oct 2017 13:23:58 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJLMWRWlGSWpSXmKPExsVysyfVTTe74na kwfpGWYslHxezODB6HN39mymAMYo1My8pvyKBNaN18xrGgucSFWt/P2BtYDwm0sXIxSEksJlR 4sjUbWwQzmlGiZubXzB2MXJysAloStz5/IkJxBYRkJa49vkyWJxZIFLi8Icf7CC2sECKxIy9j 8HiLAKqEu82QvTyClhIrPl4AcyWEJCX2NV2kRXE5hSwlJi2eToziC0EVHP5ww7WCYzcCxgZVj FqFKcWlaUW6Rob6iUVZaZnlOQmZuboGhqY6eWmFhcnpqfmJCYV6yXn525iBHqYAQh2MDYtCjz EKMnBpCTKO6XgdqQQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCV77cqCcYFFqempFWmYOMNRg0hIc PEoivKEgad7igsTc4sx0iNQpRmOORzfu/mHi6LgJJIVY8vLzUqXEeX1BSgVASjNK8+AGwWLgE qOslDAvI9BpQjwFqUW5mSWo8q8YxTkYlYR5M0Cm8GTmlcDtewV0ChPQKYzFN0BOKUlESEk1MG b7nG5pYMsQsG21N7i0LMRnedtfkU+FWswKH3/JWrPmVNxq65+QcWid+3PrA6fMmPd57ZyzWqn 79bcDS21jbT5y5Ak+cZI/905mxacJ091cUl6H7vIs7Tz+4rqxee9jWTEJMbZta3n72940NScJ Gmt1td/1Tg4yytv99HJMs1ZBl+f1oN5+JZbijERDLeai4kQAr1NwZ3wCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1507555435!109330537!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 53984 invoked from network); 9 Oct 2017 13:23:55 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-12.tower-27.messagelabs.com with SMTP; 9 Oct 2017 13:23:55 -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 C16BA1435; Mon, 9 Oct 2017 06:23:54 -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 D58E73F578; Mon, 9 Oct 2017 06:23:53 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Mon, 9 Oct 2017 14:23:37 +0100 Message-Id: <20171009132341.1678-7-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 06/10] xen/arm: mm: Use PAGE_HYPERVISOR_* instead of MT_* when calling set_fixmap 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" At the moment, PAGE_HYPERVISOR_* and MT_* have exactly the same value. In a follow-up patch the former will be extended to carry more information. It looks like the caller of set_fixmap are mixing the both. Stay consistent and only use PAGE_HYPERVISOR_*. This is also match the behavior of create_xen_entries and would potentially allow to share some part in the future. Also rename the parameter 'attributes' to 'flags' so it is clearer what is the interface. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini --- Changes in v4: - Patch added. --- xen/arch/arm/kernel.c | 2 +- xen/arch/arm/mm.c | 4 ++-- xen/arch/arm/platforms/vexpress.c | 3 ++- xen/drivers/video/arm_hdlcd.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index a12baa86e7..c2755a9ab9 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -54,7 +54,7 @@ void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len) s = paddr & (PAGE_SIZE-1); l = min(PAGE_SIZE - s, len); - set_fixmap(FIXMAP_MISC, maddr_to_mfn(paddr), MT_NORMAL_NC); + set_fixmap(FIXMAP_MISC, maddr_to_mfn(paddr), PAGE_HYPERVISOR_WC); memcpy(dst, src + s, l); clean_dcache_va_range(dst, l); diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 39bade63f5..70a03015ec 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -329,9 +329,9 @@ static inline lpae_t mfn_to_xen_entry(mfn_t mfn, unsigned attr) } /* Map a 4k page in a fixmap entry */ -void set_fixmap(unsigned map, mfn_t mfn, unsigned attributes) +void set_fixmap(unsigned map, mfn_t mfn, unsigned int flags) { - lpae_t pte = mfn_to_xen_entry(mfn, attributes); + lpae_t pte = mfn_to_xen_entry(mfn, flags); pte.pt.table = 1; /* 4k mappings always have this bit set */ pte.pt.xn = 1; write_pte(xen_fixmap + third_table_offset(FIXMAP_ADDR(map)), pte); diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c index df2c4b5bec..39b6bcc70e 100644 --- a/xen/arch/arm/platforms/vexpress.c +++ b/xen/arch/arm/platforms/vexpress.c @@ -65,7 +65,8 @@ int vexpress_syscfg(int write, int function, int device, uint32_t *data) uint32_t *syscfg = (uint32_t *) FIXMAP_ADDR(FIXMAP_MISC); int ret = -1; - set_fixmap(FIXMAP_MISC, maddr_to_mfn(V2M_SYS_MMIO_BASE), MT_DEVICE_nGnRE); + set_fixmap(FIXMAP_MISC, maddr_to_mfn(V2M_SYS_MMIO_BASE), + PAGE_HYPERVISOR_NOCACHE); if ( syscfg[V2M_SYS_CFGCTRL/4] & V2M_SYS_CFG_START ) goto out; diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c index 1175399dbc..e1174b223f 100644 --- a/xen/drivers/video/arm_hdlcd.c +++ b/xen/drivers/video/arm_hdlcd.c @@ -227,7 +227,7 @@ void __init video_init(void) /* uses FIXMAP_MISC */ set_pixclock(videomode->pixclock); - set_fixmap(FIXMAP_MISC, maddr_to_mfn(hdlcd_start), MT_DEVICE_nGnRE); + set_fixmap(FIXMAP_MISC, maddr_to_mfn(hdlcd_start), PAGE_HYPERVISOR_NOCACHE); HDLCD[HDLCD_COMMAND] = 0; HDLCD[HDLCD_LINELENGTH] = videomode->xres * bytes_per_pixel;