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 C85ABECDE43 for ; Thu, 18 Oct 2018 22:52:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F52A21486 for ; Thu, 18 Oct 2018 22:52:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="P54tTpj9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F52A21486 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 S1727631AbeJSGz2 (ORCPT ); Fri, 19 Oct 2018 02:55:28 -0400 Received: from mail-by2nam01on0051.outbound.protection.outlook.com ([104.47.34.51]:17945 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726733AbeJSGz1 (ORCPT ); Fri, 19 Oct 2018 02:55:27 -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=xztFcYOhrHAzOJlvbfvFYwj5ESDnOA5FGHAhriei8bc=; b=P54tTpj9oWMd24V2opqVH3u1P3TZnnK33Fbvc+2UKz/6L/pn0zQ26uVWpbt0e7oZqb49qxD5Z027rhgeyYuWwxAKa/MGkhBoUHjKkgYXQca9UH8CBazONW100SznwiPYPi6af+rHgnOmfhFSMMevhPjDJKBJxtBMmL9V4CqwoJA= Received: from DM5PR12MB2471.namprd12.prod.outlook.com (52.132.141.138) by DM5PR12MB1818.namprd12.prod.outlook.com (10.175.91.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.25; Thu, 18 Oct 2018 22:52:11 +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.1250.028; Thu, 18 Oct 2018 22:52:11 +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" , "linux-kernel@vger.kernel.org" , "linux-doc@vger.kernel.org" Subject: [PATCH v5 04/13] arch/x86: Bring all the macros to resctrl.h Thread-Topic: [PATCH v5 04/13] arch/x86: Bring all the macros to resctrl.h Thread-Index: AQHUZzU08KbE2SDfZk6/Pk8y99+QwA== Date: Thu, 18 Oct 2018 22:52:11 +0000 Message-ID: <20181018225124.23043-5-babu.moger@amd.com> References: <20181018225124.23043-1-babu.moger@amd.com> In-Reply-To: <20181018225124.23043-1-babu.moger@amd.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: SN4PR0201CA0044.namprd02.prod.outlook.com (2603:10b6:803:2e::30) 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;DM5PR12MB1818;20:nmqb/gbLMXzpfNcwSAitF+ux6Pkoe/C9fjnrRcfvzifEXtIwNe9Giwwa4yr6n+ss1BfcARxSbRoDwU4G8zp+vFgkpSikMADl5QjQ4QJTWPhZTJEUckH3BDCO5SlgoLmqDY2Jbis4flyV8TJ2iGhs9EiZwRwnNKMLKGjratPnJH9wAXzIXO1gemANmDCMgEnn3Om8uzzw4dRZznyRMVd4XMDeK96l/YdbdBYyJXNPoaB5yBweP/AeoFJIfr269vWG x-ms-office365-filtering-correlation-id: fab3d0bf-bb2b-4c10-7224-08d6354c5693 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:DM5PR12MB1818; x-ms-traffictypediagnostic: DM5PR12MB1818: 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)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699051)(76991095);SRVR:DM5PR12MB1818;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB1818; x-forefront-prvs: 08296C9B35 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(396003)(39860400002)(136003)(346002)(376002)(199004)(189003)(110136005)(478600001)(2201001)(8936002)(5660300001)(7406005)(14454004)(7416002)(1076002)(6486002)(6512007)(5250100002)(6436002)(68736007)(72206003)(54906003)(66066001)(106356001)(3846002)(186003)(26005)(86362001)(2616005)(2906002)(476003)(99286004)(81166006)(102836004)(81156014)(6116002)(53936002)(486006)(52116002)(446003)(36756003)(76176011)(386003)(316002)(2501003)(7736002)(11346002)(6506007)(8676002)(2900100001)(25786009)(575784001)(305945005)(71200400001)(71190400001)(105586002)(14444005)(256004)(97736004)(4326008)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1818;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: DyExX9ith5PKaXqUve4tMHkQXMamY23Pr5sU2Trb1CbdIYuZx9j5fwpaffA+oXR2pJiqGtq43Xu6iQFTkmhfRzhPBIC4riyK7LngZrTlwAqsu5J63I3SYefQpr1x1r5AExpZj8KjSlglOwFEdAkmIbo+SE+novRQbq3S4zEx8BR5SxhKd5FT47o4f8mBYxA55o6aWsABdbG6AN/1raoM1Hrlyma4KzKM42WHR0mQVMECCgwlWVXUZRAFrF0nTXih9vzRVteFWfhg2AX225sC9XlGWszKgsYLC2kF5yA+cu9JErkQ9U9HHmafiozonj8KRs0/exrQNS3arBRXAQPrz3AXjQCXZ/kF/EJw+SHU8g4= 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: fab3d0bf-bb2b-4c10-7224-08d6354c5693 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Oct 2018 22:52:11.0907 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1818 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Bring all the macros to resctrl.h and rename for consistency. Signed-off-by: Babu Moger --- arch/x86/kernel/cpu/resctrl.c | 3 --- arch/x86/kernel/cpu/resctrl.h | 5 +++++ arch/x86/kernel/cpu/resctrl_monitor.c | 7 ++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl.c b/arch/x86/kernel/cpu/resctrl.c index 6c1199f7f28e..befc4eee0f07 100644 --- a/arch/x86/kernel/cpu/resctrl.c +++ b/arch/x86/kernel/cpu/resctrl.c @@ -33,9 +33,6 @@ #include #include "resctrl.h" =20 -#define MBA_IS_LINEAR 0x4 -#define MBA_MAX_MBPS U32_MAX - /* Mutex to protect rdtgroup access. */ DEFINE_MUTEX(rdtgroup_mutex); =20 diff --git a/arch/x86/kernel/cpu/resctrl.h b/arch/x86/kernel/cpu/resctrl.h index abf5c7e4c625..e5f7bf6a8d09 100644 --- a/arch/x86/kernel/cpu/resctrl.h +++ b/arch/x86/kernel/cpu/resctrl.h @@ -12,6 +12,9 @@ #define IA32_L2_CBM_BASE 0xd10 #define IA32_MBA_THRTL_BASE 0xd50 =20 +#define IA32_QM_CTR 0x0c8e +#define IA32_QM_EVTSEL 0x0c8d + #define L3_QOS_CDP_ENABLE 0x01ULL =20 #define L2_QOS_CDP_ENABLE 0x01ULL @@ -29,6 +32,8 @@ #define MBM_CNTR_WIDTH 24 #define MBM_OVERFLOW_INTERVAL 1000 #define MAX_MBA_BW 100u +#define MBA_IS_LINEAR 0x4 +#define MBA_MAX_MBPS U32_MAX =20 #define RMID_VAL_ERROR BIT_ULL(63) #define RMID_VAL_UNAVAIL BIT_ULL(62) diff --git a/arch/x86/kernel/cpu/resctrl_monitor.c b/arch/x86/kernel/cpu/re= sctrl_monitor.c index 68dbdbbf47df..ad0107bc16a0 100644 --- a/arch/x86/kernel/cpu/resctrl_monitor.c +++ b/arch/x86/kernel/cpu/resctrl_monitor.c @@ -28,9 +28,6 @@ #include #include "resctrl.h" =20 -#define MSR_IA32_QM_CTR 0x0c8e -#define MSR_IA32_QM_EVTSEL 0x0c8d - struct rmid_entry { u32 rmid; int busy; @@ -97,8 +94,8 @@ static u64 __rmid_read(u32 rmid, u32 eventid) * IA32_QM_CTR.Error (bit 63) and IA32_QM_CTR.Unavailable (bit 62) * are error bits. */ - wrmsr(MSR_IA32_QM_EVTSEL, eventid, rmid); - rdmsrl(MSR_IA32_QM_CTR, val); + wrmsr(IA32_QM_EVTSEL, eventid, rmid); + rdmsrl(IA32_QM_CTR, val); =20 return val; } --=20 2.17.1