Commit 88fb3094 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/32s: drop CPU_FTR_USE_RTC feature 



CPU_FTR_USE_RTC feature only applies to powerpc601.

Drop this feature and replace it with tests on CONFIG_PPC_BOOK3S_601.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/170411e2360861f4a95c21faad43519a08bc4040.1566834712.git.christophe.leroy@c-s.fr
parent 12c3f1fd

arch/powerpc/include/asm/cputable.h

+1 −2
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ static inline void cpu_feature_keys_init(void) { } 
#define CPU_FTR_SPEC7450		ASM_CONST(0x00004000)

#define CPU_FTR_TAU			ASM_CONST(0x00008000)

#define CPU_FTR_CAN_DOZE		ASM_CONST(0x00010000)

#define CPU_FTR_USE_RTC			ASM_CONST(0x00020000)

#define CPU_FTR_L3CR			ASM_CONST(0x00040000)

#define CPU_FTR_L3_DISABLE_NAP		ASM_CONST(0x00080000)

#define CPU_FTR_NAP_DISABLE_L2_PR	ASM_CONST(0x00100000)
@@ -293,7 +292,7 @@ static inline void cpu_feature_keys_init(void) { } 
#endif



#define CPU_FTRS_PPC601	(CPU_FTR_COMMON | \

	CPU_FTR_COHERENT_ICACHE | CPU_FTR_UNIFIED_ID_CACHE | CPU_FTR_USE_RTC)

	CPU_FTR_COHERENT_ICACHE | CPU_FTR_UNIFIED_ID_CACHE)

#define CPU_FTRS_603	(CPU_FTR_COMMON | CPU_FTR_MAYBE_CAN_DOZE | \

	    CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_PPC_LE | CPU_FTR_NOEXECUTE)

#define CPU_FTRS_604	(CPU_FTR_COMMON | CPU_FTR_PPC_LE)

arch/powerpc/include/asm/time.h

+1 −5
Original line number Diff line number Diff line
@@ -41,11 +41,7 @@ struct div_result { 


/* Accessor functions for the timebase (RTC on 601) registers. */

/* If one day CONFIG_POWER is added just define __USE_RTC as 1 */

#ifdef CONFIG_PPC_BOOK3S_32

#define __USE_RTC()	(cpu_has_feature(CPU_FTR_USE_RTC))

#else

#define __USE_RTC()	0

#endif

#define __USE_RTC()	(IS_ENABLED(CONFIG_PPC_BOOK3S_601))



#ifdef CONFIG_PPC64

arch/powerpc/kernel/vdso.c

+0 −22
Original line number Diff line number Diff line
@@ -94,28 +94,6 @@ static struct vdso_patch_def vdso_patches[] = { 
		CPU_FTR_COHERENT_ICACHE, CPU_FTR_COHERENT_ICACHE,

		"__kernel_sync_dicache", "__kernel_sync_dicache_p5"

	},

#ifdef CONFIG_PPC32

	{

		CPU_FTR_USE_RTC, CPU_FTR_USE_RTC,

		"__kernel_gettimeofday", NULL

	},

	{

		CPU_FTR_USE_RTC, CPU_FTR_USE_RTC,

		"__kernel_clock_gettime", NULL

	},

	{

		CPU_FTR_USE_RTC, CPU_FTR_USE_RTC,

		"__kernel_clock_getres", NULL

	},

	{

		CPU_FTR_USE_RTC, CPU_FTR_USE_RTC,

		"__kernel_get_tbfreq", NULL

	},

	{

		CPU_FTR_USE_RTC, CPU_FTR_USE_RTC,

		"__kernel_time", NULL

	},

#endif

};



/*

arch/powerpc/kernel/vdso32/datapage.S

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ V_FUNCTION_END(__kernel_get_syscall_map) 
 *

 * returns the timebase frequency in HZ

 */

#ifndef CONFIG_PPC_BOOK3S_601

V_FUNCTION_BEGIN(__kernel_get_tbfreq)

  .cfi_startproc

	mflr	r12
@@ -82,3 +83,4 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq) 
	blr

  .cfi_endproc

V_FUNCTION_END(__kernel_get_tbfreq)

#endif

arch/powerpc/kernel/vdso32/vdso32.lds.S

+3 −1
Original line number Diff line number Diff line
@@ -144,10 +144,13 @@ VERSION 
		__kernel_datapage_offset;



		__kernel_get_syscall_map;

#ifndef CONFIG_PPC_BOOK3S_601

		__kernel_gettimeofday;

		__kernel_clock_gettime;

		__kernel_clock_getres;

		__kernel_time;

		__kernel_get_tbfreq;

#endif

		__kernel_sync_dicache;

		__kernel_sync_dicache_p5;

		__kernel_sigtramp32;
@@ -155,7 +158,6 @@ VERSION 
#ifdef CONFIG_PPC64

		__kernel_getcpu;

#endif

		__kernel_time;



	local: *;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE