Date: Mon, 14 Mar 2016 15:01:42 +0000 From: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> To: Wojciech Macek <wma@FreeBSD.org> Cc: src-committers <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: <6F3C2D5F-21BD-4B29-AD1A-C643212911A8@lists.zabbadoz.net> In-Reply-To: <201603140705.u2E75fWT043502@repo.freebsd.org> References: <201603140705.u2E75fWT043502@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 14 Mar 2016, at 07:05 , Wojciech Macek <wma@FreeBSD.org> wrote: >=20 > Author: wma > Date: Mon Mar 14 07:05:41 2016 > New Revision: 296825 > URL: https://svnweb.freebsd.org/changeset/base/296825 >=20 > Log: > Make MPIC compatible with ARM_INTRNG >=20 > 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. >=20 > 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. >=20 > Additionally, required ARM_INTRNG definitions were added to = mv_common.c. >=20 > Submitted by: Bartosz Szczepanek <bsz@semihalf.com> > Obtained from: Semihalf > Sponsored by: Stormshield > Reviewed by: adrian, andrew, ian, skra > Approved by: cognet (mentor) > Differential Revision: https://reviews.freebsd.org/D5030 >=20 > 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 >=20 > Modified: head/sys/arm/mv/mpic.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/mv/mpic.c Mon Mar 14 06:30:37 2016 = (r296824) > +++ head/sys/arm/mv/mpic.c Mon Mar 14 07:05:41 2016 = (r296825) >=20 > @@ -48,11 +54,16 @@ __FBSDID("$FreeBSD$"); > #include <machine/smp.h> >=20 > #include <arm/mv/mvvar.h> > +#include <arm/mv/mvreg.h> This redefines at least IRQ_MASK now in this file and breaks the build. = Can you have a look and fix it? Thanks, /bz =E2=80=94=20 Bjoern A. Zeeb Charles Haddon Spurgeon: "Friendship is one of the sweetest joys of life. Many might have failed beneath the bitterness of their trial had they not found a friend."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6F3C2D5F-21BD-4B29-AD1A-C643212911A8>