From patchwork Mon Jun 16 13:40:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 31963 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f72.google.com (mail-pb0-f72.google.com [209.85.160.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A847F206A0 for ; Mon, 16 Jun 2014 13:40:02 +0000 (UTC) Received: by mail-pb0-f72.google.com with SMTP id ma3sf20728337pbc.11 for ; Mon, 16 Jun 2014 06:40:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=9WJgNMnfUHQovyr8YNhc+Bn79084eEj6jJqll9vhZ9Q=; b=KjoUL3TeiIs1aGZqSYotzcoVUaTSjaJVjgwVX0hCCPNf6jfgyQTx2Tw+S4Mf4Di4kM BeT0zvG/sVdAMso7FLg/e1sUP+cWYefP2Vjh50AwSu8dsxWxEY4Zxsu0Nyw5SfOJ0HdQ 9vRkK0H91H/nklkFG9KXwrmhFZBD9N1tGvWdCGscFkbVh67i4Rk21bvytSO/ejTLwyPs MvjbDevto1bct2gBKl6PsYxQ4qBvIkd73gd0sSrQGEl6fXzwUWbMnJGNV9Y9Sg1roNuB 7GqH8E1mo9AJP7hSHYp+RLQqbBTLLOZu4lTRbdG80/l8noihMnetL1DYJZRbZjnRNnEj fczg== X-Gm-Message-State: ALoCoQkztBd8Rx23BWJeWagFnaNr83hoQ6UfnELYVaapXTn1pRTRjF9JeywYAV+UuZofjPPR9OX5 X-Received: by 10.68.180.132 with SMTP id do4mr2128478pbc.4.1402926001995; Mon, 16 Jun 2014 06:40:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.247 with SMTP id l110ls4208971qgf.90.gmail; Mon, 16 Jun 2014 06:40:01 -0700 (PDT) X-Received: by 10.52.136.98 with SMTP id pz2mr123556vdb.70.1402926001885; Mon, 16 Jun 2014 06:40:01 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id is9si4104703vdb.47.2014.06.16.06.40.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 16 Jun 2014 06:40:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.174 as permitted sender) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id jx11so3241563veb.5 for ; Mon, 16 Jun 2014 06:40:01 -0700 (PDT) X-Received: by 10.221.42.135 with SMTP id ty7mr16355222vcb.14.1402926001771; Mon, 16 Jun 2014 06:40:01 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp135839vcb; Mon, 16 Jun 2014 06:40:01 -0700 (PDT) X-Received: by 10.68.112.225 with SMTP id it1mr24703570pbb.23.1402926000672; Mon, 16 Jun 2014 06:40:00 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id lf13si13700783pab.199.2014.06.16.06.40.00; Mon, 16 Jun 2014 06:40:00 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753771AbaFPNj5 (ORCPT + 7 others); Mon, 16 Jun 2014 09:39:57 -0400 Received: from mail-ie0-f176.google.com ([209.85.223.176]:41176 "EHLO mail-ie0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751962AbaFPNjy (ORCPT ); Mon, 16 Jun 2014 09:39:54 -0400 Received: by mail-ie0-f176.google.com with SMTP id rd18so4987092iec.21 for ; Mon, 16 Jun 2014 06:39:53 -0700 (PDT) X-Received: by 10.42.137.70 with SMTP id x6mr2658637ict.79.1402925993665; Mon, 16 Jun 2014 06:39:53 -0700 (PDT) Received: from localhost.localdomain (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPSA id k20sm20775727igf.5.2014.06.16.06.39.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Jun 2014 06:39:53 -0700 (PDT) From: Alex Elder To: mturquette@linaro.org, mporter@linaro.org, bcm@fixthebug.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 4/7] clk: bcm281xx: implement prerequisite clocks Date: Mon, 16 Jun 2014 08:40:04 -0500 Message-Id: <1402926007-4436-5-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1402926007-4436-1-git-send-email-elder@linaro.org> References: <1402926007-4436-1-git-send-email-elder@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: elder@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Allow a clock to specify a "prerequisite" clock, identified by its name. The prerequisite clock must be prepared and enabled before a clock that depends on it is used. In order to simplify locking, we require a clock and its prerequisite to be associated with the same CCU. (We'll just trust--but not verify--that nobody defines a cycle of prerequisite clocks.) Rework the KONA_CLK() macro, and define a new KONA_CLK_PREREQ() variant that allows a prerequisite clock to be specified. Signed-off-by: Alex Elder --- drivers/clk/bcm/clk-kona.c | 70 ++++++++++++++++++++++++++++++++++++++++++++-- drivers/clk/bcm/clk-kona.h | 20 +++++++++++-- 2 files changed, 85 insertions(+), 5 deletions(-) diff --git a/drivers/clk/bcm/clk-kona.c b/drivers/clk/bcm/clk-kona.c index 2e27924..51b4edb 100644 --- a/drivers/clk/bcm/clk-kona.c +++ b/drivers/clk/bcm/clk-kona.c @@ -1037,6 +1037,42 @@ static bool __peri_clk_init(struct kona_clk *bcm_clk) /* Clock operations */ +static int kona_prereq_prepare_enable(struct kona_clk *bcm_clk) +{ + const char *clk_name = bcm_clk->init_data.name; + const char *prereq_name = bcm_clk->prereq.name; + struct clk *prereq_clk = bcm_clk->prereq.clk; + int ret; + + BUG_ON(!clk_name); + + /* Look up the prerequisite clock if we haven't already */ + if (!prereq_clk) { + prereq_clk = __clk_lookup(prereq_name); + if (WARN_ON_ONCE(!prereq_clk)) + return -ENOENT; + bcm_clk->prereq.clk = prereq_clk; + } + + /* Dependent clock already holds the prepare lock */ + ret = __clk_prepare(prereq_clk); + if (ret) { + pr_err("%s: unable to prepare prereq clock %s for %s\n", + __func__, prereq_name, clk_name); + return ret; + } + + ret = clk_enable(prereq_clk); + if (ret) { + __clk_unprepare(prereq_clk); + pr_err("%s: unable to enable prereq clock %s for %s\n", + __func__, prereq_name, clk_name); + return ret; + } + + return 0; +} + static int kona_clk_prepare(struct clk_hw *hw) { struct kona_clk *bcm_clk = to_kona_clk(hw); @@ -1044,6 +1080,13 @@ static int kona_clk_prepare(struct clk_hw *hw) unsigned long flags; int ret = 0; + /* Prepare the prerequisite clock first */ + if (bcm_clk->prereq.name) { + ret = kona_prereq_prepare_enable(bcm_clk); + if (ret) + goto out; + } + if (clk_is_initialized(bcm_clk)) return 0; @@ -1062,19 +1105,42 @@ static int kona_clk_prepare(struct clk_hw *hw) __ccu_write_disable(ccu); ccu_unlock(ccu, flags); - +out: if (!ret) clk_set_initialized(bcm_clk); return ret; } +/* + * Disable and unprepare a prerequisite clock, and drop our + * reference to it. + */ +static void kona_prereq_disable_unprepare(struct kona_clk *bcm_clk) +{ + struct clk *prereq_clk = bcm_clk->prereq.clk; + + BUG_ON(!bcm_clk->prereq.name); + WARN_ON_ONCE(!prereq_clk); + + clk_disable(prereq_clk); + __clk_unprepare(prereq_clk); +} + static void kona_clk_unprepare(struct clk_hw *hw) { struct kona_clk *bcm_clk = to_kona_clk(hw); WARN_ON(!clk_is_initialized(bcm_clk)); - /* Nothing to do. */ + + /* + * We don't do anything to unprepare Kona clocks themselves, + * but if there's a prerequisite we'll need to unprepare it. + */ + if (!bcm_clk->prereq.name) + return; + + kona_prereq_disable_unprepare(bcm_clk); } static int kona_peri_clk_enable(struct clk_hw *hw) diff --git a/drivers/clk/bcm/clk-kona.h b/drivers/clk/bcm/clk-kona.h index ea77ec1..98b6fa1 100644 --- a/drivers/clk/bcm/clk-kona.h +++ b/drivers/clk/bcm/clk-kona.h @@ -407,6 +407,10 @@ struct kona_clk { struct ccu_data *ccu; /* ccu this clock is associated with */ enum bcm_clk_type type; u32 flags; /* BCM_CLK_KONA_FLAGS_* below */ + struct { + const char *name; + struct clk *clk; + } prereq; union { void *data; struct peri_clk_data *peri; @@ -422,16 +426,26 @@ struct kona_clk { #define BCM_CLK_KONA_FLAGS_INITIALIZED ((u32)1 << 0) /* Clock initialized */ /* Initialization macro for an entry in a CCU's kona_clks[] array. */ -#define KONA_CLK(_ccu_name, _clk_name, _type) \ - { \ +#define ___KONA_CLK_COMMON(_ccu_name, _clk_name, _type) \ .init_data = { \ .name = #_clk_name, \ .ops = &kona_ ## _type ## _clk_ops, \ }, \ .ccu = &_ccu_name ## _ccu_data, \ .type = bcm_clk_ ## _type, \ - .u.data = &_clk_name ## _data, \ + .u.data = &_clk_name ## _data + +#define KONA_CLK_PREREQ(_ccu_name, _clk_name, _type, _prereq) \ + { \ + .prereq.name = #_prereq, \ + ___KONA_CLK_COMMON(_ccu_name, _clk_name, _type), \ } + +#define KONA_CLK(_ccu_name, _clk_name, _type) \ + { \ + ___KONA_CLK_COMMON(_ccu_name, _clk_name, _type), \ + } + #define LAST_KONA_CLK { .type = bcm_clk_none } /*