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

Commit 272d01bd authored by Catalin Marinas's avatar Catalin Marinas Committed by Will Deacon
Browse files

arm64: Fix circular include of asm/lse.h through linux/jump_label.h 



Commit efd9e03f ("arm64: Use static keys for CPU features")
introduced support for static keys in asm/cpufeature.h, including
linux/jump_label.h. When CC_HAVE_ASM_GOTO is not defined, this causes a
circular dependency via linux/atomic.h, asm/lse.h and asm/cpufeature.h.

This patch moves the capability macros out out of asm/cpufeature.h into
a separate asm/cpucaps.h and modifies some of the #includes accordingly.

Fixes: efd9e03f ("arm64: Use static keys for CPU features")
Reported-by: default avatarArtem Savkov <asavkov@redhat.com>
Tested-by: default avatarArtem Savkov <asavkov@redhat.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent a909d3e6

arch/arm64/include/asm/alternative.h

+1 −1
Original line number Diff line number Diff line 
#ifndef __ASM_ALTERNATIVE_H

#define __ASM_ALTERNATIVE_H



#include <asm/cpufeature.h>

#include <asm/cpucaps.h>

#include <asm/insn.h>



#ifndef __ASSEMBLY__

arch/arm64/include/asm/cpucaps.h

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * arch/arm64/include/asm/cpucaps.h

 *

 * Copyright (C) 2016 ARM Ltd.

 *

 * 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 __ASM_CPUCAPS_H

#define __ASM_CPUCAPS_H



#define ARM64_WORKAROUND_CLEAN_CACHE		0

#define ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE	1

#define ARM64_WORKAROUND_845719			2

#define ARM64_HAS_SYSREG_GIC_CPUIF		3

#define ARM64_HAS_PAN				4

#define ARM64_HAS_LSE_ATOMICS			5

#define ARM64_WORKAROUND_CAVIUM_23154		6

#define ARM64_WORKAROUND_834220			7

#define ARM64_HAS_NO_HW_PREFETCH		8

#define ARM64_HAS_UAO				9

#define ARM64_ALT_PAN_NOT_UAO			10

#define ARM64_HAS_VIRT_HOST_EXTN		11

#define ARM64_WORKAROUND_CAVIUM_27456		12

#define ARM64_HAS_32BIT_EL0			13

#define ARM64_HYP_OFFSET_LOW			14

#define ARM64_MISMATCHED_CACHE_LINE_SIZE	15



#define ARM64_NCAPS				16



#endif /* __ASM_CPUCAPS_H */

arch/arm64/include/asm/cpufeature.h

+1 −19
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <linux/jump_label.h>



#include <asm/cpucaps.h>

#include <asm/hwcap.h>

#include <asm/sysreg.h>
@@ -24,25 +25,6 @@ 
#define MAX_CPU_FEATURES	(8 * sizeof(elf_hwcap))

#define cpu_feature(x)		ilog2(HWCAP_ ## x)



#define ARM64_WORKAROUND_CLEAN_CACHE		0

#define ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE	1

#define ARM64_WORKAROUND_845719			2

#define ARM64_HAS_SYSREG_GIC_CPUIF		3

#define ARM64_HAS_PAN				4

#define ARM64_HAS_LSE_ATOMICS			5

#define ARM64_WORKAROUND_CAVIUM_23154		6

#define ARM64_WORKAROUND_834220			7

#define ARM64_HAS_NO_HW_PREFETCH		8

#define ARM64_HAS_UAO				9

#define ARM64_ALT_PAN_NOT_UAO			10

#define ARM64_HAS_VIRT_HOST_EXTN		11

#define ARM64_WORKAROUND_CAVIUM_27456		12

#define ARM64_HAS_32BIT_EL0			13

#define ARM64_HYP_OFFSET_LOW			14

#define ARM64_MISMATCHED_CACHE_LINE_SIZE	15



#define ARM64_NCAPS				16



#ifndef __ASSEMBLY__



#include <linux/kernel.h>

arch/arm64/include/asm/lse.h

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


#include <linux/stringify.h>

#include <asm/alternative.h>

#include <asm/cpufeature.h>



#ifdef __ASSEMBLER__