From patchwork Thu May 23 19:05:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 165055 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2613973ili; Thu, 23 May 2019 12:21:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+12R5auDM0mfwulPVBMnZWXyj24yYyyRy4VYeg+n3pGhIOE3gkXgCpIOEfmaDQMT33fK3 X-Received: by 2002:a17:902:7d83:: with SMTP id a3mr101714464plm.305.1558639297497; Thu, 23 May 2019 12:21:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558639297; cv=none; d=google.com; s=arc-20160816; b=qC8UcQx1NzAWnl+Dh654MQXUQeNugyzok0d9Q4xizRZ7KW5pHp0ppkQ6V75MXC0Bmm iI4mw91CZMB/DgHBOkjNBzJ9Nkg5nK2LFAPLOU8kIKpIEUD6loxlOAo3EMj1wLoIH3YT +3aMdwLnnN/bFv6Qc98LJn8QNGz3ui3QKFqmPbm8KKaUhEwogl+WrfPU1MTBrCLB3uiQ V9JEzvumNKaxBTp9seJcwrEpyGBWOgX8mQgJUoCSQyn99w1uvtdyPU+qSriwVTJfE8BZ jEFyGzlJpMdhLudFCf62ZNap6F605NJN8F561y6hExrdkNcskVETqNc4KlywjaerUphJ Dhvw== 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=zQ6sztp8QczHztHzDQJNTkIfBC8CBnlc73yVx5b+iiMD8iXH/7rI2Nvadx+Oni9OBG LAe253ZWtTpQeN3NCwGnqoSgF7k0c3+TtaNDU7cW0kTa/KukvcmMB+8dVe/rH8HLz9Q2 YGFe9r9uA1NYNoxY0mkRdX3uEOjOghhjEIz9Jc07uHBGBaA65+UW5q0IHrA1dWss6e8I dHRrFL+ZVWSgoEsQzKvxZZ1+ZIpQOV2vx/D//sTaWVFzAd17YXUm2NlvFQQXFOud4IKd Z9fh0h6meOUq6au3Kerha+pp4HAy/2F3VIvRQYxZrBD0BEmLjblA95Fwf26A62/f9Xof 8/kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vRqZ8KPI; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a33si601445plc.283.2019.05.23.12.21.37; Thu, 23 May 2019 12:21:37 -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=@kernel.org header.s=default header.b=vRqZ8KPI; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389923AbfEWTVg (ORCPT + 14 others); Thu, 23 May 2019 15:21:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:58968 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390290AbfEWTVd (ORCPT ); Thu, 23 May 2019 15:21:33 -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 ACACF20863; Thu, 23 May 2019 19:21:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558639293; bh=HiFtAIKrl+Yj/b7btEiQx9X+/cf8POcNBsL9C668gKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vRqZ8KPIOWKOwGzI8nAWoepsHZ+j/K4g9QIdG5Lx4wR8uQwxLxPd3Ao+J7UAsJHfg keJ0xBQ5NSt0lEfm23EyYfR1qWOfXDsTd/xns9stDwawjNAJEe/suZmQk3NYjbmtiB F7uzGUTx7Vcrhju0E4DI/KwR7BvEU89K1xBt/xX8= 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.0 051/139] clk: hi3660: Mark clk_gate_ufs_subsys as critical Date: Thu, 23 May 2019 21:05:39 +0200 Message-Id: <20190523181727.303517530@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181720.120897565@linuxfoundation.org> References: <20190523181720.120897565@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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",