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=-7.1 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,URIBL_BLOCKED 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 F0907C32789 for ; Tue, 6 Nov 2018 15:41:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4FD420883 for ; Tue, 6 Nov 2018 15:41:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="UgX0HvCo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A4FD420883 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 S2388906AbeKGBG4 (ORCPT ); Tue, 6 Nov 2018 20:06:56 -0500 Received: from mail-by2nam03on0078.outbound.protection.outlook.com ([104.47.42.78]:34136 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388819AbeKGBG4 (ORCPT ); Tue, 6 Nov 2018 20:06:56 -0500 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=R4I264eMYhDzfch/VEK7Il6J8jmO5IwvUK3o14NbQWg=; b=UgX0HvCoQxJwO3wkUVYcKrEENxFfgCVJvjAyG2ncoY4jqGs27cCjbwj7zPbrHYrO97BkAMFzXoLGUQsEtbp4+uxrm58lDw+ZjP/tCYzHk1JxfvirzplJRTM4w5znzzBDbfW2vRgsv07wHjV0xuAIH1dU2GBwuzNi3PPTwxPBCAw= Received: from DM5PR12MB2471.namprd12.prod.outlook.com (52.132.141.138) by DM5PR12MB1354.namprd12.prod.outlook.com (10.168.238.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.26; Tue, 6 Nov 2018 15:40:59 +0000 Received: from DM5PR12MB2471.namprd12.prod.outlook.com ([fe80::4c23:f551:bc6a:554e]) by DM5PR12MB2471.namprd12.prod.outlook.com ([fe80::4c23:f551:bc6a:554e%4]) with mapi id 15.20.1294.032; Tue, 6 Nov 2018 15:40:59 +0000 From: "Moger, Babu" To: "tglx@linutronix.de" , "mingo@redhat.com" , "bp@alien8.de" , "corbet@lwn.net" , "fenghua.yu@intel.com" , "reinette.chatre@intel.com" , "peterz@infradead.org" , "gregkh@linuxfoundation.org" , "davem@davemloft.net" , "akpm@linux-foundation.org" CC: "hpa@zytor.com" , "x86@kernel.org" , "mchehab+samsung@kernel.org" , "arnd@arndb.de" , "kstewart@linuxfoundation.org" , "pombredanne@nexb.com" , "rafael@kernel.org" , "kirill.shutemov@linux.intel.com" , "tony.luck@intel.com" , "qianyue.zj@alibaba-inc.com" , "xiaochen.shen@intel.com" , "pbonzini@redhat.com" , "Singh, Brijesh" , "Hurwitz, Sherry" , "dwmw2@infradead.org" , "Lendacky, Thomas" , "luto@kernel.org" , "joro@8bytes.org" , "jannh@google.com" , "vkuznets@redhat.com" , "rian@alum.mit.edu" , "jpoimboe@redhat.com" , "Moger, Babu" , "linux-kernel@vger.kernel.org" , "linux-doc@vger.kernel.org" Subject: [PATCH v6 01/14] arch/x86: Start renaming the rdt files to more generic names Thread-Topic: [PATCH v6 01/14] arch/x86: Start renaming the rdt files to more generic names Thread-Index: AQHUdecdmXwcsG9tTUWneGJGooMezA== Date: Tue, 6 Nov 2018 15:40:59 +0000 Message-ID: <20181106154034.15386-2-babu.moger@amd.com> References: <20181106154034.15386-1-babu.moger@amd.com> In-Reply-To: <20181106154034.15386-1-babu.moger@amd.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: SN4PR0401CA0010.namprd04.prod.outlook.com (2603:10b6:803:21::20) 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;DM5PR12MB1354;20:ath9yshde16znc6JGCQAl1sI9X4ejiKZMdBWjUONAWna4g1NMg2D8KCURDg6wJOtw6Xs+gxo6IGI8IvpNt4whZtqKXK8P4Nolt8TEmybm0Kh9GH4sreFFmAk9cwb5RNz9hzbqdyZsJzQSC4m5zxDcEiT/ViJ0PU6KNXSGM3MoOWIQFwugki5GIWDVlPMBQjwu0TXPryA54g/f+KpCqSHAHdiGL+KXiJLqHi6M8jZyuHpaYLTqWnB6TGg9uIXf9gw x-ms-office365-filtering-correlation-id: 23200840-1037-4b5c-f0de-08d643fe3f9b x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:DM5PR12MB1354; x-ms-traffictypediagnostic: DM5PR12MB1354: 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)(5005006)(8121501046)(823302103)(3231382)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(201708071742011)(7699051)(76991095);SRVR:DM5PR12MB1354;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB1354; x-forefront-prvs: 0848C1A6AA x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(376002)(39860400002)(346002)(366004)(136003)(189003)(199004)(2906002)(54906003)(76176011)(5660300001)(3846002)(6116002)(1076002)(53936002)(478600001)(25786009)(36756003)(110136005)(7406005)(7416002)(14454004)(66066001)(4326008)(6486002)(2900100001)(68736007)(305945005)(7736002)(6512007)(2201001)(6506007)(575784001)(86362001)(26005)(102836004)(14444005)(99286004)(97736004)(486006)(2501003)(386003)(11346002)(256004)(81166006)(81156014)(6436002)(316002)(72206003)(8936002)(8676002)(52116002)(71190400001)(186003)(2616005)(476003)(446003)(106356001)(71200400001)(105586002)(41533002)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1354;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: BmFKAzh+aEMfeGW8ui3W+f6wvI8F6r1sWczhBaCVUFJcvkqP20RhW3Ys0qV8hcAg64xVWVFJFSclYqZlu4ujZPAXCAG/vPIaCHOfWeFtQdWolk3P8yrc9jlW4ifIa/7K1VqB1NctZOo9VmUhA4vnl3+6FyeCOtP3KIFtRtqhIndvSm5I7fQ29HS9ry/0K3P5T/67LYUdMbdXRvd4SUdy61I7CEXkrUpmcpg6ZC84/kaxEktEcwojMu29nmZ63r+Qelb2KJahj8jXX7KgNfd3GD+hCCg3rv3jZm8FIAkVO16JrY+yVayD52YCEICO06m/iO19u3BXBrPxC8Ndz+6v0I7ou6gj5s8Gk/lng3bicec= 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: 23200840-1037-4b5c-f0de-08d643fe3f9b X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Nov 2018 15:40:59.0874 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1354 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 44272b7107ad..3f1a135a4ae0 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 27937458c231..e8d21306d0f9 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 966ac0c20d67..f9c15fafd467 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 f27b8115ffa2..6308ba3905e5 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