From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758586AbcDHMyG (ORCPT ); Fri, 8 Apr 2016 08:54:06 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:39252 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758570AbcDHMyB (ORCPT ); Fri, 8 Apr 2016 08:54:01 -0400 From: Guenter Roeck To: Russell King , Catalin Marinas Cc: Wolfram Sang , Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Guenter Roeck , Stefano Stabellini , xen-devel@lists.xenproject.org Subject: [PATCH 2/6] ARM: xen: Register with kernel restart handler Date: Fri, 8 Apr 2016 05:53:55 -0700 Message-Id: <1460120039-2497-3-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460120039-2497-1-git-send-email-linux@roeck-us.net> References: <1460120039-2497-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Guenter Roeck --- arch/arm/xen/enlighten.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 75cd7345c654..76a1d12fd27e 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -193,14 +194,22 @@ after_register_vcpu_info: put_cpu(); } -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) { struct sched_shutdown r = { .reason = SHUTDOWN_reboot }; int rc; rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r); BUG_ON(rc); + + return NOTIFY_DONE; } +static struct notifier_block xen_restart_nb = { + .notifier_call = xen_restart, + .priority = 192, +}; + static void xen_power_off(void) { struct sched_shutdown r = { .reason = SHUTDOWN_poweroff }; @@ -370,7 +379,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.5.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: linux@roeck-us.net (Guenter Roeck) Date: Fri, 8 Apr 2016 05:53:55 -0700 Subject: [PATCH 2/6] ARM: xen: Register with kernel restart handler In-Reply-To: <1460120039-2497-1-git-send-email-linux@roeck-us.net> References: <1460120039-2497-1-git-send-email-linux@roeck-us.net> Message-ID: <1460120039-2497-3-git-send-email-linux@roeck-us.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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. Signed-off-by: Guenter Roeck --- arch/arm/xen/enlighten.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 75cd7345c654..76a1d12fd27e 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -193,14 +194,22 @@ after_register_vcpu_info: put_cpu(); } -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) { struct sched_shutdown r = { .reason = SHUTDOWN_reboot }; int rc; rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r); BUG_ON(rc); + + return NOTIFY_DONE; } +static struct notifier_block xen_restart_nb = { + .notifier_call = xen_restart, + .priority = 192, +}; + static void xen_power_off(void) { struct sched_shutdown r = { .reason = SHUTDOWN_poweroff }; @@ -370,7 +379,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.5.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guenter Roeck Subject: [PATCH 2/6] ARM: xen: Register with kernel restart handler Date: Fri, 8 Apr 2016 05:53:55 -0700 Message-ID: <1460120039-2497-3-git-send-email-linux@roeck-us.net> References: <1460120039-2497-1-git-send-email-linux@roeck-us.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aoVvH-00088s-Dk for xen-devel@lists.xenproject.org; Fri, 08 Apr 2016 12:54:03 +0000 In-Reply-To: <1460120039-2497-1-git-send-email-linux@roeck-us.net> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Russell King , Catalin Marinas Cc: Stefano Stabellini , Wolfram Sang , linux-kernel@vger.kernel.org, Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org, xen-devel@lists.xenproject.org, Guenter Roeck List-Id: xen-devel@lists.xenproject.org UmVnaXN0ZXIgd2l0aCBrZXJuZWwgcmVzdGFydCBoYW5kbGVyIGluc3RlYWQgb2Ygc2V0dGluZyBh cm1fcG1fcmVzdGFydApkaXJlY3RseS4KClNlbGVjdCBhIGhpZ2ggcHJpb3JpdHkgb2YgMTkyIHRv IGVuc3VyZSB0aGF0IGRlZmF1bHQgcmVzdGFydCBoYW5kbGVycwphcmUgcmVwbGFjZWQgaWYgWGVu IGlzIHJ1bm5pbmcuCgpTaWduZWQtb2ZmLWJ5OiBHdWVudGVyIFJvZWNrIDxsaW51eEByb2Vjay11 cy5uZXQ+Ci0tLQogYXJjaC9hcm0veGVuL2VubGlnaHRlbi5jIHwgMTMgKysrKysrKysrKystLQog MSBmaWxlIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvYXJjaC9hcm0veGVuL2VubGlnaHRlbi5jIGIvYXJjaC9hcm0veGVuL2VubGlnaHRlbi5j CmluZGV4IDc1Y2Q3MzQ1YzY1NC4uNzZhMWQxMmZkMjdlIDEwMDY0NAotLS0gYS9hcmNoL2FybS94 ZW4vZW5saWdodGVuLmMKKysrIGIvYXJjaC9hcm0veGVuL2VubGlnaHRlbi5jCkBAIC0yNyw2ICsy Nyw3IEBACiAjaW5jbHVkZSA8bGludXgvY3B1Lmg+CiAjaW5jbHVkZSA8bGludXgvY29uc29sZS5o PgogI2luY2x1ZGUgPGxpbnV4L3B2Y2xvY2tfZ3RvZC5oPgorI2luY2x1ZGUgPGxpbnV4L3JlYm9v dC5oPgogI2luY2x1ZGUgPGxpbnV4L3RpbWU2NC5oPgogI2luY2x1ZGUgPGxpbnV4L3RpbWVrZWVw aW5nLmg+CiAjaW5jbHVkZSA8bGludXgvdGltZWtlZXBlcl9pbnRlcm5hbC5oPgpAQCAtMTkzLDE0 ICsxOTQsMjIgQEAgYWZ0ZXJfcmVnaXN0ZXJfdmNwdV9pbmZvOgogCXB1dF9jcHUoKTsKIH0KIAot c3RhdGljIHZvaWQgeGVuX3Jlc3RhcnQoZW51bSByZWJvb3RfbW9kZSByZWJvb3RfbW9kZSwgY29u c3QgY2hhciAqY21kKQorc3RhdGljIGludCB4ZW5fcmVzdGFydChzdHJ1Y3Qgbm90aWZpZXJfYmxv Y2sgKm5iLCB1bnNpZ25lZCBsb25nIGFjdGlvbiwKKwkJICAgICAgIHZvaWQgKmRhdGEpCiB7CiAJ c3RydWN0IHNjaGVkX3NodXRkb3duIHIgPSB7IC5yZWFzb24gPSBTSFVURE9XTl9yZWJvb3QgfTsK IAlpbnQgcmM7CiAJcmMgPSBIWVBFUlZJU09SX3NjaGVkX29wKFNDSEVET1Bfc2h1dGRvd24sICZy KTsKIAlCVUdfT04ocmMpOworCisJcmV0dXJuIE5PVElGWV9ET05FOwogfQogCitzdGF0aWMgc3Ry dWN0IG5vdGlmaWVyX2Jsb2NrIHhlbl9yZXN0YXJ0X25iID0geworCS5ub3RpZmllcl9jYWxsID0g eGVuX3Jlc3RhcnQsCisJLnByaW9yaXR5ID0gMTkyLAorfTsKKwogc3RhdGljIHZvaWQgeGVuX3Bv d2VyX29mZih2b2lkKQogewogCXN0cnVjdCBzY2hlZF9zaHV0ZG93biByID0geyAucmVhc29uID0g U0hVVERPV05fcG93ZXJvZmYgfTsKQEAgLTM3MCw3ICszNzksNyBAQCBzdGF0aWMgaW50IF9faW5p dCB4ZW5fcG1faW5pdCh2b2lkKQogCQlyZXR1cm4gLUVOT0RFVjsKIAogCXBtX3Bvd2VyX29mZiA9 IHhlbl9wb3dlcl9vZmY7Ci0JYXJtX3BtX3Jlc3RhcnQgPSB4ZW5fcmVzdGFydDsKKwlyZWdpc3Rl cl9yZXN0YXJ0X2hhbmRsZXIoJnhlbl9yZXN0YXJ0X25iKTsKIAlpZiAoIXhlbl9pbml0aWFsX2Rv bWFpbigpKSB7CiAJCXN0cnVjdCB0aW1lc3BlYzY0IHRzOwogCQl4ZW5fcmVhZF93YWxsY2xvY2so JnRzKTsKLS0gCjIuNS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpo dHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK