From patchwork Thu May 18 11:20:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mukesh Ojha X-Patchwork-Id: 95824 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp425389vqo; Thu, 18 May 2023 04:45:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4V2qnTf9FsMHsvkGElJFPvJMmyZNNXnrx4cPAXwwrSWVe/P33JPP6oCD8zeDuRNAnDUiyA X-Received: by 2002:a17:903:26cc:b0:1ae:50cc:45b with SMTP id jg12-20020a17090326cc00b001ae50cc045bmr2356637plb.36.1684410344148; Thu, 18 May 2023 04:45:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684410344; cv=none; d=google.com; s=arc-20160816; b=FNEvuKCfdxxR49fMYkhSyGAT7mRkhVQgU/GOkkSQh6nwThiPBzv5uqtD4DwHdUOnrM tZLwXOcpD2s8RsVTB31uxOfSP0nxUmIsSzI/BHuTC62/Gdva2ARGHjMWupLoWcm7O+eY MDtk8Tbd37G44uT26hnXlSccEKWmcMYMzSwvfisdL77L4w1G7WzfyzdGAORCBQSsV+qg ryNQWQ2VRRugIf4d11EryFMIvuBLwswTVSvaqrWHyo7p9dTYcck62lYcUtUOd1bXJi0E qbo+91gLeVBw0RKd40ui6GnevQDhq+IlxlSyVLBu1HN2Ke3rNS+NcxBQZG5BMpnVEntn gZSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from :dkim-signature; bh=RRCKsPJdOap6eoYga10zH0S3kuivAXi+dF7pmVl+GuQ=; b=ktQ12LHxjLRKpxZRsPqz0W232w+7n3HlRzJ5Jh2WvvmkyKrdWWbwHIM/wMq8ckgB44 gVL2acoczKSHsTgJ0l/QbfT+0uRKdA2As+nNYY3QpmXyGvHF9qmx9VhT8WZmOMwX8aKh qedwSPq2Ph/vvSCPWq42Tzcq/Mku1rQHK7FRZBv9VlVPp+fI/7zTcsfd1YjZpRyqbBmV cryP/GkESIwEeV4IvuseBYQRcwMsBxt0/dpYIL+7Zz899ZvrT31XdK3aLUiTCHtDE/hH 17Yfc7+xR6lNhq1UOkwAXFahjYAbl0RRut0i8UDsuE/ZlvC7Gs/92dWAgn7sF9xQNfd6 VGfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=g46whXEJ; 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 ja7-20020a170902efc700b001a66c437b2esi1146307plb.20.2023.05.18.04.45.27; Thu, 18 May 2023 04:45:44 -0700 (PDT) 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=g46whXEJ; 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 S230346AbjERLU5 (ORCPT + 99 others); Thu, 18 May 2023 07:20:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230049AbjERLUv (ORCPT ); Thu, 18 May 2023 07:20:51 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40F22118; Thu, 18 May 2023 04:20:49 -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 34IB1Kbw019011; Thu, 18 May 2023 11:20:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=qcppdkim1; bh=RRCKsPJdOap6eoYga10zH0S3kuivAXi+dF7pmVl+GuQ=; b=g46whXEJPHLmruOeTFT6U/kKe56comJBNPDkW6GdlVwneD27WT9JNR5CcYVqOh3Zio90 jdIHSKEJ2IQtipDHdSOxIhwRmZt6isz1DmZyOXtNqyOl0dZnN4OTDSxpj92pe/bm1Ioa DhswcINv/ksZzumwIs1aZ0MwRUYzU+Dq4Z9C/RCloTIvoViDwShuRtcOEX3/1Wchwh7R nSPGhrabs5wRH7I2rBJFZhCcXefUyf1AUmun/q1Anu0wbj6J1sczKmgVoTsvyByM7q9U pOsuscjoRoUYag+L5u/sDIM6eqZ+8whWhFoUR0UsW/Ol/IqMbiSuamXZGzIi0N0tH/3M 1w== Received: from nasanppmta04.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3qn8a614ak-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:20:42 +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 34IBKfX1006770 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:20:41 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.42; Thu, 18 May 2023 04:20:38 -0700 From: Mukesh Ojha To: , , , CC: , , "Mukesh Ojha" Subject: [PATCH] Revert "firmware: qcom_scm: Clear download bit during reboot" Date: Thu, 18 May 2023 16:50:23 +0530 Message-ID: <1684408823-5898-1-git-send-email-quic_mojha@quicinc.com> X-Mailer: git-send-email 2.7.4 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-GUID: pqT678sWLKg_3gx-DASNU0RigPIF2U-6 X-Proofpoint-ORIG-GUID: pqT678sWLKg_3gx-DASNU0RigPIF2U-6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-18_08,2023-05-17_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 suspectscore=0 phishscore=0 priorityscore=1501 malwarescore=0 clxscore=1011 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 impostorscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305180088 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 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?1766232261145249019?= X-GMAIL-MSGID: =?utf-8?q?1766232261145249019?= This reverts commit 781d32d1c970 as it causes regression(reboot does not work) for target like IPQ4019 that does not support download mode scm calls end to end. Fixes: 781d32d1c970 ("firmware: qcom_scm: Clear download bit during reboot") Signed-off-by: Mukesh Ojha Tested-by: Robert Marko --- drivers/firmware/qcom_scm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index fde33acd46b7..a4bb9265d9c0 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -1508,7 +1508,8 @@ 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); + if (download_mode) + qcom_scm_set_download_mode(false); } static const struct of_device_id qcom_scm_dt_match[] = {