From owner-svn-src-all@freebsd.org Tue Mar 15 01:37:56 2016 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 E61DFAD153B; Tue, 15 Mar 2016 01:37:56 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from kif.fubar.geek.nz (kif.fubar.geek.nz [178.62.119.249]) by mx1.freebsd.org (Postfix) with ESMTP id B7850B76; Tue, 15 Mar 2016 01:37:56 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from zapp (unknown [210.164.9.11]) by kif.fubar.geek.nz (Postfix) with ESMTPSA id E4A2CD78FE; Tue, 15 Mar 2016 01:37:24 +0000 (UTC) Date: Tue, 15 Mar 2016 10:37:18 +0900 From: Andrew Turner To: Wojciech Macek Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r296825 - in head/sys: arm/conf arm/mv arm/mv/armada38x boot/fdt/dts/arm Message-ID: <20160315103718.4f36a909@zapp> In-Reply-To: <201603140705.u2E75fWT043502@repo.freebsd.org> References: <201603140705.u2E75fWT043502@repo.freebsd.org> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.29; amd64-portbld-freebsd11.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 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: Tue, 15 Mar 2016 01:37:57 -0000 On Mon, 14 Mar 2016 07:05:41 +0000 (UTC) Wojciech Macek wrote: > Author: wma > Date: Mon Mar 14 07:05:41 2016 > New Revision: 296825 > URL: https://svnweb.freebsd.org/changeset/base/296825 > > Log: > Make MPIC compatible with ARM_INTRNG > > After ARM_INTRNG introduction, MPIC code needed several > modifications: > - IRQ resource and its handler added > - several DEVMETHODs of INTRNG interface implemented > - defines enhanced to ensure code compiles as well for AXP as for > A38X > - added dummy MSI_IRQ, ERR_IRQ defines for Armada38x > - MPIC driver was added to files.armada38x, ARM_INTRNG option > enabled in kernconf file and regs of MPIC corrected in dts file. > > Instead of modifying Armada38X DTS, offsets to CPU registers > defined in driver were changed. That required restoring 'reg' > property of mpic node in ArmadaXP to state compliant with Linux DTS. > > Additionally, required ARM_INTRNG definitions were added to > mv_common.c. > Submitted by: Bartosz Szczepanek > Obtained from: Semihalf > Sponsored by: Stormshield > Reviewed by: adrian, andrew, ian, skra > Approved by: cognet (mentor) > Differential Revision: https://reviews.freebsd.org/D5030 > > Modified: > head/sys/arm/conf/ARMADA38X > head/sys/arm/mv/armada38x/files.armada38x > head/sys/arm/mv/mpic.c > head/sys/arm/mv/mvreg.h > head/sys/boot/fdt/dts/arm/db78460.dts > > Modified: head/sys/arm/conf/ARMADA38X > ============================================================================== > --- head/sys/arm/conf/ARMADA38X Mon Mar 14 06:30:37 > 2016 (r296824) +++ head/sys/arm/conf/ARMADA38X Mon Mar > 14 07:05:41 2016 (r296825) @@ -23,6 +23,7 @@ options > SCHED_ULE # ULE scheduler #options > SCHED_4BSD # 4BSD scheduler > options SMP > +options ARM_INTRNG This file already had ARM_INTRNG set. It now has it twice. Andrew