From nobody Fri Apr 10 02:40:04 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 8FB933DFC81 for ; Wed, 4 Mar 2026 18:04:02 +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=1772647443; cv=none; b=AOwAWp6tVXrILbTeZVGpAVCxPGCDS6rwTqKQR1YPdFQ5lP+8SyauO+yX9pTNwRGxUbi6WBy7dz8zdish9KAWonZEFa/qZtyGR/dn1tNd1o3Fl59ko9tVmA0KSEyLLklXLDxhJs43X5d/mcmukNgWHxeBAneOnUWpPz4dhodJvT8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772647443; c=relaxed/simple; bh=AmJ/4s4g3aYrMbA4gYXXe4kt530xNpdozBMOFvrv/ik=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tKEjooRpxw4R6lnD0U23XS/bFqwqQw7pN3otRNGXyn1WLrB7Qk+ODg9HafxaQ80FPNOOqnBU09SRTQ0Pm89uV2rCcQDyw71rpor9Ewocb9S1nmUKFn5NgyG/UczoLaw7H7PqQ96bRjfCR+p65QOP5AfJ5TjZLWnK0szimkk/nNs= 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=ocSBfwS7; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=e80AEgbj; 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="ocSBfwS7"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="e80AEgbj" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 624HH6pL3837881 for ; Wed, 4 Mar 2026 18:04:02 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= 6K2GYPaT0CXFc6s+49BofuLoHb7MJAM3YjniV/PTVb8=; b=ocSBfwS7W/Cqi/ue ZKO60KY+TP+VXwxHOycgTe49YR91RvnTVgtJIm5D2HRSguOBT3tG665Jbaicvk9y ROgzKVtPamxVB6dT66ls626XYV/icTNUpXk+Au+E8BmQshznRl5b+3ljI2NxU+DC BwepL6Y5b+daHg7u+CyeempgDqkX2lEfulkHaVMwgETG0MZot7HtIFaikaqTbxjV 0/LtASQp3Dm6R3PvHjtOzvPSU2NoD1ReT2K1UgHbYYqQazU8IUoP4Ty+b6LfqyEY xt2Jpw0jDQSjztCZibEHmOLrTjt6hvYAu4UYgK/BTdy/ecj8UEtiYFh0TDtPQlTs kJMFVQ== 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 4cps0m04qs-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 04 Mar 2026 18:04:01 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-354c0234c1fso5953135a91.2 for ; Wed, 04 Mar 2026 10:04:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772647441; x=1773252241; 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=6K2GYPaT0CXFc6s+49BofuLoHb7MJAM3YjniV/PTVb8=; b=e80AEgbjvL9UHPUi8L9oM0mxI7MUQIenA2c/uC14U3DvbmIbV3FVAv731WdhzmURcK zwetes0tspmaq4CPlSSZUua2gja8yVYJbgct8DR/O2bRUG9UvUqIcK84GEXJWcqNgP50 gRdHpCFnW/qpbaukHtw051m7wMwnAASaWgsIhcD0oUfEZo/afWcR0/p/cG+FY/UKIw++ dLQxUiE/dKDUksQWiwkObM0YCHFnSLVlDvhZvum0hWYcfmbK+Mz6mo3QBNYif0Jt/S7w ULoCx2TDHmP6I8vcsOrPHYPxNCInIOYNltuOxs7FIapYEmFncGJdXBa76NvZD7uDy5tX sTSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772647441; x=1773252241; 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=6K2GYPaT0CXFc6s+49BofuLoHb7MJAM3YjniV/PTVb8=; b=YAX5pMKxBGTgSJSsLBmhBJzN0nYKjjQ5KfNK0Kgp+OfNkd3oNzoz4GXK4aW2QfKqMo iJfK1bZoiR01C7RHbyukBNiFQRoWuvNX/eMfma9jBR5rLYzjqrJqFDt4ZVVBgWgyTUuG 4kknyCn7p5jv3iyXz+ev++DLICt9NMK1cUHQcuNCmeLSdie+dB7OstN+w7BrWPcM0xZF bAInYFnIk2PVcVHIir516H/0/uzq+G3Gd8DivXImYrFwAogBKG64q6+uvyJAuY+Vkvfe 7OR0+1N2TT90dAv4v5S76YstHT/RcPk3mId5LwnTf8yOLYBVpaHpTP3nNUahbGj8YQmA aNGA== X-Forwarded-Encrypted: i=1; AJvYcCXUQWyfkXfAdr/V2aebLAT8xsTAbRizW8SqHglmqfjLcHnmM3z+Ur+v5be917vTEjGu2ox5dULQBy9HPB4=@vger.kernel.org X-Gm-Message-State: AOJu0Ywxhr4EWOPfDMCW9XOsuccazwFCUUwLOj9DLXjNi3BbU3qvJ1HT sWzxEULq1eBzjwMbm3MIcC7nPMzuymhqgkTtG0DQzVohcrjOTFSI0U556aQm35pa0ylp3LzrhIE q4BZM/MVY9ieAK21ULCILi+gkLHTANmR8RQXJFeLtPla361nIc+39vBuaA39uomgWohM= X-Gm-Gg: ATEYQzyndjCQPCai+1kqy4KR/hjs1WPxoxGMHG8H3lXRVXSnOcZyTr4AL8Od5wIe7p1 phSyErvdQUn3fNbaDCf4GYsDR5kDOC8dDI4bXdiZLILtpuJBT8m/z42KQSPQFdxOvujVlwk881P UUmko31vv14FRI66Y8si8FVuHBLX/tDjIn178jkmBqD90Ej7XKIhMeXUFn0ZWNN3TrBQBoOejFq HDLwI/L0NNzteaN3RTXHIf/O0nXOYoZLuSlGR84lKQbN6UdS8iuYJxdVcvndwavPYpjm2uo+l/w eCg6CyqtHrnZ8QJwAENpYyOfMjp3f0J1Lm2l5GebNcgzGX/FtTfVL/gFccB2v1QGofNhLh+b0UG lw1+RGxVQphgUKceGgytfNT6pY6XLFncULaaDlkHD3Yh68xtauEZmE3Ec5A== X-Received: by 2002:a17:90a:c2cc:b0:34c:35ce:3c5f with SMTP id 98e67ed59e1d1-359a69a2776mr2352335a91.5.1772647441142; Wed, 04 Mar 2026 10:04:01 -0800 (PST) X-Received: by 2002:a17:90a:c2cc:b0:34c:35ce:3c5f with SMTP id 98e67ed59e1d1-359a69a2776mr2352313a91.5.1772647440632; Wed, 04 Mar 2026 10:04:00 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2026 10:04:00 -0800 (PST) From: Shivendra Pratap Date: Wed, 04 Mar 2026 23:33:04 +0530 Subject: [PATCH v20 04/10] firmware: psci: Introduce command-based reset in psci_sys_reset 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-4-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=4337; i=shivendra.pratap@oss.qualcomm.com; s=20250710; h=from:subject:message-id; bh=AmJ/4s4g3aYrMbA4gYXXe4kt530xNpdozBMOFvrv/ik=; b=PjZRL0pismwX2J7LSY8RYJf4oRN9Cgr6rxdBO9Kub43Gke8+/H2QuB/RnbSvXRgPxUMIJ1JCK g0qm1UeINtEBiRYrjScfhqXYtH4z8Of/X/mu89uj6JPBnVbU+Byt2jf X-Developer-Key: i=shivendra.pratap@oss.qualcomm.com; a=ed25519; pk=CpsuL7yZ8NReDPhGgq6Xn/SRoa59mAvzWOW0QZoo4gw= X-Authority-Analysis: v=2.4 cv=e6wLiKp/ c=1 sm=1 tr=0 ts=69a87411 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=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=eczEI0HPkUfQIoTEgvMA:9 a=QEXdDO2ut3YA:10 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-ORIG-GUID: 7l7ppbqyIFcaYOnAUCGrJvOAg5jfzxt8 X-Proofpoint-GUID: 7l7ppbqyIFcaYOnAUCGrJvOAg5jfzxt8 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA0MDE0NyBTYWx0ZWRfXy9vkK8qZLT90 uTbqQEzWjmnHhF8oM1xUSUomSjq43+WFosWZdlX4zbgyJI5YD41FXBrCEliBQ6hxJTM0PtfUdJQ or1QT03LaZQ/VhyfKlBSNzD8m6KJHwVngmqd4pND8jKE9Ckw6ZHyqCHHhtMmZi0+Yd03pdEGb7/ z9mIiG4/YKfbGvTsPxiP71JdCXVZiHthDP7R1znsHi1Cxq63Ti3o0CZ5/UcGBUNpt9EFQvwFEA7 sJ75pi9Dc1Sja1tZ9TGDPbN0m2ePilSUgAcXigpfndjVpY7TgyR/SvEnwwNa5mV6uYr7tRz4nD0 fCfbrw7sAl4JXz0EgWI9vULKXHfA6cBKb6KwTzDIcpjbOAbxUJpYMdN33rdkvXmJ+c0M4xr4K4o 8Bv/cWZ/ZrmcoLwtR79hngTdxWfzGgl6yQeDUu+NRlK79B0hWC+SuoAUGm6yHNPXugIyr1V/ono HJfpu6+LWffbkLPX5Tg== 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 malwarescore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 clxscore=1015 spamscore=0 adultscore=0 impostorscore=0 suspectscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603040147 PSCI currently supports only COLD reset and ARCH WARM reset based on the Linux reboot_mode variable. The PSCI specification now includes SYSTEM_RESET2 for vendor-specific resets, but there's no mechanism to issue these through psci_sys_reset. Add a command-based reset mechanism that allows external drivers to set the psci reset command via a new psci_set_reset_cmd() function. The psci command-based reset is disabled by default and the psci_sys_reset follows its original flow until a psci_reset command is set. In kernel panic path, psci_reset command is ignored. Signed-off-by: Shivendra Pratap --- drivers/firmware/psci/psci.c | 45 ++++++++++++++++++++++++++++++++++++++++= ++-- include/linux/psci.h | 2 ++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index 38ca190d4a22d6e7e0f06420e8478a2b0ec2fe6f..ae6f7a0aead913d740070080d4b= 2a3da15b29485 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -51,6 +51,15 @@ static int resident_cpu =3D -1; struct psci_operations psci_ops; static enum arm_smccc_conduit psci_conduit =3D SMCCC_CONDUIT_NONE; =20 +struct psci_sys_reset_params { + u32 system_reset; + u32 reset_type; + u32 cookie; + bool cmd; +}; + +static struct psci_sys_reset_params psci_reset; + bool psci_tos_resident_on(int cpu) { return cpu =3D=3D resident_cpu; @@ -80,6 +89,28 @@ static u32 psci_cpu_suspend_feature; static bool psci_system_reset2_supported; static bool psci_system_off2_hibernate_supported; =20 +/** + * psci_set_reset_cmd - Sets the psci_reset_cmd for command-based + * reset which will be used in psci_sys_reset call. + * + * @cmd_sys_rst2: Set to true for SYSTEM_RESET2 based resets. + * @cmd_reset_type: Set the reset_type argument for psci_sys_reset. + * @cmd_cookie: Set the cookie argument for psci_sys_reset. + */ +void psci_set_reset_cmd(bool cmd_sys_rst2, u32 cmd_reset_type, u32 cmd_coo= kie) +{ + if (cmd_sys_rst2 && psci_system_reset2_supported) { + psci_reset.system_reset =3D PSCI_FN_NATIVE(1_1, SYSTEM_RESET2); + psci_reset.reset_type =3D cmd_reset_type; + psci_reset.cookie =3D cmd_cookie; + } else { + psci_reset.system_reset =3D PSCI_0_2_FN_SYSTEM_RESET; + psci_reset.reset_type =3D 0; + psci_reset.cookie =3D 0; + } + psci_reset.cmd =3D true; +} + static inline bool psci_has_ext_power_state(void) { return psci_cpu_suspend_feature & @@ -309,14 +340,24 @@ static int get_set_conduit_method(const struct device= _node *np) static int psci_sys_reset(struct notifier_block *nb, unsigned long action, void *data) { - if ((reboot_mode =3D=3D REBOOT_WARM || reboot_mode =3D=3D REBOOT_SOFT) && - psci_system_reset2_supported) { + if (((reboot_mode =3D=3D REBOOT_WARM || reboot_mode =3D=3D REBOOT_SOFT) && + psci_system_reset2_supported) && (panic_in_progress() || !psci_reset= .cmd)) { /* * reset_type[31] =3D 0 (architectural) * reset_type[30:0] =3D 0 (SYSTEM_WARM_RESET) * cookie =3D 0 (ignored by the implementation) */ invoke_psci_fn(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2), 0, 0, 0); + } else if (!panic_in_progress() && psci_reset.cmd) { + /* + * Commands are being set in psci_set_reset_cmd + * This issues, SYSTEM_RESET2 arch warm reset or + * SYSTEM_RESET2 vendor-specific reset or + * a SYSTEM_RESET cold reset in accordance with + * the reboot-mode command. + */ + invoke_psci_fn(psci_reset.system_reset, psci_reset.reset_type, + psci_reset.cookie, 0); } else { invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); } diff --git a/include/linux/psci.h b/include/linux/psci.h index 4ca0060a3fc42ba1ca751c7862fb4ad8dda35a4c..d13ceca88eab8932894051e7c86= e806c2ad8a73a 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -45,8 +45,10 @@ struct psci_0_1_function_ids get_psci_0_1_function_ids(v= oid); =20 #if defined(CONFIG_ARM_PSCI_FW) int __init psci_dt_init(void); +void psci_set_reset_cmd(bool cmd_sys_rst2, u32 cmd_reset_type, u32 cmd_coo= kie); #else static inline int psci_dt_init(void) { return 0; } +static inline void psci_set_reset_cmd(bool cmd_sys_rst2, u32 cmd_reset_typ= e, u32 cmd_cookie) { } #endif =20 #if defined(CONFIG_ARM_PSCI_FW) && defined(CONFIG_ACPI) --=20 2.34.1