From patchwork Thu May 4 17:54:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 98554 Delivered-To: patch@linaro.org Received: by 10.140.89.200 with SMTP id v66csp731070qgd; Thu, 4 May 2017 10:56:30 -0700 (PDT) X-Received: by 10.36.95.144 with SMTP id r138mr3621469itb.11.1493920590063; Thu, 04 May 2017 10:56:30 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id b3si23456570iog.66.2017.05.04.10.56.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 May 2017 10:56:30 -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 1d6Kxg-0002ML-48; Thu, 04 May 2017 17:54:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6Kxf-0002Ll-1X for xen-devel@lists.xen.org; Thu, 04 May 2017 17:54:43 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id B3/90-02183-1EA6B095; Thu, 04 May 2017 17:54:41 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsVysyfVTfduFne kwe9JqhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bfPX1sBV38FWcfhDYwXubuYuTiEBLYxCjR v24ZO4RzmlHiz4xFbF2MnBxsApoSdz5/YgKxRQSkJa59vswIYjMLOEi8+XiPBcQWFvCQuPt7P juIzSKgKvHy+H2wel4BS4ndd1eC1UgIyEvsarvICmJzClhJzN3aytzFyAG0zFLia4vGBEbuBY wMqxg1ilOLylKLdA3N9JKKMtMzSnITM3N0DQ1M9XJTi4sT01NzEpOK9ZLzczcxAr3LAAQ7GM+ f9jzEKMnBpCTKq/6KPVKILyk/pTIjsTgjvqg0J7X4EKMMB4eSBO/CTO5IIcGi1PTUirTMHGCY waQlOHiURHivZQCleYsLEnOLM9MhUqcYFaXEeTtA+gRAEhmleXBtsNC+xCgrJczLCHSIEE9Ba lFuZgmq/CtGcQ5GJWHeXJApPJl5JXDTXwEtZgJa3CzLAbK4JBEhJdXAOIfpJMumtxqmERPLv9 8RyXj96tJLTw1nDnZeH9ayDT6HXq1QWHBJf48u75ltCiHX817Myk2MDF/+0tl6b1TRV7/vC17 anAjWPftYR32vmMPDoiVzf4ct4Fp566KomMFhiaa1n+VnGMyz0WPiNte7kH+roJPF3o9xuf7r X+ukk1TaxTa359ReU2Ipzkg01GIuKk4EAHLyWvVoAgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1493920477!96567002!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 35842 invoked from network); 4 May 2017 17:54:37 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-9.tower-206.messagelabs.com with SMTP; 4 May 2017 17:54:37 -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 A4008344; Thu, 4 May 2017 10:54:36 -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 10FD93F4FF; Thu, 4 May 2017 10:54:35 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Thu, 4 May 2017 18:54:23 +0100 Message-Id: <20170504175425.22759-2-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170504175425.22759-1-julien.grall@arm.com> References: <20170504175425.22759-1-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH 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 --- 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)