| Message ID | 20210105071946.1971229-1-wei.chen@arm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] xen/arm: Correct the coding style of get_cycles | expand |
Hi Wei, On 05/01/2021 07:19, Wei Chen wrote: > It seems the arm inline function get_cycles has used 8 spaces for > line indent since 2012. This patch correct them to 4 spaces and > remove extra space between function name and bracket. > > Signed-off-by: Wei Chen <wei.chen@arm.com> Acked-by: Julien Grall <jgrall@amazon.com> Cheers, > --- > xen/include/asm-arm/time.h | 40 +++++++++++++++++++------------------- > 1 file changed, 20 insertions(+), 20 deletions(-) > > diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h > index 1b2c13614b..5c4529ebb5 100644 > --- a/xen/include/asm-arm/time.h > +++ b/xen/include/asm-arm/time.h > @@ -11,29 +11,29 @@ > > typedef uint64_t cycles_t; > > -static inline cycles_t get_cycles (void) > +static inline cycles_t get_cycles(void) > { > - isb(); > + isb(); > + /* > + * ARM_WORKAROUND_858921: Cortex-A73 (all versions) counter read > + * can return a wrong value when the counter crosses a 32bit boundary. > + */ > + if ( !check_workaround_858921() ) > + return READ_SYSREG64(CNTPCT_EL0); > + else > + { > /* > - * ARM_WORKAROUND_858921: Cortex-A73 (all versions) counter read > - * can return a wrong value when the counter crosses a 32bit boundary. > + * A recommended workaround for erratum 858921 is to: > + * 1- Read twice CNTPCT. > + * 2- Compare bit[32] of the two read values. > + * - If bit[32] is different, keep the old value. > + * - If bit[32] is the same, keep the new value. > */ > - if ( !check_workaround_858921() ) > - return READ_SYSREG64(CNTPCT_EL0); > - else > - { > - /* > - * A recommended workaround for erratum 858921 is to: > - * 1- Read twice CNTPCT. > - * 2- Compare bit[32] of the two read values. > - * - If bit[32] is different, keep the old value. > - * - If bit[32] is the same, keep the new value. > - */ > - cycles_t old, new; > - old = READ_SYSREG64(CNTPCT_EL0); > - new = READ_SYSREG64(CNTPCT_EL0); > - return (((old ^ new) >> 32) & 1) ? old : new; > - } > + cycles_t old, new; > + old = READ_SYSREG64(CNTPCT_EL0); > + new = READ_SYSREG64(CNTPCT_EL0); > + return (((old ^ new) >> 32) & 1) ? old : new; > + } > } > > /* List of timer's IRQ */ >
diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index 1b2c13614b..5c4529ebb5 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -11,29 +11,29 @@ typedef uint64_t cycles_t; -static inline cycles_t get_cycles (void) +static inline cycles_t get_cycles(void) { - isb(); + isb(); + /* + * ARM_WORKAROUND_858921: Cortex-A73 (all versions) counter read + * can return a wrong value when the counter crosses a 32bit boundary. + */ + if ( !check_workaround_858921() ) + return READ_SYSREG64(CNTPCT_EL0); + else + { /* - * ARM_WORKAROUND_858921: Cortex-A73 (all versions) counter read - * can return a wrong value when the counter crosses a 32bit boundary. + * A recommended workaround for erratum 858921 is to: + * 1- Read twice CNTPCT. + * 2- Compare bit[32] of the two read values. + * - If bit[32] is different, keep the old value. + * - If bit[32] is the same, keep the new value. */ - if ( !check_workaround_858921() ) - return READ_SYSREG64(CNTPCT_EL0); - else - { - /* - * A recommended workaround for erratum 858921 is to: - * 1- Read twice CNTPCT. - * 2- Compare bit[32] of the two read values. - * - If bit[32] is different, keep the old value. - * - If bit[32] is the same, keep the new value. - */ - cycles_t old, new; - old = READ_SYSREG64(CNTPCT_EL0); - new = READ_SYSREG64(CNTPCT_EL0); - return (((old ^ new) >> 32) & 1) ? old : new; - } + cycles_t old, new; + old = READ_SYSREG64(CNTPCT_EL0); + new = READ_SYSREG64(CNTPCT_EL0); + return (((old ^ new) >> 32) & 1) ? old : new; + } } /* List of timer's IRQ */
It seems the arm inline function get_cycles has used 8 spaces for line indent since 2012. This patch correct them to 4 spaces and remove extra space between function name and bracket. Signed-off-by: Wei Chen <wei.chen@arm.com> --- xen/include/asm-arm/time.h | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-)