From patchwork Fri May 5 14:30:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 98641 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp154646qge; Fri, 5 May 2017 07:32:27 -0700 (PDT) X-Received: by 10.36.10.12 with SMTP id 12mr9429590itw.74.1493994747315; Fri, 05 May 2017 07:32:27 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id c81si5086880itd.99.2017.05.05.07.32.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 May 2017 07:32:27 -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 1d6eFp-0006pT-5o; Fri, 05 May 2017 14:30:45 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6eFo-0006p9-JI for xen-devel@lists.xen.org; Fri, 05 May 2017 14:30:44 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id 06/63-03587-49C8C095; Fri, 05 May 2017 14:30:44 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRWlGSWpSXmKPExsVysyfVTXdyD0+ kwePzYhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bja1/YCv7zV2z9doa5gXE9TxcjF4eQwGZG iaaPzYwQzmlGicubDgE5nBxsApoSdz5/YgKxRQSkJa59vgwWZxZwkHjz8R4LiC0s4C2x6ORPV hCbRUBVov3IEXYQm1fAUmJR22s2EFtCQF5iV9tFsBpOASuJM//3MYPYQkA1c5Z3sU9g5F7AyL CKUb04tagstUjXXC+pKDM9oyQ3MTNH19DATC83tbg4MT01JzGpWC85P3cTI9C/DECwg3HmZf9 DjJIcTEqivGmiPJFCfEn5KZUZicUZ8UWlOanFhxhlODiUJHjru4FygkWp6akVaZk5wECDSUtw 8CiJ8P7uAkrzFhck5hZnpkOkTjEqSonzrgPpEwBJZJTmwbXBgvsSo6yUMC8j0CFCPAWpRbmZJ ajyrxjFORiVhHn5QKbwZOaVwE1/BbSYCWhxtCjY4pJEhJRUA2ONQsqfwnW7X8/V9cngmZlzun N79PEg58gi2Sknb96d0iVfcV/a7h3L8gcefBIck6Z3sh/m9PrruFXhn0zLae1zX9ctFDr7fN7 NDyxzWuVqn525u2z94b/Vrw59TucvaClfd2wDt2yFyofYJ806HXWVn7rvyKxg/f6kcY9mnVv6 4nNSzWx6V+uUWIozEg21mIuKEwGLG2HSaQIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1493994642!66800153!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.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59174 invoked from network); 5 May 2017 14:30:43 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-9.tower-21.messagelabs.com with SMTP; 5 May 2017 14:30:43 -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 A10821516; Fri, 5 May 2017 07:30:42 -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 0D27D3F3E1; Fri, 5 May 2017 07:30:41 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Fri, 5 May 2017 15:30:34 +0100 Message-Id: <20170505143036.27405-2-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170505143036.27405-1-julien.grall@arm.com> References: <20170505143036.27405-1-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v2 1/3] xen/arm: arm32: Rename the trap to the correct name 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" Per Table B1-3 in ARM DDI 0406C.c, the vector 0x8 for hyp is called "Hypervisor Call". Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- Changes in v2: - Add Stefano's reviewed-by --- xen/arch/arm/arm32/entry.S | 4 ++-- xen/arch/arm/arm32/traps.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S index 2b04a99664..05733089f7 100644 --- a/xen/arch/arm/arm32/entry.S +++ b/xen/arch/arm/arm32/entry.S @@ -149,7 +149,7 @@ trap_##trap: \ GLOBAL(hyp_traps_vector) .word 0 /* 0x00 - Reset */ b trap_undefined_instruction /* 0x04 - Undefined Instruction */ - b trap_supervisor_call /* 0x08 - Supervisor Call */ + b trap_hypervisor_call /* 0x08 - Hypervisor Call */ b trap_prefetch_abort /* 0x0c - Prefetch Abort */ b trap_data_abort /* 0x10 - Data Abort */ b trap_hypervisor /* 0x14 - Hypervisor */ @@ -157,7 +157,7 @@ GLOBAL(hyp_traps_vector) b trap_fiq /* 0x1c - FIQ */ DEFINE_TRAP_ENTRY(undefined_instruction) -DEFINE_TRAP_ENTRY(supervisor_call) +DEFINE_TRAP_ENTRY(hypervisor_call) DEFINE_TRAP_ENTRY(prefetch_abort) DEFINE_TRAP_ENTRY(hypervisor) DEFINE_TRAP_ENTRY_NOIRQ(irq) diff --git a/xen/arch/arm/arm32/traps.c b/xen/arch/arm/arm32/traps.c index 5bc5f64d86..e75836792a 100644 --- a/xen/arch/arm/arm32/traps.c +++ b/xen/arch/arm/arm32/traps.c @@ -50,9 +50,9 @@ die: do_unexpected_trap("Undefined Instruction", regs); } -asmlinkage void do_trap_supervisor_call(struct cpu_user_regs *regs) +asmlinkage void do_trap_hypervisor_call(struct cpu_user_regs *regs) { - do_unexpected_trap("Supervisor Call", regs); + do_unexpected_trap("Hypervisor Call", regs); } asmlinkage void do_trap_prefetch_abort(struct cpu_user_regs *regs)