From patchwork Thu May 23 19:05:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 165050 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2602612ili; Thu, 23 May 2019 12:12:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqz4utGPbvJYKutLq2MWD04OM/PYAxnZfd7YRtojaGVhcT9RCYEhk73PouTtkvUqcMnDAyGV X-Received: by 2002:a62:7793:: with SMTP id s141mr40579613pfc.21.1558638731505; Thu, 23 May 2019 12:12:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558638731; cv=none; d=google.com; s=arc-20160816; b=t4uO5B/K/0yi3cw5bDALtglqzVzZbeHxqhZ79s0YYzxsOyXf9s/L3k5XBxG13mnSDH 4a1mw0+XJcaGqVA22ce5OMZ57czuW+ogUWzxrcTgFD9VilsT3uarcE2PRr044KALVp8D DoXfK7gceBQXtq7YCEbGtEH9N92crvzuiEzAUCjb7hFJZJ8kTovdh1s5F62RpZSd0OEq qEYoDivYtzfOnHDnXZVSVTp6EFdf/jzZ18gDThGvcXmCSAWOljCAKtwxZ9/2he5l1u8i ezYgQ9CjQ+LDQWCdkR/cEdP6EMVI9mzg3mzdvmhOb+HmjobMhypGOzSQ8vXL1k5ELWho TkCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KEVtfQ2jsJB44mlpJnX7tOxN1Z5OXLllYNaE7aqT4pU=; b=XEP6SdJJDK+VOaGrpMJo6yc63rWXNJTvcAk98AE6QG9jUCkZEFJ6uloneTgtuCnh0/ enzdujyLKfyhndA65Fj/d2lD5JIQnu8nvww5KLbXyUSS1RqoqkflJJ9A5b0iTa0F5HKG 0W0TkCXE70ksByh3NqmvDbc4j2Vi6G/N7xl3LiThXZf/UYh8Fgtvjr+vK2d91ZoKEBuj +IPtg9OifY8LV/HEqdSkd7UQhtUlB362yCqfB9zsWZahkA9ruk6ExNlA4z3N/tTxF5he dh73NFs94IXzGmEtsYZkT2l6dIdA3wd5a7ZdnFPDKGhrgwgkFpqbxQzhGFu8VVjXsUwH rOGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Fol+1QhS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id go3si485759plb.423.2019.05.23.12.12.11; Thu, 23 May 2019 12:12:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Fol+1QhS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388388AbfEWTMK (ORCPT + 30 others); Thu, 23 May 2019 15:12:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:45780 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388365AbfEWTMH (ORCPT ); Thu, 23 May 2019 15:12:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 0D69A21841; Thu, 23 May 2019 19:12:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558638726; bh=HiFtAIKrl+Yj/b7btEiQx9X+/cf8POcNBsL9C668gKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fol+1QhSVa7Czbpo14M2e3oaAz6B0OFHoYU98VXvHQsQ9nWkm31Qi1WZabGey4BFc c+Hm4GZrTvWGIaRDhXTDplVWfeXLMbrSQqoT5iq/rI6zE8+iQi+vx0M71tLSETug2X U9sHJHXz+uItoaLzGhDUD2v5VcPC7r5dTAonpBxQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhong Kaihua , John Stultz , Zhangfei Gao , Dong Zhang , Leo Yan , Stephen Boyd Subject: [PATCH 4.14 25/77] clk: hi3660: Mark clk_gate_ufs_subsys as critical Date: Thu, 23 May 2019 21:05:43 +0200 Message-Id: <20190523181723.783646372@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181719.982121681@linuxfoundation.org> References: <20190523181719.982121681@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leo Yan commit 9f77a60669d13ed4ddfa6cd7374c9d88da378ffa upstream. clk_gate_ufs_subsys is a system bus clock, turning off it will introduce lockup issue during system suspend flow. Let's mark clk_gate_ufs_subsys as critical clock, thus keeps it on during system suspend and resume. Fixes: d374e6fd5088 ("clk: hisilicon: Add clock driver for hi3660 SoC") Cc: stable@vger.kernel.org Cc: Zhong Kaihua Cc: John Stultz Cc: Zhangfei Gao Suggested-by: Dong Zhang Signed-off-by: Leo Yan Signed-off-by: Stephen Boyd Signed-off-by: Greg Kroah-Hartman --- drivers/clk/hisilicon/clk-hi3660.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/drivers/clk/hisilicon/clk-hi3660.c +++ b/drivers/clk/hisilicon/clk-hi3660.c @@ -163,8 +163,12 @@ static const struct hisi_gate_clock hi36 "clk_isp_snclk_mux", CLK_SET_RATE_PARENT, 0x50, 17, 0, }, { HI3660_CLK_GATE_ISP_SNCLK2, "clk_gate_isp_snclk2", "clk_isp_snclk_mux", CLK_SET_RATE_PARENT, 0x50, 18, 0, }, + /* + * clk_gate_ufs_subsys is a system bus clock, mark it as critical + * clock and keep it on for system suspend and resume. + */ { HI3660_CLK_GATE_UFS_SUBSYS, "clk_gate_ufs_subsys", "clk_div_sysbus", - CLK_SET_RATE_PARENT, 0x50, 21, 0, }, + CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0x50, 21, 0, }, { HI3660_PCLK_GATE_DSI0, "pclk_gate_dsi0", "clk_div_cfgbus", CLK_SET_RATE_PARENT, 0x50, 28, 0, }, { HI3660_PCLK_GATE_DSI1, "pclk_gate_dsi1", "clk_div_cfgbus",