From owner-svn-src-all@freebsd.org Thu Jun 14 17:27:01 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B51D10164B5; Thu, 14 Jun 2018 17:27:01 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3F895766BD; Thu, 14 Jun 2018 17:27:01 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-lf0-f53.google.com (mail-lf0-f53.google.com [209.85.215.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id D05A010749; Thu, 14 Jun 2018 17:27:00 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lf0-f53.google.com with SMTP id y20-v6so10666018lfy.0; Thu, 14 Jun 2018 10:27:00 -0700 (PDT) X-Gm-Message-State: APt69E1j64jITs3P/68YsMD1YNY8ZhVZLFeG/SnEZkQwAblJmsPAMDR/ zPIrlGLLJfg5SnefqfLwMvehyghMXX7KMX5L9Y4= X-Google-Smtp-Source: ADUXVKI88EoWdV1NQHJuCEZXQpu34k7gRJNXoKJI7BTTMHqH818YwET5lglUARm4a0rKrdY17xe64KGOA4H6yiUqk2s= X-Received: by 2002:a2e:1188:: with SMTP id 8-v6mr2520458ljr.38.1528997219231; Thu, 14 Jun 2018 10:26:59 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a2e:8582:0:0:0:0:0 with HTTP; Thu, 14 Jun 2018 10:26:38 -0700 (PDT) In-Reply-To: <201806141718.w5EHIFnE093607@repo.freebsd.org> References: <201806141718.w5EHIFnE093607@repo.freebsd.org> From: Kyle Evans Date: Thu, 14 Jun 2018 12:26:38 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r335156 - head/sys/arm/arm To: Emmanuel Vadot Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2018 17:27:01 -0000 On Thu, Jun 14, 2018 at 12:18 PM, Emmanuel Vadot wrote: > Author: manu > Date: Thu Jun 14 17:18:15 2018 > New Revision: 335156 > URL: https://svnweb.freebsd.org/changeset/base/335156 > > Log: > arm timer: Add workaround for Allwinner A64 timer > > The timer present in allwinner A64 SoC is unstable, value can jump backward > or forward. > It was found that when bit 11 and upper roll over the low bits can sometimes > being read as all as 1 or all as 0. > Simply ignore the values for those cases. > > Modified: > head/sys/arm/arm/generic_timer.c > > Modified: head/sys/arm/arm/generic_timer.c > ============================================================================== > --- head/sys/arm/arm/generic_timer.c Thu Jun 14 17:09:33 2018 (r335155) > +++ head/sys/arm/arm/generic_timer.c Thu Jun 14 17:18:15 2018 (r335156) > @@ -92,6 +92,7 @@ __FBSDID("$FreeBSD$"); > struct arm_tmr_softc { > struct resource *res[4]; > void *ihl[4]; > + uint64_t (*get_cntxct)(bool); > uint32_t clkfreq; > struct eventtimer et; > bool physical; > @@ -142,6 +143,28 @@ get_freq(void) > } > > static uint64_t > +get_cntxct_a64_unstable(bool physical) > +{ > + uint64_t val > +; > + isb(); > + if (physical) { > + do { > + val = get_el0(cntpct); > + } > + while (((val + 1) & 0x7FF) <= 1); > + } > + else { > + do { > + val = get_el0(cntvct); > + } > + while (((val + 1) & 0x7FF) <= 1); > + } > + > + return (val); > +} > + > +static uint64_t > get_cntxct(bool physical) > { > uint64_t val; > @@ -226,7 +249,7 @@ static unsigned > arm_tmr_get_timecount(struct timecounter *tc) > { > > - return (get_cntxct(arm_tmr_sc->physical)); > + return (arm_tmr_sc->get_cntxct(arm_tmr_sc->physical)); > } > > static int > @@ -379,6 +402,7 @@ arm_tmr_attach(device_t dev) > if (arm_tmr_sc) > return (ENXIO); > > + sc->get_cntxct = &get_cntxct_a64_unstable; > #ifdef FDT > /* Get the base clock frequency */ > node = ofw_bus_get_node(dev); Was it intentional to set sc->get_cntxct to get_cntxct_a64_unstable in the general case? Seems like this should've been get_cntxct. > @@ -387,6 +411,13 @@ arm_tmr_attach(device_t dev) > sizeof(clock)); > if (error > 0) > sc->clkfreq = clock; > + > + if (OF_hasprop(node, "allwinner,sun50i-a64-unstable-timer")) { > + sc->get_cntxct = &get_cntxct_a64_unstable; > + if (bootverbose) > + device_printf(dev, > + "Enabling allwinner unstable timer workaround\n"); > + } > } > #endif > Since the a64-specific get_cntxct is set here. > @@ -518,10 +549,10 @@ arm_tmr_do_delay(int usec, void *arg) > else > counts = usec * counts_per_usec; > > - first = get_cntxct(sc->physical); > + first = sc->get_cntxct(sc->physical); > > while (counts > 0) { > - last = get_cntxct(sc->physical); > + last = sc->get_cntxct(sc->physical); > counts -= (int32_t)(last - first); > first = last; > } > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"