From owner-svn-src-all@freebsd.org Wed Dec 6 14:53:54 2017 Return-Path: Delivered-To: svn-src-all@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 8E12EE822D7; Wed, 6 Dec 2017 14:53:54 +0000 (UTC) (envelope-from kevans@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 5ABB5750FF; Wed, 6 Dec 2017 14:53:54 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB6Err0I057417; Wed, 6 Dec 2017 14:53:53 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB6ErrcQ057416; Wed, 6 Dec 2017 14:53:53 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201712061453.vB6ErrcQ057416@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 6 Dec 2017 14:53:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326623 - head/sys/arm/allwinner X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/sys/arm/allwinner X-SVN-Commit-Revision: 326623 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 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: Wed, 06 Dec 2017 14:53:54 -0000 Author: kevans Date: Wed Dec 6 14:53:53 2017 New Revision: 326623 URL: https://svnweb.freebsd.org/changeset/base/326623 Log: aw_mp.c: use argument name in macros Rather than relying on 'cluster' existing in the context they're used in, use the argument name. Differential Revision: https://reviews.freebsd.org/D12931 Modified: head/sys/arm/allwinner/aw_mp.c Modified: head/sys/arm/allwinner/aw_mp.c ============================================================================== --- head/sys/arm/allwinner/aw_mp.c Wed Dec 6 10:47:50 2017 (r326622) +++ head/sys/arm/allwinner/aw_mp.c Wed Dec 6 14:53:53 2017 (r326623) @@ -83,13 +83,13 @@ __FBSDID("$FreeBSD$"); #define CPUCFG_DBGCTL0 0x1e0 #define CPUCFG_DBGCTL1 0x1e4 -#define CPUS_CL_RST(cl) (0x30 + (cluster) * 0x4) -#define CPUX_CL_CTRL0(cl) (0x0 + (cluster) * 0x10) -#define CPUX_CL_CTRL1(cl) (0x4 + (cluster) * 0x10) -#define CPUX_CL_CPU_STATUS(cl) (0x30 + (cluster) * 0x4) -#define CPUX_CL_RST(cl) (0x80 + (cluster) * 0x4) -#define PRCM_CL_PWROFF(cl) (0x100 + (cluster) * 0x4) -#define PRCM_CL_PWR_CLAMP(cl, cpu) (0x140 + (cluster) * 0x4 + (cpu) * 0x4) +#define CPUS_CL_RST(cl) (0x30 + (cl) * 0x4) +#define CPUX_CL_CTRL0(cl) (0x0 + (cl) * 0x10) +#define CPUX_CL_CTRL1(cl) (0x4 + (cl) * 0x10) +#define CPUX_CL_CPU_STATUS(cl) (0x30 + (cl) * 0x4) +#define CPUX_CL_RST(cl) (0x80 + (cl) * 0x4) +#define PRCM_CL_PWROFF(cl) (0x100 + (cl) * 0x4) +#define PRCM_CL_PWR_CLAMP(cl, cpu) (0x140 + (cl) * 0x4 + (cpu) * 0x4) void aw_mp_setmaxid(platform_t plat)