Introduce typedef for [v]CPU IDs.
Change-Id: I99988988d8ac57c688c5fd52f072357202255f18
diff --git a/inc/hf/arch/cpu.h b/inc/hf/arch/cpu.h
index 384da06..f244a3c 100644
--- a/inc/hf/arch/cpu.h
+++ b/inc/hf/arch/cpu.h
@@ -41,7 +41,7 @@
* `arch_regs_set_pc_arg()`.
*/
void arch_regs_reset(struct arch_regs *r, bool is_primary, spci_vm_id_t vm_id,
- uint64_t vcpu_id, paddr_t table);
+ cpu_id_t vcpu_id, paddr_t table);
/**
* Updates the given registers so that when a vcpu runs, it starts off at the
diff --git a/inc/hf/boot_params.h b/inc/hf/boot_params.h
index 591e353..ee46777 100644
--- a/inc/hf/boot_params.h
+++ b/inc/hf/boot_params.h
@@ -31,7 +31,7 @@
};
struct boot_params {
- uint64_t cpu_ids[MAX_CPUS];
+ cpu_id_t cpu_ids[MAX_CPUS];
size_t cpu_count;
struct mem_range mem_ranges[MAX_MEM_RANGES];
size_t mem_ranges_count;
diff --git a/inc/hf/cpu.h b/inc/hf/cpu.h
index ca697e7..d44d68e 100644
--- a/inc/hf/cpu.h
+++ b/inc/hf/cpu.h
@@ -101,7 +101,7 @@
/* TODO: Update alignment such that cpus are in different cache lines. */
struct cpu {
/** CPU identifier. Doesn't have to be contiguous. */
- uint64_t id;
+ cpu_id_t id;
/** Pointer to bottom of the stack. */
void *stack_bottom;
@@ -113,12 +113,12 @@
bool is_on;
};
-void cpu_module_init(const uint64_t *cpu_ids, size_t count);
+void cpu_module_init(const cpu_id_t *cpu_ids, size_t count);
size_t cpu_index(struct cpu *c);
bool cpu_on(struct cpu *c, ipaddr_t entry, uintreg_t arg);
void cpu_off(struct cpu *c);
-struct cpu *cpu_find(uint64_t id);
+struct cpu *cpu_find(cpu_id_t id);
struct vcpu_locked vcpu_lock(struct vcpu *vcpu);
void vcpu_unlock(struct vcpu_locked *locked);
diff --git a/inc/hf/fdt_handler.h b/inc/hf/fdt_handler.h
index bcb8c8b..49d242e 100644
--- a/inc/hf/fdt_handler.h
+++ b/inc/hf/fdt_handler.h
@@ -26,7 +26,7 @@
struct mpool *ppool);
bool fdt_unmap(struct mm_stage1_locked stage1_locked, struct fdt_header *fdt,
struct mpool *ppool);
-void fdt_find_cpus(const struct fdt_node *root, uint64_t *cpu_ids,
+void fdt_find_cpus(const struct fdt_node *root, cpu_id_t *cpu_ids,
size_t *cpu_count);
void fdt_find_memory_ranges(const struct fdt_node *root, struct boot_params *p);
bool fdt_find_initrd(struct fdt_node *n, paddr_t *begin, paddr_t *end);