From patchwork Thu May 23 19:06:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 165058 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2622560ili; Thu, 23 May 2019 12:29:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqwxP7z4kwX623S6rHCNLrANLpIA+xBeN6w1Bt0vw6Sxez9VGGwDk8ZBqFhDkZWBT6lkQJKT X-Received: by 2002:a62:e10f:: with SMTP id q15mr13226872pfh.56.1558639765994; Thu, 23 May 2019 12:29:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558639765; cv=none; d=google.com; s=arc-20160816; b=ctpYr/4RXsfzie3QD7yfsgzXj97nRIEEuq91Lzr3cDOK2msxu0gvCpf16iE00C+6j6 JvVbeOGHnQciQxIT7TcWmkjGc5HnzgEJoYXt+oKjXK1UvjI2ONRk65CVu14gQjFvqCav dcB64/p7j13VvMGXFCJpvQJNB1X9c7H5N01u73c0PM4ip3PbeRZpzPbXLmzSbcQ6OMka rbvIfRmSn++JLFUzywZXOHVDrwDWJiVrN7tWyGkkcDsuDSS3TU65dwxk8gohJ8fpbnXg fgVBG+SDg6Byhg4/thzeiz4gbp/yLwX+H7mody/d7QRZl37UOdAH462qRSs1zzutHONP akUA== 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=CLe/LV99QBmTABkcQlPnlGBq/F8ZioMmSjPysUN/pbNAmy3VWGmg9qRJjavb7LITu9 kHkoGzFNJDo4nU2K155CWJvHBujAGSkj3YryioFkM/Vp6ntDQcNaCVhDcPzId/etwB3T zjGbXSPK4gFKQbcExmukWQKwG/j9+UYuI8lKFqZLE7v24zMooYpywvfMCmYrk+T7q2sd tDMFWewmYTfkl5+F8Fy45Ue4u7zHH6bAkCCJRdPsorE8Z/3h59bfkSx6V0Doj2hlifz+ Vdz8IVpXCRlujakLqs7f9Ynb6br/cfFNP4DmGbRCfFf4wWQuYmZSouimFXCJMwm+xTxR P0zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ENXBowsK; 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 z5si463751plh.219.2019.05.23.12.29.25; Thu, 23 May 2019 12:29:25 -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=ENXBowsK; 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 S2391411AbfEWT3Y (ORCPT + 30 others); Thu, 23 May 2019 15:29:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:42456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391937AbfEWT3W (ORCPT ); Thu, 23 May 2019 15:29:22 -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 EF5D52133D; Thu, 23 May 2019 19:29:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558639761; bh=HiFtAIKrl+Yj/b7btEiQx9X+/cf8POcNBsL9C668gKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ENXBowsK4E9PLX3ry0BGGWHuV853e9IaYzTXwQMGquvX+DEmmXbBUG7Cl4vuGPpJV mf6n6YX0uoV8Hocw5tU5zihFzHSDZOw7LMMRFNoMekFnotCi/dsT8YkmUiV8SAol9L WGUMCbXVlI4w49Mhzm6GtCeO36fj/7FLKA6J936g= 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 5.1 059/122] clk: hi3660: Mark clk_gate_ufs_subsys as critical Date: Thu, 23 May 2019 21:06:21 +0200 Message-Id: <20190523181712.577353528@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181705.091418060@linuxfoundation.org> References: <20190523181705.091418060@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",