From patchwork Thu Nov 7 23:38:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliot Berman X-Patchwork-Id: 841617 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 78D581EF923; Thu, 7 Nov 2024 23:38:56 +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=1731022738; cv=none; b=g+YH8fvlqmm1EgW0V1CCCm8JhBeU7pB03AKctr63i6EpOOvS1PbRrRYFR8HnASMI21wPCPhtR8lieC5ueIlQg0hdDp6+JXp03H5gd5NSd1oZc8DALQHrSmQin41WhJXK7DWFLre/lHBNbpvxA6T4Yo1bnqH/A79P17ShqYbx+Lw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731022738; c=relaxed/simple; bh=0HnLCOZP1B/1T0InZegEFDaJucGOJo6BtXW7fZfUmis=; h=From:Subject:Date:Message-ID:MIME-Version:Content-Type:To:CC; b=JsjlRUvr8Lz3QgX7cTI/X7MNVUAIHSlRx4pzH1NCopWkmqmrDne/TGn2FDRMgAuMrj+M+NIcTojhU71gTbrI6T0n3tkTlEbPXTE8ybw5Qu76I7XG4OFkz/OF0yklzMetoETdy/dVkQtz5qmmsSm8xw/ucSNRJQ1Aus1EAilO53M= 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=euHWVPSv; 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="euHWVPSv" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4A7MbG4j011905; Thu, 7 Nov 2024 23:38:36 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=98nx60epR9vs2UuESWH8Fh c4MoC94bCY9F17WIXBtko=; b=euHWVPSvcRgsN/wk3WYmDB6KofQWvqkbjFVbV5 msE0LabTvqHhTfSXzTTAHd/w61NRwtTFQOz5gVumwuUyb2PvCt6Q531J7yGFt0mI d3NEa6kiXvY3lU9q5Rq80lMin10iSmmry6qA81AYDMoVhNNY1sMVi6SpFRY0rmfZ 8jNxdZNMZHPJ37k8HUncFYPHLHi8guP+dbWB2SHO2Ab1L9sFFvI7ohWRCfjB7Dy8 JLnoSov7yNz7jgttGMQETcrJELCSM5qJtbZJ7Cze49Hum9Oj+vYwZUfuEOIOY3dQ CsXEyHbo5CjmK1HKMtRYj5rRyH1DBHoBoTI3w89RzNH27w2Q== Received: from nasanppmta02.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 42s6gm03tq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 07 Nov 2024 23:38:36 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA02.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 4A7NcZ0t006842 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 7 Nov 2024 23:38:35 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; Thu, 7 Nov 2024 15:38:34 -0800 From: Elliot Berman Subject: [PATCH v8 0/6] Implement vendor resets for PSCI SYSTEM_RESET2 Date: Thu, 7 Nov 2024 15:38:24 -0800 Message-ID: <20241107-arm-psci-system_reset2-vendor-reboots-v8-0-e8715fa65cb5@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=H4sIAHBPLWcC/5XSy07DMBAF0F+pssZoxu+w4j8QQvbYoV40KXaIq Kr+O055tNAu0uV4ce7MlfdNiTnF0jys9k2OUypp6Otg71YNrV3/GlkKdW44cIGAmrm8YdtCiZV dGePmJccSR86m2Ichsxz9MIyFEQkXpNIEBppqbXPs0scx5+m5zutUxiHvjrETzq/fCVwuTJiQA QON3hiCFiU8vr0nSj3d07CZI788Abd4gULQQijuAl71EM1N+wmSGjkqEfkfb+5g4j93S5C4+G4 +7+laB0o5LW136YqTq1AtdUV1UYcgu5bAeXnpypOrEZe6srqt7eq2zkgX7aWrzt3F/aq5X6tbB Z1WQFdc/evWn2uXurq61fPRWg+OX+nBnLl8sWuq6yRJ8BA9qX/u4XD4BC90FwGMAwAA X-Change-ID: 20231016-arm-psci-system_reset2-vendor-reboots-cc3ad456c070 To: Bjorn Andersson , Sebastian Reichel , Rob Herring , 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 , Stephen Boyd , , , Elliot Berman X-Mailer: b4 0.14.2 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: oIHAc12bN80_CxYVqJ6A5-zKsNxkVpHE X-Proofpoint-GUID: oIHAc12bN80_CxYVqJ6A5-zKsNxkVpHE 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=796 spamscore=0 suspectscore=0 adultscore=0 bulkscore=0 impostorscore=0 mlxscore=0 phishscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2411070184 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/ Signed-off-by: Elliot Berman Changes in v8: - Code style nits from Stephen - Add rb3gen2 - Link to v7: https://lore.kernel.org/r/20241028-arm-psci-system_reset2-vendor-reboots-v7-0-a4c40b0ebc54@quicinc.com Changes in v7: - Code style nits from Stephen - Dropped unnecessary hunk from the sa8775p-ride patch - Link to v6: https://lore.kernel.org/r/20241018-arm-psci-system_reset2-vendor-reboots-v6-0-50cbe88b0a24@quicinc.com 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 Reviewed-by: Konrad Dybcio --- Elliot Berman (6): 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: qcm6490-idp: Add PSCI SYSTEM_RESET2 types arm64: dts: qcom: qcs6490-rb3gen2: Add PSCI SYSTEM_RESET2 types arm64: dts: qcom: sa8775p-ride: Add PSCI SYSTEM_RESET2 types 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/qcs6490-rb3gen2.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 | 104 +++++++++++++++++++++ 11 files changed, 187 insertions(+), 4 deletions(-) --- base-commit: 98f7e32f20d28ec452afb208f9cffc08448a2652 change-id: 20231016-arm-psci-system_reset2-vendor-reboots-cc3ad456c070 Best regards,