From patchwork Tue Feb 7 19:42:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 9560965 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8C2D36047A for ; Tue, 7 Feb 2017 19:44:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EEE428446 for ; Tue, 7 Feb 2017 19:44:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73C8328486; Tue, 7 Feb 2017 19:44:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 11B2828446 for ; Tue, 7 Feb 2017 19:44:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cbBeV-0002Ml-ME; Tue, 07 Feb 2017 19:42:11 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cbBeU-0002MO-Od for xen-devel@lists.xen.org; Tue, 07 Feb 2017 19:42:10 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id C8/23-22349-2132A985; Tue, 07 Feb 2017 19:42:10 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLIsWRWlGSWpSXmKPExsVyMfS6s66g8qw Ig75fYhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aEM8eZCo6IVDy+vYupgXGWQBcjF4eQwARG ictrDzOCOCwCL1kkTi67zA7iSAj0s0o8fPsHyOEEcmIkvr17CWVXSOzb/YYJxBYSUJc4/W4HG 8SoGUwSS/pnMoIk2ARMJPb+eQBWJCIgLXHt82WwOLOAr8TNncfB4sICLhItGzaygNgsAqoSXz ++ZQOxeQU8JJ68nw61TE7i5rlOZhCbU8BT4svyiSwQiz0k5q9cxTiBUWABI8MqRo3i1KKy1CJ dIwu9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK95PzcTYzA4GIAgh2M59cGHmKU5GBSEuWt FJgVIcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mC94kiUE6wKDU9tSItMwcY5jBpCQ4eJRFeKSWgN G9xQWJucWY6ROoUoyVHT9fpl0wcp26AyD27Lr9kEmLJy89LlRLnvQwyTwCkIaM0D24cLBYvMc pKCfMyAh0oxFOQWpSbWYIq/4pRnINRSZj3H8gUnsy8Eritr4AOYgI6aNuVaSAHlSQipKQaGOf PZl47Yf/SOxZ5Fm03D+n1/JW4XNhavljtf/793NoeHdlnogcV3zIUB4aLh13/fPTY+mc+wulr Y/V2ymjrL/J9t3nK2xDf+tvSjBNeHi+TmiQiKzd7mfGXy9uerF7ptbV4fZrS7525887ylXxlk H65pL9qxZcTj0VWBD/nd1r159+DnwvkwyYpsRRnJBpqMRcVJwIADOc9JcACAAA= X-Env-Sender: edgar.iglesias@gmail.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1486496528!56618605!1 X-Originating-IP: [209.85.215.67] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 33078 invoked from network); 7 Feb 2017 19:42:09 -0000 Received: from mail-lf0-f67.google.com (HELO mail-lf0-f67.google.com) (209.85.215.67) by server-7.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 7 Feb 2017 19:42:09 -0000 Received: by mail-lf0-f67.google.com with SMTP id q89so7529681lfi.1 for ; Tue, 07 Feb 2017 11:42:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AbiZMcA2zVpnArcBheNOzM8CXftBjr/7n0aAvaC7t8I=; b=KIsYIjLnwtOJOy2PKNZBZnZ/aurlkRWZ+AdQrW+F1RB0Vbd8gfFBCa7IFoleFAlUlR aNpyDmzojgGC/W0acAcYA3NelJzhBorN3z2hyDsDLx/LbesIkx9/Q23vn2eS7rjbEdw3 daTaN+IKM7z9qYIcAQftrMfkxg1yY/6ya7GZJSUz60J0GIpGlL8V2Hq+Bq3AeRpuPYW/ FAxI//VKPxxsSd0NNaHH24sYEAoe1Z/xcIuhIMHRNYBSgvWWwZABVETDTxZJVuoBEHKG j+fa153af3XW+RqFLkjL8/ucy+vfT4lCKzXoHx2w3ssXGdbdsxOM9TYiKk8D5/rtKL6H H00w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AbiZMcA2zVpnArcBheNOzM8CXftBjr/7n0aAvaC7t8I=; b=fpuHS1d1Y1iPdIW2ZyUs+ZJg2wbXjFMLOOVrXMKeFd9OzC1OS31plZxLsF6tAz2Upx IS5FHpWIqDHdR4dIQq/A2k8nupds9hn3chLbtgdlq+tqOvqYU7cO9YWoLDvgU8VxIKRv QBhSWqqg9b1J3Mky90MwjzQGaLGy3ZL9OmP5OugaXMgd1KpzxxKwKyMdXnOCwme/kIvG oehAHAXldMW48aBDAJ1LHtu7DcI8xqCK9p3pazctk02uG8I3AheR6SYbwTo2sddJDBUI JBVKEgtdtA7EsYEJA3Mm+oy+Uhz8QfvIFS8iHLRn9WlqFnF5eh0LwUu8kXFWGKr3V+hG PZcQ== X-Gm-Message-State: AIkVDXJ85oRl/T09EAghgNRf7Bvu1OxuppXwcvYCg/OJC/XHd3Mkp/8okuyFiSsdZDqWxg== X-Received: by 10.25.32.149 with SMTP id g143mr6250570lfg.7.1486496528645; Tue, 07 Feb 2017 11:42:08 -0800 (PST) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id g85sm1659960lji.21.2017.02.07.11.42.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Feb 2017 11:42:07 -0800 (PST) From: "Edgar E. Iglesias" To: xen-devel@lists.xen.org Date: Tue, 7 Feb 2017 20:42:00 +0100 Message-Id: <1486496525-14637-2-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486496525-14637-1-git-send-email-edgar.iglesias@gmail.com> References: <1486496525-14637-1-git-send-email-edgar.iglesias@gmail.com> Cc: edgar.iglesias@xilinx.com, julien.grall@arm.com, sstabellini@kernel.org Subject: [Xen-devel] [RFC v2 1/6] xen/arm: traps: Reorder early overwrite of FID 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" X-Virus-Scanned: ClamAV using ClamSMTP From: "Edgar E. Iglesias" Move the early setting of PSCI_RESULT_REG to a later stage avoiding the early override of the FID that's stored in the same register. No functional change. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/traps.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 92b1d80..c5a4d41 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1335,8 +1335,6 @@ static void do_trap_psci(struct cpu_user_regs *regs) { register_t fid = PSCI_ARG(regs,0); - /* preloading in case psci_mode_check fails */ - PSCI_RESULT_REG(regs) = PSCI_INVALID_PARAMETERS; switch( fid ) { case PSCI_cpu_off: @@ -1369,6 +1367,7 @@ static void do_trap_psci(struct cpu_user_regs *regs) case PSCI_0_2_FN_MIGRATE_INFO_UP_CPU: case PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU: perfc_incr(vpsci_migrate_info_up_cpu); + PSCI_RESULT_REG(regs) = PSCI_INVALID_PARAMETERS; if ( psci_mode_check(current->domain, fid) ) PSCI_RESULT_REG(regs) = do_psci_0_2_migrate_info_up_cpu(); break; @@ -1385,6 +1384,7 @@ static void do_trap_psci(struct cpu_user_regs *regs) case PSCI_0_2_FN_CPU_ON: case PSCI_0_2_FN64_CPU_ON: perfc_incr(vpsci_cpu_on); + PSCI_RESULT_REG(regs) = PSCI_INVALID_PARAMETERS; if ( psci_mode_check(current->domain, fid) ) { register_t vcpuid = PSCI_ARG(regs,1); @@ -1397,6 +1397,7 @@ static void do_trap_psci(struct cpu_user_regs *regs) case PSCI_0_2_FN_CPU_SUSPEND: case PSCI_0_2_FN64_CPU_SUSPEND: perfc_incr(vpsci_cpu_suspend); + PSCI_RESULT_REG(regs) = PSCI_INVALID_PARAMETERS; if ( psci_mode_check(current->domain, fid) ) { uint32_t pstate = PSCI_ARG32(regs,1); @@ -1409,6 +1410,7 @@ static void do_trap_psci(struct cpu_user_regs *regs) case PSCI_0_2_FN_AFFINITY_INFO: case PSCI_0_2_FN64_AFFINITY_INFO: perfc_incr(vpsci_cpu_affinity_info); + PSCI_RESULT_REG(regs) = PSCI_INVALID_PARAMETERS; if ( psci_mode_check(current->domain, fid) ) { register_t taff = PSCI_ARG(regs,1); @@ -1420,6 +1422,7 @@ static void do_trap_psci(struct cpu_user_regs *regs) case PSCI_0_2_FN_MIGRATE: case PSCI_0_2_FN64_MIGRATE: perfc_incr(vpsci_cpu_migrate); + PSCI_RESULT_REG(regs) = PSCI_INVALID_PARAMETERS; if ( psci_mode_check(current->domain, fid) ) { uint32_t tcpu = PSCI_ARG32(regs,1);