From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44188C67837 for ; Thu, 11 Oct 2018 20:34:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1DBA2098A for ; Thu, 11 Oct 2018 20:34:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="h6sgYgf2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1DBA2098A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726967AbeJLEDM (ORCPT ); Fri, 12 Oct 2018 00:03:12 -0400 Received: from mail-co1nam03on0047.outbound.protection.outlook.com ([104.47.40.47]:27090 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725840AbeJLEDF (ORCPT ); Fri, 12 Oct 2018 00:03:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=k2aKs5sgSSiEgRtW0HGVMQ6LVYcDTnDhruBr97muZD8=; b=h6sgYgf2yPsHsPF/kuOXDNDBt0xdmrzGYDQN000kcK+TGl06rbWqB0ZP2KF2H0JtPf+5W2LnkhCdgQUmd2Oub1Tc1yz2xLwCstakAuG8XdRAFZQdaTxYkOyAVPimqkBdoIYrcB+6A/oMSEGcNl6Wa4yoZNM7RhmmCw+MWyNTtCY= Received: from DM5PR12MB2471.namprd12.prod.outlook.com (52.132.141.138) by DM5PR12MB2408.namprd12.prod.outlook.com (52.132.141.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.23; Thu, 11 Oct 2018 20:33:28 +0000 Received: from DM5PR12MB2471.namprd12.prod.outlook.com ([fe80::bd60:9d30:b818:b828]) by DM5PR12MB2471.namprd12.prod.outlook.com ([fe80::bd60:9d30:b818:b828%3]) with mapi id 15.20.1228.020; Thu, 11 Oct 2018 20:33:28 +0000 From: "Moger, Babu" To: "tglx@linutronix.de" , "mingo@redhat.com" , "hpa@zytor.com" , "reinette.chatre@intel.com" , "fenghua.yu@intel.com" , "james.morse@arm.com" , "vikas.shivappa@linux.intel.com" , "tony.luck@intel.com" CC: "x86@kernel.org" , "peterz@infradead.org" , "Moger, Babu" , "pombredanne@nexb.com" , "gregkh@linuxfoundation.org" , "kstewart@linuxfoundation.org" , "bp@suse.de" , "rafael.j.wysocki@intel.com" , "ak@linux.intel.com" , "kirill.shutemov@linux.intel.com" , "xiaochen.shen@intel.com" , "colin.king@canonical.com" , "Hurwitz, Sherry" , "Lendacky, Thomas" , "pbonzini@redhat.com" , "dwmw@amazon.co.uk" , "luto@kernel.org" , "jroedel@suse.de" , "jannh@google.com" , "dima@arista.com" , "jpoimboe@redhat.com" , "vkuznets@redhat.com" , "linux-kernel@vger.kernel.org" Subject: [PATCH v3 07/11] arch/x86: Initialize the resource functions that are different Thread-Topic: [PATCH v3 07/11] arch/x86: Initialize the resource functions that are different Thread-Index: AQHUYaGqYT2OtkMbH0qO7iqbS7WWhQ== Date: Thu, 11 Oct 2018 20:33:27 +0000 Message-ID: <20181011203223.18157-8-babu.moger@amd.com> References: <20181011203223.18157-1-babu.moger@amd.com> In-Reply-To: <20181011203223.18157-1-babu.moger@amd.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MWHPR22CA0062.namprd22.prod.outlook.com (2603:10b6:300:12a::24) To DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [165.204.78.1] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR12MB2408;20:EQ1eqe5xPMYIH5kRAEDLgKYCjiqfTQGQa720BmBZHXM3lUtcuw2svYt2toYjXPmrYbDFAG+rlQpcfoBauDTrrt/Dy95t2k/l5ufehZThcIgzviyBwgEYLGDSQx2zVSi5V93TIajZ6D1nF+I9A8k/Pn4AZPOYGh8Kj6UR78V0wS/J/uLetBSisK42YMUEQS2/Bs5JHlBAkXq3sSai/riujIrmRyU+772Qf5F93bwb9uKMyh141AmD7VifQpgg+dK1 x-ms-office365-filtering-correlation-id: c480ac83-f88f-489c-1596-08d62fb8ccbc x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:DM5PR12MB2408; x-ms-traffictypediagnostic: DM5PR12MB2408: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(269456686620040)(767451399110); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823302103)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699051);SRVR:DM5PR12MB2408;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB2408; x-forefront-prvs: 08220FA8D6 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(366004)(376002)(396003)(136003)(346002)(189003)(199004)(25786009)(99286004)(52116002)(256004)(4326008)(54906003)(316002)(110136005)(68736007)(71200400001)(71190400001)(102836004)(36756003)(2900100001)(305945005)(66066001)(81166006)(106356001)(8676002)(7416002)(478600001)(14454004)(105586002)(8936002)(81156014)(6512007)(2501003)(5250100002)(11346002)(446003)(476003)(2616005)(97736004)(486006)(72206003)(6486002)(7736002)(53936002)(26005)(186003)(6436002)(2201001)(5660300001)(14444005)(86362001)(1076002)(386003)(575784001)(6506007)(3846002)(76176011)(2906002)(6116002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB2408;H:DM5PR12MB2471.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: S7ZOFrl6h9dEGklba94rhhRiMaFrMl0ScULuB+bZNI1dR3GKfyc8q3lyJfUmQuPUa8c1bCLL2wMu9E1eaPkFevFtRtxwEpoz3R9HxfrRUtI1NOpkXh4ySSudHNhcNya5fD1+xeMRX2/jSB2P3g3Ula8TtITPHZtBMTff6EUgxOSsoIKjjtojoTZ0mBTdxCPOuotkYA5Exa4ihdjZK2EKkxKRDRKv33hmmE2B9kBfgGiUun19DcG8jgfy/h/tm/TCGeOa23Avd0vvbg6bv43PajSRT3+lxmkls+ejK9BCNBpfoKNgfSPEtFM6df/MAAOW93CyGtZcwyqUHabBvwd4rAF/ukI6WGop6iBua+vWmmE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: c480ac83-f88f-489c-1596-08d62fb8ccbc X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Oct 2018 20:33:27.7692 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2408 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Initialize the resource functions that are different between the vendors. Some features are initialized differently between the vendors. Add _intel suffix to Intel specific functions. For example, MBA feature varies significantly between Intel and AMD. Separate the initialization of these resource functions. That way we can easily add AMD's functions later. Signed-off-by: Babu Moger --- arch/x86/kernel/cpu/resctrl.c | 34 +++++++++++++++++++---- arch/x86/kernel/cpu/resctrl.h | 8 ++++-- arch/x86/kernel/cpu/resctrl_ctrlmondata.c | 4 +-- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl.c b/arch/x86/kernel/cpu/resctrl.c index 9c5480750069..cff5564921c3 100644 --- a/arch/x86/kernel/cpu/resctrl.c +++ b/arch/x86/kernel/cpu/resctrl.c @@ -57,7 +57,8 @@ int max_name_width, max_data_width; bool rdt_alloc_capable; =20 static void -mba_wrmsr(struct rdt_domain *d, struct msr_param *m, struct rdt_resource *= r); +mba_wrmsr_intel(struct rdt_domain *d, struct msr_param *m, + struct rdt_resource *r); static void cat_wrmsr(struct rdt_domain *d, struct msr_param *m, struct rdt_resource *= r); =20 @@ -171,10 +172,7 @@ struct rdt_resource rdt_resources_all[] =3D { .rid =3D RDT_RESOURCE_MBA, .name =3D "MB", .domains =3D domain_init(RDT_RESOURCE_MBA), - .msr_base =3D IA32_MBA_THRTL_BASE, - .msr_update =3D mba_wrmsr, .cache_level =3D 3, - .parse_ctrlval =3D parse_bw, .format_str =3D "%d=3D%*u", .fflags =3D RFTYPE_RES_MB, }, @@ -356,7 +354,8 @@ u32 delay_bw_map(unsigned long bw, struct rdt_resource = *r) } =20 static void -mba_wrmsr(struct rdt_domain *d, struct msr_param *m, struct rdt_resource *= r) +mba_wrmsr_intel(struct rdt_domain *d, struct msr_param *m, + struct rdt_resource *r) { unsigned int i; =20 @@ -868,6 +867,25 @@ static __init bool get_rdt_resources(void) return (rdt_mon_capable || rdt_alloc_capable); } =20 +static __init void rdt_init_res_defs_intel(void) +{ + struct rdt_resource *r; + + for_each_rdt_resource(r) { + if (r->rid =3D=3D RDT_RESOURCE_MBA) { + r->msr_base =3D IA32_MBA_THRTL_BASE; + r->msr_update =3D mba_wrmsr_intel; + r->parse_ctrlval =3D parse_bw_intel; + } + } +} + +static __init void rdt_init_res_defs(void) +{ + if (boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_INTEL) + rdt_init_res_defs_intel(); +} + static enum cpuhp_state rdt_online; =20 static int __init resctrl_late_init(void) @@ -875,6 +893,12 @@ static int __init resctrl_late_init(void) struct rdt_resource *r; int state, ret; =20 + /* + * Initialize functions(or definitions) that are different + * between vendors here. + */ + rdt_init_res_defs(); + /* Run quirks first */ rdt_quirks(); =20 diff --git a/arch/x86/kernel/cpu/resctrl.h b/arch/x86/kernel/cpu/resctrl.h index e5f7bf6a8d09..8731b7c91c28 100644 --- a/arch/x86/kernel/cpu/resctrl.h +++ b/arch/x86/kernel/cpu/resctrl.h @@ -444,8 +444,8 @@ struct rdt_resource { =20 int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r, struct rdt_domain *d); -int parse_bw(struct rdt_parse_data *data, struct rdt_resource *r, - struct rdt_domain *d); +int parse_bw_intel(struct rdt_parse_data *data, struct rdt_resource *r, + struct rdt_domain *d); =20 extern struct mutex rdtgroup_mutex; =20 @@ -468,6 +468,10 @@ enum { RDT_NUM_RESOURCES, }; =20 +#define for_each_rdt_resource(r) \ + for (r =3D rdt_resources_all; r < rdt_resources_all + RDT_NUM_RESOURCES;\ + r++) + #define for_each_capable_rdt_resource(r) \ for (r =3D rdt_resources_all; r < rdt_resources_all + RDT_NUM_RESOURCES;\ r++) \ diff --git a/arch/x86/kernel/cpu/resctrl_ctrlmondata.c b/arch/x86/kernel/cp= u/resctrl_ctrlmondata.c index 0c40a2e0a9b6..1da343b69f6e 100644 --- a/arch/x86/kernel/cpu/resctrl_ctrlmondata.c +++ b/arch/x86/kernel/cpu/resctrl_ctrlmondata.c @@ -64,8 +64,8 @@ static bool bw_validate(char *buf, unsigned long *data, s= truct rdt_resource *r) return true; } =20 -int parse_bw(struct rdt_parse_data *data, struct rdt_resource *r, - struct rdt_domain *d) +int parse_bw_intel(struct rdt_parse_data *data, struct rdt_resource *r, + struct rdt_domain *d) { unsigned long bw_val; =20 --=20 2.17.1