From patchwork Fri Nov 17 21:18:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliot Berman X-Patchwork-Id: 166384 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp820597vqn; Fri, 17 Nov 2023 13:22:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IHBlRiCHDTjkm1batbIo7VHHbMQTXcZS88GR8CIthuxE9Yf0h1vUnoWA8Y1RvaKbXCUp4Ks X-Received: by 2002:a05:6808:2094:b0:3a7:6d64:aa68 with SMTP id s20-20020a056808209400b003a76d64aa68mr602247oiw.18.1700256174765; Fri, 17 Nov 2023 13:22:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700256174; cv=none; d=google.com; s=arc-20160816; b=tzAUTncUghg4jksNXUTm3PIPa0UQzyfOij7IiK3NQg7IYM719TW/PqXfQhSRaZQxNh r7MxgTTkNPZ+xVbweBjuEk+80q4sFMqJ8hCWTrT/rajElvXHz+QgsNceEp8eKD5OrqjD Luz9V2jC1oF6vYvZCUnNge8NFPvlGdQ7BXLMO4afAcZfNuTMlOv43RYJi4bQAz47Af5k rXBqW+g0y4VG4SuoR+TLItOgLcpzHIgCLwGjSLfNjfNFAAjvdV+Z98pc0X8hKa97rzRr JE+0aNOfjxkuUgTE4SnKAgB2XgVhay+xwLO+kq99Ny/sFcAaTqsdWugodjYby0Sgsj9o B4oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=086iuiEUDR1u/X5N6NW5Rn1CaU9DwHw296f2RhnLZOs=; fh=hSqztiRBLPxJl4bBUOWDgSdeKGW5GNzk3N7GGirJHIY=; b=iYFbQGtq5l6aItwIfh/NgBtvlgFMZGMLKGXUkf+CAFnAaBcweh56PW4ZM+4yTTtbaU O7I5LTkLStrRvAYKJCPcAWkfHgj7D+zPrE9xS7xT327neumEt3Rha5+94zqNSJG/eJhH +PYstr1WOyc6I1m6lLbTk1vhFfOmujJWjtQnWFkHTIME+8M/PxNbuTGHEwgPwMjEHL7Y SPdb1YOVDzWPu7NE2n0DFHaXXZlxLpJtT5cUzRdv1tHoajpSib528SC6k8sEpX4EKBL6 zF7Sggk78DX43tQOPGBC3JgyG6Eo3BBABXEiJjRG5oAGCV3aVFoltnpZXKQ4e4DUHCfv Dofg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b="og5UG/Zw"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id x17-20020a63fe51000000b005b86142ee56si2565079pgj.277.2023.11.17.13.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 13:22:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b="og5UG/Zw"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 22052829991F; Fri, 17 Nov 2023 13:21:56 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346455AbjKQVVp (ORCPT + 29 others); Fri, 17 Nov 2023 16:21:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235880AbjKQVVU (ORCPT ); Fri, 17 Nov 2023 16:21:20 -0500 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 357DF4218; Fri, 17 Nov 2023 13:19:23 -0800 (PST) Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AHKK6So025137; Fri, 17 Nov 2023 21:19:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : date : subject : mime-version : content-type : content-transfer-encoding : message-id : references : in-reply-to : to : cc; s=qcppdkim1; bh=086iuiEUDR1u/X5N6NW5Rn1CaU9DwHw296f2RhnLZOs=; b=og5UG/Zwy8Sgwea5DAarZOZZyRBCtduKbix2k2Ee+UakYzpTldUCIhiMYfzrSW7gWNuR QGuECMvPZX9t3rZicwNm0RUFkmT8T95ZzkAGNTnvOQZOCLUWct0ORMuG2QN7m2rBD73r h6ksmpYYbgEXyrBzOS7+1wszlLJaBcsgThokKO5x2geW95ZIjuHBNOJS8ZkIwPY+W+DB PWG3ZXG8sIft1wxTqy5a2YI4NikUmjhjxeTrw5FYpZORBiqMICrnpotwEnqjSDtE//ia PnRIhA4WUQVLT6pjpuXFPGn123JSoC3YuDN5M54M3jGEg4eOtL4L5fXdt1fT6b8hFdUq Ng== Received: from nasanppmta04.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3udw46tebq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Nov 2023 21:19:10 +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 3AHLJ9xN004703 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Nov 2023 21:19:09 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.40; Fri, 17 Nov 2023 13:19:08 -0800 From: Elliot Berman Date: Fri, 17 Nov 2023 13:18:48 -0800 Subject: [PATCH 3/3] firmware: psci: Read and use vendor reset types MIME-Version: 1.0 Message-ID: <20231117-arm-psci-system_reset2-vendor-reboots-v1-3-03c4612153e2@quicinc.com> References: <20231117-arm-psci-system_reset2-vendor-reboots-v1-0-03c4612153e2@quicinc.com> In-Reply-To: <20231117-arm-psci-system_reset2-vendor-reboots-v1-0-03c4612153e2@quicinc.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Lorenzo Pieralisi , Mark Rutland CC: Satya Durga Srinivasu Prabhala , Melody Olvera , , , , Florian Fainelli , Elliot Berman X-Mailer: b4 0.13-dev X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01a.na.qualcomm.com (10.47.209.196) 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: 1VSAC0yc29pqRrjKrYRjSx8NgACXlnB1 X-Proofpoint-ORIG-GUID: 1VSAC0yc29pqRrjKrYRjSx8NgACXlnB1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-17_21,2023-11-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxscore=0 clxscore=1015 phishscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 adultscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311170159 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 17 Nov 2023 13:21:56 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782847818794873434 X-GMAIL-MSGID: 1782847818794873434 SoC vendors have different types of resets and are controlled through various registers. For instance, Qualcomm chipsets can reboot to a "download mode" that allows a RAM dump to be collected. Another example is they also support writing a cookie that can be read by bootloader during next boot. PSCI offers a mechanism, SYSTEM_RESET2, for these vendor reset types to be implemented without requiring drivers for every register/cookie. Add support in PSCI to statically map reboot mode commands from userspace to a vendor reset and cookie value using the device tree. Reboot mode framework is close but doesn't quite fit with the design and requirements for PSCI SYSTEM_RESET2. Some of these issues can be solved but doesn't seem reasonable in sum: 1. reboot mode registers against the reboot_notifier_list, which is too early to call SYSTEM_RESET2. PSCI would need to remember the reset type from the reboot-mode framework callback and use it psci_sys_reset. 2. reboot mode assumes only one cookie/parameter is described in the device tree. SYSTEM_RESET2 uses 2: one for the type and one for cookie. 3. psci cpuidle driver already registers a driver against the arm,psci-1.0 compatible. Refactoring would be needed to have both a cpuidle and reboot-mode driver. Signed-off-by: Elliot Berman --- drivers/firmware/psci/psci.c | 87 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index d9629ff87861..3f6a862c3999 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -29,6 +29,8 @@ #include #include +#define REBOOT_PREFIX "mode-" + /* * While a 64-bit OS can make calls with SMC32 calling conventions, for some * calls it is necessary to use SMC64 to pass or return 64-bit values. @@ -79,6 +81,14 @@ struct psci_0_1_function_ids get_psci_0_1_function_ids(void) static u32 psci_cpu_suspend_feature; static bool psci_system_reset2_supported; +struct psci_reset_param { + const char *mode; + u32 reset_type; + u32 cookie; +}; +static struct psci_reset_param *psci_reset_params; +static size_t num_psci_reset_params; + static inline bool psci_has_ext_power_state(void) { return psci_cpu_suspend_feature & @@ -305,11 +315,29 @@ static int get_set_conduit_method(const struct device_node *np) return 0; } +static void psci_vendor_sys_reset2(unsigned long action, void *data) +{ + const char *cmd = data; + size_t i; + + for (i = 0; i < num_psci_reset_params; i++) { + if (!strcmp(psci_reset_params[i].mode, cmd)) { + invoke_psci_fn(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2), + psci_reset_params[i].reset_type, + psci_reset_params[i].cookie, 0); + break; + } + } +} + static int psci_sys_reset(struct notifier_block *nb, unsigned long action, void *data) { + if (psci_system_reset2_supported && num_psci_reset_params) + psci_vendor_sys_reset2(action, data); + if ((reboot_mode == REBOOT_WARM || reboot_mode == REBOOT_SOFT) && - psci_system_reset2_supported) { + psci_system_reset2_supported) { /* * reset_type[31] = 0 (architectural) * reset_type[30:0] = 0 (SYSTEM_WARM_RESET) @@ -748,6 +776,63 @@ static const struct of_device_id psci_of_match[] __initconst = { {}, }; +static int __init psci_init_system_reset2_modes(void) +{ + const size_t len = strlen(REBOOT_PREFIX); + struct psci_reset_param *param; + struct device_node *np; + struct property *prop; + size_t count = 0; + u32 magic[2]; + int ret; + + if (!psci_system_reset2_supported) + return 0; + + np = of_find_matching_node(NULL, psci_of_match); + if (!np) + return 0; + + for_each_property_of_node(np, prop) { + if (strncmp(prop->name, REBOOT_PREFIX, len)) + continue; + ret = of_property_count_elems_of_size(np, prop->name, sizeof(magic[0])); + if (ret != 1 && ret != 2) + continue; + + count++; + } + + param = psci_reset_params = kcalloc(count, sizeof(*psci_reset_params), GFP_KERNEL); + if (!psci_reset_params) + return -ENOMEM; + + for_each_property_of_node(np, prop) { + if (strncmp(prop->name, REBOOT_PREFIX, len)) + continue; + + param->mode = kstrdup_const(prop->name + len, GFP_KERNEL); + if (!param->mode) + continue; + + ret = of_property_read_variable_u32_array(np, prop->name, magic, 1, 2); + if (ret < 0) { + pr_warn("Failed to parse vendor reboot mode %s\n", param->mode); + kfree(param->mode); + continue; + } + + /* Force reset type to be in vendor space */ + param->reset_type = PSCI_1_1_RESET_TYPE_VENDOR_START | magic[0]; + param->cookie = ret == 2 ? magic[1] : 0; + param++; + num_psci_reset_params++; + } + + return 0; +} +arch_initcall(psci_init_system_reset2_modes); + int __init psci_dt_init(void) { struct device_node *np;