diff options
author | Graeme Gregory <graeme.gregory@linaro.org> | 2013-12-04 12:16:14 +0000 |
---|---|---|
committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-12-04 12:16:14 +0000 |
commit | 1dda56f1cc8698c07308eaf2facb29480fdee3c0 (patch) | |
tree | 1cc11216f38933a375fc439c14db7febe5e4290b /arch/arm64/include/asm/cputype.h | |
parent | aca2a2cda8ae17c08fc1c56581c47ed970de41b7 (diff) | |
parent | 06487ddc8fb020d46bdd9b1d3a931930c0e9b3b6 (diff) |
Merge branch 'acpi' of git://git.linaro.org/arm/acpi/acpi into leg-kernel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/io.h
arch/arm/kernel/setup.c
arch/arm/mm/early_ioremap.c
arch/arm/mm/mmu.c
arch/arm64/Kconfig
arch/arm64/include/asm/io.h
arch/arm64/kernel/setup.c
arch/arm64/mm/ioremap.c
Diffstat (limited to 'arch/arm64/include/asm/cputype.h')
-rw-r--r-- | arch/arm64/include/asm/cputype.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h index 5fe138e0b828..58a595f8be4d 100644 --- a/arch/arm64/include/asm/cputype.h +++ b/arch/arm64/include/asm/cputype.h @@ -30,6 +30,17 @@ #define MPIDR_HWID_BITMASK 0xff00ffffff +#define MPIDR_SMP_BITMASK (0x1 << 30) +#define MPIDR_MT_BITMASK (0x1 << 24) + +#define MPIDR_LEVEL_BITS 8 +#define MPIDR_LEVEL_MASK ((1 << MPIDR_LEVEL_BITS) - 1) + +#define MPIDR_AFFINITY_LEVEL_0(mpidr) ((mpidr) & MPIDR_LEVEL_MASK) +#define MPIDR_AFFINITY_LEVEL_1(mpidr) ((mpidr >> 8) & MPIDR_LEVEL_MASK) +#define MPIDR_AFFINITY_LEVEL_2(mpidr) ((mpidr >> 16) & MPIDR_LEVEL_MASK) +#define MPIDR_AFFINITY_LEVEL_3(mpidr) ((mpidr >> 32) & MPIDR_LEVEL_MASK) + #define read_cpuid(reg) ({ \ u64 __val; \ asm("mrs %0, " reg : "=r" (__val)); \ |