Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 28 Jan 2022 14:50:26 +0100
From:   Krzysztof Adamski <krzysztof.adamski@nokia.com>
To:     Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Peter Collingbourne <pcc@google.com>,
        Guenter Roeck <linux@roeck-us.net>,
        Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc:     Alexander Sverdlin <alexander.sverdlin@nokia.com>,
        Matija Glavinic-Pecotic <matija.glavinic-pecotic.ext@nokia.com>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] arm64: move efi_reboot to restart handler
Message-ID: <YfP0osb45uJldtM9@localhost.localdomain>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+Vylt7QnJvfygzxNZQ5bbNJ2klqhQQPPhdET3PVAxHlVilZKMimzgDX4sQ/l?=
 =?us-ascii?Q?t8G0TuX8MAdq5kkr7uxx4rSijs3gJ8W1MjW9z+Vesl/F8CxLSm+w6n8wlw4r?=
 =?us-ascii?Q?RuPZxXPS9XU8iOw7Ux1mo0VlE2nGjAevqrWBoMVT4X24vI4RfEFNxatgarvR?=
 =?us-ascii?Q?rWHHAtDb9hopNnjXUI80D16QanF6zZDww4VHF92WqOlQoFI3gHey6lqHC/FM?=
 =?us-ascii?Q?t9A/Ll8RUqCSwsXDXXt7QiXstodmMGVOizCN/VTSuaQRsreK6Q4EYhtcoG1m?=
 =?us-ascii?Q?ob5oH9sbwrShKQZtSICvrAjCwiIBFDN4qgaQAroQH5RIChSnsHJWF95LqV7X?=
 =?us-ascii?Q?5bJi+Vw4LkVCxUJ2i6prxBUcCZDescgLLqKxXqZyH0UsZMlbo+VZy/xiQMMw?=
 =?us-ascii?Q?wD4hQonjOBKQsNYTHpoPMjKbhHEFAQXg1irGUC0MdYPwQqIYSMwPs//Gyhai?=
 =?us-ascii?Q?4OhQZZv2XrKgB959MvQ7qTQVi1oOgdF4NiXc+K6S8KMB8Wl85n1lR63m1K2g?=
 =?us-ascii?Q?qz7g3QfuURkkCQNTHKlPHaTSBRw5f3P/wHGrDNLfe0ZMumgo80YGAqSlVpWR?=
 =?us-ascii?Q?R85sN0m5PPI1IpzPIO9qTqClv/NH9/c9+nzdE0F5OQU67wrhkNBCI7NHvA7O?=
 =?us-ascii?Q?KU104h8Jm2Sy+i0vbTf0+AQM19To/8UauxE56DwVNux43cqpQPCitbMDRA4T?=
 =?us-ascii?Q?UWy3vQ/w1oquz03dAKvgRNIG6zkQL4qBZJFWCzrYGaEdGDd9JOd7v9eKhhxa?=
 =?us-ascii?Q?jko2a6IbnDful6RBNlXvW0sQI4UBY13JgqCMKOEWA1WWSLCuf0AuZo5tb0tU?=
 =?us-ascii?Q?2TZzXNxt9qovirayGo0wIAHFCFdHWd/NGq0AfG+GLytL/xvLHeAz1zzfaQnb?=
 =?us-ascii?Q?b8tw5C+5F/HevCxITFNyKFiKYhKleFqTt1Lj/5uZ/IdFoxtAZGAt+/0cKWFN?=
 =?us-ascii?Q?oOrP32bqcAxsJ2GjJReHtOvy4yLlGus99hkXZD3Nrv/8Pm48X2BKYx2szBDn?=
 =?us-ascii?Q?F5oM3GDXaj4cwX6M+na/dVxGMZH2BkyYikuH1rbfOVTmKuEIxVVMmssnGE++?=
 =?us-ascii?Q?7/OyunQAYQFs0+GxsjwgbsR+F0ityW/6A/euC5JpYR0LrA7Lh0bskS83eSG+?=
 =?us-ascii?Q?dX8iT1EtP2TykGlEQgvERpJ/OfqNzTeOqiEeVH/B0JeBGgbOe7GGdR2r/rbf?=
 =?us-ascii?Q?qsU/nzyoub8d1vaSxdmSSUB4RMkK+kLYldm1G/Ay4jWt6A88AVsyChLzdmJl?=
 =?us-ascii?Q?4LsvmB6hGrjlWdavnL8zvVRCN1Tzt92DKndmO2BYrNcoL7TlFjokZ3L2lips?=
 =?us-ascii?Q?I2KvMQHUSMUMDog3CZqorDeKjtJ6yMu462oea6hWpbnm/p5CjRUGNfRi2iQK?=
 =?us-ascii?Q?3mCRaKOCp+zvyyESdbxFDG/VuK0hr/h5MTa8ye7gQ0D7mFoTwtxqDAljzh5f?=
 =?us-ascii?Q?TvYMCL7wwcB0XFKsMCAxtrO3pv9XBvE5U2jpsfAgn2SuoGdswFk7vf2gkNmG?=
 =?us-ascii?Q?+KzDH5pf/qoVCQnoY3hq33LLytOVsd8W9ANMg/xyJbAa8WAGrxIopFLP950y?=
 =?us-ascii?Q?+SuaiSVHWWHYICUa5XjK5xNXjVPtrP220w4BoikZuADc1d/WB/H1UQI1FLhl?=
 =?us-ascii?Q?a1M7xB/g0QC0FXG3Q0zQcjJuCZGA8M/FatUHI/iNxYRRyXqUKIUSOuDZqXl1?=
 =?us-ascii?Q?bJKT/g=3D=3D?=
X-OriginatorOrg: nokia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fb0a705f-9ddd-485a-dafa-08d9e2652a5f
X-MS-Exchange-CrossTenant-AuthSource: DU2PR07MB8110.eurprd07.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2022 13:50:38.7209
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: iiDE6EKRuaWvdVZ1jAI0XULEfDhFvSXu8tQi9Qh8OAeo4ISBGE8k25tBlRJFfdDAD6HPJhptGxSRJOteOR5QjDSSOOq+2ZFjC92ZsYezZQM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR07MB4571
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On EFI enabled arm64 systems, efi_reboot was called before
do_kernel_restart, completely omitting the reset_handlers functionality.
By registering efi_reboot as part of the chain with slightly elevated
priority, we make it run before the default handler but still allow
plugging in other handlers.
Thanks to that, things like gpio_restart, restart handlers in
watchdog_core, mmc or mtds are working on those platforms.

The priority 130 is one higher than PSCI, to overrule that but still
allow to easily register higher prio handlers, if needed.

Signed-off-by: Krzysztof Adamski <krzysztof.adamski@nokia.com>
---

Changes in v2:
  - Register the handler in EFI code, instead of arm64 setup.c
  - Remove the contdition from the handler - it should be run in all
    cases when it is registered
  - Bump the priority to 130 to make it completly obious this should be
    run before PSCI (which has priority of 129)

 arch/arm64/kernel/process.c        |  7 -------
 drivers/firmware/efi/arm-runtime.c | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 5369e649fa79..b86ef77bb0c8 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -130,13 +130,6 @@ void machine_restart(char *cmd)
 	local_irq_disable();
 	smp_send_stop();
 
-	/*
-	 * UpdateCapsule() depends on the system being reset via
-	 * ResetSystem().
-	 */
-	if (efi_enabled(EFI_RUNTIME_SERVICES))
-		efi_reboot(reboot_mode, NULL);
-
 	/* Now call the architecture specific reboot code. */
 	do_kernel_restart(cmd);
 
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 3359ae2adf24..b9a2cdbe80b4 100644
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -80,6 +80,24 @@ static bool __init efi_virtmap_init(void)
 	return true;
 }
 
+static int efi_restart(struct notifier_block *nb, unsigned long action,
+		       void *data)
+{
+	/*
+	 * UpdateCapsule() depends on the system being reset via
+	 * ResetSystem().
+	 */
+	efi_reboot(reboot_mode, NULL);
+
+	return NOTIFY_DONE;
+}
+
+static struct notifier_block efi_restart_nb = {
+	.notifier_call = efi_restart,
+	/* We want this to take priority over PSCI which has priority of 129. */
+	.priority = 130,
+};
+
 /*
  * Enable the UEFI Runtime Services if all prerequisites are in place, i.e.,
  * non-early mapping of the UEFI system table and virtual mappings for all
@@ -148,6 +166,9 @@ static int __init arm_enable_runtime_services(void)
 	efi_native_runtime_setup();
 	set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
 
+	if (IS_ENABLED(CONFIG_ARM64))
+		register_restart_handler(&efi_restart_nb);
+
 	return 0;
 }
 early_initcall(arm_enable_runtime_services);
-- 
2.34.1