diff --git a/src/arch/x86/cpu_common.c b/src/arch/x86/cpu_common.c
index 60ffd36c6e..9387f3bc76 100644
--- a/src/arch/x86/cpu_common.c
+++ b/src/arch/x86/cpu_common.c
@@ -44,7 +44,7 @@ unsigned int cpu_cpuid_extended_level(void)
 	return cpuid_eax(0x80000000);
 }
 
-int cpu_phys_address_size(void)
+unsigned int cpu_phys_address_size(void)
 {
 	if (!(cpu_have_cpuid()))
 		return 32;
diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h
index 96cf23bb76..b24cd23a96 100644
--- a/src/arch/x86/include/arch/cpu.h
+++ b/src/arch/x86/include/arch/cpu.h
@@ -317,10 +317,10 @@ size_t get_cache_size(const struct cpu_cache_info *info);
 bool fill_cpu_cache_info(uint8_t level, struct cpu_cache_info *info);
 
 #if CONFIG(CPU_INTEL_COMMON)
-int get_reserved_phys_addr_bits(void);
+unsigned int get_reserved_phys_addr_bits(void);
 #else
 /* Default implementation */
-static inline int get_reserved_phys_addr_bits(void)
+static inline unsigned int get_reserved_phys_addr_bits(void)
 {
 	/* Default implementation */
 	return 0;
diff --git a/src/cpu/intel/common/common_init.c b/src/cpu/intel/common/common_init.c
index ff00f0247f..55bc59eb75 100644
--- a/src/cpu/intel/common/common_init.c
+++ b/src/cpu/intel/common/common_init.c
@@ -248,7 +248,7 @@ bool is_tme_supported(void)
  * configured in the MSRs according to the capabilities and platform
  * configuration. For instance, after FSP-M.
  */
-static int get_tme_keyid_bits(void)
+static unsigned int get_tme_keyid_bits(void)
 {
 	msr_t msr;
 
@@ -256,7 +256,7 @@ static int get_tme_keyid_bits(void)
 	return msr.hi & TME_ACTIVATE_HI_KEYID_BITS_MASK;
 }
 
-int get_reserved_phys_addr_bits(void)
+unsigned int get_reserved_phys_addr_bits(void)
 {
 	if (!is_tme_supported())
 		return 0;
diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h
index fc662eec9e..9783976191 100644
--- a/src/include/cpu/cpu.h
+++ b/src/include/cpu/cpu.h
@@ -9,7 +9,7 @@
 void cpu_initialize(void);
 uintptr_t cpu_get_lapic_addr(void);
 struct bus;
-int cpu_phys_address_size(void);
+unsigned int cpu_phys_address_size(void);
 
 #if ENV_RAMSTAGE
 #define __cpu_driver __attribute__((used, __section__(".rodata.cpu_driver")))