mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-27 23:20:26 +09:00
x86: cpu: Report address width from cpu_get_info()
Add support for this new field in the common code used by most x86 CPU drivers. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
c90b302d5f
commit
aec7c1c565
@ -34,6 +34,10 @@
|
|||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
|
#define CPUID_FEATURE_PAE BIT(6)
|
||||||
|
#define CPUID_FEATURE_PSE36 BIT(17)
|
||||||
|
#define CPUID_FEAURE_HTT BIT(28)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Constructor for a conventional segment GDT (or LDT) entry
|
* Constructor for a conventional segment GDT (or LDT) entry
|
||||||
* This is a macro so it can be used in initialisers
|
* This is a macro so it can be used in initialisers
|
||||||
@ -388,6 +392,25 @@ static void setup_identity(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static uint cpu_cpuid_extended_level(void)
|
||||||
|
{
|
||||||
|
return cpuid_eax(0x80000000);
|
||||||
|
}
|
||||||
|
|
||||||
|
int cpu_phys_address_size(void)
|
||||||
|
{
|
||||||
|
if (!has_cpuid())
|
||||||
|
return 32;
|
||||||
|
|
||||||
|
if (cpu_cpuid_extended_level() >= 0x80000008)
|
||||||
|
return cpuid_eax(0x80000008) & 0xff;
|
||||||
|
|
||||||
|
if (cpuid_edx(1) & (CPUID_FEATURE_PAE | CPUID_FEATURE_PSE36))
|
||||||
|
return 36;
|
||||||
|
|
||||||
|
return 32;
|
||||||
|
}
|
||||||
|
|
||||||
/* Don't allow PCI region 3 to use memory in the 2-4GB memory hole */
|
/* Don't allow PCI region 3 to use memory in the 2-4GB memory hole */
|
||||||
static void setup_pci_ram_top(void)
|
static void setup_pci_ram_top(void)
|
||||||
{
|
{
|
||||||
|
@ -127,6 +127,7 @@ int cpu_intel_get_info(struct cpu_info *info, int bclk)
|
|||||||
info->cpu_freq = ((msr.lo >> 8) & 0xff) * bclk * 1000000;
|
info->cpu_freq = ((msr.lo >> 8) & 0xff) * bclk * 1000000;
|
||||||
info->features = 1 << CPU_FEAT_L1_CACHE | 1 << CPU_FEAT_MMU |
|
info->features = 1 << CPU_FEAT_L1_CACHE | 1 << CPU_FEAT_MMU |
|
||||||
1 << CPU_FEAT_UCODE | 1 << CPU_FEAT_DEVICE_ID;
|
1 << CPU_FEAT_UCODE | 1 << CPU_FEAT_DEVICE_ID;
|
||||||
|
info->address_width = cpu_phys_address_size();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -70,3 +70,8 @@ int x86_cpu_reinit_f(void)
|
|||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int cpu_phys_address_size(void)
|
||||||
|
{
|
||||||
|
return CONFIG_CPU_ADDR_BITS;
|
||||||
|
}
|
||||||
|
@ -288,4 +288,13 @@ u32 cpu_get_family_model(void);
|
|||||||
*/
|
*/
|
||||||
u32 cpu_get_stepping(void);
|
u32 cpu_get_stepping(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* cpu_phys_address_size() - Get the physical address size in bits
|
||||||
|
*
|
||||||
|
* This is 32 for older CPUs but newer ones may support 36.
|
||||||
|
*
|
||||||
|
* @return address size (typically 32 or 36)
|
||||||
|
*/
|
||||||
|
int cpu_phys_address_size(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user