Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp2634550imm; Thu, 11 Oct 2018 13:33:58 -0700 (PDT) X-Google-Smtp-Source: ACcGV6153KxTlMr6e8111GvSbOK4PkSWlE5adO9iurmo5t/WZm1R5WACtWlDklJ9w+BX5yL9NJuc X-Received: by 2002:a17:902:34a:: with SMTP id 68-v6mr2942585pld.39.1539290038439; Thu, 11 Oct 2018 13:33:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539290038; cv=none; d=google.com; s=arc-20160816; b=I9bYOFv/rpmsmKRR3v0EcMvC1OvrEt+8h3QRcr5qFtNPYy8asEQTh/rch4mQ78lM5i VwvHpmvxHOUnDJ8H+FGPqzn2hzjarl/aQ8apgAZe4eCk13ozvNJiDXOY9+f4pAxTOT+z QQBu+v15RwdOvSYvSx/F7flgIsVguad73e80MAoQsfcnf+V8Qij99bTU6u+xvgNJdI+k A69CNLvaqSNLZN5lrCnY84AxhOl0hM7aKO7/K6/PYS50lyIF+jEFUkKNWEGoeYfIRSEt uASviqeuPzUMo4A2b6Dri4OwM+SgRx0dcUVI9V2by4zLW63s90+dK6WfWIO7I6I4L97Q pK+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature; bh=ZY6JzK22kpiong5lSlaGxlX2H50xvQehKAfOlKntON8=; b=eRgTuxHwLCSZvvpUCg+9h3iR3jSdWLVqRyzqquym1A8+o6C/DkdcSG4bfJPARuFEgG yuWsPv25u7BanbbHDoFLBPGFyCBmQWbB9IITcT66PczfQHI24dLcXLB1uCb4WwrXHHD1 Ozb8vmpWBBlOcj8t4qKtGrMh1XcX83aMD8voKLgXygW0Qqx5J02vTauYwUoWA3OOe/QJ 1rr9YpWuvsK+q1/Dc3WO3poJBRmANkeW4OoZ/q5J0s2daEd2jlbogzMxXfdVX4xaXbDP SAnAXwMHHYj0YeL2u0ALeEuwYq9Jri3sW2ERLlZQBhhzAJHrQrWNTh7wYXjY2NqEydoD +J9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector1-amd-com header.b=Q9HvQ53C; 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 d33-v6si28716998pla.292.2018.10.11.13.33.43; Thu, 11 Oct 2018 13:33:58 -0700 (PDT) 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; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector1-amd-com header.b=Q9HvQ53C; 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 S1726134AbeJLECD (ORCPT + 99 others); Fri, 12 Oct 2018 00:02:03 -0400 Received: from mail-dm3nam03on0069.outbound.protection.outlook.com ([104.47.41.69]:14720 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725742AbeJLECD (ORCPT ); Fri, 12 Oct 2018 00:02:03 -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=ZY6JzK22kpiong5lSlaGxlX2H50xvQehKAfOlKntON8=; b=Q9HvQ53CjvEuqqVMgoT0YNtRbwtPX6tTp5J+SJWxJFmVzQtd3Jo4d8eTCq855phIHXQQRdy7r8jeWVI0HKwoSUGer5Kl/jO+hvlNpA8D+sn6C3ipAoE+4fQ6x3MLpWIDYAl2IbTujRORoGdl5yYybOPal+6274MKGwWPCeMe5yE= Received: from DM5PR12MB2471.namprd12.prod.outlook.com (52.132.141.138) by DM5PR12MB1674.namprd12.prod.outlook.com (10.172.40.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.24; Thu, 11 Oct 2018 20:33:05 +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:04 +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 01/11] arch/x86: Start renaming the rdt files to more generic names Thread-Topic: [PATCH v3 01/11] arch/x86: Start renaming the rdt files to more generic names Thread-Index: AQHUYaGcaAGO/aAeYUywomcD6x+ZkA== Date: Thu, 11 Oct 2018 20:33:04 +0000 Message-ID: <20181011203223.18157-2-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;DM5PR12MB1674;20:bHgulbb4L1mUKtBy7v4j4kWtd1NP9iDBoCrCQTOmii9cS7r5+aigSpKcVfafRjaKNm5FWe9FGhb6vQEhvWQU+Esj/WYnshik3zEkNsVFc80JSqycIFc7cKUk9vd+0PYx/gAbopcJ6oWzNxXK3Kr36kiauwKJ4K2csr57yJ6OwrbyW1gRI9YRxpl80u+ENRg2eLGIQF/RWfEGjdHsAlonvOUFVHHyTde1AoF8uOL1pGW9AHEoJ5ggokmlwEPvre/8 x-ms-office365-filtering-correlation-id: 40b0e90c-9e58-4301-ca95-08d62fb8be73 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:DM5PR12MB1674; x-ms-traffictypediagnostic: DM5PR12MB1674: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(767451399110); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823302103)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201708071742011)(7699051);SRVR:DM5PR12MB1674;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB1674; x-forefront-prvs: 08220FA8D6 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(346002)(376002)(136003)(396003)(39860400002)(189003)(199004)(76176011)(53936002)(6486002)(99286004)(478600001)(6512007)(52116002)(4326008)(446003)(81166006)(6436002)(81156014)(8676002)(14454004)(2501003)(26005)(5250100002)(102836004)(1076002)(3846002)(6116002)(186003)(2906002)(7736002)(2201001)(110136005)(7416002)(54906003)(486006)(11346002)(476003)(2616005)(2900100001)(97736004)(8936002)(106356001)(305945005)(316002)(575784001)(86362001)(256004)(72206003)(66066001)(25786009)(386003)(105586002)(71200400001)(71190400001)(36756003)(6506007)(5660300001)(68736007)(14444005)(41533002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1674;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: lIMEGk6LZOpOW50hzYXuMIYBORz5KE7R8OR5V+MWvLiA1yGuqB+clltdfyWrfpQ+7vDEZ0RxI3SgVOe/jXuRIll1Mw7WxlPwphKr8WM1o7KiV2446poSL46qLnW3QfsNPbCqjOHGE39qy1z+xmC6Bnk3hp5LcSBFXmo2MVfvL4Fv24d3RMbY5ko5cfLeNns8Ssztj6H+/xKRScBX3OkDjZGej+PbNA3P/jATSLx34Ps0prZFuwLlYsuGejNk9Iy7sGjQR//01aJY1kwnaoSGYqMCiR0a+usiiVAwaLWID87PbSVDhW88NZfUhOlsz1KEtfOCGNB3Jw/nTbO2ZUkVnyHifnOLpT6qYPrUW2esl78= 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: 40b0e90c-9e58-4301-ca95-08d62fb8be73 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Oct 2018 20:33:04.7349 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1674 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org New generation of AMD processors start supporting RDT(or QOS) features. With more than one vendors supporting these features, it seems more appropriate to rename these files. Changed intel_rdt to resctrl where applicable. Signed-off-by: Babu Moger --- arch/x86/include/asm/{intel_rdt_sched.h =3D> resctrl_sched.h} | 0 arch/x86/kernel/cpu/Makefile | 6 +++--- arch/x86/kernel/cpu/{intel_rdt.c =3D> resctrl.c} | 4 ++-- arch/x86/kernel/cpu/{intel_rdt.h =3D> resctrl.h} | 6 +++--- .../cpu/{intel_rdt_ctrlmondata.c =3D> resctrl_ctrlmondata.c} | 2 +- .../kernel/cpu/{intel_rdt_monitor.c =3D> resctrl_monitor.c} | 2 +- .../cpu/{intel_rdt_pseudo_lock.c =3D> resctrl_pseudo_lock.c} | 6 +++--- ..._rdt_pseudo_lock_event.h =3D> resctrl_pseudo_lock_event.h} | 2 +- .../kernel/cpu/{intel_rdt_rdtgroup.c =3D> resctrl_rdtgroup.c} | 4 ++-- arch/x86/kernel/process_32.c | 2 +- arch/x86/kernel/process_64.c | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) rename arch/x86/include/asm/{intel_rdt_sched.h =3D> resctrl_sched.h} (100%= ) rename arch/x86/kernel/cpu/{intel_rdt.c =3D> resctrl.c} (99%) rename arch/x86/kernel/cpu/{intel_rdt.h =3D> resctrl.h} (99%) rename arch/x86/kernel/cpu/{intel_rdt_ctrlmondata.c =3D> resctrl_ctrlmonda= ta.c} (99%) rename arch/x86/kernel/cpu/{intel_rdt_monitor.c =3D> resctrl_monitor.c} (9= 9%) rename arch/x86/kernel/cpu/{intel_rdt_pseudo_lock.c =3D> resctrl_pseudo_lo= ck.c} (99%) rename arch/x86/kernel/cpu/{intel_rdt_pseudo_lock_event.h =3D> resctrl_pse= udo_lock_event.h} (95%) rename arch/x86/kernel/cpu/{intel_rdt_rdtgroup.c =3D> resctrl_rdtgroup.c} = (99%) diff --git a/arch/x86/include/asm/intel_rdt_sched.h b/arch/x86/include/asm/= resctrl_sched.h similarity index 100% rename from arch/x86/include/asm/intel_rdt_sched.h rename to arch/x86/include/asm/resctrl_sched.h diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 347137e80bf5..222cf8cc078d 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -35,9 +35,9 @@ obj-$(CONFIG_CPU_SUP_CENTAUR) +=3D centaur.o obj-$(CONFIG_CPU_SUP_TRANSMETA_32) +=3D transmeta.o obj-$(CONFIG_CPU_SUP_UMC_32) +=3D umc.o =20 -obj-$(CONFIG_INTEL_RDT) +=3D intel_rdt.o intel_rdt_rdtgroup.o intel_rdt_mo= nitor.o -obj-$(CONFIG_INTEL_RDT) +=3D intel_rdt_ctrlmondata.o intel_rdt_pseudo_lock= .o -CFLAGS_intel_rdt_pseudo_lock.o =3D -I$(src) +obj-$(CONFIG_INTEL_RDT) +=3D resctrl.o resctrl_rdtgroup.o resctrl_monitor.= o +obj-$(CONFIG_INTEL_RDT) +=3D resctrl_ctrlmondata.o resctrl_pseudo_lock.o +CFLAGS_resctrl_pseudo_lock.o =3D -I$(src) =20 obj-$(CONFIG_X86_MCE) +=3D mcheck/ obj-$(CONFIG_MTRR) +=3D mtrr/ diff --git a/arch/x86/kernel/cpu/intel_rdt.c b/arch/x86/kernel/cpu/resctrl.= c similarity index 99% rename from arch/x86/kernel/cpu/intel_rdt.c rename to arch/x86/kernel/cpu/resctrl.c index 1214f3f7ec6d..3968b54902b1 100644 --- a/arch/x86/kernel/cpu/intel_rdt.c +++ b/arch/x86/kernel/cpu/resctrl.c @@ -30,8 +30,8 @@ #include =20 #include -#include -#include "intel_rdt.h" +#include +#include "resctrl.h" =20 #define MBA_IS_LINEAR 0x4 #define MBA_MAX_MBPS U32_MAX diff --git a/arch/x86/kernel/cpu/intel_rdt.h b/arch/x86/kernel/cpu/resctrl.= h similarity index 99% rename from arch/x86/kernel/cpu/intel_rdt.h rename to arch/x86/kernel/cpu/resctrl.h index 3736f6dc9545..a9d906767bb2 100644 --- a/arch/x86/kernel/cpu/intel_rdt.h +++ b/arch/x86/kernel/cpu/resctrl.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_X86_INTEL_RDT_H -#define _ASM_X86_INTEL_RDT_H +#ifndef _ASM_X86_RESCTRL_H +#define _ASM_X86_RESCTRL_H =20 #include #include @@ -568,4 +568,4 @@ void cqm_handle_limbo(struct work_struct *work); bool has_busy_rmid(struct rdt_resource *r, struct rdt_domain *d); void __check_limbo(struct rdt_domain *d, bool force_free); =20 -#endif /* _ASM_X86_INTEL_RDT_H */ +#endif /* _ASM_X86_RESCTRL_H */ diff --git a/arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c b/arch/x86/kernel/= cpu/resctrl_ctrlmondata.c similarity index 99% rename from arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c rename to arch/x86/kernel/cpu/resctrl_ctrlmondata.c index 0f53049719cd..0c40a2e0a9b6 100644 --- a/arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c +++ b/arch/x86/kernel/cpu/resctrl_ctrlmondata.c @@ -26,7 +26,7 @@ #include #include #include -#include "intel_rdt.h" +#include "resctrl.h" =20 /* * Check whether MBA bandwidth percentage value is correct. The value is diff --git a/arch/x86/kernel/cpu/intel_rdt_monitor.c b/arch/x86/kernel/cpu/= resctrl_monitor.c similarity index 99% rename from arch/x86/kernel/cpu/intel_rdt_monitor.c rename to arch/x86/kernel/cpu/resctrl_monitor.c index b0f3aed76b75..211d97bcbde5 100644 --- a/arch/x86/kernel/cpu/intel_rdt_monitor.c +++ b/arch/x86/kernel/cpu/resctrl_monitor.c @@ -26,7 +26,7 @@ #include #include #include -#include "intel_rdt.h" +#include "resctrl.h" =20 #define MSR_IA32_QM_CTR 0x0c8e #define MSR_IA32_QM_EVTSEL 0x0c8d diff --git a/arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c b/arch/x86/kernel/= cpu/resctrl_pseudo_lock.c similarity index 99% rename from arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c rename to arch/x86/kernel/cpu/resctrl_pseudo_lock.c index 41aeb431e834..67c747b6c61e 100644 --- a/arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c +++ b/arch/x86/kernel/cpu/resctrl_pseudo_lock.c @@ -24,14 +24,14 @@ =20 #include #include -#include +#include #include =20 #include "../../events/perf_event.h" /* For X86_CONFIG() */ -#include "intel_rdt.h" +#include "resctrl.h" =20 #define CREATE_TRACE_POINTS -#include "intel_rdt_pseudo_lock_event.h" +#include "resctrl_pseudo_lock_event.h" =20 /* * MSR_MISC_FEATURE_CONTROL register enables the modification of hardware diff --git a/arch/x86/kernel/cpu/intel_rdt_pseudo_lock_event.h b/arch/x86/k= ernel/cpu/resctrl_pseudo_lock_event.h similarity index 95% rename from arch/x86/kernel/cpu/intel_rdt_pseudo_lock_event.h rename to arch/x86/kernel/cpu/resctrl_pseudo_lock_event.h index 2c041e6d9f05..d354851ed66c 100644 --- a/arch/x86/kernel/cpu/intel_rdt_pseudo_lock_event.h +++ b/arch/x86/kernel/cpu/resctrl_pseudo_lock_event.h @@ -39,5 +39,5 @@ TRACE_EVENT(pseudo_lock_l3, =20 #undef TRACE_INCLUDE_PATH #define TRACE_INCLUDE_PATH . -#define TRACE_INCLUDE_FILE intel_rdt_pseudo_lock_event +#define TRACE_INCLUDE_FILE resctrl_pseudo_lock_event #include diff --git a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c b/arch/x86/kernel/cpu= /resctrl_rdtgroup.c similarity index 99% rename from arch/x86/kernel/cpu/intel_rdt_rdtgroup.c rename to arch/x86/kernel/cpu/resctrl_rdtgroup.c index dbc7fc98b60a..7a0c9aad89f9 100644 --- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl_rdtgroup.c @@ -35,8 +35,8 @@ =20 #include =20 -#include -#include "intel_rdt.h" +#include +#include "resctrl.h" =20 DEFINE_STATIC_KEY_FALSE(rdt_enable_key); DEFINE_STATIC_KEY_FALSE(rdt_mon_enable_key); diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 5046a3c9dec2..d16207e7d1e5 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include =20 void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index ea5ea850348d..af73223ad6ba 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #ifdef CONFIG_IA32_EMULATION /* Not included via unistd.h */ --=20 2.17.1