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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 D0E02C10F14 for ; Tue, 15 Oct 2019 14:52:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4C4C20640 for ; Tue, 15 Oct 2019 14:52:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jJcLAGgH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733109AbfJOOwD (ORCPT ); Tue, 15 Oct 2019 10:52:03 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:36817 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733002AbfJOOwB (ORCPT ); Tue, 15 Oct 2019 10:52:01 -0400 Received: by mail-wr1-f66.google.com with SMTP id y19so24268002wrd.3 for ; Tue, 15 Oct 2019 07:52:00 -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=zLfyJeA9wa/YShlK3MTXpdAT71OVQlJTB0HHADMFohY=; b=jJcLAGgH3KuOU3eX27h1xp0fXk+FeZtURkHP/vua0EHtKL9+eYSnWolQZeqH7OkkHO d3bdzGyReUjNjy8cA66+kS5qLgIK1m4Wj374o0S6jdVR8ToTUbKv2oukynUtiUcmRvpc yjsLOGm1sciv3p2FzABejkzNm8JhpEfhm8JmqGGE7CjDtvXwfnpb8rHJhU/OJJKd6Q9g n/MCGzKLmRCZQ7nDEVMBJIlWjxmJoko2/SD8wQSD0KWuRKeFHsiktCMlEI5W0o8jAwgs EfqvcN1tGtFxsaGX3XRsf7LhOEstrVD3IKcEq9R+IrtUQW2ZgvPX0XPiuk8G/gvD6sem We6Q== 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=zLfyJeA9wa/YShlK3MTXpdAT71OVQlJTB0HHADMFohY=; b=VDaU0qpuyyMTOSocSEukf4U1Ninluap3TOJkqGhY9VYy8UybfZWY93hCymyDgRK/o1 /f0tdbDv4JEjzo+UZu7ibA3WMn2SwHj/NqCWBzguUzVZyIT9E6t9k3CTAknjCNjoq2tI T+H1Hw2Quw3msMDqEovv1C0SCdvbKiATI2xxB5NjXNWNI6NgF+hgGqfWkBy0sWKcrQh8 vI0m2sZCN3O54XHsxnAeGtqa/C/CcuoCyJ1jWR2ed6/o8CwnXIDNeZaadMdPtur2z8bv pIVy4eBsUFoaUvJoYhe6BPRI94nHbJPgbOZ7I809YDXcZ/k7akGD1dxqgG/VgpgD+5a3 c8wQ== X-Gm-Message-State: APjAAAWtmZm1duOVpJcQBPRF+ry6KZEzrpSFnqbTV1TmaGQPbj4R0Rvk i1kAJ147yviEplL3AacPT/M= X-Google-Smtp-Source: APXvYqyK0W3enqiUQRAcQi/YcLuvRxhG58xq5BuRJanN1ASn+Veb4bXPmLK+LGenLNx+s652oa4pHw== X-Received: by 2002:a5d:46cb:: with SMTP id g11mr17438319wrs.346.1571151118976; Tue, 15 Oct 2019 07:51:58 -0700 (PDT) Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) by smtp.gmail.com with ESMTPSA id o4sm52925154wre.91.2019.10.15.07.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 07:51:57 -0700 (PDT) From: Thierry Reding To: Russell King , arm@kernel.org Cc: Arnd Bergmann , Olof Johansson , Guenter Roeck , Stefan Agner , Wolfram Sang , Catalin Marinas , Lorenzo Pieralisi , Stefano Stabellini , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/6] drivers: firmware: psci: Register with kernel restart handler Date: Tue, 15 Oct 2019 16:51:44 +0200 Message-Id: <20191015145147.1106247-4-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 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guenter Roeck Register with kernel restart handler instead of setting arm_pm_restart directly. This enables support for replacing the PSCI restart handler with a different handler if necessary for a specific board. Select a priority of 129 to indicate a higher than default priority, but keep it as low as possible since PSCI reset is known to fail on some boards. Acked-by: Arnd Bergmann Reviewed-by: Wolfram Sang Tested-by: Wolfram Sang Signed-off-by: Guenter Roeck Acked-by: Lorenzo Pieralisi Signed-off-by: Thierry Reding --- drivers/firmware/psci/psci.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index 84f4ff351c62..a41c6ba043a2 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -250,7 +250,8 @@ static int get_set_conduit_method(struct device_node *np) return 0; } -static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd) +static int psci_sys_reset(struct notifier_block *nb, unsigned long action, + void *data) { if ((reboot_mode == REBOOT_WARM || reboot_mode == REBOOT_SOFT) && psci_system_reset2_supported) { @@ -263,8 +264,15 @@ static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd) } else { invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); } + + return NOTIFY_DONE; } +static struct notifier_block psci_sys_reset_nb = { + .notifier_call = psci_sys_reset, + .priority = 129, +}; + static void psci_sys_poweroff(void) { invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); @@ -431,7 +439,7 @@ static void __init psci_0_2_set_functions(void) psci_ops.migrate_info_type = psci_migrate_info_type; - arm_pm_restart = psci_sys_reset; + register_restart_handler(&psci_sys_reset_nb); pm_power_off = psci_sys_poweroff; } -- 2.23.0 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 ED99AECE588 for ; Tue, 15 Oct 2019 14:52:43 +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 C07182054F for ; Tue, 15 Oct 2019 14:52:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PgfzXb9q"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jJcLAGgH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C07182054F 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=JRMLRkAUiT7a/EPpRuNO5h1eiXjeZ2yUJwG2U/KT6P8=; b=PgfzXb9qOIP4fG UIRFOK8TOM7dMe+nvZD/5wVYVgcCWciTG/Bk+LG+cc1udlfkknqD64L5V79oes+3/PhLpWxR/6q6r 66ss8WUbqPAFIf0HGZbnfrRv5dJiXiTj2KkWGRGhHPRjP3LWbO5NfTz9D/pCm7ExlEdGV38vSVIqJ 0Y5rlgQnJ7fL1zAfk2s/qpPCqA1OXNByOEpRThLPVrjPRa4Y7vnyHDmN4DflMSeWwviRBaXP2D2ba 1zG8sciCzawTXEZEhLrQMC8b+Sz8ewhjnkIarNFyPLLe4QtgtJRg9hPRCVy0VqbBQ2oz3ibY7vr/E N1PGe6CgGORvitmRzEBQ==; 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 1iKOBn-0002nX-An; Tue, 15 Oct 2019 14:52:43 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKOB6-0002C6-UA for linux-arm-kernel@lists.infradead.org; Tue, 15 Oct 2019 14:52:02 +0000 Received: by mail-wr1-x443.google.com with SMTP id o18so24194183wrv.13 for ; Tue, 15 Oct 2019 07:52:00 -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=zLfyJeA9wa/YShlK3MTXpdAT71OVQlJTB0HHADMFohY=; b=jJcLAGgH3KuOU3eX27h1xp0fXk+FeZtURkHP/vua0EHtKL9+eYSnWolQZeqH7OkkHO d3bdzGyReUjNjy8cA66+kS5qLgIK1m4Wj374o0S6jdVR8ToTUbKv2oukynUtiUcmRvpc yjsLOGm1sciv3p2FzABejkzNm8JhpEfhm8JmqGGE7CjDtvXwfnpb8rHJhU/OJJKd6Q9g n/MCGzKLmRCZQ7nDEVMBJIlWjxmJoko2/SD8wQSD0KWuRKeFHsiktCMlEI5W0o8jAwgs EfqvcN1tGtFxsaGX3XRsf7LhOEstrVD3IKcEq9R+IrtUQW2ZgvPX0XPiuk8G/gvD6sem We6Q== 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=zLfyJeA9wa/YShlK3MTXpdAT71OVQlJTB0HHADMFohY=; b=k7MCdzfaeYwzOR3YljkO9BuvdLE1dB1B3qeeGkCcSrgd3FNf+KwS/L2sXyg+F9yzcl X+N/s72AUEdOQirTSQAubp4SaSNpRBhYNllN2c0bdfE4lfZE7s2yKkmhrQeTsxTadGZ5 110hsJbALt/VTksCUb0sQBPrF+5z8FfNst8mCEyUi4a+shS1joWIR7P4s7qG20d7l+Fg V3wtIoO2Azvcobbuzg7twDh7/tnZpZde6sehS/MINnXMVSX28pEV2r0ef5mtnVtbwosC 1TVPHzds2jh8DsK/qTvUSnnl1DK50T0ttiIsHn0Ne3S9V6iiucTqF7fip+OYGDXRPwvz BD3g== X-Gm-Message-State: APjAAAVVSZPTd/DiZdsmEL9WtQRt+oQfrMecvIjSKpF43xLbaO2TpglR ZWIpiGuFbQCDrqwVIT8EVtA= X-Google-Smtp-Source: APXvYqyK0W3enqiUQRAcQi/YcLuvRxhG58xq5BuRJanN1ASn+Veb4bXPmLK+LGenLNx+s652oa4pHw== X-Received: by 2002:a5d:46cb:: with SMTP id g11mr17438319wrs.346.1571151118976; Tue, 15 Oct 2019 07:51:58 -0700 (PDT) Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) by smtp.gmail.com with ESMTPSA id o4sm52925154wre.91.2019.10.15.07.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 07:51:57 -0700 (PDT) From: Thierry Reding To: Russell King , arm@kernel.org Subject: [PATCH 3/6] drivers: firmware: psci: Register with kernel restart handler Date: Tue, 15 Oct 2019 16:51:44 +0200 Message-Id: <20191015145147.1106247-4-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_075200_994687_8D2E361E X-CRM114-Status: GOOD ( 16.33 ) 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. This enables support for replacing the PSCI restart handler with a different handler if necessary for a specific board. Select a priority of 129 to indicate a higher than default priority, but keep it as low as possible since PSCI reset is known to fail on some boards. Acked-by: Arnd Bergmann Reviewed-by: Wolfram Sang Tested-by: Wolfram Sang Signed-off-by: Guenter Roeck Acked-by: Lorenzo Pieralisi Signed-off-by: Thierry Reding --- drivers/firmware/psci/psci.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index 84f4ff351c62..a41c6ba043a2 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -250,7 +250,8 @@ static int get_set_conduit_method(struct device_node *np) return 0; } -static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd) +static int psci_sys_reset(struct notifier_block *nb, unsigned long action, + void *data) { if ((reboot_mode == REBOOT_WARM || reboot_mode == REBOOT_SOFT) && psci_system_reset2_supported) { @@ -263,8 +264,15 @@ static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd) } else { invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); } + + return NOTIFY_DONE; } +static struct notifier_block psci_sys_reset_nb = { + .notifier_call = psci_sys_reset, + .priority = 129, +}; + static void psci_sys_poweroff(void) { invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); @@ -431,7 +439,7 @@ static void __init psci_0_2_set_functions(void) psci_ops.migrate_info_type = psci_migrate_info_type; - arm_pm_restart = psci_sys_reset; + register_restart_handler(&psci_sys_reset_nb); pm_power_off = psci_sys_poweroff; } -- 2.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel