From nobody Fri Apr 10 02:40:05 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 021DA3DEAFE for ; Wed, 4 Mar 2026 18:03:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772647431; cv=none; b=tSOhJOeXFTmxxXq1t5TEkJ4k5F9REHEdTsTpXn72MuzUY9UrE0jFHYdMIZz/11k98igLbBI7W4S/uonzdInhNS8xkmAj4OVOeqKS3EM8Yb2dDGZ9AqwBHQOlJFRg3PXNjCRKXy5EbjaQzdxv9ArWxQQR25NnzZkTYLiYQzgeII0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772647431; c=relaxed/simple; bh=8KcQuYEpP24a6WBCDAg2F+ny1MptqZFFDATDZNiqhrY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qGhTt/ME1ni9TmN2rhYlXJpIEADD3kpleZqPeXfA1VA6uwepnd5AiobG2TBX5DQqSvoA+7+hIADtIAjpi1xdlldfW3vMtLVZf8SgxaMYUGbm4HH3IjvCmqjm2zesKhQJtN+LV2uUbfrVDT0kJyaVWLD0/r0DdpXpzq4kPMya0+8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=BLBRchu4; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=h8TlKbHK; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="BLBRchu4"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="h8TlKbHK" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 624CMwkH152512 for ; Wed, 4 Mar 2026 18:03:45 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 5leCT/obbHTfFTbu8A2pbgBO1nV7mxacWx4r8X8VVnA=; b=BLBRchu49Q7lOaah r2rUqDTXtYnhAoypPmnBKbLt9v0/T9mDZmB7OCm4b8m7HhnNJLpUbQtqiFjcL9lf FicUQSKttndKvp6osG61QMRJJ2Dx3jwiXoiH4cghUJAKQCXUilS0Rm3CYgYfTD+J 2iWghoxgzijDG2rXxaJHtfEPQb9dV7tzF67M93oQnAGzsxxLOJKgPaYrbw6aqxzv x5rV5NXJSCRT4tW7vKpe2HYGFCyUR5z5fE5PbpSqq6AHdVap2NOyWVraFYpmwlqR 4LuUIFBYRlewridfWbROb3cQO+F85OlwjIbrh9eoN8x/DSa2x0cAeam0+FQEMHrk 9EQr1g== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cp3tvmpqe-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 04 Mar 2026 18:03:45 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-35641c14663so7424919a91.2 for ; Wed, 04 Mar 2026 10:03:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772647425; x=1773252225; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=5leCT/obbHTfFTbu8A2pbgBO1nV7mxacWx4r8X8VVnA=; b=h8TlKbHKt4CvxKV5ERtbBXfQ4EUErGLkPouieN42dl5qa26PIrfCtSLVfUDC0Y+o0u ex6Ag27Fa2kRddmB8Qcrl5u7Lo+rPzsEHSmmrFlRc4c3rm4G6aVkFHsTamstKGcNOfXw dyBMROye0Xa7n0s0aIv8DwQ+jxCFgGwPxZmixI6qXBR6mhHlNHJ/PCBMOsWsso4xqBu2 PzS1ywI6htfY9+zxUJnaL+rBh7GMEXXn4e8FI6dtiEoJjQTF8g6gesrZkM4BVhpvrR0U gR2h68tGJSUnmiqbY54azF6fSETGraqtnRRXoxKTbRGZPjCmU1QrpExs0PWAUlEBjVeA sOAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772647425; x=1773252225; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=5leCT/obbHTfFTbu8A2pbgBO1nV7mxacWx4r8X8VVnA=; b=Q848Jd84MdZO8jjFtRhmONJjDq8kD33VQpX9+YiVlRJvhgIRXipPK+leNiodRKrbFt Ae6oGFnelGRTX4yb6Tw/GCKf2rJgmvKhXYiabGMQalvQkF5fnCqcj6GNpymda1ZumeH8 srKBxIrzPBcuohRgzcdga9weSwZSIOqEA0tcDkeSawUsGvAQ496uIOxDmAR4YEUsHcZr bgkac3Drzv5iZ1zqBMmVgl64zpz86Ol6AZOZj27LWenfDnoB4F28jUDmr5iH6cbIXFHq Q+FevvB7N974yJbqnZ7BrNGL6ZNcDV/c+uL+NdGY/49B8JMYHy6GHT9+KBo6bTiP/1V7 3qDg== X-Forwarded-Encrypted: i=1; AJvYcCVtLQIuzN2JVYiVXm+6mB/HCA3P07opr83tCxVWZ/HsYXZ0XMJGQYNxmRYo9vZu09/LoaY6bQHpPOUb5w0=@vger.kernel.org X-Gm-Message-State: AOJu0YwFo4wpGFuWD9rXpRFfvYOYsn5giRhiSqg7GPnfSFlFNMwpZBj4 oEVSLv/N/h6Ll19/juqqaw5iXTDOYK36GdFzNta5ynUdr0NuyTZEtzFIXHm+iKHP3Ix4Rp5etMe 06JPPQB2Oh8uEcd06xiqXKMeOWaLHc0zKj5dqTpVuTuaiAMLyH67zpCHxbYge4RN6v7E= X-Gm-Gg: ATEYQzyEWY93/NKOGOCWmci97/FK23PU0UbZ/X05t/b33XTKJiF60NwKAJUQm1bMID+ BF7kgUXe1KS/83A9QLrag9nY8bhHXwFe1vMP54OOGASmyg4ss2Nn+3OPletjp1G4cizc+dOzkXw oZtEhjPUSgjisRNrNRTlNlaWsVSYQaDTJ1b6mAXQL+8rY7oSs9gRKTqtBsNGpRKIInOZ1O5Pjhn VzIbHbolAM4jxw5EKFX3Aj6IeqNkBTOtMHaI+T4ak7YO2CCXBhpKCNIKy/ggeB4o+7s7pEH9zjd LNVsUGaIr0H1EHFiaoXMg2GOZCcHl2HavcbuMDMS7N4QVbWbXuG+MdOUtiMXMc7NBnqCCOi0sVx oIs5zbIaWG0fCMkbixHK6XXP5gxkExpXfRVNtJJT8S0JOfagU2nEVJXz4+w== X-Received: by 2002:a17:90b:3fc8:b0:359:dd9:3de5 with SMTP id 98e67ed59e1d1-359a69ae7e7mr2522695a91.4.1772647424477; Wed, 04 Mar 2026 10:03:44 -0800 (PST) X-Received: by 2002:a17:90b:3fc8:b0:359:dd9:3de5 with SMTP id 98e67ed59e1d1-359a69ae7e7mr2522654a91.4.1772647423957; Wed, 04 Mar 2026 10:03:43 -0800 (PST) Received: from hu-spratap-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359a8f22062sm1080606a91.1.2026.03.04.10.03.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2026 10:03:43 -0800 (PST) From: Shivendra Pratap Date: Wed, 04 Mar 2026 23:33:02 +0530 Subject: [PATCH v20 02/10] power: reset: reboot-mode: Add support for 64 bit magic 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: <20260304-arm-psci-system_reset2-vendor-reboots-v20-2-cf7d346b8372@oss.qualcomm.com> References: <20260304-arm-psci-system_reset2-vendor-reboots-v20-0-cf7d346b8372@oss.qualcomm.com> In-Reply-To: <20260304-arm-psci-system_reset2-vendor-reboots-v20-0-cf7d346b8372@oss.qualcomm.com> To: Lorenzo Pieralisi , Arnd Bergmann , Bjorn Andersson , Sebastian Reichel , Rob Herring , Souvik Chakravarty , Krzysztof Kozlowski , Andy Yan , Matthias Brugger , Mark Rutland , Conor Dooley , Konrad Dybcio , John Stultz , Moritz Fischer , Bartosz Golaszewski , Sudeep Holla Cc: Florian Fainelli , Krzysztof Kozlowski , Dmitry Baryshkov , Mukesh Ojha , Andre Draszik , Kathiravan Thirumoorthy , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Shivendra Pratap , Srinivas Kandagatla X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1772647398; l=7396; i=shivendra.pratap@oss.qualcomm.com; s=20250710; h=from:subject:message-id; bh=8KcQuYEpP24a6WBCDAg2F+ny1MptqZFFDATDZNiqhrY=; b=Quxdo+gN7haqmu+eDMts1IZ0ljKit/vaTkr3wMfpYRhp8casQAkwwj1uz2maGX4edprwxn4sU 2UFOUZ+rj+vAzN33bwNlxHfyCrttyCETbo6UYJ3f3OZB75WXP7ppGpb X-Developer-Key: i=shivendra.pratap@oss.qualcomm.com; a=ed25519; pk=CpsuL7yZ8NReDPhGgq6Xn/SRoa59mAvzWOW0QZoo4gw= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA0MDE0NyBTYWx0ZWRfX3DyFQ+iDcDaR BRQp1kJNIl530e6Ubl3MasapdZpmg80qFhZvRisvnLs/HykgXU6eh4CH34MBUUZPpt9yBYZIycP aev1ng0q8OSWHMRL8wzF8qBIi1fMyV3KGG2eMTBAR5m2zrPNA4sMzd30UJfFUI8zgnTeCr8BB3R eWnP6DwDglq+GBF7418Lj3nFXbj9bXwox/d2zE3zZ9Xrcztd5kssYJAIPFKFkPrE8PrLbl9Oi2k hTNQky5o7waoGevNeZBDVqTIC2kMvn4Kuu2Qi/4A0UYdKwB4tF6KkLKYg+yTE5+Dld38IUTLdU2 mRPZJh+FQyaX0l1aMPbY/rfYjwnJ9Tqwo6HX1r/FLVl0AFdEx5wfMwWWey+VBXLbgUDUtItFejR /pr9K+uJeo6gNTcOyQVlaZC0/+EXZ7VxYqZHvb+ZmvWr34ff/6S0MMLfDGG22koXB3HPpGc94Th aEVE/5X8l///CYYSB8g== X-Authority-Analysis: v=2.4 cv=VYv6/Vp9 c=1 sm=1 tr=0 ts=69a87401 cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=MO_J9Aa4ypbE8kPWTcIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-GUID: Q89jSAc9EvB1GwoIHf1E6CmoBJue4Z9f X-Proofpoint-ORIG-GUID: Q89jSAc9EvB1GwoIHf1E6CmoBJue4Z9f X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-04_07,2026-03-04_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 suspectscore=0 bulkscore=0 adultscore=0 spamscore=0 phishscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603040147 Current reboot-mode supports a single 32-bit argument for any supported mode. Some reboot-mode based drivers may require passing two independent 32-bit arguments during a reboot sequence, for uses-cases, where a mode requires an additional argument. Such drivers may not be able to use the reboot-mode driver. For example, ARM PSCI vendor-specific resets, need two arguments for its operation =E2=80=93 reset_type and cookie, to complete the reset operation. If a driver wants to implement this firmware-based reset, it cannot use reboot-mode framework. Introduce 64-bit magic values in reboot-mode driver to accommodate up-to two 32-bit arguments in below format. | Higher 32 bit | Lower 32 bit | | arg2 | arg1 | Update current reboot-mode drivers for 64-bit magic. Signed-off-by: Shivendra Pratap Reviewed-by: Sebastian Reichel --- drivers/power/reset/nvmem-reboot-mode.c | 8 ++++---- drivers/power/reset/qcom-pon.c | 6 +++--- drivers/power/reset/reboot-mode.c | 16 +++++++++------- drivers/power/reset/syscon-reboot-mode.c | 6 +++--- include/linux/reboot-mode.h | 15 ++++++++++++++- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/drivers/power/reset/nvmem-reboot-mode.c b/drivers/power/reset/= nvmem-reboot-mode.c index d260715fccf67f9f072bb56c5defbf885750650e..bd05d660490c686b43134f82f1e= add7665403d20 100644 --- a/drivers/power/reset/nvmem-reboot-mode.c +++ b/drivers/power/reset/nvmem-reboot-mode.c @@ -17,10 +17,10 @@ struct nvmem_reboot_mode { struct nvmem_cell *cell; }; =20 -static int nvmem_reboot_mode_write(struct reboot_mode_driver *reboot, - unsigned int magic) +static int nvmem_reboot_mode_write(struct reboot_mode_driver *reboot, u64 = magic) { struct nvmem_reboot_mode *nvmem_rbm; + u32 magic_arg1 =3D REBOOT_MODE_ARG1(magic); size_t buf_len; void *buf; int ret; @@ -32,10 +32,10 @@ static int nvmem_reboot_mode_write(struct reboot_mode_d= river *reboot, return PTR_ERR(buf); kfree(buf); =20 - if (buf_len > sizeof(magic)) + if (buf_len > sizeof(magic_arg1)) return -EINVAL; =20 - ret =3D nvmem_cell_write(nvmem_rbm->cell, &magic, buf_len); + ret =3D nvmem_cell_write(nvmem_rbm->cell, &magic_arg1, buf_len); if (ret < 0) dev_err(reboot->dev, "update reboot mode bits failed\n"); =20 diff --git a/drivers/power/reset/qcom-pon.c b/drivers/power/reset/qcom-pon.c index 7e108982a582e8243c5c806bd4a793646b87189f..57b36e6186f80aff947fd7f5aae= 5ce280c65dc6b 100644 --- a/drivers/power/reset/qcom-pon.c +++ b/drivers/power/reset/qcom-pon.c @@ -27,17 +27,17 @@ struct qcom_pon { long reason_shift; }; =20 -static int qcom_pon_reboot_mode_write(struct reboot_mode_driver *reboot, - unsigned int magic) +static int qcom_pon_reboot_mode_write(struct reboot_mode_driver *reboot, u= 64 magic) { struct qcom_pon *pon =3D container_of (reboot, struct qcom_pon, reboot_mode); + u32 magic_arg1 =3D REBOOT_MODE_ARG1(magic); int ret; =20 ret =3D regmap_update_bits(pon->regmap, pon->baseaddr + PON_SOFT_RB_SPARE, GENMASK(7, pon->reason_shift), - magic << pon->reason_shift); + magic_arg1 << pon->reason_shift); if (ret < 0) dev_err(pon->dev, "update reboot mode bits failed\n"); =20 diff --git a/drivers/power/reset/reboot-mode.c b/drivers/power/reset/reboot= -mode.c index d033043f5250a4de152a7786ef37e88a0ace3bbb..f5ab6eab210bcd9670441a4d2a3= 01d9efdf2f322 100644 --- a/drivers/power/reset/reboot-mode.c +++ b/drivers/power/reset/reboot-mode.c @@ -19,12 +19,11 @@ =20 struct mode_info { const char *mode; - u32 magic; + u64 magic; struct list_head list; }; =20 -static unsigned int get_reboot_mode_magic(struct reboot_mode_driver *reboo= t, - const char *cmd) +static u64 get_reboot_mode_magic(struct reboot_mode_driver *reboot, const = char *cmd) { const char *normal =3D "normal"; struct mode_info *info; @@ -56,7 +55,7 @@ static int reboot_mode_notify(struct notifier_block *this, unsigned long mode, void *cmd) { struct reboot_mode_driver *reboot; - unsigned int magic; + u64 magic; =20 reboot =3D container_of(this, struct reboot_mode_driver, reboot_notifier); magic =3D get_reboot_mode_magic(reboot, cmd); @@ -78,7 +77,7 @@ int reboot_mode_register(struct reboot_mode_driver *reboo= t) struct property *prop; struct device_node *np =3D reboot->dev->of_node; size_t len =3D strlen(PREFIX); - u32 magic; + u32 magic[2] =3D {0}; int ret; =20 INIT_LIST_HEAD(&reboot->head); @@ -87,7 +86,10 @@ int reboot_mode_register(struct reboot_mode_driver *rebo= ot) if (strncmp(prop->name, PREFIX, len)) continue; =20 - if (device_property_read_u32(reboot->dev, prop->name, &magic)) { + size_t count =3D device_property_count_u32(reboot->dev, prop->name); + + if (!count || count > ARRAY_SIZE(magic) || + device_property_read_u32_array(reboot->dev, prop->name, magic, count= )) { pr_debug("reboot mode %s without magic number\n", prop->name); continue; } @@ -98,7 +100,7 @@ int reboot_mode_register(struct reboot_mode_driver *rebo= ot) goto error; } =20 - info->magic =3D magic; + info->magic =3D REBOOT_MODE_MAGIC(magic[0], magic[1]); info->mode =3D kstrdup_const(prop->name + len, GFP_KERNEL); if (!info->mode) { ret =3D -ENOMEM; diff --git a/drivers/power/reset/syscon-reboot-mode.c b/drivers/power/reset= /syscon-reboot-mode.c index e0772c9f70f7a19cd8ec8a0b7fdbbaa7ba44afd0..9f4b18c5e46f6a8bf197773cece= b80b250f57541 100644 --- a/drivers/power/reset/syscon-reboot-mode.c +++ b/drivers/power/reset/syscon-reboot-mode.c @@ -20,16 +20,16 @@ struct syscon_reboot_mode { u32 mask; }; =20 -static int syscon_reboot_mode_write(struct reboot_mode_driver *reboot, - unsigned int magic) +static int syscon_reboot_mode_write(struct reboot_mode_driver *reboot, u64= magic) { struct syscon_reboot_mode *syscon_rbm; + u32 magic_arg1 =3D REBOOT_MODE_ARG1(magic); int ret; =20 syscon_rbm =3D container_of(reboot, struct syscon_reboot_mode, reboot); =20 ret =3D regmap_update_bits(syscon_rbm->map, syscon_rbm->offset, - syscon_rbm->mask, magic); + syscon_rbm->mask, magic_arg1); if (ret < 0) dev_err(reboot->dev, "update reboot mode bits failed\n"); =20 diff --git a/include/linux/reboot-mode.h b/include/linux/reboot-mode.h index 4a2abb38d1d612ec0fdf05eb18c98b210f631b7f..2ce189fdfff4b396d7cc6f175b3= 0016781ae4fe9 100644 --- a/include/linux/reboot-mode.h +++ b/include/linux/reboot-mode.h @@ -2,10 +2,23 @@ #ifndef __REBOOT_MODE_H__ #define __REBOOT_MODE_H__ =20 +#include +#include +#include + +/* Construct 64-bit reboot magic: arg2 in upper 32 bits, arg1 in lower 32 = */ +#define REBOOT_MODE_MAGIC(arg1, arg2) \ + (FIELD_PREP(GENMASK_ULL(31, 0), (arg1)) | \ + FIELD_PREP(GENMASK_ULL(63, 32), (arg2))) +/* Get 32 bit arg1 from 64 bit magic */ +#define REBOOT_MODE_ARG1(magic) FIELD_GET(GENMASK_ULL(31, 0), magic) +/* Get 32 bit arg2 from 64 bit magic */ +#define REBOOT_MODE_ARG2(magic) FIELD_GET(GENMASK_ULL(63, 32), magic) + struct reboot_mode_driver { struct device *dev; struct list_head head; - int (*write)(struct reboot_mode_driver *reboot, unsigned int magic); + int (*write)(struct reboot_mode_driver *reboot, u64 magic); struct notifier_block reboot_notifier; }; =20 --=20 2.34.1