From patchwork Thu Oct 18 13:20:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 149131 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp1972680lji; Thu, 18 Oct 2018 06:23:25 -0700 (PDT) X-Google-Smtp-Source: ACcGV61vf3Qbt0aYsjtDmtQH5IaEhz2H8AkNvaiXLweFPhnT0Gmtx8lgarhKiM2q9kr++L+9m/RB X-Received: by 2002:a81:7407:: with SMTP id p7-v6mr18637050ywc.401.1539869005515; Thu, 18 Oct 2018 06:23:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539869005; cv=none; d=google.com; s=arc-20160816; b=nrXrDZKLDioGnGiL87p2BYdJMM05zMAz6SYWHiCux166EUiEhVSmEoIkgBvOCcUHeU jJhRE1TOY58zCJX1gZCB2lAzmOnD9A2dVc0oaSIwBEtx7+7YbhvOgG+4XFJY/gySMfdz jnb9rViPhjBmak1n5jnPD+x4+kJvqK988z3IS7U+EqagIobF0TWp0y2v7QgzwPhE8Jmu eoc7dnvksU/W54foDZgirV8uIdQPlFj/cFJqK9b/oqLQ2Vkh+dVpDTHa68iUNVxzwFhh DficGDEMJcGODnjmDnty6BPWZcJr+zkOIrICy638LiNFVds74KIk3jvvv4avOMYTVl2h /o8w== 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:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from; bh=Yq7tF+4u6ZTSAJxmJmLA2ooMh2K4quDIIFckrZhQmls=; b=ZJ2/5iacSdIW21j2ByHXA7hUIN7C3iJBQlcFw4y5FAyZxsCtBhWKgR6zdkvUQwUkif YV0KNBwqP4dcmtjls/1O2kei58qfedIof9DCQ0XkAoQSeBOveUSXKm0FaQL3NhKf/wj0 m+TKVt8hwsgaPA+u0lroohzymmAncnhXABHRcyUgg9yAeb+fObuQjvcOMiTOMfmxIVbL Y+aRgSSQ34eJsLQi/B1ADA4nP0B9LI3sZG76zshuvk+UNE41BxrEHtJUrmE7v/FUM6AD EqKJge7FkkLJ1HIBxFPFwkHeN5j+gA8wDiqACpeKBrWW23gDgccc96bCbhVzg5PZ4VlX GqFg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id i10-v6si409637ywi.203.2018.10.18.06.23.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Oct 2018 06:23:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gD8F0-00035V-QQ; Thu, 18 Oct 2018 13:21:30 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gD8Ez-00033k-DZ for xen-devel@lists.xen.org; Thu, 18 Oct 2018 13:21:29 +0000 X-Inumbo-ID: eb657735-d2d8-11e8-a6a9-d7ebe60f679a Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id eb657735-d2d8-11e8-a6a9-d7ebe60f679a; Thu, 18 Oct 2018 13:22:54 +0000 (UTC) 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 8A64D341; Thu, 18 Oct 2018 06:21:28 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C2B793F59C; Thu, 18 Oct 2018 06:21:27 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Thu, 18 Oct 2018 14:20:58 +0100 Message-Id: <20181018132109.31192-12-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181018132109.31192-1-julien.grall@arm.com> References: <20181018132109.31192-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH 11/22] xen/arm: Move out of processor.h traps related variable/function X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Julien Grall , sstabellini@kernel.org MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" do_unexpected_traps() is moved to traps.h while init_traps() and hyp_traps_vectors() are moved to setup.h. Signed-off-by: Julien Grall Reviewed-by: Andrii Anisov --- xen/include/asm-arm/processor.h | 6 ------ xen/include/asm-arm/setup.h | 3 +++ xen/include/asm-arm/traps.h | 2 ++ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 3592aa36d8..b05f17f35c 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -453,10 +453,6 @@ extern register_t __cpu_logical_map[]; #endif #ifndef __ASSEMBLY__ -extern uint32_t hyp_traps_vector[]; - -void init_traps(void); - void panic_PAR(uint64_t par); void show_execution_state(struct cpu_user_regs *regs); @@ -470,8 +466,6 @@ void show_registers(const struct cpu_user_regs *regs); #define cpu_to_core(_cpu) (0) #define cpu_to_socket(_cpu) (0) -void noreturn do_unexpected_trap(const char *msg, struct cpu_user_regs *regs); - struct vcpu; void vcpu_regs_hyp_to_user(const struct vcpu *vcpu, struct vcpu_guest_core_regs *regs); diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 5f41ba0cba..11e1b2aacf 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -83,6 +83,9 @@ struct bootmodule *add_boot_module(bootmodule_kind kind, struct bootmodule *boot_module_find_by_kind(bootmodule_kind kind); const char *boot_module_kind_as_string(bootmodule_kind kind); +extern uint32_t hyp_traps_vector[]; +void init_traps(void); + #endif /* * Local variables: diff --git a/xen/include/asm-arm/traps.h b/xen/include/asm-arm/traps.h index 8b6f09b6b8..3d60160310 100644 --- a/xen/include/asm-arm/traps.h +++ b/xen/include/asm-arm/traps.h @@ -46,6 +46,8 @@ void do_trap_hvc_smccc(struct cpu_user_regs *regs); int do_bug_frame(struct cpu_user_regs *regs, vaddr_t pc); +void noreturn do_unexpected_trap(const char *msg, struct cpu_user_regs *regs); + /* Functions for pending virtual abort checking window. */ void abort_guest_exit_start(void); void abort_guest_exit_end(void);