> -----Original Message----- > From: Chen-Yu Tsai [mailto:w...@csie.org] > Sent: Wednesday, May 13, 2015 2:26 PM > To: Wang Dongsheng-B40534 > Cc: Sun York-R58495; Ian Campbell; Hans De Goede; Albert ARIBAUD; Wang Huan- > B18965; J. Kiszka; U-Boot Mailing List; Marc Zyngier > Subject: Re: [U-Boot] [PATCH 1/2] ARMv7: Factor out reusable timer_wait from > sunxi/psci.S > > Hi, > > On Wed, May 13, 2015 at 1:59 PM, Dongsheng Wang > <dongsheng.w...@freescale.com> wrote: > > From: Wang Dongsheng <dongsheng.w...@freescale.com> > > > > timer_wait is moved from sunxi/psci.S, and it can be converted completely > > into a reusable armv7 generic timer. LS1021A will use it as well. > > > > Signed-off-by: Wang Dongsheng <dongsheng.w...@freescale.com> > > --- > > This patch depend on Jan Kiszka <jan.kis...@siemens.com> patches. > > > > Jan Kiszka patches link: > > http://patchwork.ozlabs.org/project/uboot/list/?submitter=710&state=* > > > > diff --git a/arch/arm/cpu/armv7/sunxi/psci.S > > b/arch/arm/cpu/armv7/sunxi/psci.S > > index 7ec0500..6f4c762 100644 > > --- a/arch/arm/cpu/armv7/sunxi/psci.S > > +++ b/arch/arm/cpu/armv7/sunxi/psci.S > > @@ -18,6 +18,8 @@ > > */ > > > > #include <config.h> > > + > > +#include <asm/arch-armv7/generictimer.h> > > #include <asm/gic.h> > > #include <asm/macro.h> > > #include <asm/psci.h> > > @@ -43,26 +45,6 @@ > > #define GICD_BASE 0x1c81000 > > #define GICC_BASE 0x1c82000 > > > > -.macro timer_wait reg, ticks > > - @ Program CNTP_TVAL > > - movw \reg, #(\ticks & 0xffff) > > - movt \reg, #(\ticks >> 16) > > - mcr p15, 0, \reg, c14, c2, 0 > > - isb > > - @ Enable physical timer, mask interrupt > > - mov \reg, #3 > > - mcr p15, 0, \reg, c14, c2, 1 > > - @ Poll physical timer until ISTATUS is on > > -1: isb > > - mrc p15, 0, \reg, c14, c2, 1 > > - ands \reg, \reg, #4 > > - bne 1b > > - @ Disable timer > > - mov \reg, #0 > > - mcr p15, 0, \reg, c14, c2, 1 > > - isb > > -.endm > > - > > .globl psci_fiq_enter > > psci_fiq_enter: > > push {r0-r12} > > diff --git a/arch/arm/include/asm/arch-armv7/generictimer.h > b/arch/arm/include/asm/arch-armv7/generictimer.h > > new file mode 100644 > > index 0000000..9cf4105 > > --- /dev/null > > +++ b/arch/arm/include/asm/arch-armv7/generictimer.h > > @@ -0,0 +1,41 @@ > > +/* > > + * Copyright 2015 Freescale Semiconductor, Inc. > > + * Author: Wang Dongsheng <dongsheng.w...@freescale.com> > > Since you are only moving code, without making substantial > changes to it, don't you think you should keep the original > author's (Marc Zyngier CC-ed) copyright here? >
Totally agree. Should keep the original author's copyright. BTW, I missed to do 'checkpatch' for this patch. I will fix the code style in next version. Regards, -Dongsheng _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
