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,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 7A9CFC7113E for ; Mon, 15 Oct 2018 20:55:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1856E208B3 for ; Mon, 15 Oct 2018 20:55:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="e1VuVdTL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1856E208B3 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 S1726954AbeJPEmf (ORCPT ); Tue, 16 Oct 2018 00:42:35 -0400 Received: from mail-sn1nam01on0078.outbound.protection.outlook.com ([104.47.32.78]:26912 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726926AbeJPEmf (ORCPT ); Tue, 16 Oct 2018 00:42:35 -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=e1VuVdTLjeURE/r6EmR+pEBjrhcRL+eIpvFE0s3DiebC1BdX1n1XXyF3si0oYqbvAXTWMcElnObccYC8FfIQe5fMmKLseGbEs6PkCejodRH1eaKZHmhLzO3u8uVSfLYOxCgG0C00wSNLvDjNT7F/O6a19vSsxrOw39hsdfLlSDQ= Received: from DM5PR12MB2471.namprd12.prod.outlook.com (52.132.141.138) by DM5PR12MB2534.namprd12.prod.outlook.com (52.132.141.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.24; Mon, 15 Oct 2018 20:55:32 +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.027; Mon, 15 Oct 2018 20:55:32 +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" , "tony.luck@intel.com" , "corbet@lwn.net" 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" , "mchehab+samsung@kernel.org" , "davem@davemloft.net" , "akpm@linux-foundation.org" , "arnd@arndb.de" Subject: [PATCH v4 01/13] arch/x86: Start renaming the rdt files to more generic names Thread-Topic: [PATCH v4 01/13] arch/x86: Start renaming the rdt files to more generic names Thread-Index: AQHUZMlphW2f/ne5NkCDga58IvcO1Q== Date: Mon, 15 Oct 2018 20:55:32 +0000 Message-ID: <20181015205514.25387-2-babu.moger@amd.com> References: <20181015205514.25387-1-babu.moger@amd.com> In-Reply-To: <20181015205514.25387-1-babu.moger@amd.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: SN6PR02CA0017.namprd02.prod.outlook.com (2603:10b6:805:a2::30) To DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [165.204.78.1] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR12MB2534;20:1D37i2oXP3y1vQ3lAzAHUjK5cYd+M8fIOKR/8YlQAL80eVjKb1o7b12Cm1V0aMnuRf9hA66H33YEGceeqgaHuoVrLWJHV3FxofaAJZFa3oqV31pCVoZc/cS7gnKUxTkywNsZz8iPB+fn+MpYf2i7T1Xx5Davq0HxnVIUTeQR7MQG2qt6Nzscvk32Sul2ODmhQcrMCyP++lVytGLc1IGpbq/lpMDrjZuCR8q3zrzxCy8HE4whtNHCaCfCNN57m/oJ x-ms-office365-filtering-correlation-id: fd0a809e-2301-4e1f-90ab-08d632e08b97 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:DM5PR12MB2534; x-ms-traffictypediagnostic: DM5PR12MB2534: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; 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)(93006095)(93001095)(10201501046)(3002001)(3231355)(944501410)(52105095)(6055026)(149066)(150057)(6041310)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(201708071742011)(7699051)(76991067);SRVR:DM5PR12MB2534;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB2534; x-forefront-prvs: 0826B2F01B x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(396003)(346002)(39860400002)(376002)(136003)(199004)(189003)(478600001)(6116002)(486006)(14444005)(256004)(25786009)(476003)(81166006)(81156014)(316002)(14454004)(8676002)(8936002)(71190400001)(71200400001)(2201001)(3846002)(575784001)(86362001)(97736004)(52116002)(7416002)(76176011)(7406005)(386003)(6436002)(6506007)(6486002)(68736007)(5250100002)(66066001)(2900100001)(110136005)(186003)(54906003)(26005)(36756003)(305945005)(6512007)(446003)(5660300001)(4326008)(11346002)(1076002)(72206003)(105586002)(2616005)(99286004)(102836004)(106356001)(7736002)(2501003)(2906002)(53936002)(41533002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB2534;H:DM5PR12MB2471.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 14XkWRMFPIUPiSuo2Ucg1rqvU/h54eqC6Udi1CcbQLitsm7N7XJK06/7WiQOdaB3VplrOlaEbzECXYR0UG3U+CPy+KnkJYl5wL4D0rM2CD9X+FAx2aUQAmpi2VZtl/aTLRZnw+FfHKJvC5LFRlgwIREI56slE+5we5E9h/FwGerf9Rm1+w1259gKlQRi7Xl4i1Pgp/c5aSldn1vWiRIk9jMeDLpcn5l0ltTyhEVbSTkSBlV+PDwVgiyyTfrO7VrXk/CaBzYihCJkEqId3wAGRl+8HGhm2lneqpNZmqD+vX6mx7B0X1PxMxVlRrc+L/ya/6LkrKkO86/oX+Cl/l2BAW86bVuSjsO7X898ciO7Ngc= 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: fd0a809e-2301-4e1f-90ab-08d632e08b97 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Oct 2018 20:55:32.0306 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2534 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