Commit-ID: 0f00717ecce4b366b3f530153e982cb2eeadafd1 Gitweb: https://git.kernel.org/tip/0f00717ecce4b366b3f530153e982cb2eeadafd1 Author: Babu Moger <babu.mo...@amd.com> AuthorDate: Wed, 21 Nov 2018 20:28:29 +0000 Committer: Borislav Petkov <b...@suse.de> CommitDate: Thu, 22 Nov 2018 20:16:19 +0100
x86/resctrl: Re-arrange the RDT init code Separate the call sequence for rdt_quirks and MBA feature. This is in preparation to handle vendor differences in these call sequences. Rename the functions to make the flow a bit more meaningful. Signed-off-by: Babu Moger <babu.mo...@amd.com> Signed-off-by: Borislav Petkov <b...@suse.de> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Andy Lutomirski <l...@kernel.org> Cc: Arnd Bergmann <a...@arndb.de> Cc: Brijesh Singh <brijesh.si...@amd.com> Cc: "Chang S. Bae" <chang.seok....@intel.com> Cc: David Miller <da...@davemloft.net> Cc: David Woodhouse <dw...@infradead.org> Cc: Dmitry Safonov <d...@arista.com> Cc: Fenghua Yu <fenghua...@intel.com> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> Cc: "H. Peter Anvin" <h...@zytor.com> Cc: Ingo Molnar <mi...@redhat.com> Cc: Jann Horn <ja...@google.com> Cc: Joerg Roedel <jroe...@suse.de> Cc: Jonathan Corbet <cor...@lwn.net> Cc: Josh Poimboeuf <jpoim...@redhat.com> Cc: Kate Stewart <kstew...@linuxfoundation.org> Cc: "Kirill A. Shutemov" <kirill.shute...@linux.intel.com> Cc: <linux-doc@vger.kernel.org> Cc: Mauro Carvalho Chehab <mchehab+sams...@kernel.org> Cc: Paolo Bonzini <pbonz...@redhat.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Philippe Ombredanne <pombreda...@nexb.com> Cc: Pu Wen <pu...@hygon.cn> Cc: <qianyue...@alibaba-inc.com> Cc: "Rafael J. Wysocki" <raf...@kernel.org> Cc: Reinette Chatre <reinette.cha...@intel.com> Cc: Rian Hunter <r...@alum.mit.edu> Cc: Sherry Hurwitz <sherry.hurw...@amd.com> Cc: Suravee Suthikulpanit <suravee.suthikulpa...@amd.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Thomas Lendacky <thomas.lenda...@amd.com> Cc: Tony Luck <tony.l...@intel.com> Cc: Vitaly Kuznetsov <vkuzn...@redhat.com> Cc: <xiaochen.s...@intel.com> Cc: x86-ml <x...@kernel.org> Link: https://lkml.kernel.org/r/20181121202811.4492-4-babu.mo...@amd.com --- arch/x86/kernel/cpu/resctrl/core.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c index 0cf890ae0de2..40380731c588 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -259,7 +259,7 @@ static inline bool rdt_get_mb_table(struct rdt_resource *r) return false; } -static bool rdt_get_mem_config(struct rdt_resource *r) +static bool __get_mem_config(struct rdt_resource *r) { union cpuid_0x10_3_eax eax; union cpuid_0x10_x_edx edx; @@ -794,6 +794,14 @@ static bool __init rdt_cpu_has(int flag) return ret; } +static __init bool get_mem_config(void) +{ + if (rdt_cpu_has(X86_FEATURE_MBA)) + return __get_mem_config(&rdt_resources_all[RDT_RESOURCE_MBA]); + + return false; +} + static __init bool get_rdt_alloc_resources(void) { bool ret = false; @@ -818,10 +826,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 (get_mem_config()) + ret = true; + return ret; } @@ -840,7 +847,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 __check_quirks_intel(void) { switch (boot_cpu_data.x86_model) { case INTEL_FAM6_HASWELL_X: @@ -855,9 +862,14 @@ static __init void rdt_quirks(void) } } +static __init void check_quirks(void) +{ + if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) + __check_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(); @@ -871,6 +883,8 @@ static int __init resctrl_late_init(void) struct rdt_resource *r; int state, ret; + check_quirks(); + if (!get_rdt_resources()) return -ENODEV;
