From nobody Tue Feb 10 10:03:36 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 36017346A1F for ; Tue, 23 Dec 2025 17:08:12 +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=1766509694; cv=none; b=c9I7c61VebAsDlbnOLLn9BzRukbO+yc4gzOTNcy8Pd2XopKdzi+Pe8awag5Gm3FFE3C4j39Sx66wm0XoCeqL65NAiW4I3tVdE54w2zV3CtLrWgCByLb3o1LtaoT6IBCMeMH+zJU14rKpBuM1ifRgq89yicadoZ324XYdSg1vvv4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766509694; c=relaxed/simple; bh=2o2cT38Ly46xd/419lqAtzNeNc4dO02E+TShPOPKLWU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Tcu/MnMifh1cz4wCaGQEViGhO2LzqMTdl0vG9N+FxZr8jS4i42cRulApTUb/8Ni0ARNCS4yZ7h0ZUdhn5Yydp2FK6zILBcyex/mSSFTLEHHmyzPRQMJactKJ3icHkbjGof4dNt2lNkUXX9dwL20J1R7gbHC/Vi+VqWdbrLsBmOc= 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=KJW59uGp; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=FhR7mswz; 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="KJW59uGp"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="FhR7mswz" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BNAlrt91569209 for ; Tue, 23 Dec 2025 17:08:11 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= 7mc3GOn350tsV5ROq6wQgRZLIh0hhlkh6WOkw1l+Vmk=; b=KJW59uGpb8HkkLVK xDoavrn4MmeLJb+PXS0aMTmD105NuKRIRhuMJXXJ88k5I20iGy98cfm9pu1cLNEp r5Th+IFHeMFZ+XxFQy5FovEEooftgnFr4tNojHWbEfmq3sU+/e7razRdqO53YORY ow2q7Lv4zy0Iv7v600styZbeIVlOTUWXNL1vFRHpaceZwy4PR0earaGHH5DeOipc eMkHNsDGBVuyY9cwZFFqU2rPpLCTfAzGq4xQhPt4GJW0tJn+QC17kY+2BUmIiSJC StkG23iQYhqctdzgZV3qJQZqfvNWOsaMkUAfdibJCGJSlQuYzwslIux0pvNzAtvy jM41GQ== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4b76yy4dkx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 23 Dec 2025 17:08:11 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2a0dabc192eso114294335ad.0 for ; Tue, 23 Dec 2025 09:08:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1766509691; x=1767114491; 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=7mc3GOn350tsV5ROq6wQgRZLIh0hhlkh6WOkw1l+Vmk=; b=FhR7mswzBlXO6z933RUQVlzGPq+QRFOCQRRwpaKHsD9iAnjEIgERryJH3Av6wJczIj aZbTk3fXwbBZS60e776IkAHMa8Aj8zzEGlsk+3u9BQxnvtDbmbtBSe7ilTv55mc3d0FN Mgml6Bk9i7x5quXYWdCUljr8qvtNwXZfaWs27Cz7qONNmnpfL/JvMkNHChOMll1ByZ5K 8WF8qTC1qAgy8CP1NeCxoIb3al9JL/B2T+zteon60DhTUmK/ZJRzhdoI/6XCvax9HA72 s2zfLX0EFr5ULVYNbn2e+iRm2BCpaZ7/ECXNCkVw7AQBZhHhksE9uv797ahvXsxwjmx3 z+hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766509691; x=1767114491; 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=7mc3GOn350tsV5ROq6wQgRZLIh0hhlkh6WOkw1l+Vmk=; b=n2EWwl/50borApm53tJtBaNgZfKwS5dXVrLve9yJM1GPGhlxEZWpmXNKOstVFrexG9 rlu1yb580Uoa+M5MoI8MUAltuPGoS+U5dEHzrdTu+trqSuuHhQkYrkXWidHwp+VTh9rJ LiOJn6aS7oLu4U/Q05lCDVxIebys+vuBms3UmkT0tAds09y7sBr/6mkvDVl/79EGa40U pBiwN2X/WtHS4zJVjIH5GDPHZP+ZSn/H0Kghbra5injtfUPG7XyxN9hCCo9zc+oyn3Qd M86UOFZiOxEiGG8u/i9sWR2hLC2AzActXkcawkNJNGQGw3kEIEk48/P/VbFxw5SVXKp8 1LKQ== X-Forwarded-Encrypted: i=1; AJvYcCUInRH3q3E4UVuy8N17h9fM7R8+ORRDWQrCaKceeKbq4q+fNMPqu23aAimzgbGoz63lVktMdBHf2EqjLUs=@vger.kernel.org X-Gm-Message-State: AOJu0Yxs3FVMaPPgZ1daH0CI1RZXqNzFddRgvvlj1tgxishzNrv3DAuY Gjbc+QFovi4PszvAJbtKAmMbIn+MJ14hxJho8PmlOSyweJezT4Ygi+z1eVs0edQ2jkkTLLBD5My fRXRwfBD2gNQgpultaNtlVj5KhMktJhwRreXFTw2YfDYJPA7iZauDW3K52DKVQY+rMwU= X-Gm-Gg: AY/fxX5zxvvKRs80Kabcx6HZjag57eObSEJrEnbXijLunDbROI1NBZlhllNHdJRLijp 241Y+4q5mEk2ZYWTcEdQtfNLvMFvzObayptMVp/AJCHkjK+VsLpWX6hvLWFWnE5r2az8fE4o+ZA 7t3vqf0ZZU0SmSKXogRJ22u9hvB6Pn9+Ok/hDbOH7p5i7PpHrAHlwCKUP8cdvQf/ukItnkYDQDa Mm2ftmX9WlcrO/h1P0/ObtncTLcAR9rP6tADftK7Oe0Yn85eQHyrOj0txCzuzU2Y/Nwtbi/r7f+ xOXzQSWxBGBR7NlhhArp9UQMeuc2hxNQsFhwPPvk0Ow+BVEzgHo+wHBS2RObXy32XCRbf3kvg1V nNNBrlMOFoXnCOMKp5Jp/Yrtlm7NIyRa6WemdJVNGhyfQiA== X-Received: by 2002:a17:902:ec8b:b0:2a0:d436:e7ad with SMTP id d9443c01a7336-2a2f2832c51mr157278005ad.49.1766509690524; Tue, 23 Dec 2025 09:08:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IGQ4aOnLvyrVaT66N/eDSlqnerZMeyA1rrRBgGG9I3JAKDcbQUsSMiZ5xQmSXBqsbJ2CmnO9w== X-Received: by 2002:a17:902:ec8b:b0:2a0:d436:e7ad with SMTP id d9443c01a7336-2a2f2832c51mr157277475ad.49.1766509689927; Tue, 23 Dec 2025 09:08:09 -0800 (PST) Received: from hu-spratap-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a2f3d5d863sm130019325ad.80.2025.12.23.09.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 09:08:09 -0800 (PST) From: Shivendra Pratap Date: Tue, 23 Dec 2025 22:37:33 +0530 Subject: [PATCH v18 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: <20251223-arm-psci-system_reset2-vendor-reboots-v18-2-32fa9e76efc3@oss.qualcomm.com> References: <20251223-arm-psci-system_reset2-vendor-reboots-v18-0-32fa9e76efc3@oss.qualcomm.com> In-Reply-To: <20251223-arm-psci-system_reset2-vendor-reboots-v18-0-32fa9e76efc3@oss.qualcomm.com> To: Lorenzo Pieralisi , Arnd Bergmann , Bjorn Andersson , Sebastian Reichel , Rob Herring , Sudeep Holla , Souvik Chakravarty , Krzysztof Kozlowski , Andy Yan , Bartosz Golaszewski 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, Shivendra Pratap , Srinivas Kandagatla , Umang Chheda , Nirmesh Kumar Singh X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1766509672; l=7589; i=shivendra.pratap@oss.qualcomm.com; s=20250710; h=from:subject:message-id; bh=2o2cT38Ly46xd/419lqAtzNeNc4dO02E+TShPOPKLWU=; b=ErA8eTOuOFOVhrWwNxeIIP8Srfsn/pUO1IpTWe2NedElfQ2IN4YB6eCoG1OL1KxxLRWA2O5U9 jE3AMKHa3WXBeBut/eiy7DVsRaP290clHrPDEVmXVTJPn/xTrYR/pwP X-Developer-Key: i=shivendra.pratap@oss.qualcomm.com; a=ed25519; pk=CpsuL7yZ8NReDPhGgq6Xn/SRoa59mAvzWOW0QZoo4gw= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjIzMDE0MiBTYWx0ZWRfX363JrB2jtUJ9 C7KSJavjEMHAHMx01Oyo4zFplQdsHp/NWRcE3DtuWgj4i4HFuu9EtZr2ff59SQ8vH+/xHQ2hOPN DN7kHk2lXydJTUOE3RldrrikXzSHCpIFAlFmj/EgoPkyvlD3qz+PExejRXPlSxMFf8Od2TDmdbD tcETXgCdPZmfK+2tTglrAKmRGWnLy5S3LgFmef45r34+g9meEWo5SJGejR03wQQ0enIIK0Gr/qF 4ofVFtUqjqbO31HLG+PX8oVLQUpf+m/0Uk/kjPRdcgnRJkeM9rE9tjnYga6XbgFwpY3y7J3Qsa4 eC2/A4xjnHHV3J5AJXoERGx/U81AM/e8pmBDz1xu8gTmfMREntevf3CsH8N9wJ8hhy0E/138JW4 lZnZ5z7ojtpG1lVwpaErH6l4rGEe0XiyiYMVfH1i6Z+ZUmq6Pzrdtfa3ejk6SIx+8b2l1xB1DSf iyUpi6ar7equhmX2ZKg== X-Authority-Analysis: v=2.4 cv=Zb0Q98VA c=1 sm=1 tr=0 ts=694acc7b cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=wP3pNCr1ah4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=MO_J9Aa4ypbE8kPWTcIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-ORIG-GUID: nsSucrd7cq-fPri7YCiQYUTm7RZO1lOQ X-Proofpoint-GUID: nsSucrd7cq-fPri7YCiQYUTm7RZO1lOQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-23_04,2025-12-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 malwarescore=0 impostorscore=0 phishscore=0 spamscore=0 bulkscore=0 adultscore=0 suspectscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2512230142 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. u64 magic Reviewed-by: Nirmesh Kumar Singh Reviewed-by: Umang Chheda -------------------------------------------- | Higher 32 bit | Lower 32 bit | | arg2 | arg1 | -------------------------------------------- Update current reboot-mode drivers for 64-bit magic. Reviewed-by: Umang Chheda Reviewed-by: Nirmesh Kumar Singh Signed-off-by: Shivendra Pratap --- drivers/power/reset/nvmem-reboot-mode.c | 10 ++++++---- drivers/power/reset/qcom-pon.c | 8 +++++--- drivers/power/reset/reboot-mode.c | 24 ++++++++++++++++++------ drivers/power/reset/syscon-reboot-mode.c | 8 +++++--- include/linux/reboot-mode.h | 6 +++++- 5 files changed, 39 insertions(+), 17 deletions(-) diff --git a/drivers/power/reset/nvmem-reboot-mode.c b/drivers/power/reset/= nvmem-reboot-mode.c index 41530b70cfc48c2a83fbbd96f523d5816960a0d1..b3d21d39b0f732254c40103db1b= 51fb7045ce344 100644 --- a/drivers/power/reset/nvmem-reboot-mode.c +++ b/drivers/power/reset/nvmem-reboot-mode.c @@ -16,15 +16,17 @@ 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) { - int ret; struct nvmem_reboot_mode *nvmem_rbm; + u32 magic_arg1; + int ret; =20 + /* Use low 32 bits of magic for argument_1 */ + magic_arg1 =3D FIELD_GET(GENMASK_ULL(31, 0), magic); nvmem_rbm =3D container_of(reboot, struct nvmem_reboot_mode, reboot); =20 - ret =3D nvmem_cell_write(nvmem_rbm->cell, &magic, sizeof(magic)); + ret =3D nvmem_cell_write(nvmem_rbm->cell, &magic_arg1, sizeof(magic_arg1)= ); 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..ccce1673b2ec47d02524edd4481= 1d4f528c243e8 100644 --- a/drivers/power/reset/qcom-pon.c +++ b/drivers/power/reset/qcom-pon.c @@ -27,17 +27,19 @@ 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; int ret; =20 + /* Use low 32 bits of magic for argument_1 */ + magic_arg1 =3D FIELD_GET(GENMASK_ULL(31, 0), magic); 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 4b6ae4007c4f6fb7d51520b4be2bf3cb1dff518e..54adcda57e44edf2fd2cda0f752= 226f747aa72d7 100644 --- a/drivers/power/reset/reboot-mode.c +++ b/drivers/power/reset/reboot-mode.c @@ -17,12 +17,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; @@ -54,7 +53,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); @@ -77,7 +76,8 @@ 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_arg1; + u32 magic_arg2; int ret; =20 INIT_LIST_HEAD(&reboot->head); @@ -86,10 +86,13 @@ int reboot_mode_register(struct reboot_mode_driver *reb= oot) if (strncmp(prop->name, PREFIX, len)) continue; =20 - if (of_property_read_u32(np, prop->name, &magic)) { + if (of_property_read_u32(np, prop->name, &magic_arg1)) { pr_err("reboot mode %s without magic number\n", prop->name); continue; } + /* Default magic_arg2 to zero */ + if (of_property_read_u32_index(np, prop->name, 1, &magic_arg2)) + magic_arg2 =3D 0; =20 info =3D kzalloc(sizeof(*info), GFP_KERNEL); if (!info) { @@ -97,6 +100,15 @@ int reboot_mode_register(struct reboot_mode_driver *reb= oot) goto error; } =20 + /** + * Format of u64 magic + *------------------------------------------- + *| Higher 32 bit | Lower 32 bit | + *| arg2 | arg1 | + *------------------------------------------- + */ + info->magic =3D FIELD_PREP(GENMASK_ULL(63, 32), magic_arg2) | + FIELD_PREP(GENMASK_ULL(31, 0), magic_arg1); 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..eb7fc5b7d6a7ed8a833d4920991= c4c40b5b13ca7 100644 --- a/drivers/power/reset/syscon-reboot-mode.c +++ b/drivers/power/reset/syscon-reboot-mode.c @@ -20,16 +20,18 @@ 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; int ret; =20 + /* Use low 32 bits of magic for argument_1 */ + magic_arg1 =3D FIELD_GET(GENMASK_ULL(31, 0), magic); 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..a359dc0c6dede0ac5ce67190a00= d46a7e7856707 100644 --- a/include/linux/reboot-mode.h +++ b/include/linux/reboot-mode.h @@ -2,10 +2,14 @@ #ifndef __REBOOT_MODE_H__ #define __REBOOT_MODE_H__ =20 +#include +#include +#include + 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