Commit 5a8e81c0 authored by lishusen's avatar lishusen
Browse files

arm64/delay: remove USECS_TO_CYCLES to avoid conflict 

virt inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IB7PU3


CVE: NA

----------------------------------------------------

Remove USECS_TO_CYCLES and xloops_to_cycles() in delay-const.h and
revert delay.c to avoid conflict (drivers/soc/qcom/rpmh-rsc.c).

No functional change.

Signed-off-by: default avatarlishusen <lishusen2@huawei.com>
parent 343ce7d4

arch/arm64/include/asm/delay-const.h

+1 −11
Original line number Diff line number Diff line
@@ -4,22 +4,12 @@ 


#include <asm/param.h>	/* For HZ */



/* 2**32 / 1000000 (rounded up) */

#define __usecs_to_xloops_mult	0x10C7UL



/* 2**32 / 1000000000 (rounded up) */

#define __nsecs_to_xloops_mult	0x5UL



extern unsigned long loops_per_jiffy;

static inline unsigned long xloops_to_cycles(unsigned long xloops)

{

	return (xloops * loops_per_jiffy * HZ) >> 32;

}



#define USECS_TO_CYCLES(time_usecs) \

	xloops_to_cycles((time_usecs) * __usecs_to_xloops_mult)



#define NSECS_TO_CYCLES(time_nsecs) \

	xloops_to_cycles((time_nsecs) * __nsecs_to_xloops_mult)

	((((time_nsecs) * __nsecs_to_xloops_mult) * loops_per_jiffy * HZ) >> 32)



#endif	/* _ASM_DELAY_CONST_H */

arch/arm64/lib/delay.c

+10 −3
Original line number Diff line number Diff line
@@ -12,10 +12,17 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/timex.h>

#include <asm/delay-const.h>



#include <clocksource/arm_arch_timer.h>



#define USECS_TO_CYCLES(time_usecs)			\

	xloops_to_cycles((time_usecs) * 0x10C7UL)



static inline unsigned long xloops_to_cycles(unsigned long xloops)

{

	return (xloops * loops_per_jiffy * HZ) >> 32;

}



void __delay(unsigned long cycles)

{

	cycles_t start = get_cycles();
@@ -51,12 +58,12 @@ EXPORT_SYMBOL(__const_udelay); 


void __udelay(unsigned long usecs)

{

	__const_udelay(usecs * __usecs_to_xloops_mult);

	__const_udelay(usecs * 0x10C7UL); /* 2**32 / 1000000 (rounded up) */

}

EXPORT_SYMBOL(__udelay);



void __ndelay(unsigned long nsecs)

{

	__const_udelay(nsecs * __nsecs_to_xloops_mult);

	__const_udelay(nsecs * 0x5UL); /* 2**32 / 1000000000 (rounded up) */

}

EXPORT_SYMBOL(__ndelay);