From owner-svn-src-head@freebsd.org Tue Apr 3 23:29:35 2018 Return-Path: Delivered-To: svn-src-head@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 4D850F8964F; Tue, 3 Apr 2018 23:29:35 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 008E67B8A9; Tue, 3 Apr 2018 23:29:35 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EF68138A9; Tue, 3 Apr 2018 23:29:34 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w33NTYJw015669; Tue, 3 Apr 2018 23:29:34 GMT (envelope-from mw@FreeBSD.org) Received: (from mw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w33NTY4C015668; Tue, 3 Apr 2018 23:29:34 GMT (envelope-from mw@FreeBSD.org) Message-Id: <201804032329.w33NTY4C015668@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org using -f From: Marcin Wojtas Date: Tue, 3 Apr 2018 23:29:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331965 - head/sys/arm/mv X-SVN-Group: head X-SVN-Commit-Author: mw X-SVN-Commit-Paths: head/sys/arm/mv X-SVN-Commit-Revision: 331965 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Apr 2018 23:29:35 -0000 Author: mw Date: Tue Apr 3 23:29:34 2018 New Revision: 331965 URL: https://svnweb.freebsd.org/changeset/base/331965 Log: Split out delay code in Marvell timer driver for PLATFORM The PLATFORM code will perform the software loop in the early boot, so extract the actual delay code to handle situation, when the timers are already initialized. Obtained from: Semihalf Sponsored by: Stormshield Modified: head/sys/arm/mv/timer.c Modified: head/sys/arm/mv/timer.c ============================================================================== --- head/sys/arm/mv/timer.c Tue Apr 3 23:27:07 2018 (r331964) +++ head/sys/arm/mv/timer.c Tue Apr 3 23:29:34 2018 (r331965) @@ -124,9 +124,7 @@ static void mv_watchdog_enable_armadaxp(void); static void mv_watchdog_disable_armv5(void); static void mv_watchdog_disable_armadaxp(void); -#ifdef PLATFORM -void mv_delay(int usec, void* arg); -#endif +static void mv_delay(int usec, void* arg); static struct mv_timer_config timer_armadaxp_config = { @@ -300,25 +298,12 @@ mv_timer_get_timecount(struct timecounter *tc) return (INITIAL_TIMECOUNTER - mv_get_timer(1)); } -#ifdef PLATFORM -void +static void mv_delay(int usec, void* arg) -#else -void -DELAY(int usec) -#endif { uint32_t val, val_temp; int32_t nticks; - if (!timers_initialized) { - for (; usec > 0; usec--) - for (val = 100; val > 0; val--) - __asm __volatile("nop" ::: "memory"); - return; - } - TSENTER(); - val = mv_get_timer(1); nticks = ((timer_softc->config->clock_src / 1000000 + 1) * usec); @@ -331,8 +316,25 @@ DELAY(int usec) val = val_temp; } - TSEXIT(); } + +#ifndef PLATFORM +void +DELAY(int usec) +{ + uint32_t val; + + if (!timers_initialized) { + for (; usec > 0; usec--) + for (val = 100; val > 0; val--) + __asm __volatile("nop" ::: "memory"); + } else { + TSENTER(); + mv_delay(usec, NULL); + TSEXIT(); + } +} +#endif static uint32_t mv_get_timer_control(void)