From patchwork Wed Jul 29 05:18:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanley Chu X-Patchwork-Id: 11690351 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3423A13B1 for ; Wed, 29 Jul 2020 05:18:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1B40520786 for ; Wed, 29 Jul 2020 05:18:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="kMAixCiS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726884AbgG2FSw (ORCPT ); Wed, 29 Jul 2020 01:18:52 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:41150 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726054AbgG2FSw (ORCPT ); Wed, 29 Jul 2020 01:18:52 -0400 X-UUID: fb8c768a8ce64b0f88330079f964f83e-20200729 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=AiW8oR0hft7D4lqwhgoiimjhk6Sk5LoavMLolAc9+uE=; b=kMAixCiS+/p1KXt1K1WXEZdN5icS/7d/+Q05fBuS4NUMeqRsR667H0V32ff3mcABeWMM44IJYhCIpCpedZndvE8Q/FCL8fMp/iUDsaoieu1OI9VnTTjHQ9k4JVyIiUEIJ6bR4ymf6j8tQN/Uo0Bd2lsh2CEfjwUEiuaLwC4YD7Q=; X-UUID: fb8c768a8ce64b0f88330079f964f83e-20200729 Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 154831121; Wed, 29 Jul 2020 13:18:48 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs08n2.mediatek.inc (172.21.101.56) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 29 Jul 2020 13:18:41 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 29 Jul 2020 13:18:37 +0800 From: Stanley Chu To: , , , , , CC: , , , , , , , , , , , , , Stanley Chu Subject: [PATCH v1 1/2] scsi: ufs: Introduce device quirk "DELAY_AFTER_LPM" Date: Wed, 29 Jul 2020 13:18:39 +0800 Message-ID: <20200729051840.31318-2-stanley.chu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200729051840.31318-1-stanley.chu@mediatek.com> References: <20200729051840.31318-1-stanley.chu@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 0D04A94861386952C8B68E824B73A7255AEB99E12A9CBFEE23563D1A21504EC12000:8 X-MTK: N Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Some UFS devices require delay after VCC power rail is turned-off. Introduce a device quirk "DELAY_AFTER_LPM" to add 5ms delays after VCC power-off during suspend flow. Signed-off-by: Andy Teng Signed-off-by: Peter Wang Signed-off-by: Stanley Chu Reviewed-by: Can Guo --- drivers/scsi/ufs/ufs_quirks.h | 7 +++++++ drivers/scsi/ufs/ufshcd.c | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/drivers/scsi/ufs/ufs_quirks.h b/drivers/scsi/ufs/ufs_quirks.h index 2a0041493e30..07f559ac5883 100644 --- a/drivers/scsi/ufs/ufs_quirks.h +++ b/drivers/scsi/ufs/ufs_quirks.h @@ -109,4 +109,11 @@ struct ufs_dev_fix { */ #define UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES (1 << 10) +/* + * Some UFS devices require delay after VCC power rail is turned-off. + * Enable this quirk to introduce 5ms delays after VCC power-off during + * suspend flow. + */ +#define UFS_DEVICE_QUIRK_DELAY_AFTER_LPM (1 << 11) + #endif /* UFS_QUIRKS_H_ */ diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index acba2271c5d3..63f4e2f75aa1 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -8111,6 +8111,8 @@ static int ufshcd_link_state_transition(struct ufs_hba *hba, static void ufshcd_vreg_set_lpm(struct ufs_hba *hba) { + bool vcc_off = false; + /* * It seems some UFS devices may keep drawing more than sleep current * (atleast for 500us) from UFS rails (especially from VCCQ rail). @@ -8139,13 +8141,22 @@ static void ufshcd_vreg_set_lpm(struct ufs_hba *hba) if (ufshcd_is_ufs_dev_poweroff(hba) && ufshcd_is_link_off(hba) && !hba->dev_info.is_lu_power_on_wp) { ufshcd_setup_vreg(hba, false); + vcc_off = true; } else if (!ufshcd_is_ufs_dev_active(hba)) { ufshcd_toggle_vreg(hba->dev, hba->vreg_info.vcc, false); + vcc_off = true; if (!ufshcd_is_link_active(hba)) { ufshcd_config_vreg_lpm(hba, hba->vreg_info.vccq); ufshcd_config_vreg_lpm(hba, hba->vreg_info.vccq2); } } + + /* + * Some UFS devices require delay after VCC power rail is turned-off. + */ + if (vcc_off && hba->vreg_info.vcc && + hba->dev_quirks & UFS_DEVICE_QUIRK_DELAY_AFTER_LPM) + usleep_range(5000, 5100); } static int ufshcd_vreg_set_hpm(struct ufs_hba *hba) From patchwork Wed Jul 29 05:18:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanley Chu X-Patchwork-Id: 11690349 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 75A8C13B1 for ; Wed, 29 Jul 2020 05:18:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D6B720663 for ; Wed, 29 Jul 2020 05:18:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="nAqTsord" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726961AbgG2FSy (ORCPT ); Wed, 29 Jul 2020 01:18:54 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:39746 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726948AbgG2FSx (ORCPT ); Wed, 29 Jul 2020 01:18:53 -0400 X-UUID: 819579986c5b4f969e42bd34f63af158-20200729 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=QUhdKvtEZ3oYulCgHXYM8lA8sxpnG1aE1NCi4A96spY=; b=nAqTsordxVAavwTJNPrCThmnaKk7QOfXlVZe4k7rKk2dWesmJXpuCHOkeMUP4XRvDxfH7zmORxyAwujiKdD+5SpnNwpw5HNjX48RAjbRkQHYX4Lp/lh8xmP0dSD/z37JTNtIu/HMxVg/vy4uF3zKHXZETbxw3kVPwIdvwSDl29k=; X-UUID: 819579986c5b4f969e42bd34f63af158-20200729 Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by mailgw02.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1006815708; Wed, 29 Jul 2020 13:18:51 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 29 Jul 2020 13:18:41 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 29 Jul 2020 13:18:38 +0800 From: Stanley Chu To: , , , , , CC: , , , , , , , , , , , , , Stanley Chu Subject: [PATCH v1 2/2] scsi: ufs-mediatek: Apply DELAY_AFTER_LPM quirk to Micron devices Date: Wed, 29 Jul 2020 13:18:40 +0800 Message-ID: <20200729051840.31318-3-stanley.chu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200729051840.31318-1-stanley.chu@mediatek.com> References: <20200729051840.31318-1-stanley.chu@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: C22D0764E2EC598E7EB26704ED03C2DE7AD0BD31B37A81BA375C253C04D04AC52000:8 X-MTK: N Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Micron UFS devices require DELAY_AFTER_LPM device quirk in MediaTek platforms. Signed-off-by: Andy Teng Signed-off-by: Peter Wang Signed-off-by: Stanley Chu --- drivers/scsi/ufs/ufs-mediatek.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c index 31af8b3d2b53..7ff2682f481c 100644 --- a/drivers/scsi/ufs/ufs-mediatek.c +++ b/drivers/scsi/ufs/ufs-mediatek.c @@ -36,6 +36,8 @@ ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, high, res) static struct ufs_dev_fix ufs_mtk_dev_fixups[] = { + UFS_FIX(UFS_VENDOR_MICRON, UFS_ANY_MODEL, + UFS_DEVICE_QUIRK_DELAY_AFTER_LPM), UFS_FIX(UFS_VENDOR_SKHYNIX, "H9HQ21AFAMZDAR", UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES), END_FIX