Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3189940imu; Fri, 23 Nov 2018 23:42:34 -0800 (PST) X-Google-Smtp-Source: AJdET5fyTR/EbMR5c4AjtJDJofWsZO1kwl0qXJtw59cyuNdZegN0fRqVRg1Vja9NXQqDwt1nlV0Z X-Received: by 2002:a62:6085:: with SMTP id u127-v6mr20117563pfb.147.1543045354849; Fri, 23 Nov 2018 23:42:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543045354; cv=none; d=google.com; s=arc-20160816; b=UCIUq+LBnZ5E3JgljZ5jcJ1jeFV2Z/DJ4K1gDB+qzbt65sEPW4OqCsfEYklMzMKEGk DZOpBTmPTjat2q7dXIcKfq6bJknG+9RUeFIpUhHG5yobuAMlJrsBxiF0mafM7MoBeOZh eY9KmEHrJP92aEnr5MWHMC1PViAxZyV68OwX/DPlYxXMJ/RCrQWzXc17c7SVjV/9Czsm tgN1YEaCrKL/HWV6V2rIqRML8L2NB8nirBFkUZOfmSU8R9MF3h56m1TUtj3IjsTkgJF9 c8oBu8gRS/Qypw2YtKdU6C2l34XuR3l3DfGFIuGIbyyyVHUgLssjIJTj0feb5kLgzXjE 6Vjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition :content-transfer-encoding:mime-version:robot-unsubscribe:robot-id :git-commit-id:subject:to:references:in-reply-to:reply-to:cc :message-id:from:date; bh=vsnuJYDwuexYBbZ3Jvwr/37nIfhxyxCYTsRoWabjokI=; b=re9uiq1orvyIAFy8IQWWjLBjmrJ+1miGLZFGQmI6b9xLmvqI2LBy50tDvxeXTQRt2W hr9c2CLBquTP8L5m+SjorZ8uiYq09jq82P9ljS7hsVg7rA1UnWGdpZkS6g1r/AGOVlFB 6YdoS+3zXKVjv6LElSQUX50A+ubfpDWHpMGCt4lVzgy/wCcZGNdshCsI6+t6Q+7u/sUQ kpBDeS+0SDLrauuS+EZB2tpxsl4NE//pKV1eFWVdDLzNJrRHZ5TyqURrkVIube9kpjNv FalH3JvwEGSv+6Aq6AWqvDAKxkYfyLwpDoBN3L8cKWnM5UKEvk9FKMyYBXMZa1emHIZT DoFw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f16si20899967pgg.173.2018.11.23.23.42.20; Fri, 23 Nov 2018 23:42:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407628AbeKWI3X (ORCPT + 99 others); Fri, 23 Nov 2018 03:29:23 -0500 Received: from terminus.zytor.com ([198.137.202.136]:47869 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404865AbeKWI3W (ORCPT ); Fri, 23 Nov 2018 03:29:22 -0500 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id wAMLl7e23947114 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 22 Nov 2018 13:47:07 -0800 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id wAMLl71P3947110; Thu, 22 Nov 2018 13:47:07 -0800 Date: Thu, 22 Nov 2018 13:47:07 -0800 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Babu Moger Message-ID: Cc: x86@kernel.org, mingo@redhat.com, arnd@arndb.de, linux-kernel@vger.kernel.org, mingo@kernel.org, bp@suse.de, davem@davemloft.net, linux-doc@vger.kernel.org, kstewart@linuxfoundation.org, dwmw2@infradead.org, hpa@zytor.com, babu.moger@amd.com, Thomas.Lendacky@amd.com, gregkh@linuxfoundation.org, jpoimboe@redhat.com, reinette.chatre@intel.com, brijesh.singh@amd.com, tglx@linutronix.de, qianyue.zj@alibaba-inc.com, kirill.shutemov@linux.intel.com, tony.luck@intel.com, dima@arista.com, rafael@kernel.org, chang.seok.bae@intel.com, xiaochen.shen@intel.com, puwen@hygon.cn, pbonzini@redhat.com, sherry.hurwitz@amd.com, fenghua.yu@intel.com, rian@alum.mit.edu, jroedel@suse.de, akpm@linux-foundation.org, peterz@infradead.org, jannh@google.com, Babu.Moger@amd.com, corbet@lwn.net, luto@kernel.org, vkuznets@redhat.com, suravee.suthikulpanit@amd.com, pombredanne@nexb.com, mchehab+samsung@kernel.org Reply-To: tony.luck@intel.com, kirill.shutemov@linux.intel.com, puwen@hygon.cn, xiaochen.shen@intel.com, chang.seok.bae@intel.com, dima@arista.com, rafael@kernel.org, pbonzini@redhat.com, sherry.hurwitz@amd.com, fenghua.yu@intel.com, jroedel@suse.de, rian@alum.mit.edu, akpm@linux-foundation.org, jannh@google.com, peterz@infradead.org, mchehab+samsung@kernel.org, pombredanne@nexb.com, suravee.suthikulpanit@amd.com, vkuznets@redhat.com, luto@kernel.org, corbet@lwn.net, Babu.Moger@amd.com, x86@kernel.org, mingo@redhat.com, arnd@arndb.de, linux-kernel@vger.kernel.org, bp@suse.de, mingo@kernel.org, linux-doc@vger.kernel.org, dwmw2@infradead.org, kstewart@linuxfoundation.org, davem@davemloft.net, Thomas.Lendacky@amd.com, gregkh@linuxfoundation.org, babu.moger@amd.com, hpa@zytor.com, tglx@linutronix.de, brijesh.singh@amd.com, reinette.chatre@intel.com, jpoimboe@redhat.com, qianyue.zj@alibaba-inc.com In-Reply-To: <20181121202811.4492-4-babu.moger@amd.com> References: <20181121202811.4492-4-babu.moger@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cache] x86/resctrl: Re-arrange the RDT init code Git-Commit-ID: 0f00717ecce4b366b3f530153e982cb2eeadafd1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, T_DATE_IN_FUTURE_96_Q autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on terminus.zytor.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 0f00717ecce4b366b3f530153e982cb2eeadafd1 Gitweb: https://git.kernel.org/tip/0f00717ecce4b366b3f530153e982cb2eeadafd1 Author: Babu Moger AuthorDate: Wed, 21 Nov 2018 20:28:29 +0000 Committer: Borislav Petkov 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 Signed-off-by: Borislav Petkov Cc: Andrew Morton Cc: Andy Lutomirski Cc: Arnd Bergmann Cc: Brijesh Singh Cc: "Chang S. Bae" Cc: David Miller Cc: David Woodhouse Cc: Dmitry Safonov Cc: Fenghua Yu Cc: Greg Kroah-Hartman Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Jann Horn Cc: Joerg Roedel Cc: Jonathan Corbet Cc: Josh Poimboeuf Cc: Kate Stewart Cc: "Kirill A. Shutemov" Cc: Cc: Mauro Carvalho Chehab Cc: Paolo Bonzini Cc: Peter Zijlstra Cc: Philippe Ombredanne Cc: Pu Wen Cc: Cc: "Rafael J. Wysocki" Cc: Reinette Chatre Cc: Rian Hunter Cc: Sherry Hurwitz Cc: Suravee Suthikulpanit Cc: Thomas Gleixner Cc: Thomas Lendacky Cc: Tony Luck Cc: Vitaly Kuznetsov Cc: Cc: x86-ml Link: https://lkml.kernel.org/r/20181121202811.4492-4-babu.moger@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;