From patchwork Wed Mar 20 10:05:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 160656 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp86254jan; Wed, 20 Mar 2019 03:06:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqwPHQVu57S0xDK+NJir8e1QrK/E9nK0a9x54fPrGfKUgzu6a4WVrKmcooPGsiYZWH3NPl3U X-Received: by 2002:a62:2a97:: with SMTP id q145mr6936128pfq.22.1553076363451; Wed, 20 Mar 2019 03:06:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553076363; cv=none; d=google.com; s=arc-20160816; b=qW+Wce2NE6v5p2I7L8k5OS80vyXrvTOtNbQgte9NKc4Vwna74tL+EM0cXqRyuNgpeP zozyTtctEU9ukcKZqE5z8q2fuE080V8rdz2TYQd2Q/Yl7RkX9+SOo7EEHcPrXpnnpzko KIPzmhUbczTVvxQytCxTg5i/l57B/wHecO3scbbRqxI3LR2tfs+cUjUBPbcIo+UD7ni0 m3hEcWV4rDfRpyj/77wXsmuOfOkGj0k2Dt4BEs4VMQOy7O5ADj8cFhMlMN/NxXh6IU5L b3W4eyiZQNu1WXh2dBcKhZdkxMoqqT6wBKgui99llTTsTtcKbcNfgtersu4HDOrG0mmV oewA== 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; bh=it2EbfqIKkGakT1fEE8g/fE0QVmOppWgv7mGI6uSqEg=; b=kaMjtWbPcSAwjbQUyPL4NajhjcjK8R9eQYhojmOcZrfIWWc7d/EA+Jan+wK+vMUCCj ZYP6hzVfAz8JlIItuk6DoyZwF6Xehu0q4g/DnJbjgXPR+YkO49o1XpWCOckujYmWUmhY HmW56JRpMqT6SsYBjp+BV2y2Y9hIdUVa4MQ42Vq6tnBjgm6KlgjiTJp5uoK02WudaRPP 1n/nB3fi02TY5PyNO7HmvkVelpYiDIe4V49NV9F3XGv/sCt5Dt+x/qtlaxFWW5Ubrmyd /VZtltV/fMOHpQ2IQGHbFUrzOlhy11ewwvdX1Sk7Q+FdYi0Fzi3JvqQK6TE80AuIN80j 2JpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cLqPdQOB; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e2si1605742pln.45.2019.03.20.03.06.03; Wed, 20 Mar 2019 03:06:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=@linaro.org header.s=google header.b=cLqPdQOB; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726114AbfCTKGC (ORCPT + 14 others); Wed, 20 Mar 2019 06:06:02 -0400 Received: from mail-oi1-f194.google.com ([209.85.167.194]:41628 "EHLO mail-oi1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725980AbfCTKGC (ORCPT ); Wed, 20 Mar 2019 06:06:02 -0400 Received: by mail-oi1-f194.google.com with SMTP id v7so1300871oie.8 for ; Wed, 20 Mar 2019 03:06:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=it2EbfqIKkGakT1fEE8g/fE0QVmOppWgv7mGI6uSqEg=; b=cLqPdQOBKlG14DWYeUi7imbmZmOZeC9+Iy8OCANwmMgEeXCaUVqjc6+1WbF8HbR1/k Ggwmuy4Ja7mQNDIZjCO8rgW2vmGtwOg4vazra3G9PpAeVjRLm9OhyxtcgSkyfpXFh21V htyYLYADPD4+dUx61SqKgg+hHvLEJrvTtxLEqq8gDHLkswHjPREgGWzreZpfxA43hVQp G03+69p4egQD7kmD4jRfP/apQbflnAHxf6cWlojFDhD75SP2TNt3Gq25iLv/sjqkKqTm s/9OdYVf34CLOiyK0SxONTbUrHlGig6yRVk7FZ9hVl4RHRcfdfEgd/HRYRJbIIyXQjUR 0dwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=it2EbfqIKkGakT1fEE8g/fE0QVmOppWgv7mGI6uSqEg=; b=OYhQWuf0V1KT5+pMpv+z3RjQHi3+0TU8308BYGww33RWCz4P1zHut0RoYaucmNBh5t KJJVjyIX3EOx33ebAt9FglRR7RAOP0FzDnxV4+BiDtlB+03Pkn6OWEmU7Wk1E8+IS9X3 PNWiTTAGiz8gahryKbBgCCYq5215pNlKpbnph4dHY8UMMTqc7Uw5T0ceksgbg4glPS8f YaNRuIn5ftEiq99TeBWeIxttRzqxR/As3O9WzqXv4uy2T7p1cOXFIt7gp0WwGbKfxnmY z5a8dXUuceBgop6OMoWS6deH/yBxl4cOiHh9htyidEGJh0VQlGvc9JtIAAcnHIRCrfTN 998g== X-Gm-Message-State: APjAAAUdmcBAUvm1UrdTchb6Xx9eCwlBwASrnPJwNqzHY1uKhQ9mvlHr 98gqfrxlJT6dvnudBIIWKYsQrVtulUs= X-Received: by 2002:a54:4891:: with SMTP id r17mr4821054oic.7.1553076361704; Wed, 20 Mar 2019 03:06:01 -0700 (PDT) Received: from localhost.localdomain (li808-42.members.linode.com. [104.237.132.42]) by smtp.gmail.com with ESMTPSA id f62sm609238otb.54.2019.03.20.03.05.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Mar 2019 03:06:00 -0700 (PDT) From: Leo Yan To: Michael Turquette , Stephen Boyd , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan , stable@vger.kernel.org, Zhong Kaihua , John Stultz , Zhangfei Gao Subject: [PATCH v2] clk: hi3660: Mark clk_gate_ufs_subsys as critical Date: Wed, 20 Mar 2019 18:05:08 +0800 Message-Id: <20190320100508.6950-1-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 --- drivers/clk/hisilicon/clk-hi3660.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/clk/hisilicon/clk-hi3660.c b/drivers/clk/hisilicon/clk-hi3660.c index f40419959656..794eeff0d5d2 100644 --- a/drivers/clk/hisilicon/clk-hi3660.c +++ b/drivers/clk/hisilicon/clk-hi3660.c @@ -163,8 +163,12 @@ static const struct hisi_gate_clock hi3660_crgctrl_gate_sep_clks[] = { "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",