From patchwork Mon Jan 30 17:21:50 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: 9545765 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 6FC8A604A0 for ; Mon, 30 Jan 2017 17:24:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CCBB25D9E for ; Mon, 30 Jan 2017 17:24:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 403DF2811E; Mon, 30 Jan 2017 17:24:58 +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 CC76225D9E for ; Mon, 30 Jan 2017 17:24:57 +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 1cYFeT-0001by-PR; Mon, 30 Jan 2017 17:22:01 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYFeS-0001b6-NJ for xen-devel@lists.xen.org; Mon, 30 Jan 2017 17:22:00 +0000 Received: from [85.158.143.35] by server-9.bemta-6.messagelabs.com id A0/FF-27165-8367F885; Mon, 30 Jan 2017 17:22:00 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDIsWRWlGSWpSXmKPExsVyMfS6o655WX+ EwY3NwhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aLjtdsBUdEKn5faGBrYJwl0MXIxSEkMIFR ov/ia1YQh0XgJYvEpwn/mEEcCYF+VoklR5cAZTiBnBiJ5WuOsEHYpRKLZnxmArGFBNQlTr/bw QYxajqTxMtrH8ESbAImEnv/PACzRQSkJa59vswIYjML+Erc3HkcKM7BISzgIvHgWiZImEVAVe Lgonlg83kF3CW6Zu5ggtglJ3HzXCcziM0p4CGxp/0fI8Red4l5j36zTGAUWMDIsIpRozi1qCy 1SNfQXC+pKDM9oyQ3MTNH19DATC83tbg4MT01JzGpWC85P3cTIzC0GIBgB+PtjQGHGCU5mJRE efs+9kUI8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuBVKu2PEBIsSk1PrUjLzAEGOUxagoNHSYQ3D STNW1yQmFucmQ6ROsVoydHTdfolE8epGyByz67LL5mEWPLy81KlxHk/lwA1CIA0ZJTmwY2DRe IlRlkpYV5GoAOFeApSi3IzS1DlXzGKczAqCfMGg6zlycwrgdv6CuggJqCD3F/1gRxUkoiQkmp gnMBR9ntSbUPwg6AZJ9eXTueJawoTzmN1ZLN4+2Wx525D6Ytf7s74lfd56s+sI9/T9rV26UU9 2FRWfWnBUdW5XLPFHqUl5p9Nf3fzu4V+2hPhr/IVJ7Z291wQinq3S2xbYh77911JPZrX9n4NZ MsUV9MqkPx/+9KBZ7cq9TP+XeLqddkTEx/FosRSnJFoqMVcVJwIANwGAmm/AgAA X-Env-Sender: edgar.iglesias@gmail.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1485796918!48570880!1 X-Originating-IP: [209.85.215.65] 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 40663 invoked from network); 30 Jan 2017 17:21:59 -0000 Received: from mail-lf0-f65.google.com (HELO mail-lf0-f65.google.com) (209.85.215.65) by server-10.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 30 Jan 2017 17:21:59 -0000 Received: by mail-lf0-f65.google.com with SMTP id x1so32017025lff.0 for ; Mon, 30 Jan 2017 09:21:59 -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=hflOQKOxQ0eAJGGEqfmLjYH8DQrrKiNJHl1FRCLET8k=; b=ffiJZbjtH11x3T/4p7z+xR/kHb02fPvBP+K5dOHKCVwVW2Wq9gVq6BowXBz/0Ifyau ZY3wy9RAAx9IxLQwYfe5v2QLlYzlIn5eyzh7Gy14Ru1O+Gftk6v5fGmeYKjqzF80dcuH gwFBS10w6taZGqcH/L9wuQdNPaKsJjgmsoG63l8sSd4vPu4Rd0+z8MP0fvJjCqzx95EZ 5FwFY/0fFkjX1DgbQr8HzB9H6CsVop75T0NjwD1NrvxDT0i7zhQFqBBWp13g1QxF3oTu btN6doMX5Fc5dHTTo9igTepwm8Nsl/qAtqeApySMGVbChX5BdHPhI8RHD9C0ExDHIUEj Wwyw== 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=hflOQKOxQ0eAJGGEqfmLjYH8DQrrKiNJHl1FRCLET8k=; b=AMuge/pE8Aaur0ggMx7gmBwnWEF8VhyuUDAjBcTzSB7qMvp0+M/uZhD/hk2lBVQmu0 vzG5mtxW1rWWhqzjEFgP1fxdRE8qt//7A4UJOT2a05Mra2en35Z2kE/Pt8Dr8SJMlbWP NU7oKrRYrx98LzpYMhdv8Rh31lRpR16kJ71hDol7505assJdA7l/PtUeA/g0Ps+TS5ob c+e3+2PtryZfJs8SXbrWD+LhWz9+jlvk19x8mT455cciN3d4RqCM9F0o4oqhxXmXotJV yDODo0+zZ8D3ZaVZboRfOTEejzfIAv4Q8IfXps2FsZPFB4Cvcmy+ZQWToffbvChgPEoQ AaQg== X-Gm-Message-State: AIkVDXINta0qZ5H70myViWvioBkfg0I+xBq2lr34//xsHF+dzWBtlwmnDB+Juwkp2gBpBA== X-Received: by 10.46.80.71 with SMTP id v7mr898866ljd.38.1485796918505; Mon, 30 Jan 2017 09:21:58 -0800 (PST) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id 70sm3853410lfw.11.2017.01.30.09.21.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jan 2017 09:21:57 -0800 (PST) From: "Edgar E. Iglesias" To: xen-devel@lists.xen.org Date: Mon, 30 Jan 2017 18:21:50 +0100 Message-Id: <1485796915-9372-2-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485796915-9372-1-git-send-email-edgar.iglesias@gmail.com> References: <1485796915-9372-1-git-send-email-edgar.iglesias@gmail.com> Cc: edgar.iglesias@xilinx.com, julien.grall@arm.com, sstabellini@kernel.org Subject: [Xen-devel] [RFC v1 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 --- 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 35d8e8b..a5fbf1e 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1334,8 +1334,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: @@ -1368,6 +1366,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; @@ -1384,6 +1383,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); @@ -1396,6 +1396,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); @@ -1408,6 +1409,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); @@ -1419,6 +1421,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);