From patchwork Wed Mar 1 09:55:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mukesh Ojha X-Patchwork-Id: 62836 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3545841wrd; Wed, 1 Mar 2023 02:11:12 -0800 (PST) X-Google-Smtp-Source: AK7set9L8WDl88I5/1FRERCETMvoS3L/mX14ntd6qqlH0xGN+KqhDkow+7qudkw98167nOdA2XgF X-Received: by 2002:a05:6402:481:b0:4ad:7205:8427 with SMTP id k1-20020a056402048100b004ad72058427mr6066382edv.27.1677665472044; Wed, 01 Mar 2023 02:11:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677665472; cv=none; d=google.com; s=arc-20160816; b=EIAshzAvxHpZNjwtqIsQmiiyZgBzYrU8XRfdcdVf/QfydVUqSKWg7Cz14XrIxBOerG rxFEPWrlZHnJff2997anFftMJn0hKhJfp1KCMol0gcS87ooZvn6ZnauP+bUtCulvXUvN rYTpfpy5RhthaXdnYumibJdGaz2B8CGDbgW4sMEbcLDGFENeWlhjA75vPqEDsIIONqYx TeoBrWhN84YT/uP4e8ASH5T0ELAl1cJN4VYAkluaZ3uDbbRLak3OI47ZhbIxwEtzjvrA SoNzgGaXNozP7B1PWvToz+9eMZ1UsHyTdIMf1XNFkriawa0WaCV/1+S4VSbbK1yX8BSQ udHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=+FZpNfLkdDyqzXjB0eX1M8JOxdfTOmA1cb8JAzLa99k=; b=LsUPUA4EnvH1sCCfwouK4w1xHM+yy/CAhb82oz5toq/ZjBUwmJkgpmGsztMCi9hDB2 HP4cSOvaF01RLxpDAsmWtkRZsQtkWZUGg9zSekBUwMCMGDhj8Y3AU8oorLC2gbEYv8GS uXrG49AqSKa8hQrKRUclWZqDaeMKwg4sENUnUZAtm+JpbeWayNcRbOjwlZicfiqfyiCg e0evT+IXwPN4K6yDUhoF7mdTSzMKinOX7Mv2RFxpLgS7OscB7EJ3G0h3UfVpci6wjarE QYqKqYfGaDGSlmP6Ld+MQmkaITCaB1+E2Og86QufyzYQF0zIdflTzw2lrzJL7hCCxYLR 67qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=WuIgQgno; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w10-20020a50fa8a000000b004ad155fcafbsi5349796edr.607.2023.03.01.02.10.48; Wed, 01 Mar 2023 02:11:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=WuIgQgno; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229568AbjCAJ6p (ORCPT + 99 others); Wed, 1 Mar 2023 04:58:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229963AbjCAJ6e (ORCPT ); Wed, 1 Mar 2023 04:58:34 -0500 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6817A24C9D; Wed, 1 Mar 2023 01:58:09 -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 3216cMNk023643; Wed, 1 Mar 2023 09:57:05 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-type; s=qcppdkim1; bh=+FZpNfLkdDyqzXjB0eX1M8JOxdfTOmA1cb8JAzLa99k=; b=WuIgQgno2nNL01qXMDjmXqPbspQIqvsBlPe9THAHNlNvvQw2uWmGKFViEBi7nPHXITyM 5NcYfmppbS7vntS8UdFwDyZUdepCwTL2DpNuvjv3UMvg0LOSwx79tA1SNfIh5ZAEw+fZ knCYz5Il10YPWtty90pv4FLUSemA3qTcNglVmmAS3TuZ1VKn+V/U3J60vGmnIPzkAxV2 5rK5vHFNX50pS8OBwstu1UTNdQ4X8n6BPEdVx+YKQbIvuH+l+bkKmZUxmDzDDxHJTg0z xamArhkQOha+ANpTuXBqiSR+2jFfhNACTdqlp0ZLKj+n8TEmGTmEjAbkiciPlYfCeDXv 0Q== Received: from nasanppmta04.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3p1mwxaj2t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 01 Mar 2023 09:57:05 +0000 Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3219v4oO016400 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 1 Mar 2023 09:57:04 GMT Received: from hu-mojha-hyd.qualcomm.com (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Wed, 1 Mar 2023 01:57:02 -0800 From: Mukesh Ojha To: , , CC: , , "Mukesh Ojha" Subject: [PATCH v2 3/4] firmware: qcom_scm: Refactor code to support multiple download mode Date: Wed, 1 Mar 2023 15:25:54 +0530 Message-ID: <1677664555-30191-4-git-send-email-quic_mojha@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1677664555-30191-1-git-send-email-quic_mojha@quicinc.com> References: <1677664555-30191-1-git-send-email-quic_mojha@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: Ny4qEyvpBspzvwLmvwo7XbcKuNe-Ky78 X-Proofpoint-GUID: Ny4qEyvpBspzvwLmvwo7XbcKuNe-Ky78 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-01_04,2023-02-28_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 bulkscore=0 impostorscore=0 mlxscore=0 clxscore=1015 lowpriorityscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 priorityscore=1501 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303010082 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 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759159750495290069?= X-GMAIL-MSGID: =?utf-8?q?1759159750495290069?= Currently on Qualcomm SoC, download_mode is enabled if CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is selected. Refactor the code such that it supports multiple download modes and drop CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT config instead, give interface to set the download mode from module parameter. Signed-off-by: Mukesh Ojha --- Changes in v2: - Passed download mode as parameter - Accept human accepatable download mode string. - enable = !!dload_mode - Shifted module param callback to somewhere down in the file so that it no longer need to know the prototype of qcom_scm_set_download_mode() - updated commit text. drivers/firmware/Kconfig | 11 -------- drivers/firmware/qcom_scm.c | 65 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 20 deletions(-) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index b59e304..ff7e9f3 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -215,17 +215,6 @@ config MTK_ADSP_IPC config QCOM_SCM tristate -config QCOM_SCM_DOWNLOAD_MODE_DEFAULT - bool "Qualcomm download mode enabled by default" - depends on QCOM_SCM - help - A device with "download mode" enabled will upon an unexpected - warm-restart enter a special debug mode that allows the user to - "download" memory content over USB for offline postmortem analysis. - The feature can be enabled/disabled on the kernel command line. - - Say Y here to enable "download mode" by default. - config SYSFB bool select BOOT_VESA_SUPPORT diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index c9f1fad..ca07208 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -17,17 +17,22 @@ #include #include #include +#include #include "qcom_scm.h" -static bool download_mode = IS_ENABLED(CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT); -module_param(download_mode, bool, 0); - #define SCM_HAS_CORE_CLK BIT(0) #define SCM_HAS_IFACE_CLK BIT(1) #define SCM_HAS_BUS_CLK BIT(2) #define QCOM_DOWNLOAD_MODE_MASK 0x30 +#define QCOM_DOWNLOAD_FULLDUMP 0x10 +#define QCOM_DOWNLOAD_NODUMP 0x0 + +#define MAX_DLOAD_LEN 8 + +static char download_mode[] = "off"; +static u32 dload_mode; struct qcom_scm { struct device *dev; @@ -417,8 +422,9 @@ static int __qcom_scm_set_dload_mode(struct device *dev, bool enable) return qcom_scm_call_atomic(__scm->dev, &desc, NULL); } -static void qcom_scm_set_download_mode(bool enable) +static void qcom_scm_set_download_mode(u32 dload_mode) { + bool enable = !!dload_mode; bool avail; int ret = 0; u32 val; @@ -438,7 +444,7 @@ static void qcom_scm_set_download_mode(bool enable) val &= ~QCOM_DOWNLOAD_MODE_MASK; if (enable) - val |= QCOM_SCM_BOOT_SET_DLOAD_MODE; + val |= dload_mode; ret = qcom_scm_io_writel(__scm->dload_mode_addr, val); } else { @@ -1338,6 +1344,47 @@ bool qcom_scm_is_available(void) } EXPORT_SYMBOL(qcom_scm_is_available); +static int set_dload_mode(const char *val, const struct kernel_param *kp) +{ + int ret; + + if (!strncmp(val, "full", strlen("full"))) { + dload_mode = QCOM_DOWNLOAD_FULLDUMP; + } else if (!strncmp(val, "off", strlen("off"))) { + dload_mode = QCOM_DOWNLOAD_NODUMP; + } else { + if (kstrtouint(val, 0, &dload_mode) || + !(dload_mode == 0 || dload_mode == 1)) { + pr_err("unknown download mode\n"); + return -EINVAL; + } + + } + + ret = param_set_copystring(val, kp); + if (ret) + return ret; + + if (__scm) + qcom_scm_set_download_mode(dload_mode); + + return 0; +} + +static const struct kernel_param_ops dload_mode_param_ops = { + .set = set_dload_mode, + .get = param_get_string, +}; + +static struct kparam_string dload_mode_param = { + .string = download_mode, + .maxlen = MAX_DLOAD_LEN, +}; + +module_param_cb(download_mode, &dload_mode_param_ops, &dload_mode_param, 0644); +MODULE_PARM_DESC(download_mode, + "Download mode: off/full or 0/1/off/on for existing users"); + static int qcom_scm_probe(struct platform_device *pdev) { struct qcom_scm *scm; @@ -1418,12 +1465,12 @@ static int qcom_scm_probe(struct platform_device *pdev) __get_convention(); /* - * If requested enable "download mode", from this point on warmboot + * If download mode is requested, from this point on warmboot * will cause the boot stages to enter download mode, unless * disabled below by a clean shutdown/reboot. */ - if (download_mode) - qcom_scm_set_download_mode(true); + if (dload_mode) + qcom_scm_set_download_mode(dload_mode); return 0; } @@ -1431,7 +1478,7 @@ static int qcom_scm_probe(struct platform_device *pdev) static void qcom_scm_shutdown(struct platform_device *pdev) { /* Clean shutdown, disable download mode to allow normal restart */ - qcom_scm_set_download_mode(false); + qcom_scm_set_download_mode(QCOM_DOWNLOAD_NODUMP); } static const struct of_device_id qcom_scm_dt_match[] = {