From patchwork Thu May 23 19:05:38 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: 165052 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2607263ili; Thu, 23 May 2019 12:15:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqw3Nwq74AVJcx/EtnayHLizN6l2cT3lliJYY6JvAjpA5gThZaQe77bA1+MY1jx8sWJ08gs1 X-Received: by 2002:a17:90a:22d0:: with SMTP id s74mr3388412pjc.3.1558638952756; Thu, 23 May 2019 12:15:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558638952; cv=none; d=google.com; s=arc-20160816; b=UUoYPt3de6NhYPWcq8EmXTsMJhqWJ7097zOdg33A4Ga70HF6zVP8kHRVuVRgFF1euL jM+31xLQLWn0FhCc6qfEe+TgYX8mqtkiLM6Nm64XKd+1onLqopPCqMkHBDVZx0NnOadB bf6zB6RoK1Rv5+w3MNyL48q7Kci2cgOFj2HeE+xl2vczFSUvBjB2bYnqRiYzfySzMQsh x4VS5WpR6ZVCfO8pozJxfzNvd0QkV+gy1qOhlE8JSYbO2I/MGabFHxWf1wmCkmTuxmtf Kz2z7xCQzL+FuIw0Lx5f80udIrpGH6KNCoVgVeybpl5kXimQQ5URHh6WmIfcBbuPSfUa 9xGw== 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=1I9NgwJU9bqak6r7DSifGq9/JVaviFus6sPKMjt9FUzt2Bbh838QkNn3HbtdjcmSY5 To80LW2qyPdUwDs1WLFZzilOBew8lyQOpdR429Lr/bvjdt6jXBSsP5qFwsDo2udXpFlP MHj4nRkgiJh5xVppGoGTcTiaMSm8JSVphrxv86S6yrFOA+xBA1irKWuC/Ay8sablJyZW CXh7eVbKlMhCduB90gf+B3bXdi6ngRHyCH4deRgCbqpVR9JvWLl2+dWK3WWF1KAN8p4K jzHRiDDtC1rsobBXEYZD3pv+TSA/gxwWRcYAW9uMtWtZiUBdiBmmMUMCuDr1qB0Lfu2m K7ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cAnmXq3r; 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 101si619454plb.31.2019.05.23.12.15.52; Thu, 23 May 2019 12:15:52 -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=cAnmXq3r; 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 S2388623AbfEWTPv (ORCPT + 30 others); Thu, 23 May 2019 15:15:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:50270 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389066AbfEWTPq (ORCPT ); Thu, 23 May 2019 15:15:46 -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 D590C2133D; Thu, 23 May 2019 19:15:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558638946; bh=HiFtAIKrl+Yj/b7btEiQx9X+/cf8POcNBsL9C668gKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cAnmXq3rNl4GYGEnZ89oWrttUELBRqd1Nt00SVPEKLswghcE3lgtUMPEP22RzW8ko dx/qv4xcvn67z+1u1Rk/8cr5ANrizYCxKKsLzE34c1RZ/sIh9e+s1Pl9Mia1zdfLCZ HgyIMX6UXbkpVLWe8XwyK7w5dhrZBNCl+98IyXz8= 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.19 039/114] clk: hi3660: Mark clk_gate_ufs_subsys as critical Date: Thu, 23 May 2019 21:05:38 +0200 Message-Id: <20190523181735.310111138@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181731.372074275@linuxfoundation.org> References: <20190523181731.372074275@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",