From patchwork Mon Apr 24 17:58:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9696857 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 D7DC160224 for ; Mon, 24 Apr 2017 18:01:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1E38283F9 for ; Mon, 24 Apr 2017 18:01:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C666F28419; Mon, 24 Apr 2017 18:01:08 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 53607283F9 for ; Mon, 24 Apr 2017 18:01:08 +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 1d2iGK-0007hc-JG; Mon, 24 Apr 2017 17:59:00 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2iGJ-0007fz-Dt for xen-devel@lists.xen.org; Mon, 24 Apr 2017 17:58:59 +0000 Received: from [85.158.143.35] by server-4.bemta-6.messagelabs.com id 01/A2-02956-3EC3EF85; Mon, 24 Apr 2017 17:58:59 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsVysyfVTfeRzb8 Ig7YnyhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aJG13sBe84KiY1TWJqYNzP3sXIxSEksJlR 4vXrM1DOaUaJKdv2ATmcHGwCmhJ3Pn9iArFFBKQlrn2+zAhiMwvsZJRYfyUNxBYWiJa4cLmFB cRmEVCVOPvmH5jNK2AhsaXhEtgcCQF5iV1tF1lBbE4BS4mZn3+AzRECqpnfvoZ1AiP3AkaGVY waxalFZalFuoZmeklFmekZJbmJmTm6hgZmermpxcWJ6ak5iUnFesn5uZsYgR5mAIIdjPc3Bhx ilORgUhLl9ZL7FyHEl5SfUpmRWJwRX1Sak1p8iFGDg0Ngwtm505mkWPLy81KVJHi7rYHqBItS 01Mr0jJzgCEIUyrBwaMkwhtmBZTmLS5IzC3OTIdInWJUlBLnnQXSJwCSyCjNg2uDhf0lRlkpY V5GoKOEeApSi3IzS1DlXzGKczAqCfO2g0zhycwrgZv+CmgxE9DiqfZ/QBaXJCKkpBoY1cSCLK 4c+ODkqbM7SKDekHldieniZ9LMS1L3NVTN23oyYftKk385LCo8ElMXR9utXvzh4s4Ze95VHvj 51u1g6NOrq4P6r7Dl7hfina9+4Pi65YFHzvrMOZ/4XCmnPfzspKQFNqYi92dqyrpMvC5ve7lE xqp/1qnNj56ddZZxqa3mLPZd9MunQYmlOCPRUIu5qDgRAKnF7fV2AgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1493056738!60599050!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 38472 invoked from network); 24 Apr 2017 17:58:58 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-16.tower-21.messagelabs.com with SMTP; 24 Apr 2017 17:58:58 -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 D620015A1; Mon, 24 Apr 2017 10:58:57 -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 ADAC33F4FF; Mon, 24 Apr 2017 10:58:56 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Mon, 24 Apr 2017 18:58:38 +0100 Message-Id: <20170424175839.5262-3-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170424175839.5262-1-julien.grall@arm.com> References: <20170424175839.5262-1-julien.grall@arm.com> Cc: mark.rutland@arm.com, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Julien Grall , sstabellini@kernel.org, linux-arm-kernel@lists.infradead.org Subject: [Xen-devel] [PATCH 2/3 v2] arm/xen: Consolidate calls to shutdown hypercall in a single helper 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 Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- Changes in v2: - Patch added --- arch/arm/xen/enlighten.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 81e3217b12d3..ba7f4c8f5c3e 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -191,20 +191,24 @@ static int xen_dying_cpu(unsigned int cpu) return 0; } -static void xen_restart(enum reboot_mode reboot_mode, const char *cmd) +void xen_reboot(int reason) { - struct sched_shutdown r = { .reason = SHUTDOWN_reboot }; + struct sched_shutdown r = { .reason = reason }; int rc; + rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r); BUG_ON(rc); } +static void xen_restart(enum reboot_mode reboot_mode, const char *cmd) +{ + xen_reboot(SHUTDOWN_reboot); +} + + static void xen_power_off(void) { - struct sched_shutdown r = { .reason = SHUTDOWN_poweroff }; - int rc; - rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r); - BUG_ON(rc); + xen_reboot(SHUTDOWN_poweroff); } static irqreturn_t xen_arm_callback(int irq, void *arg)