From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACD97C10F14 for ; Tue, 15 Oct 2019 14:52:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 734072054F for ; Tue, 15 Oct 2019 14:52:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BbZe/39d"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="je+bnMh2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 734072054F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=t0LHXyPESSrdQ/umlGvdfqIxudW4rWntbAxRdaqg6Hk=; b=BbZe/39dT+viCg +s7FQL/ORvlG1b9cKZoG5RBsWti47/f/vuYgFR3c9w3ne/pOYil0ZeBhvrnhEYky9aPIxWWmwW4GN FCWxK0jqJcJDMep4kTg5uZqgMIrIesJmaaUvMsaj/S1tkJGHfD1ylc4z5fbuJ3gd/NunqLqsEIW79 FOHR8HQ310Q+FK3biYnxCcexG89VRwXrzoW62WkJUHAhq3hLDGVLFbVEpaRSgF+ly88rdJQlmkCKN fBg0xFrmo7Jr6HVBvrNZGKW8FBRS5DpGJtgBz/6QXSOdHWMKqbKAozyCiVJNUZMJWAIpUqNhs3PLC NobbPgKf0E8e8wV734tw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKOBa-0002ZI-0B; Tue, 15 Oct 2019 14:52:30 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKOB3-00027d-EA for linux-arm-kernel@lists.infradead.org; Tue, 15 Oct 2019 14:51:58 +0000 Received: by mail-wr1-x441.google.com with SMTP id b9so24276527wrs.0 for ; Tue, 15 Oct 2019 07:51:56 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=HVU/godtoQv4DaTv3SteCyrdF1xeYmNG3gGjlOL2mBY=; b=je+bnMh2iMgS8RPyMgkQZFclubihcMqnvxo7F9+r8I5QkRFOV4XODNkmLpjkmgBW86 qbfMe8B4hwFU3dD7OtnrJchUzMPBRoUug5/nt+ulQAgqZHkPeI8AS2toLFd6uR63EKwY wJzr/UxIQGuH/Y62uIk2LtXSgcYNqtc/kQlCiTZQKrcIEaRv7ov5O7tFCaxGXjLBFxGf 2r4a3rpNdGCSb0j+FwnIlToL5XZQ0qcRKnEV0LiMJi3rbWevOQvGFSkFuFlSzvh/S4tn /gFhFHOUsjym8CGJGmoWUFhn1WJRJt1CXnq9L0h9ZpD3J1BTL+jEBT7pJr1P0d1YWhop vDLg== 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:mime-version:content-transfer-encoding; bh=HVU/godtoQv4DaTv3SteCyrdF1xeYmNG3gGjlOL2mBY=; b=RVmqcAnIJBAMEBYWsYmITVdTvTFMn1m4jlXMOtxdpn91knyFSI5ZU1V7MMw5rNkeHp sQdFafE3yZks8WHSTraYuuJAUm7DOu+suJexwPW2LeATgkXO2lqy7X6xUs+Wr+MzmsCR p+Ne1p81jCi0fYn3oRwpxks2K6IcXqbF1nojYZ6GfItKmdJrU7xuiM1KInA+v54Z2dfJ OviuHgddeRLKOh87CMEIdNpoBNJ2B+SNEh6KaVO1fIbCp6HqNqbcN0oqKjGoH+AwBY8v x/kp9bxcYixrp4divahvdR4puqty8Sg3+2nUpvARvslUrjiyR/wEC3MPlwY1GhicQOlb IItw== X-Gm-Message-State: APjAAAVealMFZz0MGz7WQdd4AEuKYn7xM8/0sMR7xz7/6IpNLYmtxNV3 VtIOl8aB0QQs/BEBlAjaZIY= X-Google-Smtp-Source: APXvYqzxyrmF8m6jp6CA2DOs+xMZnw2mPPE30sPyfOc1/Lkdhzai01UBp+PivWAtSTN8LV4o8dciYA== X-Received: by 2002:adf:eb0f:: with SMTP id s15mr29275926wrn.97.1571151115705; Tue, 15 Oct 2019 07:51:55 -0700 (PDT) Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) by smtp.gmail.com with ESMTPSA id c21sm15940495wmb.46.2019.10.15.07.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 07:51:53 -0700 (PDT) From: Thierry Reding To: Russell King , arm@kernel.org Subject: [PATCH 2/6] ARM: xen: Register with kernel restart handler Date: Tue, 15 Oct 2019 16:51:43 +0200 Message-Id: <20191015145147.1106247-3-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191015145147.1106247-1-thierry.reding@gmail.com> References: <20191015145147.1106247-1-thierry.reding@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191015_075157_487716_E203B571 X-CRM114-Status: GOOD ( 15.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , Arnd Bergmann , Stefano Stabellini , Catalin Marinas , linux-kernel@vger.kernel.org, Stefan Agner , Wolfram Sang , linux-arm-kernel@lists.infradead.org, Olof Johansson , Guenter Roeck Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Guenter Roeck Register with kernel restart handler instead of setting arm_pm_restart directly. Select a high priority of 192 to ensure that default restart handlers are replaced if Xen is running. Acked-by: Arnd Bergmann Reviewed-by: Wolfram Sang Reviewed-by: Stefano Stabellini Signed-off-by: Guenter Roeck Signed-off-by: Thierry Reding --- arch/arm/xen/enlighten.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 1e57692552d9..eb0a0edb9909 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -181,11 +182,18 @@ void xen_reboot(int reason) BUG_ON(rc); } -static void xen_restart(enum reboot_mode reboot_mode, const char *cmd) +static int xen_restart(struct notifier_block *nb, unsigned long action, + void *data) { xen_reboot(SHUTDOWN_reboot); + + return NOTIFY_DONE; } +static struct notifier_block xen_restart_nb = { + .notifier_call = xen_restart, + .priority = 192, +}; static void xen_power_off(void) { @@ -406,7 +414,7 @@ static int __init xen_pm_init(void) return -ENODEV; pm_power_off = xen_power_off; - arm_pm_restart = xen_restart; + register_restart_handler(&xen_restart_nb); if (!xen_initial_domain()) { struct timespec64 ts; xen_read_wallclock(&ts); -- 2.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel