[PATCH v5 03/13] arch/x86: Re-arrange RDT init code
From: "Moger, Babu" <Babu.Moger@amd.com>
Date: 2018-10-18 22:53:18
Also in:
lkml
Subsystem:
the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
Separate the call sequence for rdt_quirks and MBA feature. This is in preparation to handle vendor differences in these call sequences. Signed-off-by: Babu Moger <babu.moger@amd.com> --- arch/x86/kernel/cpu/resctrl.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl.c b/arch/x86/kernel/cpu/resctrl.c
index 8afc0da6fa59..6c1199f7f28e 100644
--- a/arch/x86/kernel/cpu/resctrl.c
+++ b/arch/x86/kernel/cpu/resctrl.c@@ -787,6 +787,16 @@ static bool __init rdt_cpu_has(int flag) return ret; } +static __init bool rdt_mba_config(void) +{ + if (rdt_cpu_has(X86_FEATURE_MBA)) { + if (rdt_get_mem_config(&rdt_resources_all[RDT_RESOURCE_MBA])) + return true; + } + + return false; +} + static __init bool get_rdt_alloc_resources(void) { bool ret = false;
@@ -811,10 +821,9 @@ static __init bool get_rdt_alloc_resources(void) ret = true; } - if (rdt_cpu_has(X86_FEATURE_MBA)) { - if (rdt_get_mem_config(&rdt_resources_all[RDT_RESOURCE_MBA])) - ret = true; - } + if (rdt_mba_config()) + ret = true; + return ret; }
@@ -833,7 +842,7 @@ static __init bool get_rdt_mon_resources(void) return !rdt_get_mon_l3_config(&rdt_resources_all[RDT_RESOURCE_L3]); } -static __init void rdt_quirks(void) +static __init void rdt_quirks_intel(void) { switch (boot_cpu_data.x86_model) { case INTEL_FAM6_HASWELL_X:
@@ -848,9 +857,14 @@ static __init void rdt_quirks(void) } } +static __init void rdt_quirks(void) +{ + if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) + rdt_quirks_intel(); +} + static __init bool get_rdt_resources(void) { - rdt_quirks(); rdt_alloc_capable = get_rdt_alloc_resources(); rdt_mon_capable = get_rdt_mon_resources();
@@ -864,6 +878,9 @@ static int __init resctrl_late_init(void) struct rdt_resource *r; int state, ret; + /* Run quirks first */ + rdt_quirks(); + if (!get_rdt_resources()) return -ENODEV;
--
2.17.1