From owner-svn-src-head@freebsd.org Wed Jul 5 09:27:19 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA32ADA62F0; Wed, 5 Jul 2017 09:27:19 +0000 (UTC) (envelope-from andrew@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 mx1.freebsd.org (Postfix) with ESMTPS id AD2D778FC1; Wed, 5 Jul 2017 09:27:19 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v659RILg014744; Wed, 5 Jul 2017 09:27:18 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v659RIKm014742; Wed, 5 Jul 2017 09:27:18 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201707050927.v659RIKm014742@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Wed, 5 Jul 2017 09:27:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r320668 - in head/sys/arm: arm conf X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: in head/sys/arm: arm conf X-SVN-Commit-Revision: 320668 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.23 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: Wed, 05 Jul 2017 09:27:20 -0000 Author: andrew Date: Wed Jul 5 09:27:18 2017 New Revision: 320668 URL: https://svnweb.freebsd.org/changeset/base/320668 Log: Require the ARM Generic Timer driver is built for MULTIDELAY on 32bit arm. As this driver is also used for DELAY on arm64 we need to keep the existing DELAY code for it to use. Modified: head/sys/arm/arm/generic_timer.c head/sys/arm/conf/EXYNOS5.common Modified: head/sys/arm/arm/generic_timer.c ============================================================================== --- head/sys/arm/arm/generic_timer.c Wed Jul 5 06:32:53 2017 (r320667) +++ head/sys/arm/arm/generic_timer.c Wed Jul 5 09:27:18 2017 (r320668) @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef MULTIDELAY +#if defined(__arm__) #include /* For arm_set_delay */ #endif @@ -72,6 +72,10 @@ __FBSDID("$FreeBSD$"); #include #endif +#if defined(__arm__) && !defined(MULTIDELAY) +#error The generic timer requires MULTIDELAY on 32bit arm +#endif + #define GT_CTRL_ENABLE (1 << 0) #define GT_CTRL_INT_MASK (1 << 1) #define GT_CTRL_INT_STAT (1 << 2) @@ -427,7 +431,7 @@ arm_tmr_attach(device_t dev) sc->et.et_priv = sc; et_register(&sc->et); -#ifdef MULTIDELAY +#if defined(__arm__) arm_set_delay(arm_tmr_do_delay, sc); #endif @@ -505,7 +509,7 @@ arm_tmr_do_delay(int usec, void *arg) } } -#ifndef MULTIDELAY +#if defined(__aarch64__) void DELAY(int usec) { Modified: head/sys/arm/conf/EXYNOS5.common ============================================================================== --- head/sys/arm/conf/EXYNOS5.common Wed Jul 5 06:32:53 2017 (r320667) +++ head/sys/arm/conf/EXYNOS5.common Wed Jul 5 09:27:18 2017 (r320668) @@ -23,6 +23,7 @@ makeoptions WERROR="-Werror" include "std.armv6" options SCHED_ULE # ULE scheduler options PLATFORM # Platform based SoC +options MULTIDELAY options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols