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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 A943BC2D0DA for ; Sun, 29 Dec 2019 18:00:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 77E65206A4 for ; Sun, 29 Dec 2019 18:00:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642418; bh=h8v+R6jxtgqrSNMwvvPHFn6Txf2btWnv7cfOnHF7bDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=b9SasU/5WWkw6HciBdIR+jdD4pOAxpjor9TM+fA8xaqJVHsdoObt1h1jtKZR4OLkv VNia9B30+7VENtBr9tUhGp00Neczsof6TZOQQdKpF29cgIQ9kcICnMnyRTMOat1y8J IRzr7J0AFkIlZQOPvr7x5PV6+b1XfsxR6biAzE3E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729945AbfL2R5o (ORCPT ); Sun, 29 Dec 2019 12:57:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:48466 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733299AbfL2R5l (ORCPT ); Sun, 29 Dec 2019 12:57:41 -0500 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 DC802222C3; Sun, 29 Dec 2019 17:57:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642261; bh=h8v+R6jxtgqrSNMwvvPHFn6Txf2btWnv7cfOnHF7bDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y7M+BwBgUzVDWg1sxuAVu4e6gIb4vmfc6iHIaBPJws5DIMMcvkUEM9H53fk4kH3hG n89T4GRll+nLMdjmoiBk9OOzUcEJN5AV8Qxmsl6E+L/gSSVczrpB9LWKhYW+qg0jAV 8Y+F1riYFx9yC75ctjD6nmc36vZau+zQrtsw1His= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peng Fan , Shawn Guo Subject: [PATCH 5.4 408/434] clk: imx: clk-composite-8m: add lock to gate/mux Date: Sun, 29 Dec 2019 18:27:41 +0100 Message-Id: <20191229172729.780057067@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Peng Fan commit 073a01e8d7c23b3efb59a3d4c20aa546f9ec29a9 upstream. There is a lock to divider in the composite driver, but that's not enough. lock to gate/mux are also needed to provide exclusive access to the register. Fixes: d3ff9728134e ("clk: imx: Add imx composite clock") Signed-off-by: Peng Fan Cc: Signed-off-by: Shawn Guo Signed-off-by: Greg Kroah-Hartman --- drivers/clk/imx/clk-composite-8m.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/clk/imx/clk-composite-8m.c +++ b/drivers/clk/imx/clk-composite-8m.c @@ -142,6 +142,7 @@ struct clk *imx8m_clk_composite_flags(co mux->reg = reg; mux->shift = PCG_PCS_SHIFT; mux->mask = PCG_PCS_MASK; + mux->lock = &imx_ccm_lock; div = kzalloc(sizeof(*div), GFP_KERNEL); if (!div) @@ -161,6 +162,7 @@ struct clk *imx8m_clk_composite_flags(co gate_hw = &gate->hw; gate->reg = reg; gate->bit_idx = PCG_CGC_SHIFT; + gate->lock = &imx_ccm_lock; hw = clk_hw_register_composite(NULL, name, parent_names, num_parents, mux_hw, &clk_mux_ops, div_hw,