From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1874E57C91 for ; Thu, 2 May 2024 23:20:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714692056; cv=none; b=LxtYSFov/UVgKQ8S6iu3WBMV5AmL8MaD4kS2h0MQQJMCawnz9Fa1kk0dsMORQVbgwSUDgTBOx2IfjBMuGIeruZcBlpUb+abJEsvaFMjywLu/ZDgZGzHq8OBr6WP/Bumb9SLooHgOwTCQGLQeGukbzPFXjfqvP2aA6K1+aJUkSP8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714692056; c=relaxed/simple; bh=/BD3wxAtMeBhjQcyimNBdRRV8wUoskv6H5KUanY3Oqw=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=XYs37EtPmYRbyyBT9Oqbk1sgTvL3xo43J8lyY8Wm0fFEFmEcM6eTE9XTxWzoLO79xqiD1Kk7Xsm38/BVhn3tAT5J/ZdKXmjw4F9+B7oGBjn7hlr8VoXDENod6FSJR7cXYAfPBNXrLdLPaezNE4qEIKuQwcOCyxlDRQmdEI3adis= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=UQ+uQiaq; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="UQ+uQiaq" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a5200afe39eso1041946666b.1 for ; Thu, 02 May 2024 16:20:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1714692050; x=1715296850; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=0ByVaaMKgikK9K01TQNZAeU3i4lX5j7GPcDDDxv6HGU=; b=UQ+uQiaqzBmGAbh5GUQIa0DzdA4AzZaZSV9HSafIn23UneEGQmPwt+Jw6CGTxX2V4/ sClIYE8rDQxBFEoRcsgfQGstcY2dzliHt4SCOVPrJRJwwGAQqm0AjLBbkO4OkgHd6N31 J5/1wCmTJdv3j4pfpImAHDDWpcgiX5nY2tmg4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714692050; x=1715296850; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0ByVaaMKgikK9K01TQNZAeU3i4lX5j7GPcDDDxv6HGU=; b=sDlyZD93a/lyTyFkLtzr8Rfo32UMFjakKuSU/UXT9f616AakO//l0L8bqBjX8pXEMH 640FOmv/EEXXXacd1YyAFSOVIrr6FVottxR95JtbgOHhGoh8mjiQy3rx2M5vVScl7wDZ 37E0ahmkhML8+0A629nZQKR39Rexplvnh8lrJCfcTPzY8YaOzEEbjnqdCID8r6bd1DlQ JMriWE5wK9m78yzW/pXn+yTLFRO7WV+N2BlCYmsWPb/YWB5Uevky+BSL6KZEbPQjbDMz wyqyDQZ9B2gnE8Z+3wqddEeg9IEzwXcREQjNXecAR1arvSOWf58Mi9EKS34YkwNgdn8Q g6Wg== X-Forwarded-Encrypted: i=1; AJvYcCXI7TcClDcCD92J1dMvH3vuS2En7tzqIQFwp/6OLoh0JsT7CgkNi5a9AU0W/hYkDVBQ1yyxHaCb7gJ3py9OEqF821rf8zbA5A7o X-Gm-Message-State: AOJu0YwEdXD8BlAtIBUcG0HQmiKGbouuUYQu2sd9K2GxpGfjV6GC7pjo O1DjSjLwpWQ6JuUQVEwcB0x2gMWb0kcz6ZNZPuz3sZ/DmptqTEDeK7WtGfHEOUNbxYcxr5umrbO pjw== X-Google-Smtp-Source: AGHT+IETXvG9hzglx0vrkNkZ64IOnUY/wNanaKVCnzkGQdfNQuQl/68lcXV51LDzezYU66ASuwC1PA== X-Received: by 2002:a17:907:9952:b0:a55:a1d4:84f5 with SMTP id kl18-20020a170907995200b00a55a1d484f5mr709298ejc.43.1714692050251; Thu, 02 May 2024 16:20:50 -0700 (PDT) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com. [209.85.128.44]) by smtp.gmail.com with ESMTPSA id ce3-20020a170906b24300b00a587831c09fsm1026321ejb.186.2024.05.02.16.20.49 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 May 2024 16:20:49 -0700 (PDT) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-41bff91ecdcso16445e9.1 for ; Thu, 02 May 2024 16:20:49 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCXfBApt+te1glcLcQ8RP1BUdFUyKHewh/wHq4ijnMKPmgzuVOlLaB6mipeJmKOydl3JwAn5RO7otO3HOz5MeKmfjjF3ZIM+Ombf X-Received: by 2002:a05:600c:190c:b0:41b:e55c:8dca with SMTP id 5b1f17b1804b1-41e1cf3429dmr334315e9.7.1714692048795; Thu, 02 May 2024 16:20:48 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20240502224703.103150-1-swboyd@chromium.org> In-Reply-To: <20240502224703.103150-1-swboyd@chromium.org> From: Doug Anderson Date: Thu, 2 May 2024 16:20:31 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH] clk: qcom: Park shared RCGs upon registration To: Stephen Boyd Cc: Michael Turquette , Stephen Boyd , Bjorn Andersson , linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, patches@lists.linux.dev, linux-arm-msm@vger.kernel.org, Laura Nao , Dmitry Baryshkov , Taniya Das Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, On Thu, May 2, 2024 at 3:47=E2=80=AFPM Stephen Boyd w= rote: > > There's two problems with shared RCGs. > > The first problem is that they incorrectly report the parent after > commit 703db1f5da1e ("clk: qcom: rcg2: Cache CFG register updates for > parked RCGs"). That's because the cached CFG register value needs to be > populated when the clk is registered. clk_rcg2_shared_enable() writes > the cached CFG register value 'parked_cfg'. This value is initially zero > due to static initializers. If a driver calls clk_enable() before > setting a rate or parent, it will set the parent to '0' which is > (almost?) always XO, and may not reflect the parent at registration. In > the worst case, this switches the RCG from sourcing a fast PLL to the > slow crystal speed. > > The second problem is that the force enable bit isn't cleared. The force > enable bit is only used during parking and unparking of shared RCGs. > Otherwise it shouldn't be set because it keeps the RCG enabled even when > all the branches on the output of the RCG are disabled (the hardware has > a feedback mechanism so that any child branches keep the RCG enabled > when the branch enable bit is set). This problem wastes power if the clk > is unused, and is harmful in the case that the clk framework disables > the parent of the force enabled RCG. In the latter case, the GDSC the > shared RCG is associated with will get wedged if the RCG's source clk is > disabled and the GDSC tries to enable the RCG to do "housekeeping" while > powering on. > > Both of these problems combined with incorrect runtime PM usage in the > display driver lead to a black screen on Qualcomm sc7180 Trogdor > chromebooks. What happens is that the bootloader leaves the > 'disp_cc_mdss_rot_clk' enabled and the 'disp_cc_mdss_rot_clk_src' force > enabled and parented to 'disp_cc_pll0'. The mdss driver probes and > runtime suspends, disabling the mdss_gdsc which uses the > 'disp_cc_mdss_rot_clk_src' for "housekeeping". The > 'disp_cc_mdss_rot_clk' is disabled during late init because the clk is > unused, but the parent 'disp_cc_mdss_rot_clk_src' is still force enabled > because the force enable bit was never cleared. Then 'disp_cc_pll0' is > disabled because it is also unused. That's because the clk framework > believes the parent of the RCG is XO when it isn't. A child device of > the mdss device (e.g. DSI) runtime resumes mdss which powers on the > mdss_gdsc. This wedges the GDSC because 'disp_cc_mdss_rot_clk_src' is > parented to 'disp_cc_pll0' and that PLL is off. With the GDSC wedged, > mdss_runtime_resume() tries to enable 'disp_cc_mdss_mdp_clk' but it > can't because the GDSC has wedged all the clks associated with the GDSC > causing clks to stay stuck off. > > This leads to the following warning seen at boot and a black screen > because the display driver fails to probe. > > disp_cc_mdss_mdp_clk status stuck at 'off' > WARNING: CPU: 1 PID: 81 at drivers/clk/qcom/clk-branch.c:87 clk_branch_t= oggle+0x114/0x168 > Modules linked in: > CPU: 1 PID: 81 Comm: kworker/u16:4 Not tainted 6.7.0-g0dd3ee311255 #1 f5= 757d475795053fd2ad52247a070cd50dd046f2 > Hardware name: Google Lazor (rev1 - 2) with LTE (DT) > Workqueue: events_unbound deferred_probe_work_func > pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=3D--) > pc : clk_branch_toggle+0x114/0x168 > lr : clk_branch_toggle+0x110/0x168 > sp : ffffffc08084b670 > pmr_save: 00000060 > x29: ffffffc08084b680 x28: ffffff808006de00 x27: 0000000000000001 > x26: ffffff8080dbd4f4 x25: 0000000000000000 x24: 0000000000000000 > x23: 0000000000000000 x22: ffffffd838461198 x21: ffffffd838007997 > x20: ffffffd837541d5c x19: 0000000000000001 x18: 0000000000000004 > x17: 0000000000000000 x16: 0000000000000010 x15: ffffffd837070fac > x14: 0000000000000003 x13: 0000000000000004 x12: 0000000000000001 > x11: c0000000ffffdfff x10: ffffffd838347aa0 x9 : 08dadf92e516c000 > x8 : 08dadf92e516c000 x7 : 0000000000000000 x6 : 0000000000000027 > x5 : ffffffd8385a61f2 x4 : 0000000000000000 x3 : ffffffc08084b398 > x2 : ffffffc08084b3a0 x1 : 00000000ffffdfff x0 : 00000000fffffff0 > Call trace: > clk_branch_toggle+0x114/0x168 > clk_branch2_enable+0x24/0x30 > clk_core_enable+0x5c/0x1c8 > clk_enable+0x38/0x58 > clk_bulk_enable+0x40/0xb0 > mdss_runtime_resume+0x68/0x258 > pm_generic_runtime_resume+0x30/0x44 > __genpd_runtime_resume+0x30/0x80 > genpd_runtime_resume+0x124/0x214 > __rpm_callback+0x7c/0x15c > rpm_callback+0x30/0x88 > rpm_resume+0x390/0x4d8 > rpm_resume+0x43c/0x4d8 > __pm_runtime_resume+0x54/0x98 > __device_attach+0xe0/0x170 > device_initial_probe+0x1c/0x28 > bus_probe_device+0x48/0xa4 > device_add+0x52c/0x6fc > mipi_dsi_device_register_full+0x104/0x1a8 > devm_mipi_dsi_device_register_full+0x28/0x78 > ti_sn_bridge_probe+0x1dc/0x2bc > auxiliary_bus_probe+0x4c/0x94 > really_probe+0xf8/0x270 > __driver_probe_device+0xa8/0x130 > driver_probe_device+0x44/0x104 > __device_attach_driver+0xa4/0xcc > bus_for_each_drv+0x94/0xe8 > __device_attach+0xf8/0x170 > device_initial_probe+0x1c/0x28 > bus_probe_device+0x48/0xa4 > deferred_probe_work_func+0x9c/0xd8 > > Fix these problems by parking shared RCGs at boot. This will properly > initialize the parked_cfg struct member so that the parent is reported > properly and ensure that the clk won't get stuck on or off because the > RCG is parented to the safe source (XO). > > Fixes: 703db1f5da1e ("clk: qcom: rcg2: Cache CFG register updates for par= ked RCGs") > Reported-by: Stephen Boyd > Closes: https://lore.kernel.org/r/1290a5a0f7f584fcce722eeb2a1fd898.sboyd@= kernel.org > Closes: https://issuetracker.google.com/319956935 > Reported-by: Laura Nao > Closes: https://lore.kernel.org/r/20231218091806.7155-1-laura.nao@collabo= ra.com > Cc: Bjorn Andersson > Cc: Dmitry Baryshkov > Cc: Douglas Anderson > Cc: Taniya Das > Signed-off-by: Stephen Boyd > --- > > This is an alternative approach to [1] which doesn't require any hacks > to disable clks during driver probe. > > [1] https://lore.kernel.org/r/20240327202740.3075378-1-swboyd@chromium.or= g > > drivers/clk/qcom/clk-rcg2.c | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) I'm not even close to an expert on the Qualcomm clock stuff, but the description of what's going on here seems reasonable to me. I agree that getting this fixed is important, so I'd be OK with a somewhat weak: Reviewed-by: Douglas Anderson ...hopefully others more in the know will also review and make sure it's not going to break anyone's use cases.