From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753110AbcB2WRe (ORCPT ); Mon, 29 Feb 2016 17:17:34 -0500 Received: from mail-bn1bon0089.outbound.protection.outlook.com ([157.56.111.89]:4032 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752071AbcB2WR3 (ORCPT ); Mon, 29 Feb 2016 17:17:29 -0500 Authentication-Results: alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=none action=none header.from=amd.com; From: Aravind Gopalakrishnan To: , , , , , , CC: , , , , , , , , Subject: [PATCH V2 1/5] x86/mce: Move MCx_CONFIG MSR definition Date: Mon, 29 Feb 2016 16:32:55 -0600 Message-ID: <1456785179-14378-2-git-send-email-Aravind.Gopalakrishnan@amd.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456785179-14378-1-git-send-email-Aravind.Gopalakrishnan@amd.com> References: <1456785179-14378-1-git-send-email-Aravind.Gopalakrishnan@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BLUPR11CA0023.namprd11.prod.outlook.com (10.141.240.33) To BY1PR12MB0424.namprd12.prod.outlook.com (25.162.147.13) X-MS-Office365-Filtering-Correlation-Id: 50326201-9f76-473b-5832-08d3415619fb X-Microsoft-Exchange-Diagnostics: 1;BY1PR12MB0424;2:MGcIzyg2SbscVUuMWdXuVqV9D3PyfpW35v6jQxf5OlKhKlChMNM495Lotl/buA9bG2C/8967pDcSawoywJneM8py2k/vxFw0OpG5Fmev4LBlpFDK69wnTnCuATP6g/bK0OLrIuJ9pxffkOH/W5idUnLkjO18Yt5ALjDBV6Z7eL/4JfrZ3hy/uB+IxPksmVjv;3:VGnNQvJ/2Gfjdo5wSLuctPsXrStfJ2hWgNTBEQ5RtiChtfe5FjrHvgGw6ncGCylLYpgDBjeweRTmB+syqrxpCmmUnHXFAc3yQCkqTtuevCAforuN0pTrnOsDM/k11wEA;25:pEsRS56fo99OxIz+CpHaB89sIeT9GSiwV2O6/fCN13Nd25OfJpj5RG+w5AeJLTdsoBmP+PvBnBuWiz7E/ER/b+4xYTyZSlt2O11lWiRSmLoTLgneDo3SrcZdy3+bap+VQRK/ejq/ge1L35SVOwY9LeO1T6vpFY/VhlIjTNGzTNwJiZytppawzqLZowYmQLx9gw+oDXgX2/ykl7N3iHHxE2VbH6yWO6CIMgXm8xBpC7mdRstLLg4XyUaT3eN9GYRktNjAZo+RsPJBfbtIlNTpxoMdvBQoe144txmtjQBWJ/pn2cjnnGoNw5eVPUml92Mzt4x/ElLo/df9Xth9y1XCQg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR12MB0424; X-Microsoft-Exchange-Diagnostics: 1;BY1PR12MB0424;20:1fl3HW7OOdX7WEHq2XPaYICBcy7W222MffpR5LoNs1m6SvuWa96sQJzOq2QT0vGmZtvYd2DNEKTLpwT1BJuk6fQbK6RwAtTo0d2CHBr6ewYh7SmMMV7CC4R4OdOUiH6MBqmfv4TkDP4njGncMf8789VNmkTddhfKPGiOrqq5A1Tf4BLAJbdfjhzTpulXdZzYOiIryaIOYJBtPFJhcwS2mmJfAh2q62b7wumD0QYB2AysXhe9yjy2rR1DRVIbPee42qU10NlKsUb7JUNwpn3876asMM951/I6Y0dXDXRQ4QP9W+QT1ba3kWrWvrrW39zPjjksp5Ft6ptp3aoF07iN+5BEob2ONMgLfENP5YkMjzDz50Te4pkqD6Y01BGRQm2z2H17KWXsaelnRakCt6qGl3WVb2EQDTQLAiy6ixNnEtX+l4PWd0RSk0PLtf2mKvP9fhVCqF6/bxhtBNOvxhAyIev/N6oWAKHre7DNP6qwbLKZjXYZB4KLU0DkbuypZo27;4:wmfR8XECBTb6DUbXfibUDl4XC8HrcZ/TZH5LjVTeV+l9f4ziNajMmHm0AyCRNs+cwkW14JSXRUd3SK5eHVAbcknzfYhY+Koip9IqHWMsGrrQi6TCTGNXXC2g4fY9AmkNWWrUpyQLF1LBHR++Icx0SrRyVFRdq8A5Yp1CqSqOOXqhbIPZce7gk5Hsjb7cq/KMvMQS6e9c54sH5VeUvX6UsSW1kNrY1WdF7T3hQxGr9f5ZI2zRsjRf7/F3heMdrKhWi2pih9Ul7qfRYcoZmuIY7R6X4wD3269bNmS9hQS0Em7H5OOIypd6SX0m6PhKsNKTfEkffQL7lBmIjeqe9xEcDpLiC48UxTAuEHz2f4jTF3XEJ0LDFpksRZv7cw/wC0GL X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001);SRVR:BY1PR12MB0424;BCL:0;PCL:0;RULEID:;SRVR:BY1PR12MB0424; X-Forefront-PRVS: 0867F4F1AA X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(209900001)(15395725005)(2201001)(2950100001)(77096005)(15975445007)(87976001)(53416004)(122386002)(4326007)(2906002)(5001960100003)(50466002)(40100003)(42186005)(50226001)(189998001)(5003940100001)(5008740100001)(19580405001)(19580395003)(36756003)(5001770100001)(86362001)(92566002)(66066001)(47776003)(50986999)(5004730100002)(76176999)(1096002)(586003)(3846002)(229853001)(48376002)(6116002)(81156008)(6606295002);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR12MB0424;H:arav-dinar.amd.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY1PR12MB0424;23:V47jwRzgLVa7Kr576tGqX2DD6aJePfFxmh9xijnkz?= =?us-ascii?Q?OLZlu/ftMaYBmPB5aXaxtcr7P6oQk/pa3R1OO5hm0ntf25ISj+oMwquQgtw7?= =?us-ascii?Q?yWUAURNf8T2K/xbnI9YwQiEDXzlUbeSD/VLmoaaS3QTNPesSwBCGRT//oUdv?= =?us-ascii?Q?fOC4EODo0eNUra0uztYWlIc2JE/Cn1BFZYCXNnblHRtgz79Yvjcl7JHrryrp?= =?us-ascii?Q?q4brOHxLwn45N9zw04MdQGYN74l1vg6GhnSIZ90lNgj7BMUavTJ2VPp4wX+k?= =?us-ascii?Q?r1IKem4p4b83mJc4yQEpqTl7QlHysNpajjxyj4FSGfS12iUd2joIr6DJU6RR?= =?us-ascii?Q?ClU5KsqTwik6U6epxV2mnCH8bfNkN23A+3zb0NRdZyx4nPVTtl2oR0uXChYO?= =?us-ascii?Q?aFpBU0ca6jHhvx2vmypKFpr0/BN4ecgoTrzbWcsYeSEoF+DSHnTLmPC7OmIS?= =?us-ascii?Q?NFUj1ezvKwdodI2sZuVjhg1+cI9OWr/2t5aImQWt+KZ6nVqVC96ek8RR2LET?= =?us-ascii?Q?Jdg4mYJPl+Oy8SW1n3g7o/deAT+ak/u6vgbpgY2kgjXcLKxdrV/CDhAQ4Ia0?= =?us-ascii?Q?fw3o+IY7FxHmrutvzp1sLbZcT98XJj+1pUX8BxPfTQNuvVh7X+EqMHxvzm1v?= =?us-ascii?Q?HP0hPeulI7sKWcOigw0YXSC7NLyofHEwadRfUNVQ37VW/BUSQg5Dyvx+brEO?= =?us-ascii?Q?yYsPts9vJZ9atId+Mb8UhPKaviseeqMjqLhszGUgisA1vR7741kLTQjIXtU3?= =?us-ascii?Q?W+wzSvbikvbZG+nS20cPG8o4cmybGGHC5ED6FsIEB45KaJkqVGspzjCWRpCg?= =?us-ascii?Q?tsyvEK+1Qgi2+Uxy34oJ3GoGiBFp1trfMgqqNeHRD3vlISsCDSikWFN2viG7?= =?us-ascii?Q?V75+3q9hh2aD6pcq+Pg1an/9JUMF068nGUjbtR3Q3JZ/muiSIYaLXEfXKl2t?= =?us-ascii?Q?2FO4IJzpBZNWqwQX9iQfUFg9fdtyLyZFihJ6RlKE3xxLfv3LhorTZPPVQ2ok?= =?us-ascii?Q?rANSGYwWdMIUhq6lB4XMkGBiNm910FYZeixMMpTgCY9ompM35PXYqAPeLoU/?= =?us-ascii?Q?IDzVA83TyXcmeVqKfrmMySagBz5AGUFooD/MZ5wfVGxh2Oh4w=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY1PR12MB0424;5:+6LY/lo4ZBc3fA+d3fdFaaSyPchkmN1egyWZQC5iYct7hMkhyhWOiREIUm8y5fZJ8L/nu1s5NIxuwqr1qIHfICKhyyW24wHpXU/L7mmMhbNenVNoroF+QulFr6hDsJxrAUhf25cCUUs5lxPmEYGS2g==;24:iQHVkSONLmrrkbgGg4o+cb+iHxhagqaFivobcRUGVI/JuqvRuYhUm0LHcZOxf5n+KGwY3GhaTDGqpWiPhuGj0KirsDTlDT1GnYvif3vQVxE=;20:gE35OZdHuR88Ch2LCML9vOKZoypNdoPaf3ma9YbwEIzeJ8qVpe+SyGIIVr1tGPiKJjtVkRvgdIeTA3CGTUl7MzMfcpDCQhLkarMNEZDO0yHeVcfNdDPo4yOF5JEcGSRDrhZilGUTavF2gKQIDm8qVREwHPPrg4u+dTYPAIYvV9QtOliYwssP7+rmRkB0l/VnEAmVzlYs7QBJsRu3hxivSg7v4m39/CdNN4D1eYhK07I4QyeIW+hF8H20x10cM+Ii X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Feb 2016 22:17:22.6860 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR12MB0424 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since this is contained to only MCE code, move the MSR definiton there instead of adding to msr-index Per discussion here: http://marc.info/?l=linux-kernel&m=145633699026474&w=2 Signed-off-by: Aravind Gopalakrishnan --- arch/x86/include/asm/mce.h | 4 ++++ arch/x86/include/asm/msr-index.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 18d2ba9..e8b09b3 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -91,6 +91,10 @@ #define MCE_LOG_LEN 32 #define MCE_LOG_SIGNATURE "MACHINECHECK" +/* 'SMCA': AMD64 Scalable MCA */ +#define MSR_AMD64_SMCA_MC0_CONFIG 0xc0002004 +#define MSR_AMD64_SMCA_MCx_CONFIG(x) (MSR_AMD64_SMCA_MC0_CONFIG + 0x10*(x)) + /* * This structure contains all data related to the MCE log. Also * carries a signature to make it easier to find from external diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 75a5bb6..984ab75 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -269,10 +269,6 @@ #define MSR_IA32_MC0_CTL2 0x00000280 #define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) -/* 'SMCA': AMD64 Scalable MCA */ -#define MSR_AMD64_SMCA_MC0_CONFIG 0xc0002004 -#define MSR_AMD64_SMCA_MCx_CONFIG(x) (MSR_AMD64_SMCA_MC0_CONFIG + 0x10*(x)) - #define MSR_P6_PERFCTR0 0x000000c1 #define MSR_P6_PERFCTR1 0x000000c2 #define MSR_P6_EVNTSEL0 0x00000186 -- 2.7.0