From patchwork Fri Oct 18 19:39:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliot Berman X-Patchwork-Id: 836962 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 39B25204026; Fri, 18 Oct 2024 19:40:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729280426; cv=none; b=E1+ywGz/waNNSgrVd/h+FGqJzrrAyZLChKE1eWJgh5WpOiZQNSe/NkPxFcPAO2swFiRretQ6/tF8zGnlqVWcvlxn5g1ipkP298Cmt2wSuor6fD4Xt4YARTUM9nwzKvxD+yWDfYoRf2a0IFiJI1RbR5dNgFFv9StNq3sm867kmOs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729280426; c=relaxed/simple; bh=LPW8/ez6AwSPZDjxxtxtUFyILYtZeVKHH5MWyDhAyYI=; h=From:Subject:Date:Message-ID:MIME-Version:Content-Type:To:CC; b=lDihurItoQWbeWWJ1wycUAw5U6466mHZ2p9yqX66jtO1ZL7r/oNYZ/bCee/8uS9qItctPLgFqIV8Kpf4cUIYxCM5gM7FNYcZqhOrkOAyah9XwLNj4q0/i6ECCxbYmXNnVP5obajzexbusIToCxQfNjQewJzzYwvCZNbUqg+KOu8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=hZMXociR; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="hZMXociR" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49IFEW5a010129; Fri, 18 Oct 2024 19:40:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=A0FUHvPsDiLCJXQ5F+IVBe /dkeLQt6w8lHz0ZlzcbZo=; b=hZMXociR/rF3CPaLjebD4Ujd5Kp+zW8qJGDt0U YEKTtRhPNl1co1VUM0xhV6hKwUEZCrCXrZufuCe6qIRrJaw5t19IjWjjbUOG/kvt U9U/OMPmGO1/mFbw2SIuEXepkvNSYWyRf73pBuLtta0+npLnPzjq2TQOfbNGY6Qj mrbTuMHqLeM4F8juiPPCLgjvNtunyy0IGmbf+GzdMVNqs+7teA/3YuoACNOtzxbN IEERf6bAko7oSJzcgJerp6QKTe0hWePyPPIYSQ1nR/lKCiCDpWUsGpSJlNPAuEQq Pf7wK7Gy6ckLrOMNSGJXrK3u88IPOEa5I01M4hl3BvhadkEA== Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 42bt540nem-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 18 Oct 2024 19:40:06 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA05.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 49IJe5BW014162 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 18 Oct 2024 19:40:05 GMT Received: from hu-eberman-lv.qualcomm.com (10.49.16.6) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Fri, 18 Oct 2024 12:40:04 -0700 From: Elliot Berman Subject: [PATCH v6 0/5] Implement vendor resets for PSCI SYSTEM_RESET2 Date: Fri, 18 Oct 2024 12:39:45 -0700 Message-ID: <20241018-arm-psci-system_reset2-vendor-reboots-v6-0-50cbe88b0a24@quicinc.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAIG5EmcC/5XQTU7DMBAF4KtUXmM0478kXXEPhJAzdqgXiYsdI qoqd8cpoAJhkS5nFt97M2eWfQo+s/3uzJKfQg5xKIO52zE62OHF8+DKzAQIiYCG29TzY6bA8ym Pvn9OPvtR8MkPLiaefBvjmDmRtE5pQ1ABK9Yx+S68X3Ien8p8CHmM6XSJnXDZfiUItTFhQg4cD LZVRdCggofXt0BhoHuK/RL56Um4xXPknJFSC+vwXw+xuqmfJGVQoJZe/PKWH0zi+24FCjffLZa etrGgtTWq7tauvLoa9VZXFheNc6prCGyr1q66ugZxq6uK29RdaWsrZX29dvVPd/N/9fLf2jQaO qOB/rjzPH8ApWCMxtwCAAA= To: Bjorn Andersson , Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Vinod Koul , Andy Yan , "Lorenzo Pieralisi" , Mark Rutland , Bartosz Golaszewski , Arnd Bergmann , Olof Johansson , Catalin Marinas , Will Deacon , , Krzysztof Kozlowski , Konrad Dybcio , Konrad Dybcio CC: Satya Durga Srinivasu Prabhala , Melody Olvera , Shivendra Pratap , , , , Florian Fainelli , , , Elliot Berman X-Mailer: b4 0.14.1 X-ClientProxiedBy: nalasex01c.na.qualcomm.com (10.47.97.35) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: LzttEHW59RXLO2mcaqcy25v01H_qzGmJ X-Proofpoint-GUID: LzttEHW59RXLO2mcaqcy25v01H_qzGmJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 bulkscore=0 lowpriorityscore=0 malwarescore=0 clxscore=1015 priorityscore=1501 impostorscore=0 phishscore=0 spamscore=0 mlxscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410180125 The PSCI SYSTEM_RESET2 call allows vendor firmware to define additional reset types which could be mapped to the reboot argument. Setting up reboot on Qualcomm devices can be inconsistent from chipset to chipset. Generally, there is a PMIC register that gets written to decide the reboot type. There is also sometimes a cookie that can be written to indicate that the bootloader should behave differently than a regular boot. These knobs evolve over product generations and require more drivers. Qualcomm firmwares are beginning to expose vendor SYSTEM_RESET2 types to simplify driver requirements from Linux. Add support in PSCI to statically wire reboot mode commands from userspace to a vendor reset and cookie value using the device tree. The DT bindings are similar to reboot mode framework except that 2 integers are accepted (the type and cookie). Also, reboot mode framework is intended to program the cookies, but not actually reboot the host. PSCI SYSTEM_RESET2 does both. I've not added support for reading ACPI tables since I don't have any device which provides them + firmware that supports vendor SYSTEM_RESET2 types. --- Lorenzo and I are also looking for some feedback on whether it is safe to perform a vendor SYSTEM_RESET2 irrespective of the enum reboot_mode: https://lore.kernel.org/all/Zw5ffeYW5uRpsaG3@lpieralisi/ --- Previous discussions around SYSTEM_RESET2: - https://lore.kernel.org/lkml/20230724223057.1208122-2-quic_eberman@quicinc.com/T/ - https://lore.kernel.org/all/4a679542-b48d-7e11-f33a-63535a5c68cb@quicinc.com/ To: Bjorn Andersson To: Konrad Dybcio To: Sebastian Reichel To: Rob Herring To: Krzysztof Kozlowski To: Conor Dooley To: Vinod Koul To: Andy Yan To: Lorenzo Pieralisi To: Mark Rutland To: Bartosz Golaszewski To: Arnd Bergmann To: Olof Johansson A To: Catalin Marinas To: Will Deacon To: cros-qcom-dts-watchers@chromium.org Cc: Satya Durga Srinivasu Prabhala Cc: Melody Olvera Cc: Shivendra Pratap Cc: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli Cc: linux-pm@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org Signed-off-by: Elliot Berman Changes in v6: - Rebase to v6.11 and fix trivial conflicts in qcm6490-idp - Add sa8775p-ride support (same as qcm6490-idp) - Link to v5: https://lore.kernel.org/r/20240617-arm-psci-system_reset2-vendor-reboots-v5-0-086950f650c8@quicinc.com Changes in v5: - Drop the nested "items" in prep for future dtschema tools - Link to v4: https://lore.kernel.org/r/20240611-arm-psci-system_reset2-vendor-reboots-v4-0-98f55aa74ae8@quicinc.com Changes in v4: - Change mode- properties from uint32-matrix to uint32-array - Restructure the reset-types node so only the restriction is in the if/then schemas and not the entire definition - Link to v3: https://lore.kernel.org/r/20240515-arm-psci-system_reset2-vendor-reboots-v3-0-16dd4f9c0ab4@quicinc.com Changes in v3: - Limit outer number of items to 1 for mode-* properties - Move the reboot-mode for psci under a subnode "reset-types" - Fix the DT node in qcm6490-idp so it doesn't overwrite the one from sc7820.dtsi - Link to v2: https://lore.kernel.org/r/20240414-arm-psci-system_reset2-vendor-reboots-v2-0-da9a055a648f@quicinc.com Changes in v2: - Fixes to schema as suggested by Rob and Krzysztof - Add qcm6490 idp as first Qualcomm device to support - Link to v1: https://lore.kernel.org/r/20231117-arm-psci-system_reset2-vendor-reboots-v1-0-03c4612153e2@quicinc.com Changes in v1: - Reference reboot-mode bindings as suggeted by Rob. - Link to RFC: https://lore.kernel.org/r/20231030-arm-psci-system_reset2-vendor-reboots-v1-0-dcdd63352ad1@quicinc.com To: Sebastian Reichel To: Rob Herring To: Krzysztof Kozlowski To: Conor Dooley To: Bartosz Golaszewski To: Vinod Koul To: Andy Yan To: Lorenzo Pieralisi To: Mark Rutland To: Bjorn Andersson To: Konrad Dybcio To: cros-qcom-dts-watchers@chromium.org Cc: linux-pm@vger.kernel.org Cc: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-arm-msm@vger.kernel.org --- Elliot Berman (5): dt-bindings: power: reset: Convert mode-.* properties to array dt-bindings: arm: Document reboot mode magic firmware: psci: Read and use vendor reset types arm64: dts: qcom: Add PSCI SYSTEM_RESET2 types for qcm6490-idp arm64: dts: qcom: Add PSCI SYSTEM_RESET2 types for sa8775p-ride Documentation/devicetree/bindings/arm/psci.yaml | 43 ++++++++++ .../bindings/power/reset/nvmem-reboot-mode.yaml | 4 + .../devicetree/bindings/power/reset/qcom,pon.yaml | 7 ++ .../bindings/power/reset/reboot-mode.yaml | 4 +- .../bindings/power/reset/syscon-reboot-mode.yaml | 4 + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 7 ++ arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi | 7 ++ arch/arm64/boot/dts/qcom/sa8775p.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +- drivers/firmware/psci/psci.c | 92 ++++++++++++++++++++++ include/linux/arm-smccc.h | 5 ++ 11 files changed, 173 insertions(+), 4 deletions(-) --- base-commit: 98f7e32f20d28ec452afb208f9cffc08448a2652 change-id: 20231016-arm-psci-system_reset2-vendor-reboots-cc3ad456c070 Best regards,