Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8102f47a authored by Baruch Siach's avatar Baruch Siach Committed by Chris Zankel
Browse files

xtensa: consolidate ccount access routines 



Use get_ccount everywhere; remove xtensa_get_ccount.

Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent e504c4b6

arch/xtensa/include/asm/delay.h

+3 −10
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#ifndef _XTENSA_DELAY_H

#define _XTENSA_DELAY_H



#include <asm/processor.h>

#include <asm/timex.h>

#include <asm/param.h>



extern unsigned long loops_per_jiffy;
@@ -24,24 +24,17 @@ static inline void __delay(unsigned long loops) 
			      : "=r" (loops) : "0" (loops));

}



static __inline__ u32 xtensa_get_ccount(void)

{

	u32 ccount;

	asm volatile ("rsr %0, ccount\n" : "=r" (ccount));

	return ccount;

}



/* For SMP/NUMA systems, change boot_cpu_data to something like

 * local_cpu_data->... where local_cpu_data points to the current

 * cpu. */



static __inline__ void udelay (unsigned long usecs)

{

	unsigned long start = xtensa_get_ccount();

	unsigned long start = get_ccount();

	unsigned long cycles = usecs * (loops_per_jiffy / (1000000UL / HZ));



	/* Note: all variables are unsigned (can wrap around)! */

	while (((unsigned long)xtensa_get_ccount()) - start < cycles)

	while (((unsigned long)get_ccount()) - start < cycles)

		;

}

arch/xtensa/variants/s6000/delay.c

+1 −2
Original line number Diff line number Diff line 
#include <asm/delay.h>

#include <asm/timex.h>

#include <asm/io.h>

#include <variant/hardware.h>
@@ -17,7 +16,7 @@ void platform_calibrate_ccount(void) 
		"1:	l32i %0, %2, 0 ;"

		"	beq %0, %1, 1b ;"

		: "=&a"(u) : "a"(t), "a"(tstamp));

		b = xtensa_get_ccount();

		b = get_ccount();

		if (i == LOOPS)

			a = b;

	} while (--i >= 0);