From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MIME_BASE64_TEXT,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0370BC2D0DB for ; Fri, 24 Jan 2020 15:08:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CDCEA20709 for ; Fri, 24 Jan 2020 15:08:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="Asg5uidi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390349AbgAXPIK (ORCPT ); Fri, 24 Jan 2020 10:08:10 -0500 Received: from mailgw01.mediatek.com ([210.61.82.183]:1537 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S2390222AbgAXPIB (ORCPT ); Fri, 24 Jan 2020 10:08:01 -0500 X-UUID: 0b5789e018684a3e996afe6e10b09d57-20200124 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=nmiAzrKgD/bdvC/COaVLhsa4iiJmtILGj/E1/yJKpsg=; b=Asg5uidiy5Y0Rf+3o1xMmCsU2p6lr4tGw9jt0PcGdwklZlXpkmHHepMv2nrlSTciyIi8xexhO6ZiW6bD2dBlI9FRxTQbcW4kmJOH+5dsjvemZf4hU5Tm6/A7RwRoTN0rQqYWN4BEofkELVVMa7X7xC1wqoTdQI6K+lpmIgp+13Q=; X-UUID: 0b5789e018684a3e996afe6e10b09d57-20200124 Received: from mtkcas08.mediatek.inc [(172.21.101.126)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1168101450; Fri, 24 Jan 2020 23:07:47 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 24 Jan 2020 23:06:39 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 24 Jan 2020 23:07:16 +0800 From: Stanley Chu To: , , , , CC: , , , , , , , , , , , , Stanley Chu Subject: [PATCH v2 1/5] scsi: ufs-mediatek: ensure UniPro is not powered down before linkup Date: Fri, 24 Jan 2020 23:07:39 +0800 Message-ID: <20200124150743.15110-2-stanley.chu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200124150743.15110-1-stanley.chu@mediatek.com> References: <20200124150743.15110-1-stanley.chu@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-SNTS-SMTP: 1F59915D745A3D88C912CB29D712BF7BB3D21E6AD68062AA4C20CE86CEA718A92000:8 X-MTK: N Content-Transfer-Encoding: base64 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org TWVkaWFUZWsgQ2hpcHNldHMgY2FuIGVudGVyIHByb3ByaWV0YXJ5IFVuaVBybyBsb3ctcG93ZXIg bW9kZSBkdXJpbmcNCnN1c3BlbmQgd2hpbGUgbGluayBpcyBpbiBoaWJlcm44IHN0YXRlLiBNYWtl IHN1cmUgbGVhdmluZyBsb3ctcG93ZXINCm1vZGUgYmVmb3JlIGV2ZXJ5IGxpbmsgc3RhcnR1cCB0 byBwcmV2ZW50IGxvY2t1cCBpbiBhbnkgcG9zc2libGUgZXJyb3IgcmVjb3ZlcnkNCnBhdGguDQoN CkluIHRoZSBzYW1lIHRpbWUsIHJlLWZhY3RvciByZWxhdGVkIGZ1bmNpdG9ucyB0byBpbXByb3Zl IGNvZGUgcmVhZGFiaWxpdHkuDQoNClNpZ25lZC1vZmYtYnk6IFN0YW5sZXkgQ2h1IDxzdGFubGV5 LmNodUBtZWRpYXRlay5jb20+DQotLS0NCiBkcml2ZXJzL3Njc2kvdWZzL3Vmcy1tZWRpYXRlay5j IHwgMTkgKysrKysrKysrKy0tLS0tLS0tLQ0KIDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25z KCspLCA5IGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zY3NpL3Vmcy91ZnMt bWVkaWF0ZWsuYyBiL2RyaXZlcnMvc2NzaS91ZnMvdWZzLW1lZGlhdGVrLmMNCmluZGV4IDUzZWFl NWZlMmFkZS4uN2FjODM4Y2MxNWQxIDEwMDY0NA0KLS0tIGEvZHJpdmVycy9zY3NpL3Vmcy91ZnMt bWVkaWF0ZWsuYw0KKysrIGIvZHJpdmVycy9zY3NpL3Vmcy91ZnMtbWVkaWF0ZWsuYw0KQEAgLTMw LDYgKzMwLDExIEBADQogI2RlZmluZSB1ZnNfbXRrX2RldmljZV9yZXNldF9jdHJsKGhpZ2gsIHJl cykgXA0KIAl1ZnNfbXRrX3NtYyhVRlNfTVRLX1NJUF9ERVZJQ0VfUkVTRVQsIGhpZ2gsIHJlcykN CiANCisjZGVmaW5lIHVmc19tdGtfdW5pcHJvX3Bvd2VyZG93bihoYmEsIHBvd2VyZG93bikgXA0K Kwl1ZnNoY2RfZG1lX3NldChoYmEsIFwNCisJCSAgICAgICBVSUNfQVJHX01JQl9TRUwoVlNfVU5J UFJPUE9XRVJET1dOQ09OVFJPTCwgMCksIFwNCisJCSAgICAgICBwb3dlcmRvd24pDQorDQogc3Rh dGljIHZvaWQgdWZzX210a19jZmdfdW5pcHJvX2NnKHN0cnVjdCB1ZnNfaGJhICpoYmEsIGJvb2wg ZW5hYmxlKQ0KIHsNCiAJdTMyIHRtcDsNCkBAIC0yOTAsNiArMjk1LDggQEAgc3RhdGljIGludCB1 ZnNfbXRrX3ByZV9saW5rKHN0cnVjdCB1ZnNfaGJhICpoYmEpDQogCWludCByZXQ7DQogCXUzMiB0 bXA7DQogDQorCXVmc19tdGtfdW5pcHJvX3Bvd2VyZG93bihoYmEsIDApOw0KKw0KIAkvKiBkaXNh YmxlIGRlZXAgc3RhbGwgKi8NCiAJcmV0ID0gdWZzaGNkX2RtZV9nZXQoaGJhLCBVSUNfQVJHX01J QihWU19TQVZFUE9XRVJDT05UUk9MKSwgJnRtcCk7DQogCWlmIChyZXQpDQpAQCAtMzkwLDkgKzM5 Nyw3IEBAIHN0YXRpYyBpbnQgdWZzX210a19saW5rX3NldF9ocG0oc3RydWN0IHVmc19oYmEgKmhi YSkNCiAJaWYgKGVycikNCiAJCXJldHVybiBlcnI7DQogDQotCWVyciA9IHVmc2hjZF9kbWVfc2V0 KGhiYSwNCi0JCQkgICAgIFVJQ19BUkdfTUlCX1NFTChWU19VTklQUk9QT1dFUkRPV05DT05UUk9M LCAwKSwNCi0JCQkgICAgIDApOw0KKwllcnIgPSB1ZnNfbXRrX3VuaXByb19wb3dlcmRvd24oaGJh LCAwKTsNCiAJaWYgKGVycikNCiAJCXJldHVybiBlcnI7DQogDQpAQCAtNDEzLDE0ICs0MTgsMTAg QEAgc3RhdGljIGludCB1ZnNfbXRrX2xpbmtfc2V0X2xwbShzdHJ1Y3QgdWZzX2hiYSAqaGJhKQ0K IHsNCiAJaW50IGVycjsNCiANCi0JZXJyID0gdWZzaGNkX2RtZV9zZXQoaGJhLA0KLQkJCSAgICAg VUlDX0FSR19NSUJfU0VMKFZTX1VOSVBST1BPV0VSRE9XTkNPTlRST0wsIDApLA0KLQkJCSAgICAg MSk7DQorCWVyciA9IHVmc19tdGtfdW5pcHJvX3Bvd2VyZG93bihoYmEsIDEpOw0KIAlpZiAoZXJy KSB7DQogCQkvKiBSZXN1bWUgVW5pUHJvIHN0YXRlIGZvciBmb2xsb3dpbmcgZXJyb3IgcmVjb3Zl cnkgKi8NCi0JCXVmc2hjZF9kbWVfc2V0KGhiYSwNCi0JCQkgICAgICAgVUlDX0FSR19NSUJfU0VM KFZTX1VOSVBST1BPV0VSRE9XTkNPTlRST0wsIDApLA0KLQkJCSAgICAgICAwKTsNCisJCXVmc19t dGtfdW5pcHJvX3Bvd2VyZG93bihoYmEsIDApOw0KIAkJcmV0dXJuIGVycjsNCiAJfQ0KIA0KLS0g DQoyLjE4LjANCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE55BC2D0DB for ; Fri, 24 Jan 2020 15:18:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9CD1D20709 for ; Fri, 24 Jan 2020 15:18:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Zzy0HlEv"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="Asg5uidi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9CD1D20709 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yoo4M84nQpcY0T1gnEs5GvSwlTSr8JXYWGqencDDyXk=; b=Zzy0HlEvRaHs0L SMVszqXVcTN+VJwKIbCPHlB6LEGRS/vqfNCa3StA69F5hdh7+Th8tbJZsgfwpg+lJeW4trBvTKZAb Ucc0BIpDoom4gv37IjEqmAiF6e9pRmzN7OcyZcZQTrrQssBt49Aca1V27ox9SLN7Wow0wDZdLH903 UXK7rDGLwIM/2UahZsrQA6cAO4PNv1ntsQwXwsnI+ad6Dicdm816keEyzQTDJMKyrBYpTsLDzOvKk dvEUhVp6JfRcN8b0Dx2VEkudvHb8uEqYO0gPdEyyxRmxisoByyqeVpvw2s0IpRWAwe4UsFmnJw6lc 6EWwwEGteCaYyApxZSQw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iv0iy-00010i-TS; Fri, 24 Jan 2020 15:18:20 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iv0ih-0000nE-2W; Fri, 24 Jan 2020 15:18:04 +0000 X-UUID: c0b81eebbb4c4a488b4692ccda60c856-20200124 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=nmiAzrKgD/bdvC/COaVLhsa4iiJmtILGj/E1/yJKpsg=; b=Asg5uidiy5Y0Rf+3o1xMmCsU2p6lr4tGw9jt0PcGdwklZlXpkmHHepMv2nrlSTciyIi8xexhO6ZiW6bD2dBlI9FRxTQbcW4kmJOH+5dsjvemZf4hU5Tm6/A7RwRoTN0rQqYWN4BEofkELVVMa7X7xC1wqoTdQI6K+lpmIgp+13Q=; X-UUID: c0b81eebbb4c4a488b4692ccda60c856-20200124 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 115092328; Fri, 24 Jan 2020 07:18:01 -0800 Received: from MTKMBS02N2.mediatek.inc (172.21.101.101) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 24 Jan 2020 07:09:11 -0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 24 Jan 2020 23:06:39 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 24 Jan 2020 23:07:16 +0800 From: Stanley Chu To: , , , , Subject: [PATCH v2 1/5] scsi: ufs-mediatek: ensure UniPro is not powered down before linkup Date: Fri, 24 Jan 2020 23:07:39 +0800 Message-ID: <20200124150743.15110-2-stanley.chu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200124150743.15110-1-stanley.chu@mediatek.com> References: <20200124150743.15110-1-stanley.chu@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 1F59915D745A3D88C912CB29D712BF7BB3D21E6AD68062AA4C20CE86CEA718A92000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200124_071803_125928_560E87DB X-CRM114-Status: UNSURE ( 9.93 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stanley Chu , bvanassche@acm.org, andy.teng@mediatek.com, chun-hung.wu@mediatek.com, kuohong.wang@mediatek.com, linux-kernel@vger.kernel.org, cang@codeaurora.org, linux-mediatek@lists.infradead.org, peter.wang@mediatek.com, matthias.bgg@gmail.com, beanhuo@micron.com, linux-arm-kernel@lists.infradead.org, asutoshd@codeaurora.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org MediaTek Chipsets can enter proprietary UniPro low-power mode during suspend while link is in hibern8 state. Make sure leaving low-power mode before every link startup to prevent lockup in any possible error recovery path. In the same time, re-factor related funcitons to improve code readability. Signed-off-by: Stanley Chu --- drivers/scsi/ufs/ufs-mediatek.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c index 53eae5fe2ade..7ac838cc15d1 100644 --- a/drivers/scsi/ufs/ufs-mediatek.c +++ b/drivers/scsi/ufs/ufs-mediatek.c @@ -30,6 +30,11 @@ #define ufs_mtk_device_reset_ctrl(high, res) \ ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, high, res) +#define ufs_mtk_unipro_powerdown(hba, powerdown) \ + ufshcd_dme_set(hba, \ + UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0), \ + powerdown) + static void ufs_mtk_cfg_unipro_cg(struct ufs_hba *hba, bool enable) { u32 tmp; @@ -290,6 +295,8 @@ static int ufs_mtk_pre_link(struct ufs_hba *hba) int ret; u32 tmp; + ufs_mtk_unipro_powerdown(hba, 0); + /* disable deep stall */ ret = ufshcd_dme_get(hba, UIC_ARG_MIB(VS_SAVEPOWERCONTROL), &tmp); if (ret) @@ -390,9 +397,7 @@ static int ufs_mtk_link_set_hpm(struct ufs_hba *hba) if (err) return err; - err = ufshcd_dme_set(hba, - UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0), - 0); + err = ufs_mtk_unipro_powerdown(hba, 0); if (err) return err; @@ -413,14 +418,10 @@ static int ufs_mtk_link_set_lpm(struct ufs_hba *hba) { int err; - err = ufshcd_dme_set(hba, - UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0), - 1); + err = ufs_mtk_unipro_powerdown(hba, 1); if (err) { /* Resume UniPro state for following error recovery */ - ufshcd_dme_set(hba, - UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0), - 0); + ufs_mtk_unipro_powerdown(hba, 0); return err; } -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA1A0C35242 for ; Fri, 24 Jan 2020 15:18:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B01F720709 for ; Fri, 24 Jan 2020 15:18:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bEhewRKk"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="Asg5uidi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B01F720709 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DExYGV62tWxtLClvHypD7valmvYJyHbJIqIR6bPUEPc=; b=bEhewRKkijqExy JtRkd14YM8ohseCaWOOoyx6O8kQ/gnXbaFEHIobGUYD2XQ8hetQfp1ytPSMUH/JbgjNYG6i6pe4DP qestXduUvLiMk+ZKLEeypDGfKrUG6onOcNKE0I3fOzNKre/QPyE3hq9voQLobtWUBySleUkIH7IsZ r4HUMnopv/rsCLert9PMEZMycmT1sc1onKZsrGXrXECWt+TmN3KS3Tv0o2a1PIHpQRNCzel5CL/D6 8uOhxgRaPfxnP/c9CkQyubEuMjPB/crTfP+Ff8D9FkHDHD9RNBDP07dU4TWzjxAWNSPOMoQP5UU3Z HMWIj0Sop5y1KMW3aiow==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iv0ik-0000oK-LX; Fri, 24 Jan 2020 15:18:06 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iv0ih-0000nE-2W; Fri, 24 Jan 2020 15:18:04 +0000 X-UUID: c0b81eebbb4c4a488b4692ccda60c856-20200124 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=nmiAzrKgD/bdvC/COaVLhsa4iiJmtILGj/E1/yJKpsg=; b=Asg5uidiy5Y0Rf+3o1xMmCsU2p6lr4tGw9jt0PcGdwklZlXpkmHHepMv2nrlSTciyIi8xexhO6ZiW6bD2dBlI9FRxTQbcW4kmJOH+5dsjvemZf4hU5Tm6/A7RwRoTN0rQqYWN4BEofkELVVMa7X7xC1wqoTdQI6K+lpmIgp+13Q=; X-UUID: c0b81eebbb4c4a488b4692ccda60c856-20200124 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 115092328; Fri, 24 Jan 2020 07:18:01 -0800 Received: from MTKMBS02N2.mediatek.inc (172.21.101.101) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 24 Jan 2020 07:09:11 -0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 24 Jan 2020 23:06:39 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 24 Jan 2020 23:07:16 +0800 From: Stanley Chu To: , , , , Subject: [PATCH v2 1/5] scsi: ufs-mediatek: ensure UniPro is not powered down before linkup Date: Fri, 24 Jan 2020 23:07:39 +0800 Message-ID: <20200124150743.15110-2-stanley.chu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200124150743.15110-1-stanley.chu@mediatek.com> References: <20200124150743.15110-1-stanley.chu@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 1F59915D745A3D88C912CB29D712BF7BB3D21E6AD68062AA4C20CE86CEA718A92000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200124_071803_125928_560E87DB X-CRM114-Status: UNSURE ( 9.93 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stanley Chu , bvanassche@acm.org, andy.teng@mediatek.com, chun-hung.wu@mediatek.com, kuohong.wang@mediatek.com, linux-kernel@vger.kernel.org, cang@codeaurora.org, linux-mediatek@lists.infradead.org, peter.wang@mediatek.com, matthias.bgg@gmail.com, beanhuo@micron.com, linux-arm-kernel@lists.infradead.org, asutoshd@codeaurora.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org MediaTek Chipsets can enter proprietary UniPro low-power mode during suspend while link is in hibern8 state. Make sure leaving low-power mode before every link startup to prevent lockup in any possible error recovery path. In the same time, re-factor related funcitons to improve code readability. Signed-off-by: Stanley Chu --- drivers/scsi/ufs/ufs-mediatek.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c index 53eae5fe2ade..7ac838cc15d1 100644 --- a/drivers/scsi/ufs/ufs-mediatek.c +++ b/drivers/scsi/ufs/ufs-mediatek.c @@ -30,6 +30,11 @@ #define ufs_mtk_device_reset_ctrl(high, res) \ ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, high, res) +#define ufs_mtk_unipro_powerdown(hba, powerdown) \ + ufshcd_dme_set(hba, \ + UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0), \ + powerdown) + static void ufs_mtk_cfg_unipro_cg(struct ufs_hba *hba, bool enable) { u32 tmp; @@ -290,6 +295,8 @@ static int ufs_mtk_pre_link(struct ufs_hba *hba) int ret; u32 tmp; + ufs_mtk_unipro_powerdown(hba, 0); + /* disable deep stall */ ret = ufshcd_dme_get(hba, UIC_ARG_MIB(VS_SAVEPOWERCONTROL), &tmp); if (ret) @@ -390,9 +397,7 @@ static int ufs_mtk_link_set_hpm(struct ufs_hba *hba) if (err) return err; - err = ufshcd_dme_set(hba, - UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0), - 0); + err = ufs_mtk_unipro_powerdown(hba, 0); if (err) return err; @@ -413,14 +418,10 @@ static int ufs_mtk_link_set_lpm(struct ufs_hba *hba) { int err; - err = ufshcd_dme_set(hba, - UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0), - 1); + err = ufs_mtk_unipro_powerdown(hba, 1); if (err) { /* Resume UniPro state for following error recovery */ - ufshcd_dme_set(hba, - UIC_ARG_MIB_SEL(VS_UNIPROPOWERDOWNCONTROL, 0), - 0); + ufs_mtk_unipro_powerdown(hba, 0); return err; } -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel