From patchwork Mon Jul 24 22:30:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliot Berman X-Patchwork-Id: 705753 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4433BC001DE for ; Mon, 24 Jul 2023 22:31:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229683AbjGXWbs (ORCPT ); Mon, 24 Jul 2023 18:31:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230251AbjGXWbr (ORCPT ); Mon, 24 Jul 2023 18:31:47 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E76371735; Mon, 24 Jul 2023 15:31:36 -0700 (PDT) Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36OMMYf8017581; Mon, 24 Jul 2023 22:31:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=nN0DJtoEROST43YwVQQar5B/uJDpBZz6QURRfq3efdA=; b=FuvxLIZ0/vlLyXC6DzO2ISgcd8RaUzhxm+hMWEKruPKEeVdxbEA1QijLvuqgIRVIRLTW /SckP/wSk7pNlFYP6u5KZOk1TYLZgeE//nRNfkiMC1gYzwMUns9d0RjTNc9f+8r//Es5 kfV/EAAI1JCP+R8ZyAwervbi2jD5wyzDpCYbtnEA+TNqzCtLG8/4ivxHWLysMLeZ3iar nuOe2fJoQS/lYM58gzg4IKCQgJRT3J4kgFzW/PkGFVtmI0wdHt8Xgrf7Et4KIhcoV4ZN AwJFCN1hmstd68601ZE/1KHTQ8CFs9QU41bjCsunZ5j5FA4I+VHOnCrGsQ8gFqZkrhux +g== Received: from nasanppmta04.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3s1qcysk2t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 22:31:28 +0000 Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 36OMVRDh003758 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 22:31:27 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.1118.30; Mon, 24 Jul 2023 15:31:27 -0700 From: Elliot Berman To: Mark Rutland , Lorenzo Pieralisi , Sebastian Reichel CC: Elliot Berman , Krzysztof Kozlowski , Conor Dooley , "Rob Herring" , , , , , , , Satya Durga Srinivasu Prabhala , Melody Olvera , "Prasad Sodagudi" Subject: [RFC PATCH 1/4] power: reset: reboot-mode: Allow magic to be 0 Date: Mon, 24 Jul 2023 15:30:51 -0700 Message-ID: <20230724223057.1208122-2-quic_eberman@quicinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230724223057.1208122-1-quic_eberman@quicinc.com> References: <20230724223057.1208122-1-quic_eberman@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] 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: AO2zXQZKTTZ9AQV95k8OBBjoBe9P4s9R X-Proofpoint-GUID: AO2zXQZKTTZ9AQV95k8OBBjoBe9P4s9R X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-24_16,2023-07-24_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 malwarescore=0 adultscore=0 spamscore=0 suspectscore=0 phishscore=0 priorityscore=1501 mlxlogscore=999 clxscore=1015 mlxscore=0 bulkscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307240196 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Allow magic from the reboot-mode driver to be defined, but 0. This is useful when the register/command to trigger reboot needs 0 to be written. This is the case when the "default" reboot mode is to enter a crash dump collection mode (e.g. when triggered by a watchdog) and Linux doing a normal reboot requires the setting to be explicitly reset to zero. Signed-off-by: Elliot Berman --- drivers/power/reset/reboot-mode.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/power/reset/reboot-mode.c b/drivers/power/reset/reboot-mode.c index b4076b10b893..a646aefa041b 100644 --- a/drivers/power/reset/reboot-mode.c +++ b/drivers/power/reset/reboot-mode.c @@ -19,11 +19,10 @@ struct mode_info { struct list_head list; }; -static unsigned int get_reboot_mode_magic(struct reboot_mode_driver *reboot, - const char *cmd) +static bool get_reboot_mode_magic(struct reboot_mode_driver *reboot, + const char *cmd, unsigned int *magic) { const char *normal = "normal"; - int magic = 0; struct mode_info *info; if (!cmd) @@ -31,12 +30,12 @@ static unsigned int get_reboot_mode_magic(struct reboot_mode_driver *reboot, list_for_each_entry(info, &reboot->head, list) { if (!strcmp(info->mode, cmd)) { - magic = info->magic; - break; + *magic = info->magic; + return true; } } - return magic; + return false; } static int reboot_mode_notify(struct notifier_block *this, @@ -46,8 +45,7 @@ static int reboot_mode_notify(struct notifier_block *this, unsigned int magic; reboot = container_of(this, struct reboot_mode_driver, reboot_notifier); - magic = get_reboot_mode_magic(reboot, cmd); - if (magic) + if (get_reboot_mode_magic(reboot, cmd, &magic)) reboot->write(reboot, magic); return NOTIFY_DONE; From patchwork Mon Jul 24 22:30:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliot Berman X-Patchwork-Id: 705752 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 053BEC001E0 for ; Mon, 24 Jul 2023 22:32:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231246AbjGXWcB (ORCPT ); Mon, 24 Jul 2023 18:32:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230362AbjGXWb6 (ORCPT ); Mon, 24 Jul 2023 18:31:58 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD6F01BD9; Mon, 24 Jul 2023 15:31:40 -0700 (PDT) Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36OKj0sR025253; Mon, 24 Jul 2023 22:31:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=0RiqDvAsRoz+wat/BUC+Un9PsqnWtL24OIyCvnctV6A=; b=jSwYOX3NDyEvudpBV/16k7U/XSFzhxw9l4D1MRLontm/ufK26H3VGUP4LzOzYmxzhRYk IQlihyVSfxWt+nC0rm6pOyGvIUS4CYmO05DBnGv07ifMqhPzb2igH9s2fpNLSB1d08RZ 2PUjxHVVLH3La7D0aX0CGN0TQx9I6dg3AhJCRh0MzQlCjP9TzAtuTDmNM+LyRP23t3fn BqxjCQQ9WRMgSJNkX3AT+SBL3/enTVlIMY9PIo5wgshBKMQfxrNiwFn55FTP3vZhmZiX ekaXlgGi9ZnbTBYmz6XDWnsmKBJvJCQCvk0hewBY5+/xuE/hDCxIbAoi/tsSmkqhCC8k jg== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3s1u3t92my-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 22:31:30 +0000 Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 36OMVTga000964 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 22:31:29 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.1118.30; Mon, 24 Jul 2023 15:31:28 -0700 From: Elliot Berman To: Mark Rutland , Lorenzo Pieralisi , Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Elliot Berman CC: , , , , , , "Satya Durga Srinivasu Prabhala" , Melody Olvera , Prasad Sodagudi Subject: [RFC PATCH 3/4] dt-bindings: power: reset: Document arm,psci-vendor-reset Date: Mon, 24 Jul 2023 15:30:53 -0700 Message-ID: <20230724223057.1208122-4-quic_eberman@quicinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230724223057.1208122-1-quic_eberman@quicinc.com> References: <20230724223057.1208122-1-quic_eberman@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] 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-GUID: mRLoo05zWGFRJvpu-xQK8I2LCYpYz64R X-Proofpoint-ORIG-GUID: mRLoo05zWGFRJvpu-xQK8I2LCYpYz64R X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-24_18,2023-07-24_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 lowpriorityscore=0 mlxlogscore=999 clxscore=1015 impostorscore=0 suspectscore=0 spamscore=0 phishscore=0 adultscore=0 bulkscore=0 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307240198 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add devicetree bindings for using PSCI SYSTEM_RESET2 with vendor reset types. Signed-off-by: Elliot Berman --- .../power/reset/arm,psci-vendor-reset.yaml | 35 +++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 36 insertions(+) create mode 100644 Documentation/devicetree/bindings/power/reset/arm,psci-vendor-reset.yaml diff --git a/Documentation/devicetree/bindings/power/reset/arm,psci-vendor-reset.yaml b/Documentation/devicetree/bindings/power/reset/arm,psci-vendor-reset.yaml new file mode 100644 index 000000000000..18b0b8c167a1 --- /dev/null +++ b/Documentation/devicetree/bindings/power/reset/arm,psci-vendor-reset.yaml @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2023 Qualcomm Innovation Center, Inc. All Rights Reserved. +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/power/reset/arm,psci-vendor-reset.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: PSCI SYSTEM_RESET2 Vendor Resets + +maintainers: + - Elliot Berman + +description: | + PSCI SYSTEM_RESET2 supports vendor-defined reset types. This describes + the conversion of reboot modes to the reset types. + +properties: + compatible: + const: arm,psci-vendor-reset + +allOf: + - $ref: reboot-mode.yaml# + +additionalProperties: false + +examples: + - | + firmware { + psci-vendor-resets { + compatible = "arm,psci-vendor-reset"; + reboot-normal = <0x100>; + reboot-bootloader = <0x101>; + reboot-fastboot = <0x102>; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index d516295978a4..2da4c5f1917b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16982,6 +16982,7 @@ M: Mark Rutland M: Lorenzo Pieralisi L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained +F: Documentation/devicetree/bindings/power/reset/arm,psci-vendor-reset.yaml F: drivers/firmware/psci/ F: include/linux/psci.h F: include/uapi/linux/psci.h