From patchwork Fri Jul 6 04:55:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 141553 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2680764ljj; Thu, 5 Jul 2018 21:56:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdCyzmQ89LTOzsJyeW359YOdYtjGLrbxyM6rljldwJeJ/0cw+q46vKGRNZWnYTnTbudE1R4 X-Received: by 2002:a63:2a0b:: with SMTP id q11-v6mr1339890pgq.36.1530852982722; Thu, 05 Jul 2018 21:56:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530852982; cv=none; d=google.com; s=arc-20160816; b=panWB5k8r9/AtIA1G5+JbQiE5EJX4naG8Bg/y5cm/KwHql+CFHZJAZCutfNXE1oSvm nh/mE1JSidF+8bEcXcXNlUZVsUC/5OHKL3XKIrKXyeuHgKo/phaVeeaKnS9Mk0lHeb+n kIyDVWcIaSDvNPLLGLaargZeMhAjB3eXE1oBcWjNXY66equ2xL64ru+yFTpUj0CnI1UD Q2oSncdSRtBbhqi7CguvpCA/Lp3WRMWBcaFywEfKRaeT8MTuVlwiTN68Y67vGywJ95dJ nzEmyenCA2JCzBOXaAT6tz3HzzRNiPWlwUbz9v9P4OYXpGtnRuYpaIzd8FqaDHZEjR4Z lQdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=y6osxGydMLaxGvGlbwagLUM5lLEVFl0Xqt5KhzJZeao=; b=zupq+M5SW8C2h6MNc+ywTw+PNEfciTtZJG8aGGNGDjIgdUubPix2epnd7U/CrKlKYs VZ7MbX7DHroCoxx9mtHIwemjuvAeEJatKZWIYhZkyA5m76TOiQpiXJBoPtvow2oR4ZEh 0MP1Wn1sBdvaiDcRD+FlLztrqjK+y0mf9UW5Wpu0KOjgDByuWzjqTFPEQSEwcFXZRxAE BErKreErW/4FJAQHtoWEFQo5uKIY7ZbfifK96zZsXdaDhzwXpThYzc0TqC31J2eNXgc6 oRooY3VXHP3nsDcFnv/iyS0q8ppa+1ee+kZ7rUi10w+qz6x93R509Op4q+9RYMpXEOXr Q1Gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=default header.b="eB6x/jmv"; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 65-v6si4202584pld.395.2018.07.05.21.56.22; Thu, 05 Jul 2018 21:56:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=default header.b="eB6x/jmv"; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754034AbeGFE4V (ORCPT + 13 others); Fri, 6 Jul 2018 00:56:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:32830 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754032AbeGFE4V (ORCPT ); Fri, 6 Jul 2018 00:56:21 -0400 Received: from localhost.localdomain (unknown [223.226.33.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4E66324058; Fri, 6 Jul 2018 04:56:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1530852980; bh=LbA59CxmPvDQU6I35uNpGhWVwxNLyfPSa0Mkv1ksAWY=; h=From:To:Cc:Subject:Date:From; b=eB6x/jmv1ylU95sFBp7vt84YnPhG8FzQf6FB+XOCIlduiQmpc7t6vwbTXbz1+SqzW iCzOqSF1vaQEepx2BP9wujXtU9m7jfIgLMzKBt5HkmUG1O/R7g3Gmp4ZXxeROOMbuE nIk86nzZK6sGJtZg/nmsnZlfF83vSicCfUx5Zj7I= From: Vinod Koul To: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org Cc: Bjorn Andersson , Andy Gross , David Brown , Michael Turquette , Stephen Boyd , Vinod Koul Subject: [PATCH v2] clk: qcom: gcc-msm8996: Disable halt check on UFS tx clock Date: Fri, 6 Jul 2018 10:25:40 +0530 Message-Id: <20180706045540.1579-1-vkoul@kernel.org> X-Mailer: git-send-email 2.14.4 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Commit 12d807cd34b8 ("clk: qcom: gcc-msm8996: Disable halt check on UFS clocks") marked BRANCH_HALT_SKIP for ufs rx clocks, but missed ufs tx clocks. The result of that is kernel warnings at reboot: [ 105.624283] gcc_ufs_tx_symbol_0_clk status stuck at 'on' [ 105.624311] WARNING: CPU: 1 PID: 1 at drivers/clk/qcom/clk-branch.c:100 clk_branch_toggle+0x190/0x1b0 [ 105.633235] Modules linked in: [ 105.645118] CPU: 1 PID: 1 Comm: systemd-shutdow Tainted: G W 4.18.0-rc2-00002-g2bfbe52a53a3 #11 [ 105.647988] Hardware name: Qualcomm Technologies, Inc. DB820c (DT) [ 105.657966] pstate: 60000085 (nZCv daIf -PAN -UAO) [ 105.664127] pc : clk_branch_toggle+0x190/0x1b0 [ 105.668900] lr : clk_branch_toggle+0x190/0x1b0 [ 105.673324] sp : ffff00000805bb40 [ 105.677751] x29: ffff00000805bb40 x28: 0000000000000000 [ 105.681140] x27: ffff8000d947cc60 x26: 0000000000000001 [ 105.686520] x25: ffff000008f71900 x24: 0000000000000000 [ 105.691816] x23: ffff00000925e338 x22: ffff00000855f8e0 [ 105.697114] x21: 0000000000000000 x20: 0000000000000000 [ 105.702407] x19: ffff0000091c9000 x18: ffffffffffffffff [ 105.707702] x17: 0000ffffac148c58 x16: ffff000008b82928 [ 105.712998] x15: ffff0000091c96c8 x14: ffff0000893817c7 [ 105.718293] x13: ffff0000093817d5 x12: ffff0000091c9940 [ 105.723587] x11: ffff0000085e3e70 x10: ffff00000805b780 [ 105.728884] x9 : ffff00000805bb40 x8 : 7320737574617473 [ 105.734179] x7 : 206b6c635f305f6c x6 : 00000000000001e5 [ 105.739472] x5 : 0000000000000000 x4 : 0000000000000000 [ 105.744769] x3 : ffffffffffffffff x2 : ffff0000091e2658 [ 105.750063] x1 : a7c4712dd5e09c00 x0 : 0000000000000000 [ 105.755360] Call trace: [ 105.760652] clk_branch_toggle+0x190/0x1b0 [ 105.762824] clk_branch2_disable+0x18/0x20 [ 105.766994] clk_core_disable+0x58/0xa8 [ 105.771069] clk_core_disable_lock+0x20/0x38 [ 105.774803] clk_disable+0x1c/0x28 [ 105.779320] __ufshcd_setup_clocks+0x298/0x308 [ 105.782529] ufshcd_suspend+0x160/0x308 [ 105.786953] ufshcd_shutdown+0x38/0xa0 [ 105.790690] ufshcd_pltfrm_shutdown+0x10/0x18 [ 105.794512] platform_drv_shutdown+0x20/0x30 [ 105.798935] device_shutdown+0x110/0x1e8 [ 105.803278] kernel_restart_prepare+0x34/0x40 [ 105.807181] kernel_restart+0x14/0x78 [ 105.811434] sys_reboot+0x200/0x248 [ 105.815081] el0_svc_naked+0x30/0x34 [ 105.818378] ---[ end trace 8d2322276b27879c ]--- Mark gcc_ufs_tx_symbol_0_clk as BRANCH_HALT_SKIP as well. Fixes: 12d807cd34b8 ("clk: qcom: gcc-msm8996: Disable halt check on UFS clocks") Reviewed-by: Bjorn Andersson Signed-off-by: Vinod Koul --- drivers/clk/qcom/gcc-msm8996.c | 1 + 1 file changed, 1 insertion(+) -- 2.14.4 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/clk/qcom/gcc-msm8996.c b/drivers/clk/qcom/gcc-msm8996.c index 9f35b3fe1d97..ff8d66fd94e6 100644 --- a/drivers/clk/qcom/gcc-msm8996.c +++ b/drivers/clk/qcom/gcc-msm8996.c @@ -2781,6 +2781,7 @@ static struct clk_branch gcc_ufs_rx_cfg_clk = { static struct clk_branch gcc_ufs_tx_symbol_0_clk = { .halt_reg = 0x75018, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x75018, .enable_mask = BIT(0),