From: Wang Dongsheng <Dongsheng.Wang@freescale.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/2] ARMv7: Factor out reusable timer_wait from sunxi/psci_sun7i.S
Date: Thu, 4 Jun 2015 04:16:09 +0000 [thread overview]
Message-ID: <BL2PR03MB1802B0B1C658243B722A1059DB30@BL2PR03MB180.namprd03.prod.outlook.com> (raw)
In-Reply-To: <1433390469-3052-1-git-send-email-dongsheng.wang@freescale.com>
Hi all,
Sorry I was too busy recently, and I forgot to tag version information.
The patches should be marked for V2 version.
*V2*:
1. Retain the original author's Copyright.
2. Based on Chen-Yu Tsai's patch rebase this patch, factor out time_wait
Macro from psci_sun7i.S and psci_sun6i.S.
Regards,
-Dongsheng
> -----Original Message-----
> From: Dongsheng Wang [mailto:dongsheng.wang at freescale.com]
> Sent: Thursday, June 04, 2015 12:01 PM
> To: Sun York-R58495
> Cc: ijc at hellion.org.uk; hdegoede at redhat.com; albert.u.boot at aribaud.net;
> jan.kiszka at siemens.com; Jin Zhengxiong-R64188; Wang Huan-B18965; Zhao Chenhui-
> B35336; u-boot at lists.denx.de; Wang Dongsheng-B40534
> Subject: [PATCH 1/2] ARMv7: Factor out reusable timer_wait from
> sunxi/psci_sun7i.S
>
> From: Wang Dongsheng <dongsheng.wang@freescale.com>
>
> timer_wait is moved from sunxi/psci_sun7i.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.wang@freescale.com>
>
> diff --git a/arch/arm/cpu/armv7/sunxi/psci_sun6i.S
> b/arch/arm/cpu/armv7/sunxi/psci_sun6i.S
> index d4cb51e..4ff46e4 100644
> --- a/arch/arm/cpu/armv7/sunxi/psci_sun6i.S
> +++ b/arch/arm/cpu/armv7/sunxi/psci_sun6i.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/cpu/armv7/sunxi/psci_sun7i.S
> b/arch/arm/cpu/armv7/sunxi/psci_sun7i.S
> index bbfeec8..e15d587 100644
> --- a/arch/arm/cpu/armv7/sunxi/psci_sun7i.S
> +++ b/arch/arm/cpu/armv7/sunxi/psci_sun7i.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..0956d7c
> --- /dev/null
> +++ b/arch/arm/include/asm/arch-armv7/generictimer.h
> @@ -0,0 +1,50 @@
> +/*
> + * Copyright (C) 2013 - ARM Ltd
> + * Author: Marc Zyngier <marc.zyngier@arm.com>
> + *
> + * Based on code by Carl van Schaik <carl@ok-labs.com>.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program. If not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#ifndef _GENERICTIMER_H_
> +#define _GENERICTIMER_H_
> +
> +#ifdef __ASSEMBLY__
> +
> +/*
> + * This macro provide a physical timer that can be used for delay in the code.
> + * The macro is moved from sunxi/psci_sun7i.S
> + *
> + * reg: is used in this macro.
> + * ticks: The freq is based on generic timer.
> + */
> +.macro timer_wait reg, ticks
> + movw \reg, #(\ticks & 0xffff)
> + movt \reg, #(\ticks >> 16)
> + mcr p15, 0, \reg, c14, c2, 0
> + isb
> + mov \reg, #3
> + mcr p15, 0, \reg, c14, c2, 1
> +1 : isb
> + mrc p15, 0, \reg, c14, c2, 1
> + ands \reg, \reg, #4
> + bne 1b
> + mov \reg, #0
> + mcr p15, 0, \reg, c14, c2, 1
> + isb
> +.endm
> +
> +#endif /* __ASSEMBLY__ */
> +
> +#endif /* _GENERICTIMER_H_ */
> --
> 2.1.0.27.g96db324
next prev parent reply other threads:[~2015-06-04 4:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-04 4:01 [U-Boot] [PATCH 1/2] ARMv7: Factor out reusable timer_wait from sunxi/psci_sun7i.S Dongsheng Wang
2015-06-04 4:01 ` [U-Boot] [PATCH 2/2] arm/ls102xa: Add PSCI support for ls102xa Dongsheng Wang
2015-06-04 4:17 ` Wang Dongsheng
2015-07-14 7:14 ` Wang Dongsheng
2015-07-15 2:10 ` Wang Dongsheng
2015-07-15 2:25 ` Huan Wang
2015-07-20 21:14 ` York Sun
2015-06-04 4:16 ` Wang Dongsheng [this message]
2015-06-04 10:15 ` [U-Boot] [PATCH 1/2] ARMv7: Factor out reusable timer_wait from sunxi/psci_sun7i.S Hans de Goede
2015-06-05 8:41 ` Wang Dongsheng
2015-06-05 9:35 ` Hans de Goede
2015-06-05 9:39 ` Wang Dongsheng
2015-06-05 15:11 ` York Sun
2015-06-05 19:17 ` Hans de Goede
2015-07-14 7:15 ` Wang Dongsheng
2015-07-20 21:13 ` York Sun
2015-07-21 2:39 ` Wang Dongsheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BL2PR03MB1802B0B1C658243B722A1059DB30@BL2PR03MB180.namprd03.prod.outlook.com \
--to=dongsheng.wang@freescale.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.