eba1c71819
Commit af040ffc9b ("ARM: make it easier to check the CPU part number
correctly") changed ARM_CPU_PART_X masks, and the way they are returned and
checked against. Usage of read_cpuid_part_number() is now deprecated, and
calling places updated accordingly. This actually broke cpuidle-big_little
initialization, as bl_idle_driver_init() performs a check using an hardcoded
mask on cpu_id.
Create an interface to perform the check (that is now even easier to read).
Define also a proper mask (ARM_CPU_PART_MASK) that makes this kind of checks
cleaner and helps preventing bugs in the future. Update usage accordingly.
Signed-off-by: Juri Lelli <juri.lelli@arm.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
109 lines
2.2 KiB
C
109 lines
2.2 KiB
C
/*
|
|
* ARM specific SMP header, this contains our implementation
|
|
* details.
|
|
*/
|
|
#ifndef __ASMARM_SMP_PLAT_H
|
|
#define __ASMARM_SMP_PLAT_H
|
|
|
|
#include <linux/cpumask.h>
|
|
#include <linux/err.h>
|
|
|
|
#include <asm/cpu.h>
|
|
#include <asm/cputype.h>
|
|
|
|
/*
|
|
* Return true if we are running on a SMP platform
|
|
*/
|
|
static inline bool is_smp(void)
|
|
{
|
|
#ifndef CONFIG_SMP
|
|
return false;
|
|
#elif defined(CONFIG_SMP_ON_UP)
|
|
extern unsigned int smp_on_up;
|
|
return !!smp_on_up;
|
|
#else
|
|
return true;
|
|
#endif
|
|
}
|
|
|
|
/**
|
|
* smp_cpuid_part() - return part id for a given cpu
|
|
* @cpu: logical cpu id.
|
|
*
|
|
* Return: part id of logical cpu passed as argument.
|
|
*/
|
|
static inline unsigned int smp_cpuid_part(int cpu)
|
|
{
|
|
struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpu);
|
|
|
|
return is_smp() ? cpu_info->cpuid & ARM_CPU_PART_MASK :
|
|
read_cpuid_part();
|
|
}
|
|
|
|
/* all SMP configurations have the extended CPUID registers */
|
|
#ifndef CONFIG_MMU
|
|
#define tlb_ops_need_broadcast() 0
|
|
#else
|
|
static inline int tlb_ops_need_broadcast(void)
|
|
{
|
|
if (!is_smp())
|
|
return 0;
|
|
|
|
return ((read_cpuid_ext(CPUID_EXT_MMFR3) >> 12) & 0xf) < 2;
|
|
}
|
|
#endif
|
|
|
|
#if !defined(CONFIG_SMP) || __LINUX_ARM_ARCH__ >= 7
|
|
#define cache_ops_need_broadcast() 0
|
|
#else
|
|
static inline int cache_ops_need_broadcast(void)
|
|
{
|
|
if (!is_smp())
|
|
return 0;
|
|
|
|
return ((read_cpuid_ext(CPUID_EXT_MMFR3) >> 12) & 0xf) < 1;
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* Logical CPU mapping.
|
|
*/
|
|
extern u32 __cpu_logical_map[];
|
|
#define cpu_logical_map(cpu) __cpu_logical_map[cpu]
|
|
/*
|
|
* Retrieve logical cpu index corresponding to a given MPIDR[23:0]
|
|
* - mpidr: MPIDR[23:0] to be used for the look-up
|
|
*
|
|
* Returns the cpu logical index or -EINVAL on look-up error
|
|
*/
|
|
static inline int get_logical_index(u32 mpidr)
|
|
{
|
|
int cpu;
|
|
for (cpu = 0; cpu < nr_cpu_ids; cpu++)
|
|
if (cpu_logical_map(cpu) == mpidr)
|
|
return cpu;
|
|
return -EINVAL;
|
|
}
|
|
|
|
/*
|
|
* NOTE ! Assembly code relies on the following
|
|
* structure memory layout in order to carry out load
|
|
* multiple from its base address. For more
|
|
* information check arch/arm/kernel/sleep.S
|
|
*/
|
|
struct mpidr_hash {
|
|
u32 mask; /* used by sleep.S */
|
|
u32 shift_aff[3]; /* used by sleep.S */
|
|
u32 bits;
|
|
};
|
|
|
|
extern struct mpidr_hash mpidr_hash;
|
|
|
|
static inline u32 mpidr_hash_size(void)
|
|
{
|
|
return 1 << mpidr_hash.bits;
|
|
}
|
|
|
|
extern int platform_can_cpu_hotplug(void);
|
|
|
|
#endif
|