From nobody Sat Sep 26 05:33:47 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA5053612E2; Fri, 4 Sep 2026 07:47:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788508022; cv=none; b=i7BkiuuItNAzN47sSjf6EWDio8rcYGJ08ynVNKDa5ZYKpTNwt66KI6lxvkXjoLb2O64Ci5ILugFRmgtFLCljaobtzfd4nhpeYB7wlnUpW9BylyZNo/B1wteqdFgfRXDQqkMw1P41SUmgDaR2EhpBG9F0w1J355jZKikDr02fvk4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788508022; c=relaxed/simple; bh=JjU0NmyrHjQlVYmu58rWFIQi9wV0Yk0e9whJMEcZGqg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=X7j7KQ5/z8hrXdQqCLqTc8vlQgMa+awOk2FM8yk0Hg7QGnrn6d3/T5bX5lWyA+A7Lwr90SjdecfZaExPpBw0ASW0FDtgMYoNuE7I5dY4E/6Tmeb2sbjjsPOfPhdjDG9OPbTSFjDH3aOb0dQiLepTTeOtDpfP/Uo86PEjyAxTf3w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=bF7WFeEs; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=MHewjGPm; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="bF7WFeEs"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="MHewjGPm" From: Gregor Herburger DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1788508013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D1PdO7b96oZEBitMdoxZM/am5g9LcgR3z7wz5ec3PhU=; b=bF7WFeEsT8kmHKHQhjY9iCFz5V0byYZjWwOj/fH+48AUnQjt3k3dMRstbjXC0zYtaKWH2Y Zlu95OV5I2MxjnumjqZY1n4QLsUClBa5IE8CuvQOBAkxHtlAyB2MwzoY49zwnLyQTPUxzT QQtNrRelKtMLreXUAC1d37wIleDlYaWXkocuv0jF/jYMrz6bSz7MT35x/oZSSFzcbJNCJt bbHnC9/8pu6nA1BVV2WTUrjiqNJAZ65bAKNwzgJsDwDr//NWgJVS41OUByEcNQr7MgSgxW uP54l40xWXU2cIc5DKwjMrxsgAwL8HTaB1mUs7rQCjyXPUhRz2OdAbOHgH85zg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1788508013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D1PdO7b96oZEBitMdoxZM/am5g9LcgR3z7wz5ec3PhU=; b=MHewjGPmtYcj8ZvRqg4xz7hnipB4HfkJOiZsohayRmZ2RkL+7WMaIVbKYXWVlodbhGlgOI xeJe0+a/so+Z77Dw== Date: Fri, 04 Sep 2026 09:46:49 +0200 Subject: [PATCH v4 1/4] firmware: raspberrypi: reorder rpi_firmware_property_tag enum Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260904-rpi-tryboot-v4-1-fdee8bc53ff7@linutronix.de> References: <20260904-rpi-tryboot-v4-0-fdee8bc53ff7@linutronix.de> In-Reply-To: <20260904-rpi-tryboot-v4-0-fdee8bc53ff7@linutronix.de> To: Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Eric Anholt , Stefan Wahren Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Gregor Herburger X-Developer-Signature: v=1; a=ed25519-sha256; t=1788508013; l=4658; i=gregor.herburger@linutronix.de; s=20260226; h=from:subject:message-id; bh=JjU0NmyrHjQlVYmu58rWFIQi9wV0Yk0e9whJMEcZGqg=; b=ost2OB3Qt88g8OIHEOl7bVAwsWB4M1WIMH00w5+gBo+XQfbaXFF4XfW4HvZpAgqGWDwaKjNv/ UClcw+3TsIFBVlEaAQXJ0BHtva0fxrqZo+EcSNFsa2fO38P6w0qydCP X-Developer-Key: i=gregor.herburger@linutronix.de; a=ed25519; pk=u72Lv7+/lS5CC1hmSrb17lv/6CK7HBh4Lvz77PHA5LM= The enum was once ordered by tag values. The later added tags were added in a different order. Reorder the tags again. No functional change intended. Signed-off-by: Gregor Herburger --- include/soc/bcm2835/raspberrypi-firmware.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm28= 35/raspberrypi-firmware.h index 975bef529854a..8ad1cdbf5e9f5 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -72,26 +72,26 @@ enum rpi_firmware_property_tag { RPI_FIRMWARE_GET_EDID_BLOCK =3D 0x00030020, RPI_FIRMWARE_GET_CUSTOMER_OTP =3D 0x00030021, RPI_FIRMWARE_GET_DOMAIN_STATE =3D 0x00030030, + RPI_FIRMWARE_GET_GPIO_STATE =3D 0x00030041, + RPI_FIRMWARE_GET_GPIO_CONFIG =3D 0x00030043, + RPI_FIRMWARE_GET_PERIPH_REG =3D 0x00030045, RPI_FIRMWARE_GET_THROTTLED =3D 0x00030046, RPI_FIRMWARE_GET_CLOCK_MEASURED =3D 0x00030047, RPI_FIRMWARE_NOTIFY_REBOOT =3D 0x00030048, + RPI_FIRMWARE_GET_POE_HAT_VAL =3D 0x00030049, + RPI_FIRMWARE_SET_POE_HAT_VAL =3D 0x00030050, + RPI_FIRMWARE_NOTIFY_XHCI_RESET =3D 0x00030058, + RPI_FIRMWARE_NOTIFY_DISPLAY_DONE =3D 0x00030066, RPI_FIRMWARE_SET_CLOCK_STATE =3D 0x00038001, RPI_FIRMWARE_SET_CLOCK_RATE =3D 0x00038002, RPI_FIRMWARE_SET_VOLTAGE =3D 0x00038003, RPI_FIRMWARE_SET_TURBO =3D 0x00038009, RPI_FIRMWARE_SET_CUSTOMER_OTP =3D 0x00038021, RPI_FIRMWARE_SET_DOMAIN_STATE =3D 0x00038030, - RPI_FIRMWARE_GET_GPIO_STATE =3D 0x00030041, RPI_FIRMWARE_SET_GPIO_STATE =3D 0x00038041, RPI_FIRMWARE_SET_SDHOST_CLOCK =3D 0x00038042, - RPI_FIRMWARE_GET_GPIO_CONFIG =3D 0x00030043, RPI_FIRMWARE_SET_GPIO_CONFIG =3D 0x00038043, - RPI_FIRMWARE_GET_PERIPH_REG =3D 0x00030045, RPI_FIRMWARE_SET_PERIPH_REG =3D 0x00038045, - RPI_FIRMWARE_GET_POE_HAT_VAL =3D 0x00030049, - RPI_FIRMWARE_SET_POE_HAT_VAL =3D 0x00030050, - RPI_FIRMWARE_NOTIFY_XHCI_RESET =3D 0x00030058, - RPI_FIRMWARE_NOTIFY_DISPLAY_DONE =3D 0x00030066, =20 /* Dispmanx TAGS */ RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE =3D 0x00040001, @@ -107,7 +107,6 @@ enum rpi_firmware_property_tag { RPI_FIRMWARE_FRAMEBUFFER_GET_PALETTE =3D 0x0004000b, RPI_FIRMWARE_FRAMEBUFFER_GET_TOUCHBUF =3D 0x0004000f, RPI_FIRMWARE_FRAMEBUFFER_GET_GPIOVIRTBUF =3D 0x00040010, - RPI_FIRMWARE_FRAMEBUFFER_RELEASE =3D 0x00048001, RPI_FIRMWARE_FRAMEBUFFER_TEST_PHYSICAL_WIDTH_HEIGHT =3D 0x00044003, RPI_FIRMWARE_FRAMEBUFFER_TEST_VIRTUAL_WIDTH_HEIGHT =3D 0x00044004, RPI_FIRMWARE_FRAMEBUFFER_TEST_DEPTH =3D 0x00044005, @@ -117,6 +116,7 @@ enum rpi_firmware_property_tag { RPI_FIRMWARE_FRAMEBUFFER_TEST_OVERSCAN =3D 0x0004400a, RPI_FIRMWARE_FRAMEBUFFER_TEST_PALETTE =3D 0x0004400b, RPI_FIRMWARE_FRAMEBUFFER_TEST_VSYNC =3D 0x0004400e, + RPI_FIRMWARE_FRAMEBUFFER_RELEASE =3D 0x00048001, RPI_FIRMWARE_FRAMEBUFFER_SET_PHYSICAL_WIDTH_HEIGHT =3D 0x00048003, RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_WIDTH_HEIGHT =3D 0x00048004, RPI_FIRMWARE_FRAMEBUFFER_SET_DEPTH =3D 0x00048005, @@ -125,10 +125,10 @@ enum rpi_firmware_property_tag { RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_OFFSET =3D 0x00048009, RPI_FIRMWARE_FRAMEBUFFER_SET_OVERSCAN =3D 0x0004800a, RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE =3D 0x0004800b, - RPI_FIRMWARE_FRAMEBUFFER_SET_TOUCHBUF =3D 0x0004801f, - RPI_FIRMWARE_FRAMEBUFFER_SET_GPIOVIRTBUF =3D 0x00048020, RPI_FIRMWARE_FRAMEBUFFER_SET_VSYNC =3D 0x0004800e, RPI_FIRMWARE_FRAMEBUFFER_SET_BACKLIGHT =3D 0x0004800f, + RPI_FIRMWARE_FRAMEBUFFER_SET_TOUCHBUF =3D 0x0004801f, + RPI_FIRMWARE_FRAMEBUFFER_SET_GPIOVIRTBUF =3D 0x00048020, =20 RPI_FIRMWARE_VCHIQ_INIT =3D 0x00048010, =20 --=20 2.47.3 From nobody Sat Sep 26 05:33:47 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 621B03A9639; Fri, 4 Sep 2026 07:47:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788508022; cv=none; b=ua0+4FV8uAZDhtA/I/w//zWxvs+E8o4xxRBAIMJPH02yK8+nbQTDP1dwmwIyK3nGk6nEn+G1Ocm2Lrh7HbKSzCGVUwJkoFYotgZYVEBho1deA9xXXxvBJU5Bg0Be8kPsDNYvxelwEqiuPrcvfb/gtY0TYnGTKqMaZgqPg2fPBWc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788508022; c=relaxed/simple; bh=JTGSzF3cwcMgL2GV7Aem6Nhh3tKER7RTd2LK3CeGm58=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jjPZFBK6R6sLu+uXHiDE8e75y9FPb2jTEuTWfXWF3VdKPMwehCr2yiKd3grmIAwtIZTQDeU/ZRdt1fi8pVtbJTL1bis/F81ngFavXZrGs2bsMSCI5x0Dj+/66a25BCbebOlRHZDuyNCJ1yjW69I+W22fOhmJRkSMMJngsn13GGE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=IEH6dCow; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=x8NGYwKR; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="IEH6dCow"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="x8NGYwKR" From: Gregor Herburger DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1788508013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZlSADl29CmHDkOq9VyOqS+dZQ9n9eCe+aPQc5gMZi0s=; b=IEH6dCowFYkVcaYBHPhRPPT6HfFx6gXRhzI4SkLHe8BrkqygfYiDmttEZfq9CqY+bs2T/8 DKC8KpFCPlxQAxspwprKl9Zj4n1xLP0FnS2T65ElkYBpMorCA9HYa2SlrXcgCwB9WjoHyJ LREyTHF2rVwUzSBUzvrWvNzW2QQZmP/mtavUBG01Fnl02xEbndth1kTVJbwJHSoIPBEPu8 /LIy0D03vvfU/mxDTdb12TasItO0DL2CSsXQTnKL3hgBBZZv/CRA+0wRUVD4hdmzkjCL5s qaC5FHTBM/LbkYc7rsF6mTXjxE7AqVH8RGaDmCp+yByhzlqLfAQnxR0LvvWaHA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1788508013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZlSADl29CmHDkOq9VyOqS+dZQ9n9eCe+aPQc5gMZi0s=; b=x8NGYwKR+/Fv7VhGnNMKhojBtA5yPbywehQdjPLSjgLKgmPLjg1N3lA2C83Ghx1zeYe+yn Ohd8ATSkkflXqBDA== Date: Fri, 04 Sep 2026 09:46:50 +0200 Subject: [PATCH v4 2/4] dt-bindings: raspberrypi,bcm2835-firmware: Include 'reboot-mode.yaml' Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260904-rpi-tryboot-v4-2-fdee8bc53ff7@linutronix.de> References: <20260904-rpi-tryboot-v4-0-fdee8bc53ff7@linutronix.de> In-Reply-To: <20260904-rpi-tryboot-v4-0-fdee8bc53ff7@linutronix.de> To: Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Eric Anholt , Stefan Wahren Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Krzysztof Kozlowski , Gregor Herburger X-Developer-Signature: v=1; a=ed25519-sha256; t=1788508013; l=1239; i=gregor.herburger@linutronix.de; s=20260226; h=from:subject:message-id; bh=JTGSzF3cwcMgL2GV7Aem6Nhh3tKER7RTd2LK3CeGm58=; b=VF7C8aGUlasLDfXs/AkUeCU+SzcvTP0kvwfcegGrPyJtZzSfFSunlMsKj2erwjY/+cwmOHWeu kpltefjMXOODzWAlOgNVa/T4NQHkBGdObtfsWapKPLkDHoBKFGC2ZN9 X-Developer-Key: i=gregor.herburger@linutronix.de; a=ed25519; pk=u72Lv7+/lS5CC1hmSrb17lv/6CK7HBh4Lvz77PHA5LM= The Raspberry Pi firmware allows to set a reboot mode called tryboot that allows to try booting from a different partition to allow updating of the boot partition. Allow reboot mode properties by referencing the reboot-mode schema. The firmware allows a 32bit value to be sent as reboot flag so restrict the maxItems to 1. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Gregor Herburger --- .../bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml | 9 +++++= ++++ 1 file changed, 9 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-= firmware.yaml b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm28= 35-firmware.yaml index 983ea80eaec97..28c5713860468 100644 --- a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmwar= e.yaml +++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmwar= e.yaml @@ -133,6 +133,15 @@ properties: required: - compatible =20 + mode-normal: + maxItems: 1 + + mode-tryboot: + maxItems: 1 + +allOf: + - $ref: /schemas/power/reset/reboot-mode.yaml# + required: - compatible - mboxes --=20 2.47.3 From nobody Sat Sep 26 05:33:47 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6231A3D6662; Fri, 4 Sep 2026 07:47:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788508023; cv=none; b=l8UmiYJUe4wIAB2DGn1iyjP2fFVjQ9IehOBZpJiAos7ysnERO48o3e+EHFLud06F9F305k+Nzke0WBy+nbQIEyjLepWQH+MsQ7Ykc3mztW0JmZHQUUIB07xUiwcrumqxr1ZX2cl6kcW4HgnJeBeIg0iW5hHfOMX1YIar5Lt1fdc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788508023; c=relaxed/simple; bh=m/CpdHsEvCUAW7gTaGCn5VOySfV0RT0PmGxauC7Qq9Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mpk8pT2sOZLTnG/stsoPYBpKiFZ+MlZ3hPMcC2SoSDJ3EXhqHzCPlMYt5Rxm0tvJw0JsuDEFzuTxCB5mgk+UvXxjzKcK2yj/KTfvulbpn4BM2kDo6W6rKQbE0TYydFM6r2Uj+Gf1IFkFzW2s5eaXyGN6YRY7KjgIyg2Igep5zKs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=zaxys6tg; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=JLzMvJgv; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="zaxys6tg"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="JLzMvJgv" From: Gregor Herburger DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1788508014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AM15zzYi1yxVJZ232mvEjfyytA9TXr/3DtqNdm0DHBM=; b=zaxys6tgPVbJX8vLnb8M/vj1wL3qhYCNdiJ36chsK5B6qMPvA9tKNQ7N5khlICnnPZr0ql vxPYU9x4PAuYZNHRC2Y9ESw/2ABiZBY3XN7hfBw6gDdOAImAq/iVq5bKuCGJji/E1KVme9 IoL9V79bqrmr29Cxq9ZhKQtfLk3WTMyf3ooiq8/ltp9eZR8SOUwghn9CyyCT1QY+tMQZN6 ibAlODXyidW1wCywLfsqS+VeCe840OB8oqJPj1SptMAkixPj/womAThisoJIZa4hY14vB/ CTyv8JQgvl9SeZcys25jXKsXk5iXzBh9YRR1qGPiyj5CcNqx7o9ndyKJ+zlqeg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1788508014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AM15zzYi1yxVJZ232mvEjfyytA9TXr/3DtqNdm0DHBM=; b=JLzMvJgvk15wscBR3sZMxMkrUMD4hCcY6ItDGtLN6M4vRakonQ4umjiakjQ0xE6FSuJ1Ad vqfGmtXTaQRv1kDg== Date: Fri, 04 Sep 2026 09:46:51 +0200 Subject: [PATCH v4 3/4] firmware: raspberrypi: Add reboot mode support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260904-rpi-tryboot-v4-3-fdee8bc53ff7@linutronix.de> References: <20260904-rpi-tryboot-v4-0-fdee8bc53ff7@linutronix.de> In-Reply-To: <20260904-rpi-tryboot-v4-0-fdee8bc53ff7@linutronix.de> To: Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Eric Anholt , Stefan Wahren Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Gregor Herburger X-Developer-Signature: v=1; a=ed25519-sha256; t=1788508013; l=5609; i=gregor.herburger@linutronix.de; s=20260226; h=from:subject:message-id; bh=m/CpdHsEvCUAW7gTaGCn5VOySfV0RT0PmGxauC7Qq9Y=; b=9dVVDGfkubSY0dcIMI5zmv98wOBijAH+GwXXiWdPr/8GmVq4fCSaDbzAl5s67ZSg/uwIlfNbS Q7VbkGUvJkDChKqEHUqPJ1uohqQAm4pZ4iQ/iaFMsSxfwTa7aG6V2R9 X-Developer-Key: i=gregor.herburger@linutronix.de; a=ed25519; pk=u72Lv7+/lS5CC1hmSrb17lv/6CK7HBh4Lvz77PHA5LM= The Raspberry Pi firmware has a tryboot mode where it tries to boot from another partition. This can be used to create a A/B update scheme. To enable this on the next boot, the RPI_FIRMWARE_SET_REBOOT_FLAGS message must be sent to the firmware. Add support for this by registering a reboot mode driver. Furthermore, safely registering the reboot mode requires adjusting the teardown sequence. Replace the manually called rpi_firmware_put() with a devres-managed called (devm_add_action_or_reset). Without this, the cleanup function of devm_reboot_mode_register() would trigger a use-after-free error by attempting to access the firmware context after it had already been freed by rpi_firmware_remove(). Signed-off-by: Gregor Herburger Tested-by: Stefan Wahren --- drivers/firmware/Kconfig | 2 ++ drivers/firmware/raspberrypi.c | 40 ++++++++++++++++++++++++++= ---- include/soc/bcm2835/raspberrypi-firmware.h | 2 ++ 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index b7cc11e4fbfa6..ec9e06960ec32 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -139,6 +139,8 @@ config RASPBERRYPI_FIRMWARE depends on ARM || ARM64 depends on MAILBOX default ARCH_BCM2835 + select POWER_RESET + select REBOOT_MODE help This option enables support for communicating with the firmware on the Raspberry Pi. diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c index 0aa322e9a2e73..9038bd5fdb8e2 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include =20 @@ -29,6 +30,7 @@ struct rpi_firmware { struct mbox_client cl; struct mbox_chan *chan; /* The property channel. */ struct completion c; + struct reboot_mode_driver reboot_mode; u32 enabled; =20 struct kref consumers; @@ -273,10 +275,37 @@ static void devm_rpi_firmware_put(void *data) rpi_firmware_put(fw); } =20 +static int rpi_firmware_reboot_mode_write(struct reboot_mode_driver *reboo= t, + unsigned int magic) +{ + struct rpi_firmware *fw =3D container_of(reboot, struct rpi_firmware, + reboot_mode); + __le32 fw_magic =3D cpu_to_le32(magic); + + if (!magic) + return 0; + + return rpi_firmware_property(fw, RPI_FIRMWARE_SET_REBOOT_FLAGS, + &fw_magic, sizeof(fw_magic)); +} + +static void rpi_register_reboot_mode(struct device *dev, struct rpi_firmwa= re *fw) +{ + int ret; + + fw->reboot_mode.dev =3D dev; + fw->reboot_mode.write =3D rpi_firmware_reboot_mode_write; + ret =3D devm_reboot_mode_register(dev, &fw->reboot_mode); + if (ret) + dev_err(dev, "Failed to register reboot mode: %d\n", ret); + +} + static int rpi_firmware_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; struct rpi_firmware *fw; + int ret; =20 /* * Memory will be freed by rpi_firmware_delete() once all users have @@ -292,7 +321,7 @@ static int rpi_firmware_probe(struct platform_device *p= dev) =20 fw->chan =3D mbox_request_channel(&fw->cl, 0); if (IS_ERR(fw->chan)) { - int ret =3D PTR_ERR(fw->chan); + ret =3D PTR_ERR(fw->chan); kfree(fw); return dev_err_probe(dev, ret, "Failed to get mbox channel\n"); } @@ -300,11 +329,16 @@ static int rpi_firmware_probe(struct platform_device = *pdev) init_completion(&fw->c); kref_init(&fw->consumers); =20 + ret =3D devm_add_action_or_reset(dev, devm_rpi_firmware_put, fw); + if (ret) + return ret; + platform_set_drvdata(pdev, fw); =20 rpi_firmware_print_firmware_revision(fw); rpi_register_hwmon_driver(dev, fw); rpi_register_clk_driver(dev); + rpi_register_reboot_mode(dev, fw); =20 return 0; } @@ -321,14 +355,10 @@ static void rpi_firmware_shutdown(struct platform_dev= ice *pdev) =20 static void rpi_firmware_remove(struct platform_device *pdev) { - struct rpi_firmware *fw =3D platform_get_drvdata(pdev); - platform_device_unregister(rpi_hwmon); rpi_hwmon =3D NULL; platform_device_unregister(rpi_clk); rpi_clk =3D NULL; - - rpi_firmware_put(fw); } =20 static const struct of_device_id rpi_firmware_of_match[] =3D { diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm28= 35/raspberrypi-firmware.h index 8ad1cdbf5e9f5..b75596dc367bb 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -81,6 +81,7 @@ enum rpi_firmware_property_tag { RPI_FIRMWARE_GET_POE_HAT_VAL =3D 0x00030049, RPI_FIRMWARE_SET_POE_HAT_VAL =3D 0x00030050, RPI_FIRMWARE_NOTIFY_XHCI_RESET =3D 0x00030058, + RPI_FIRMWARE_GET_REBOOT_FLAGS =3D 0x00030064, RPI_FIRMWARE_NOTIFY_DISPLAY_DONE =3D 0x00030066, RPI_FIRMWARE_SET_CLOCK_STATE =3D 0x00038001, RPI_FIRMWARE_SET_CLOCK_RATE =3D 0x00038002, @@ -92,6 +93,7 @@ enum rpi_firmware_property_tag { RPI_FIRMWARE_SET_SDHOST_CLOCK =3D 0x00038042, RPI_FIRMWARE_SET_GPIO_CONFIG =3D 0x00038043, RPI_FIRMWARE_SET_PERIPH_REG =3D 0x00038045, + RPI_FIRMWARE_SET_REBOOT_FLAGS =3D 0x00038064, =20 /* Dispmanx TAGS */ RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE =3D 0x00040001, --=20 2.47.3 From nobody Sat Sep 26 05:33:47 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 622833D6494; Fri, 4 Sep 2026 07:47:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788508022; cv=none; b=ip0cTZPhjfNpe+JQA8FQWHuWhw1DDzOb31FbRqjoV/9vhB7sP0Q5ZpEJlMN6I8MFPf8hTg3eJ7EFMRKVEl4FAM1ZRlHn57oPeJESlh8nv0C5P6hT+j2w/clx3xEDBl2xEPMGEMSIpZRgJHTPHnsf+VaO2l56I2uhbWdETfw6Dig= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788508022; c=relaxed/simple; bh=mtAzetqs605P30BAlqjqWHlKtFDY7Xar7nSqW4P19ok=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GlsJ3CgEFkI+5BVNyW8/ahXZUN6ygdJA/fyjIvdtW8joyN9LHS/Ya2aYZylpwBmhtUPEslrXLvhqIr4Up6zx8ozQCByoPMLkh3Kj0iySLAmakzQIm4zWajXLNU03hMDC+AZ92sWe+ZouLC+hWXMdIjREUsh9PeNWdl8HTnblmYg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Ou7KYloF; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Oli/DLLT; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Ou7KYloF"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Oli/DLLT" From: Gregor Herburger DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1788508014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=64FPqO/LfunvshSq+IFyW+9AM3tTCc0dWxi+1v1KXro=; b=Ou7KYloFVfQeXOYjs6icOcO0toqKh4tb2sQ5odwXHVOTwX0ANZ1w+cy3jK1J43zOSlVWPE TADjKYOCz9fBujFYOOTnLvbGbycGhmkNqsILmWSUk3/swvmvSLabubbgdG1xz6drH4MQfG RJBqmnkESJR7Ehab8xEeeld3SFCt6JSZ/+e8FTfcU6nP9qdOTHD2mg0DzYcfJKHnP3voPF Zceser/FEoKcNOMKUmEBCTAh/YaOZ5yNGpmj5ZQe5eBN+oCGsgnBjZmSfc86pdJAoCTevq 683mAaE1G4Hw1r7XELAC6fdnfVNhIHL0TusJ8r5WAh2sQJlJ4qu4VFHWoDKGXg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1788508014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=64FPqO/LfunvshSq+IFyW+9AM3tTCc0dWxi+1v1KXro=; b=Oli/DLLTChQOzEKX+fc9+x90BNQKTKC6oGTFHIhIYW3mksystGx1zRRJ8OHifiAzXvnItd y/3GJMSmp9tHQVDA== Date: Fri, 04 Sep 2026 09:46:52 +0200 Subject: [PATCH v4 4/4] arm64: dts: broadcom: bcm2712: Add reboot modes to firmware node Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260904-rpi-tryboot-v4-4-fdee8bc53ff7@linutronix.de> References: <20260904-rpi-tryboot-v4-0-fdee8bc53ff7@linutronix.de> In-Reply-To: <20260904-rpi-tryboot-v4-0-fdee8bc53ff7@linutronix.de> To: Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Eric Anholt , Stefan Wahren Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Gregor Herburger X-Developer-Signature: v=1; a=ed25519-sha256; t=1788508013; l=866; i=gregor.herburger@linutronix.de; s=20260226; h=from:subject:message-id; bh=mtAzetqs605P30BAlqjqWHlKtFDY7Xar7nSqW4P19ok=; b=9OHiFAcRLrbVcJZzqxiwULkiLJzATYx1es2N7u29eEKBKhMKvQyU31E4wctPOOGLn+ajDrn7n tG42W1UFI9vDi4tqcsiGlslqMktTkAGruvyhdfLm6uDdAQ/iC8PxQWf X-Developer-Key: i=gregor.herburger@linutronix.de; a=ed25519; pk=u72Lv7+/lS5CC1hmSrb17lv/6CK7HBh4Lvz77PHA5LM= The Raspberry Pi firmware driver allows the tryboot reboot mode. Add this mode and normal boot mode to the node. Signed-off-by: Gregor Herburger --- arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi b/arch/= arm64/boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi index b7a6bc34ae1ab..67095c7ff770d 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi @@ -49,6 +49,8 @@ firmware: rpi-firmware { compatible =3D "raspberrypi,bcm2835-firmware", "simple-mfd"; =20 mboxes =3D <&mailbox>; + mode-normal =3D <0>; + mode-tryboot =3D <1>; =20 firmware_clocks: clocks { compatible =3D "raspberrypi,firmware-clocks"; --=20 2.47.3