From nobody Fri Mar 8 14:10:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Trp323pqPz5DCmj; Fri, 8 Mar 2024 14:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Trp321llNz4WlV; Fri, 8 Mar 2024 14:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709907006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zMDrre9Qag8Gy+yy2x8t3bXXMb+BdMqHW66YYl71ha0=; b=y3l7hmOG8JASNeJtgbCH4kQblyziR1RcSPXpsCzh4Gwry5wgXnsYfXBkt21kkwbw24icYA 9CsPRE/suZrQ2klkkFJdOww6AGxKuyAEzBFpgWGnUAz1bRCgv38yR+6PC5VuBmrY077MkQ v/p5HWZ93FJYMHtl+3dd4ayiOIASZa/sOTlAm52BpR8eODCzd+K/ouexvbeFWiuCB+1cQx ySv/enuvAwerTA/I0SaIlDlVZS2aIjnbVkoztRrJCtCQ22cMUICvnidPJ6GQOrl9D2iz1b syeOZlWizM+kbvkmrfcvOepBx1pbHqoK2UtT9B7vnwpb8r1htzaqPKHnBWGaSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709907006; a=rsa-sha256; cv=none; b=r7t9sZe591Tl5vqKIPVzDf7CAryaDseo8qQv0MNHrZ5MHjVtm1SMeQ/a0CILVoO63z9HX/ py90J7uELowZoABJ2Sf8Q0nuALqx8oPxdV9dyOa8A7HOKay/nFxPLW8wGlw+GjqJvLF0qw e13EuwUOO83UQE3FI9cGvr8iiJMHP0RmD0EL8VHOKgCnufj41lUXsfyQMj7+0RnzBEz7c8 H87hS5+sKg85wHgLsAjp116P4OAzkdAvDmGCOtFOhVNJv9XYtz6XljawaGXvRhzfIuSKLt +lcXcKLi7+WTMfNHzNC3hbheBAd26W9wZOvTIhaSDpnwbyl/k9gN+cKBispZbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709907006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zMDrre9Qag8Gy+yy2x8t3bXXMb+BdMqHW66YYl71ha0=; b=wTMUhAwTAUpq5Kx5pjUeEMtQPyLrUf3zbBGzWIJxDep0tYOWJTWHQXyi78+sij/yIe99Wo PDV9Nx/ERTlgYRAQe8g0C1+AmbWzSTh3ZzpymLm/sH32+54yp9yeKunv/oJ8BjR5HOSk36 0t5HO2oFDzmAtQMjFF9r7e9jZdnNg+YLqwSxYOUgvfRuIH0FSX9WTDYF4N1O3v6+p6Orzu PAQItL+CtHAYB8qnhgKzUNeeyi9l+OcGRYj8VJwWmXrYEltAm4/ERpEgrHugn5+wkpKxMw a+64U9G48yftCJDEczpmKCs9fJyvNAPRgMN5w6IH/j9ujj54M7xeTsYtJb8yvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Trp321LKtzLwK; Fri, 8 Mar 2024 14:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 428EA6WO057374; Fri, 8 Mar 2024 14:10:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 428EA69L057369; Fri, 8 Mar 2024 14:10:06 GMT (envelope-from git) Date: Fri, 8 Mar 2024 14:10:06 GMT Message-Id: <202403081410.428EA69L057369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 08635c51d1e3 - main - clkdom_dump(): improve output text List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08635c51d1e34f8a3e42c7cf35dc7264a5b68118 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=08635c51d1e34f8a3e42c7cf35dc7264a5b68118 commit 08635c51d1e34f8a3e42c7cf35dc7264a5b68118 Author: Mitchell Horne AuthorDate: 2024-03-08 14:09:08 +0000 Commit: Mitchell Horne CommitDate: 2024-03-08 14:09:36 +0000 clkdom_dump(): improve output text If the call to clknode_get_freq() returns an error (unlikely), report this, rather than printing the error code as the clock frequency. If the clock has no parent (e.g. a fixed reference clock), print "none" rather than "(NULL)(-1)". This is a more human-legible presentation of the same information. Reviewed by: manu MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44267 --- sys/dev/clk/clk.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/dev/clk/clk.c b/sys/dev/clk/clk.c index 52015d4e2905..5c74d84cacc8 100644 --- a/sys/dev/clk/clk.c +++ b/sys/dev/clk/clk.c @@ -512,10 +512,20 @@ clkdom_dump(struct clkdom * clkdom) CLK_TOPO_SLOCK(); TAILQ_FOREACH(clknode, &clkdom->clknode_list, clkdom_link) { rv = clknode_get_freq(clknode, &freq); - printf("Clock: %s, parent: %s(%d), freq: %ju\n", clknode->name, - clknode->parent == NULL ? "(NULL)" : clknode->parent->name, - clknode->parent_idx, - (uintmax_t)((rv == 0) ? freq: rv)); + if (rv != 0) { + printf("Clock: %s, error getting frequency: %d\n", + clknode->name, rv); + continue; + } + + if (clknode->parent != NULL) { + printf("Clock: %s, parent: %s(%d), freq: %ju\n", + clknode->name, clknode->parent->name, + clknode->parent_idx, (uintmax_t)freq); + } else { + printf("Clock: %s, parent: none, freq: %ju\n", + clknode->name, (uintmax_t)freq); + } } CLK_TOPO_UNLOCK(); }