From patchwork Tue Feb 28 10:02:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?S09OUkFEIEZyw6lkw6lyaWM=?= X-Patchwork-Id: 9595053 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 088C060429 for ; Tue, 28 Feb 2017 10:06:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB011284FF for ; Tue, 28 Feb 2017 10:06:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE25E28518; Tue, 28 Feb 2017 10:06:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CCA5C284FF for ; Tue, 28 Feb 2017 10:06:40 +0000 (UTC) Received: from localhost ([::1]:59865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cieg3-0000XG-Sb for patchwork-qemu-devel@patchwork.kernel.org; Tue, 28 Feb 2017 05:06:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cied5-0006oF-Uk for qemu-devel@nongnu.org; Tue, 28 Feb 2017 05:03:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cied2-00047h-Pq for qemu-devel@nongnu.org; Tue, 28 Feb 2017 05:03:35 -0500 Received: from greensocs.com ([193.104.36.180]:38376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cied2-00047G-D2 for qemu-devel@nongnu.org; Tue, 28 Feb 2017 05:03:32 -0500 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id AADEC40CA94; Tue, 28 Feb 2017 11:03:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1488276211; bh=NYVATN0wgqVZ7Rb+RKmNRrA+agIKrLHOygt8p6+W4vM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mU9nR3rQGqDeTMM+QrY1nKvjGeWLLHCsdpkPKMhmj+d0M+ZzJQq3pnbuxiS6rtXU5 Fr0uG2pqkPWZiiw6ZcB9bsxotLvsG/nxKaxg7fDv+Yo3X6GbgyD/A9vGIYdcwEgxNN 8HOEEaxHCt+6pLdbudDkzrQjGv3857eufwcGIlgA= X-Virus-Scanned: amavisd-new at greensocs.com Authentication-Results: gs-01.greensocs.com (amavisd-new); dkim=pass (1024-bit key) header.d=greensocs.com Received: from greensocs.com ([127.0.0.1]) by localhost (gs-01.greensocs.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wo1eoV95045R; Tue, 28 Feb 2017 11:03:30 +0100 (CET) Received: from corsair.home (bd231-7-88-127-3-24.fbx.proxad.net [88.127.3.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: fred.konrad@greensocs.com) by greensocs.com (Postfix) with ESMTPSA id 5BBD01A5656; Tue, 28 Feb 2017 11:03:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1488276210; bh=NYVATN0wgqVZ7Rb+RKmNRrA+agIKrLHOygt8p6+W4vM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GRrHOneP0g1eBMbyGTM6n1mzS7/9aRS+rKVoAZEnk1yvMPMj2QYomlySFDBRXzDFE Mnto4+Zz+/Xlv6oRpt+VRcU9FYXffi5VP/NiapbCZjKxevnMY7zsKGKAfo3VHNA6QZ YvL1dsxoXiQXJOJuvwqwdtVied7yJLN3BE4FTl8c= From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org Date: Tue, 28 Feb 2017 11:02:58 +0100 Message-Id: <1488276185-31168-4-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1488276185-31168-1-git-send-email-fred.konrad@greensocs.com> References: <1488276185-31168-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 193.104.36.180 Subject: [Qemu-devel] [PATCH v3 03/10] qemu-clk: allow to bind two clocks together X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, mark.burton@greensocs.com, alistair.francis@xilinx.com, clg@kaod.org, fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: KONRAD Frederic This introduces the clock binding and the update part. When the qemu_clk_rate_update(qemu_clk, int) function is called: * The clock callback is called on the qemu_clk so it can change the rate. * The qemu_clk_rate_update function is called on all the driven clock. Signed-off-by: KONRAD Frederic V2 -> V3: * s/qemu_clk/QEMUClock/g * Rename in_rate to ref_rate * Rename out_rate to rate * Rename qemu_clk_bind_clock to qemu_clk_bind V1 -> V2: * Rename qemu_clk_on_rate_update_cb to QEMUClkRateUpdateCallback and move the pointer to the structure instead of having a pointer-to-function type. --- include/qemu/qemu-clock.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++ qemu-clock.c | 58 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+) diff --git a/include/qemu/qemu-clock.h b/include/qemu/qemu-clock.h index ffe743d..f80de56 100644 --- a/include/qemu/qemu-clock.h +++ b/include/qemu/qemu-clock.h @@ -30,12 +30,25 @@ #define TYPE_CLOCK "qemu-clk" #define QEMU_CLOCK(obj) OBJECT_CHECK(QEMUClock, (obj), TYPE_CLOCK) +typedef struct ClkList ClkList; +typedef uint64_t QEMUClkRateUpdateCallback(void *opaque, uint64_t rate); + typedef struct QEMUClock { /*< private >*/ Object parent_obj; char *name; /* name of this clock in the device. */ + uint64_t ref_rate; /* rate of the clock which drive this pin. */ + uint64_t rate; /* rate of this clock pin. */ + void *opaque; + QEMUClkRateUpdateCallback *cb; + QLIST_HEAD(, ClkList) bound; } QEMUClock; +struct ClkList { + QEMUClock *clk; + QLIST_ENTRY(ClkList) node; +}; + /** * qemu_clk_device_add_clock: * @dev: the device on which the clock needs to be added. @@ -59,4 +72,58 @@ void qemu_clk_device_add_clock(DeviceState *dev, QEMUClock *clk, */ QEMUClock *qemu_clk_device_get_clock(DeviceState *dev, const char *name); +/** + * qemu_clk_bind: + * @out: the clock output. + * @in: the clock input. + * + * Connect the clock together. This is unidirectional so a + * qemu_clk_update_rate will go from @out to @in. + * + */ +void qemu_clk_bind(QEMUClock *out, QEMUClock *in); + +/** + * qemu_clk_unbind: + * @out: the clock output. + * @in: the clock input. + * + * Disconnect the clocks if they were bound together. + * + */ +void qemu_clk_unbind(QEMUClock *out, QEMUClock *in); + +/** + * qemu_clk_update_rate: + * @clk: the clock to update. + * @rate: the new rate in Hz. + * + * Update the @clk to the new @rate. + * + */ +void qemu_clk_update_rate(QEMUClock *clk, uint64_t rate); + +/** + * qemu_clk_refresh: + * @clk: the clock to be refreshed. + * + * If a model alters the topology of a clock tree, it must call this function on + * the clock source to refresh the clock tree. + * + */ +void qemu_clk_refresh(QEMUClock *clk); + +/** + * qemu_clk_set_callback: + * @clk: the clock associated to the callback. + * @cb: the function which is called when a refresh happen on the clock @clk. + * @opaque: the opaque data passed to the callback. + * + * Set the callback @cb which will be called when the clock @clk is updated. + * + */ +void qemu_clk_set_callback(QEMUClock *clk, + QEMUClkRateUpdateCallback *cb, + void *opaque); + #endif /* QEMU_CLOCK_H */ diff --git a/qemu-clock.c b/qemu-clock.c index 6eeecf3..24719e2 100644 --- a/qemu-clock.c +++ b/qemu-clock.c @@ -37,6 +37,64 @@ } \ } while (0); +void qemu_clk_refresh(QEMUClock *clk) +{ + qemu_clk_update_rate(clk, clk->ref_rate); +} + +void qemu_clk_update_rate(QEMUClock *clk, uint64_t rate) +{ + ClkList *child; + + clk->ref_rate = rate; + clk->rate = rate; + + if (clk->cb) { + clk->rate = clk->cb(clk->opaque, rate); + } + + DPRINTF("%s output rate updated to %" PRIu64 "\n", + object_get_canonical_path(OBJECT(clk)), + clk->rate); + + QLIST_FOREACH(child, &clk->bound, node) { + qemu_clk_update_rate(child->clk, clk->rate); + } +} + +void qemu_clk_bind(QEMUClock *out, QEMUClock *in) +{ + ClkList *child; + + child = g_malloc(sizeof(child)); + assert(child); + child->clk = in; + object_ref(OBJECT(in)); + QLIST_INSERT_HEAD(&out->bound, child, node); + qemu_clk_update_rate(in, out->rate); +} + +void qemu_clk_unbind(QEMUClock *out, QEMUClock *in) +{ + ClkList *child, *next; + + QLIST_FOREACH_SAFE(child, &out->bound, node, next) { + if (child->clk == in) { + QLIST_REMOVE(child, node); + g_free(child); + object_unref(OBJECT(in)); + } + } +} + +void qemu_clk_set_callback(QEMUClock *clk, + QEMUClkRateUpdateCallback *cb, + void *opaque) +{ + clk->cb = cb; + clk->opaque = opaque; +} + void qemu_clk_device_add_clock(DeviceState *dev, QEMUClock *clk, const char *name) {