From nobody Thu Jun 23 18:16:06 2022 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 F1204876B83; Thu, 23 Jun 2022 18:16:07 +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 4LTT2v2jyRz3PRt; Thu, 23 Jun 2022 18:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656008167; 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=4P7ZUQkayPCUtUOnhCHDEVjm56zGqHU8qs2+t6fEuds=; b=qABT/xI+ldtR3ADBXFAleRVsCpIFIi3j4CaQBkRgz10e9705DgtjTmrpKRoZzefPPWMWVG UIZWIC2Vgcdl15RPMtxgp8/trKi/2jbGA2nGO3wRN/YvE9Ge4Tpl35bwGItMqtNyK81tOH LK51TrSB3KXL+w9sA/53ZvniezjOr+/chz+YerPxID4MCTZKdQ12ExsKXQGuL0kn76wHmZ T1JjkazD7nXTHNnu4NZ7KZevi2XwMSRse0PHbZFGdjx/P/bzd4zUZxUHU1t03uMakoIB8U DhDN/+Rcg9EaWhcanCAOKQuxpyxvhsLzncJoI18VLK6sjIuwAXfNy5d0AiS4fA== 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 D6A8320039; Thu, 23 Jun 2022 18:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25NIG6J5014903; Thu, 23 Jun 2022 18:16:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NIG6lZ014902; Thu, 23 Jun 2022 18:16:06 GMT (envelope-from git) Date: Thu, 23 Jun 2022 18:16:06 GMT Message-Id: <202206231816.25NIG6lZ014902@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: 8701571df9fa - main - set_cputicker: use a bool 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: 8701571df9fad787f5833310cd696fe51e0cde6d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656008167; 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=4P7ZUQkayPCUtUOnhCHDEVjm56zGqHU8qs2+t6fEuds=; b=XJ722dzbmbfAPRHzUxgxX4LXd95W5guBQ3oZJZ0PBVbItQLLK2c0H3Skj+IkBMXVJQPib3 Hcv4mV5uDbS44dYmbN1JN83Z96Px2yiGFwi2ArQhaFvemHiwN2a1jcuP2A+itKibFN6enU h+wbJ4i7zUNugjGoM/08mEEqVcjKzzLWCBvSNDNFeRWTCOBZHJCLseUwo1EmtLwQwVMyCC +i3t/B7P33ZhG485BmMFGvsY9FGWxP8Q6+z7TFgx3wsaZYB90OZKVPpSuhG7HJPAdMMgnO Vo8gzBsuySpFyYz00+HXl6HSeA9r3YRclXDemSDwFZqsaY0EGQqeZxRLIbYP4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656008167; a=rsa-sha256; cv=none; b=B/YrAJtB0SvS5cRNwK2Sq7QBbKd38bkg6ww0QlcWLUYQ7gOPAeiI+rvHjh734csa18DiHY hzMKxgsSuC+d+D66gaszRuXUE2+ZstW1/d2HsIDtDG2bJE1mYdXa713S4O2UaoeY25uK/5 F91O3w97PatEzjwtc4FQynHLrQlKaVI60xnbHEhSyHMS+kP6ILGUrrNTrMi6bI7PzVPWnK 3CWd7JSLxe6og6Eith6zSahLBUGYgUQ/RU5sfjMQgiZqgCqZYZX4OVsxI78RNkohUzuCaI VAsgmjSUnsHD5jdrIfP+aUomEB49a0FTbtLLWJiceGYda4HWUr8IXyHrh/ARqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8701571df9fad787f5833310cd696fe51e0cde6d commit 8701571df9fad787f5833310cd696fe51e0cde6d Author: Mitchell Horne AuthorDate: 2022-06-21 16:22:26 +0000 Commit: Mitchell Horne CommitDate: 2022-06-23 18:15:11 +0000 set_cputicker: use a bool The third argument to this function indicates whether the supplied ticker is fixed or variable, i.e. requiring calibration. Give this argument a type and name that better conveys this purpose. Reviewed by: kib, markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35459 --- sys/i386/i386/geode.c | 2 +- sys/kern/kern_tc.c | 6 +++--- sys/powerpc/powerpc/clock.c | 2 +- sys/sys/systm.h | 2 +- sys/x86/x86/tsc.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/i386/i386/geode.c b/sys/i386/i386/geode.c index bef94a90629e..ee34c48157b0 100644 --- a/sys/i386/i386/geode.c +++ b/sys/i386/i386/geode.c @@ -291,7 +291,7 @@ geode_probe(device_t self) tc_init(&geode_timecounter); EVENTHANDLER_REGISTER(watchdog_list, geode_watchdog, NULL, 0); - set_cputicker(geode_cputicks, 27000000, 0); + set_cputicker(geode_cputicks, 27000000, false); } break; case 0x0510100b: diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index fcdec7a58200..37287df4d1fd 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -2035,7 +2035,7 @@ SYSINIT(timecounter, SI_SUB_CLOCKS, SI_ORDER_SECOND, inittimecounter, NULL); /* Cpu tick handling -------------------------------------------------*/ -static int cpu_tick_variable; +static bool cpu_tick_variable; static uint64_t cpu_tick_frequency; DPCPU_DEFINE_STATIC(uint64_t, tc_cpu_ticks_base); @@ -2128,14 +2128,14 @@ cpu_tick_calibrate(int reset) } void -set_cputicker(cpu_tick_f *func, uint64_t freq, unsigned var) +set_cputicker(cpu_tick_f *func, uint64_t freq, bool isvariable) { if (func == NULL) { cpu_ticks = tc_cpu_ticks; } else { cpu_tick_frequency = freq; - cpu_tick_variable = var; + cpu_tick_variable = isvariable; cpu_ticks = func; } } diff --git a/sys/powerpc/powerpc/clock.c b/sys/powerpc/powerpc/clock.c index a530d6c71a6b..46495108e5f1 100644 --- a/sys/powerpc/powerpc/clock.c +++ b/sys/powerpc/powerpc/clock.c @@ -190,7 +190,7 @@ decr_init(void) ticks_per_sec = platform_timebase_freq(&cpu); ps_per_tick = 1000000000000 / ticks_per_sec; - set_cputicker(mftb, ticks_per_sec, 0); + set_cputicker(mftb, ticks_per_sec, false); snprintf(buf, sizeof(buf), "cpu%d:decrementer", curcpu); intrcnt_add(buf, &decr_counts[curcpu]); decr_et_stop(NULL); diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 98637c4f4838..f4b3421b76ba 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -407,7 +407,7 @@ int getenv_array(const char *name, void *data, int size, int *psize, #define GETENV_SIGNED true /* negative numbers allowed */ typedef uint64_t (cpu_tick_f)(void); -void set_cputicker(cpu_tick_f *func, uint64_t freq, unsigned var); +void set_cputicker(cpu_tick_f *func, uint64_t freq, bool isvariable); extern cpu_tick_f *cpu_ticks; uint64_t cpu_tickrate(void); uint64_t cputick2usec(uint64_t tick); diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c index 96f209e4c08d..040e7ffcd3b8 100644 --- a/sys/x86/x86/tsc.c +++ b/sys/x86/x86/tsc.c @@ -846,7 +846,7 @@ tsc_levels_changed(void *arg, int unit) error = CPUFREQ_LEVELS(cf_dev, levels, &count); if (error == 0 && count != 0) { max_freq = (uint64_t)levels[0].total_set.freq * 1000000; - set_cputicker(rdtsc, max_freq, 1); + set_cputicker(rdtsc, max_freq, true); } else printf("tsc_levels_changed: no max freq found\n"); free(levels, M_TEMP);