From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.1 008/186] drm/pl111: Initialize clock spinlock early Date: Sat, 1 Jun 2019 09:13:44 -0400 Message-ID: <20190601131653.24205-8-sashal@kernel.org> References: <20190601131653.24205-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8BC6C899B3 for ; Sat, 1 Jun 2019 13:17:15 +0000 (UTC) In-Reply-To: <20190601131653.24205-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , dri-devel@lists.freedesktop.org, Guenter Roeck List-Id: dri-devel@lists.freedesktop.org RnJvbTogR3VlbnRlciBSb2VjayA8bGludXhAcm9lY2stdXMubmV0PgoKWyBVcHN0cmVhbSBjb21t aXQgM2UwMWFlMjYxMmJkZDc5NzVjNzRlYzcxMjNkN2Y4ZjVlNmVlZDc5NSBdCgpUaGUgZm9sbG93 aW5nIHdhcm5pbmcgaXMgc2VlbiBvbiBzeXN0ZW1zIHdpdGggYnJva2VuIGNsb2NrIGRpdmlkZXIu CgpJTkZPOiB0cnlpbmcgdG8gcmVnaXN0ZXIgbm9uLXN0YXRpYyBrZXkuCnRoZSBjb2RlIGlzIGZp bmUgYnV0IG5lZWRzIGxvY2tkZXAgYW5ub3RhdGlvbi4KdHVybmluZyBvZmYgdGhlIGxvY2tpbmcg Y29ycmVjdG5lc3MgdmFsaWRhdG9yLgpDUFU6IDAgUElEOiAxIENvbW06IHN3YXBwZXIgTm90IHRh aW50ZWQgNS4xLjAtMDk2OTgtZzFmYjNiNTIgIzEKSGFyZHdhcmUgbmFtZTogQVJNIEludGVncmF0 b3IvQ1AgKERldmljZSBUcmVlKQpbPGMwMDExYmU4Pl0gKHVud2luZF9iYWNrdHJhY2UpIGZyb20g WzxjMDAwZWJiOD5dIChzaG93X3N0YWNrKzB4MTAvMHgxOCkKWzxjMDAwZWJiOD5dIChzaG93X3N0 YWNrKSBmcm9tIFs8YzA3ZDNmZDA+XSAoZHVtcF9zdGFjaysweDE4LzB4MjQpCls8YzA3ZDNmZDA+ XSAoZHVtcF9zdGFjaykgZnJvbSBbPGMwMDYwZDQ4Pl0gKHJlZ2lzdGVyX2xvY2tfY2xhc3MrMHg2 NzQvMHg2ZjgpCls8YzAwNjBkNDg+XSAocmVnaXN0ZXJfbG9ja19jbGFzcykgZnJvbSBbPGMwMDVk ZTJjPl0KCShfX2xvY2tfYWNxdWlyZSsweDY4LzB4MjEyOCkKWzxjMDA1ZGUyYz5dIChfX2xvY2tf YWNxdWlyZSkgZnJvbSBbPGMwMDYwNDA4Pl0gKGxvY2tfYWNxdWlyZSsweDExMC8weDIxYykKWzxj MDA2MDQwOD5dIChsb2NrX2FjcXVpcmUpIGZyb20gWzxjMDdmNzU1Yz5dIChfcmF3X3NwaW5fbG9j aysweDM0LzB4NDgpCls8YzA3Zjc1NWM+XSAoX3Jhd19zcGluX2xvY2spIGZyb20gWzxjMDUzNmM4 Yz5dCgkocGwxMTFfZGlzcGxheV9lbmFibGUrMHhmOC8weDVmYykKWzxjMDUzNmM4Yz5dIChwbDEx MV9kaXNwbGF5X2VuYWJsZSkgZnJvbSBbPGMwNTAyZjU0Pl0KCShkcm1fYXRvbWljX2hlbHBlcl9j b21taXRfbW9kZXNldF9lbmFibGVzKzB4MWVjLzB4MjQ0KQoKU2luY2UgY29tbWl0IGVlZGQ2MDMz YjRjOCAoImRybS9wbDExMTogU3VwcG9ydCB2YXJpYW50cyB3aXRoIGJyb2tlbiBjbG9jawpkaXZp ZGVyIiksIHRoZSBzcGlubG9jayBpcyBub3QgaW5pdGlhbGl6ZWQgaWYgdGhlIGNsb2NrIGRpdmlk ZXIgaXMgYnJva2VuLgpJbml0aWFsaXplIGl0IGVhcmxpZXIgdG8gZml4IHRoZSBwcm9ibGVtLgoK Rml4ZXM6IGVlZGQ2MDMzYjRjOCAoImRybS9wbDExMTogU3VwcG9ydCB2YXJpYW50cyB3aXRoIGJy b2tlbiBjbG9jayBkaXZpZGVyIikKQ2M6IExpbnVzIFdhbGxlaWogPGxpbnVzLndhbGxlaWpAbGlu YXJvLm9yZz4KU2lnbmVkLW9mZi1ieTogR3VlbnRlciBSb2VjayA8bGludXhAcm9lY2stdXMubmV0 PgpTaWduZWQtb2ZmLWJ5OiBMaW51cyBXYWxsZWlqIDxsaW51cy53YWxsZWlqQGxpbmFyby5vcmc+ Ckxpbms6IGh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC8xNTU3 NzU4NzgxLTIzNTg2LTEtZ2l0LXNlbmQtZW1haWwtbGludXhAcm9lY2stdXMubmV0ClNpZ25lZC1v ZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vcGwxMTEvcGwxMTFfZGlzcGxheS5jIHwgNSArKystLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5z ZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v cGwxMTEvcGwxMTFfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL3BsMTExL3BsMTExX2Rpc3Bs YXkuYwppbmRleCA3NTRmNmIyNWYyNjUyLi42ZDlmNzg2MTJkZWViIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vcGwxMTEvcGwxMTFfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9w bDExMS9wbDExMV9kaXNwbGF5LmMKQEAgLTUzMSwxNCArNTMxLDE1IEBAIHBsMTExX2luaXRfY2xv Y2tfZGl2aWRlcihzdHJ1Y3QgZHJtX2RldmljZSAqZHJtKQogCQlkZXZfZXJyKGRybS0+ZGV2LCAi Q0xDRDogdW5hYmxlIHRvIGdldCBjbGNkY2xrLlxuIik7CiAJCXJldHVybiBQVFJfRVJSKHBhcmVu dCk7CiAJfQorCisJc3Bpbl9sb2NrX2luaXQoJnByaXYtPnRpbTJfbG9jayk7CisKIAkvKiBJZiB0 aGUgY2xvY2sgZGl2aWRlciBpcyBicm9rZW4sIHVzZSB0aGUgcGFyZW50IGRpcmVjdGx5ICovCiAJ aWYgKHByaXYtPnZhcmlhbnQtPmJyb2tlbl9jbG9ja2RpdmlkZXIpIHsKIAkJcHJpdi0+Y2xrID0g cGFyZW50OwogCQlyZXR1cm4gMDsKIAl9CiAJcGFyZW50X25hbWUgPSBfX2Nsa19nZXRfbmFtZShw YXJlbnQpOwotCi0Jc3Bpbl9sb2NrX2luaXQoJnByaXYtPnRpbTJfbG9jayk7CiAJZGl2LT5pbml0 ID0gJmluaXQ7CiAKIAlyZXQgPSBkZXZtX2Nsa19od19yZWdpc3Rlcihkcm0tPmRldiwgZGl2KTsK LS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E4FAC28CC1 for ; Sat, 1 Jun 2019 13:44:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0398B27719 for ; Sat, 1 Jun 2019 13:44:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559396652; bh=s+Z98v9ivrDolaDrRNoRrO6t6pmUb/gBb80oUlBT2RM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zQNhz2y/0AswO3qJfsqqlB8Mgx1JdcD4vWXrGE1DInq5x7qK0ZO5cbabVUiW9+Q2O n4Cl36OvfFxFMYNMixdiRHQrLN6EaQayo9vVOlXUqLAZ4/ipU9VrZbFOM/6TSaCxc9 sSPKgINAvyoPEmmodpfp/GMmY3lFXv9v/ZZhTB9o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727899AbfFANoK (ORCPT ); Sat, 1 Jun 2019 09:44:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:41956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727356AbfFANRP (ORCPT ); Sat, 1 Jun 2019 09:17:15 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C12EB27251; Sat, 1 Jun 2019 13:17:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559395035; bh=s+Z98v9ivrDolaDrRNoRrO6t6pmUb/gBb80oUlBT2RM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TQRalkMppdwB+2NOkR0A9L1EcquxGN9uZhQMYLlVPHLXd+Nx7F2PpOjvM9Nn06rQl /hzzGkYiScSsZDuCMM3IrNA6EfrVqCIl6LXdU62GrVn6V5pvQYvpioPi1I9YcQANVP +UCOAbobOCgrIgZp/4ZopdOc3q7aZLF/j/CRiFqU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Guenter Roeck , Linus Walleij , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.1 008/186] drm/pl111: Initialize clock spinlock early Date: Sat, 1 Jun 2019 09:13:44 -0400 Message-Id: <20190601131653.24205-8-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190601131653.24205-1-sashal@kernel.org> References: <20190601131653.24205-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guenter Roeck [ Upstream commit 3e01ae2612bdd7975c74ec7123d7f8f5e6eed795 ] The following warning is seen on systems with broken clock divider. INFO: trying to register non-static key. the code is fine but needs lockdep annotation. turning off the locking correctness validator. CPU: 0 PID: 1 Comm: swapper Not tainted 5.1.0-09698-g1fb3b52 #1 Hardware name: ARM Integrator/CP (Device Tree) [] (unwind_backtrace) from [] (show_stack+0x10/0x18) [] (show_stack) from [] (dump_stack+0x18/0x24) [] (dump_stack) from [] (register_lock_class+0x674/0x6f8) [] (register_lock_class) from [] (__lock_acquire+0x68/0x2128) [] (__lock_acquire) from [] (lock_acquire+0x110/0x21c) [] (lock_acquire) from [] (_raw_spin_lock+0x34/0x48) [] (_raw_spin_lock) from [] (pl111_display_enable+0xf8/0x5fc) [] (pl111_display_enable) from [] (drm_atomic_helper_commit_modeset_enables+0x1ec/0x244) Since commit eedd6033b4c8 ("drm/pl111: Support variants with broken clock divider"), the spinlock is not initialized if the clock divider is broken. Initialize it earlier to fix the problem. Fixes: eedd6033b4c8 ("drm/pl111: Support variants with broken clock divider") Cc: Linus Walleij Signed-off-by: Guenter Roeck Signed-off-by: Linus Walleij Link: https://patchwork.freedesktop.org/patch/msgid/1557758781-23586-1-git-send-email-linux@roeck-us.net Signed-off-by: Sasha Levin --- drivers/gpu/drm/pl111/pl111_display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/pl111/pl111_display.c b/drivers/gpu/drm/pl111/pl111_display.c index 754f6b25f2652..6d9f78612deeb 100644 --- a/drivers/gpu/drm/pl111/pl111_display.c +++ b/drivers/gpu/drm/pl111/pl111_display.c @@ -531,14 +531,15 @@ pl111_init_clock_divider(struct drm_device *drm) dev_err(drm->dev, "CLCD: unable to get clcdclk.\n"); return PTR_ERR(parent); } + + spin_lock_init(&priv->tim2_lock); + /* If the clock divider is broken, use the parent directly */ if (priv->variant->broken_clockdivider) { priv->clk = parent; return 0; } parent_name = __clk_get_name(parent); - - spin_lock_init(&priv->tim2_lock); div->init = &init; ret = devm_clk_hw_register(drm->dev, div); -- 2.20.1