Commit da905c9d authored by Andrew Jones's avatar Andrew Jones
Browse files

arm/arm64: support 64-bit MPIDRs



Reported-by: Andre Przywara's avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: Andrew Jones's avatarAndrew Jones <drjones@redhat.com>
parent 7a20b74e
...@@ -46,7 +46,7 @@ static inline void local_irq_disable(void) ...@@ -46,7 +46,7 @@ static inline void local_irq_disable(void)
} }
#define MPIDR __ACCESS_CP15(c0, 0, c0, 5) #define MPIDR __ACCESS_CP15(c0, 0, c0, 5)
static inline unsigned int get_mpidr(void) static inline uint64_t get_mpidr(void)
{ {
return read_sysreg(MPIDR); return read_sysreg(MPIDR);
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <asm/pgtable-hwdef.h> #include <asm/pgtable-hwdef.h>
#define NR_CPUS 255 #define NR_CPUS 255
extern u32 cpus[NR_CPUS]; /* per-cpu IDs (MPIDRs) */ extern u64 cpus[NR_CPUS]; /* per-cpu IDs (MPIDRs) */
extern int nr_cpus; extern int nr_cpus;
#define NR_MEM_REGIONS 8 #define NR_MEM_REGIONS 8
......
...@@ -24,7 +24,7 @@ extern unsigned long stacktop; ...@@ -24,7 +24,7 @@ extern unsigned long stacktop;
extern void io_init(void); extern void io_init(void);
extern void setup_args_progname(const char *args); extern void setup_args_progname(const char *args);
u32 cpus[NR_CPUS] = { [0 ... NR_CPUS-1] = (~0U) }; u64 cpus[NR_CPUS] = { [0 ... NR_CPUS-1] = (u64)~0 };
int nr_cpus; int nr_cpus;
struct mem_region mem_regions[NR_MEM_REGIONS]; struct mem_region mem_regions[NR_MEM_REGIONS];
......
...@@ -78,7 +78,7 @@ static inline void local_irq_disable(void) ...@@ -78,7 +78,7 @@ static inline void local_irq_disable(void)
asm volatile("msr daifset, #2" : : : "memory"); asm volatile("msr daifset, #2" : : : "memory");
} }
static inline unsigned int get_mpidr(void) static inline uint64_t get_mpidr(void)
{ {
return read_sysreg(mpidr_el1); return read_sysreg(mpidr_el1);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment