From patchwork Wed Jul 20 16:11:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 72438 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp66338qga; Wed, 20 Jul 2016 09:13:59 -0700 (PDT) X-Received: by 10.107.17.218 with SMTP id 87mr37438287ior.101.1469031239385; Wed, 20 Jul 2016 09:13:59 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id z74si2561680iof.5.2016.07.20.09.13.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jul 2016 09:13:59 -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 1bPu6B-0007tu-1T; Wed, 20 Jul 2016 16:11:51 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bPu69-0007pN-8L for xen-devel@lists.xen.org; Wed, 20 Jul 2016 16:11:49 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id 90/94-21406-5C2AF875; Wed, 20 Jul 2016 16:11:49 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOLMWRWlGSWpSXmKPExsVysyfVTffIov5 wg5udmhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa0b7uwvsBd+4KxYvmsPWwHias4uRi0NIYBOj xO0PX1kgnNOMEosa/zF2MXJysAloStz5/IkJxBYRkJa49vkyI0gRs0A7o8Tyjf9YQBLCAoESr d2fWEFsFgFViaYtE8AaeAVcJead28oGYksIyEmcPDYZrIYTKH7+5E+wBUICLhKb3n5jnsDIvY CRYRWjenFqUVlqka6RXlJRZnpGSW5iZo6uoYGZXm5qcXFiempOYlKxXnJ+7iZGoIcZgGAH47K /TocYJTmYlER5VUV7w4X4kvJTKjMSizPii0pzUosPMcpwcChJ8C5e2B8uJFiUmp5akZaZAww1 mLQEB4+SCO8vkDRvcUFibnFmOkTqFKOilDjvNpCEAEgiozQPrg0W3pcYZaWEeRmBDhHiKUgty s0sQZV/xSjOwagkzHsYZApPZl4J3PRXQIuZgBbPEQBbXJKIkJJqYOSSrNvCcWZijMDFuLbzOd EPwu+s27XIe5mC5UeWBO6cFf4McorXQ6dVlLafTPjr7538xS/Pzzbww2XRY+qvP711l9igybi E3zvbdWNjgb+gWKi+92nf/wJTK25ddBZ+ECG2J/5ise6WUJ4ayb4le4z/yk8TWaRfXZF39k1Y w/Jobp8vHLtWKrEUZyQaajEXFScCABRprt9qAgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1469031108!24785933!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51090 invoked from network); 20 Jul 2016 16:11:48 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-8.tower-21.messagelabs.com with SMTP; 20 Jul 2016 16:11:48 -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 8BCBABFF; Wed, 20 Jul 2016 09:12:58 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.218.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E02EB3F387; Wed, 20 Jul 2016 09:11:46 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 20 Jul 2016 17:11:01 +0100 Message-Id: <1469031064-23344-20-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1469031064-23344-1-git-send-email-julien.grall@arm.com> References: <1469031064-23344-1-git-send-email-julien.grall@arm.com> Cc: proskurin@sec.in.tum.de, Julien Grall , sstabellini@kernel.org, wei.chen@linaro.org, steve.capper@arm.com Subject: [Xen-devel] [PATCH 19/22] xen/arm: p2m: Inline p2m_load_VTTBR into p2m_restore_state 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" p2m_restore_state is the last caller of p2m_load_VTTBR and already check if the vCPU does not belong to the idle domain. Note that it is likely possible to remove some isb in the function p2m_restore_state, however this is not the purpose of this patch. So the numerous isb have been left. Signed-off-by: Julien Grall --- xen/arch/arm/p2m.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 015c1e8..c756e0c 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -105,19 +105,6 @@ void dump_p2m_lookup(struct domain *d, paddr_t addr) P2M_ROOT_LEVEL, P2M_ROOT_PAGES); } -static void p2m_load_VTTBR(struct domain *d) -{ - struct p2m_domain *p2m = &d->arch.p2m; - - if ( is_idle_domain(d) ) - return; - - ASSERT(p2m->vttbr); - - WRITE_SYSREG64(p2m->vttbr, VTTBR_EL2); - isb(); /* Ensure update is visible */ -} - void p2m_save_state(struct vcpu *p) { p->arch.sctlr = READ_SYSREG(SCTLR_EL1); @@ -126,6 +113,7 @@ void p2m_save_state(struct vcpu *p) void p2m_restore_state(struct vcpu *n) { register_t hcr; + struct p2m_domain *p2m = &n->domain->arch.p2m; if ( is_idle_vcpu(n) ) return; @@ -134,7 +122,7 @@ void p2m_restore_state(struct vcpu *n) WRITE_SYSREG(hcr & ~HCR_VM, HCR_EL2); isb(); - p2m_load_VTTBR(n->domain); + WRITE_SYSREG64(p2m->vttbr, VTTBR_EL2); isb(); if ( is_32bit_domain(n->domain) )