From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756899AbcANWyL (ORCPT ); Thu, 14 Jan 2016 17:54:11 -0500 Received: from mail-bl2on0064.outbound.protection.outlook.com ([65.55.169.64]:1312 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754568AbcANWyI (ORCPT ); Thu, 14 Jan 2016 17:54:08 -0500 X-Greylist: delayed 3387 seconds by postgrey-1.27 at vger.kernel.org; Thu, 14 Jan 2016 17:54:08 EST Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=amd.com; alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0O0YSXY-07-1ZA-02 X-M-MSG: Subject: Re: [PATCH 5/5] x86/mcheck/AMD: Set MCAX Enable bit To: Borislav Petkov References: <1452809140-3328-1-git-send-email-Aravind.Gopalakrishnan@amd.com> <1452809140-3328-6-git-send-email-Aravind.Gopalakrishnan@amd.com> <20160114224606.GK19941@pd.tnic> CC: , , , , , , From: Aravind Gopalakrishnan Message-ID: <56982706.502@amd.com> Date: Thu, 14 Jan 2016 16:53:58 -0600 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <20160114224606.GK19941@pd.tnic> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.180.168.240] X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.221;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(24454002)(199003)(164054003)(189002)(479174004)(377454003)(586003)(110136002)(1096002)(65806001)(36756003)(6116002)(65956001)(106466001)(64126003)(3846002)(101416001)(50466002)(83506001)(87936001)(4001350100001)(92566002)(1220700001)(50986999)(77096005)(5004730100002)(5008740100001)(86362001)(2950100001)(23676002)(47776003)(76176999)(97736004)(189998001)(65816999)(2906002)(117636001)(230700001)(54356999)(105586002)(4326007);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR12MB0713;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0713;2:UKIlI1iD3gPKOZufp8ogYFifE31lstZ8mXScUxQcfWNuAzh2h5SfpCiwmpSALL4kOKSCgaM1Cc69IecggTl5lX7YqzbGbwDbwtSFzN1FZZhgrev6mRarInN8leQh/xPoHRVBJBorwS/87pBPjsxAxA==;3:ucZ1AlVC6xHeo+YwZM2YYFT+PfjOuqrlPBhDZBCTend2AvCgJHK8jWnaivjLS1jovWfOdzvyZwmoWI9xS/tcgNurr4Iz+KaNCWLiXxXOXTpVkZfDI6MVZ1DlH3N+gAu1Jugj0WCKx0IVEnSmfU3s5LcWu48QzJnzhnaiuH/q8xapvKNMtk2FZznKMxgvmgKfuPLCuzdv7EleSA+PcPtkuaK+88ARzaOn/a5Oc1EtXFc=;25:oP8cBWpqNGXdlvvVxHGXGb3J7IpjhtiYk/6b8lXbD/ceiFfxsfn2KAHsdPTKa22KdNWanno4XWn8mEZvOvyo4v9ggWpPVZqygM62FaKV5K/T3dGHxAHrHwT4YOv7uWCHQM3FFSsHk+m3TJy7Fi7j5XHxoGsIkoLTINSv5t8DR4VJUh+6ztl0QcGmv6hHV4K9boUsRg6gWl/1Hge/gfY2p7+7S/k9b8Rt1iEViWz06wPWeM2kTmebk8CjR3Adz7Dg X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0713; X-MS-Office365-Filtering-Correlation-Id: 1f93f2b7-2925-4c13-5149-08d31d3599fe X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0713;20:8TmUlVAMLeIcjngojKOpCaCHrKdhf5idoJvP76c072dpKlWA5eRWt0t6vH3Ro4AmwALL1vYdi1+itqAjVaRPFKYMQbcXvhWbIRhqtdD71K7SWAuT0goRVBir2LD+2TiQ5dodFoexTmhFzH+zdiYc2K2cjymu4yUbWqw/jw7xyIQ/+3vINHXW+G8dlKra0IyUfY4oAzwhCO/MVdTSc/jNFHAnA3no2GQPY0Kk1Jzu7TS3YjPfb/TzilbxgPlTqh3cufZars9B4bvHVEZqtwJaYGwBvRDVaOWKluXwTV+gIv2S94muYJsQQ78yT0BVR984qDSjRHjLTq6KygPrbehUJwgQ7Dqcx33pTRsH1Tbg8zN/AaHQyWUxPdHwVH8U0q0LDuV2+X079tJBL4UTEymzZNimv52L9CQ3kJy32bDfziOHForVbyI3/M1yc2Nebb06UI9DTYD6eJ8jD0LgL28UwDCQupO8Z8ayrndnYyyZl4NVoKcKbtnKoqQV6tX9eB7z;4:MTGubhqB55yRlUOVShbFDogJTCWv+YdgxZ9/uxx5E4AygQp4UeZPawe3K1JZjrgK0vtKM0srRwrxsSKP0MhA2tQzZJpm9OIL9enNvSCS2XqXe5+7Fq/aCRneuJKnxWjL0b6vMfP9rAnYHAsb9ENc7huN4kjChK44mt1GzG11PG0hPpzNuQ/vH5pg4g5lUKQhaaq9ABPPy6rzAppERsYe0AnZwc6g2T82L3lSUVtgmxpa43ZmxOgGJh0mePSF/uU1TrZuvEfmKG/M/x7XrKV+eaI0a0L886NKFnKOXzpSJ+9QWO5VSb1Lq7A9fKTVOSvnwNNejAmfcR/TWtrXllUgbnJYDOTpyDV5CVEJUcgWsVlsoPkOKnT8n3psZOjCQXTjLSP80qFoweNYQOd/19cd+2OKnLHntAVG3EJrr+dWUVRcumrH+jtOi3UKot5Bjvn/ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(13018025)(5005006)(13015025)(13017025)(10201501046)(3002001);SRVR:CY1PR12MB0713;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0713; X-Forefront-PRVS: 08213D42D3 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTFQUjEyTUIwNzEzOzIzOmcxODk0V1BCL3pMVUp3RmlxUC9PYld1ekZG?= =?utf-8?B?bkM3LzFhbXFHZWhZalNEWU8xTXlKcy9DaWNycnJiU0U1V1V1SlhnMWxTeEVq?= =?utf-8?B?cWt1dDVucEZQUjNOVjhNK1JVZDRreUxxNzQrQUZXQXowczZTZEpPRTBZbmdI?= =?utf-8?B?MVozc2t0QnUwTmV6cXNUYVlYN1JIVWV4TUZxcGpuSTA5Slg0TWRvMTBnQzk3?= =?utf-8?B?SDkxN3Myay9VUjJGQjZTS2tGQm9UeG9KbndmMnBLMnJubnVsYXdwSWIxdXpZ?= =?utf-8?B?cGF3SCtpb3laTVJKUS83RlVUSHpVcXFmR2RNUjRBdGRhN2swdHBLSm5CRnQ4?= =?utf-8?B?VUVXTDVSWVhlOTNmUGsrV2JZTjVxUURyNTJXT05vRHFRQ0JnZzl0NnAxWXY2?= =?utf-8?B?S3R6S3VLcjdTalVqMnAybTVqMWZaL0FPOXVsdjRGOEN3MjV1NVhzVHJ4RmFX?= =?utf-8?B?T3labmpEcDBENUEvV004K0l0V1JOOEo4SC9TTmdyNE5oZ3pxbW1UK2FrUU9n?= =?utf-8?B?RjV6Wm9KZUJpU0FNT0VUdWVmRHFadURYNEpKRUs0cGZ1UmR6amNmeU9nMVBa?= =?utf-8?B?bldsWTJaZW1XbGxmQS9xUS9SL2xoY2V6blVMajE0L0dsc1pKQkpxWXFNNTNF?= =?utf-8?B?ZWRIOWlMYUJzdm1JRVBNdUlmY2UvZFVSeFBpNkNWQW55MDhDZmtwZUxzbm5j?= =?utf-8?B?Q056YXVzcGRhdTFXMkxyektLanMwSGtLZC9ySWhFQnhSdGx5TzRnTTdBdG8x?= =?utf-8?B?TVlPbXUxdTcvNW02NWNiWDJsdmRDYkxKTmNiNngycVZsSmhzMStlbHBIcTcv?= =?utf-8?B?WlVDQzdITC9TZVAxeWJla01jajhicnJiNDZRc3FZNVNIVCtCM0lwQ21FM1Rs?= =?utf-8?B?bkt4MUkwaVQxRCtFU1pqYnF6Sk5rM3NaN1NZVG9RSGVEdmZsM3VxN0Z6d3FE?= =?utf-8?B?UCsvSURwTUNaUnRHQTM0L3JtWnYrNDdQM2ZkbkppSlMwVDU4TDZBRlBzVmZI?= =?utf-8?B?TWlCOUI3UlFoaDdYVGpUamwvbXR3OEpZeWs4MW9UMW5XQ1hkOTZrcGgweFBy?= =?utf-8?B?RzFnejdqMHd2RlFtbUdHWUYzV21XZXQvQ3VPRDFaY3pCeXMzQTY1OTJXc1dE?= =?utf-8?B?YTZ0MnZYeWJjMEZEdUFiakRFSWJmSGcwUjFuYXdZenJ2aDJ4dmkzR0NBNjVm?= =?utf-8?B?dldWWHdKZDFCQmFONlR2TUlCUW9mYUJhbTlScGcwcmdHYlFpY1JrQ2VnMmRx?= =?utf-8?B?VWh2eHlaclYwMU13cHhqSG5BaThqc29IdndjV0gxaG1GZUhyZVViOUhtWHJX?= =?utf-8?B?Mk1UblhSTmU3Vkw3bHNEUU5OOWdaU1EyVGc1N1hZbDRkditTaFl2SXNNcDVq?= =?utf-8?B?WDJaSE91eFdUSmdDVWVLM1crcWcrQTBwR0VDMUdmcmFwS2xHMTlBQmtNdHRX?= =?utf-8?B?Zys2ZDR4RjZWaUZnUkxFYlk4NXhmenJkd3VUZnBUWmNTcmgvdEFQNHBOcUVP?= =?utf-8?Q?yVPN/13SVfFRqER4Jz81yL4mlLMs0J8K4J6LaVWTNRyyDD?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0713;5:VNQjrbliFd71ofP6xxLMYBfIISKPZfAAFBC/VMhTGuED93DbHSOO/jwLAJTHXweJWow/fVB9YjqwOdn9PPtveq+5hnQ1yZjmD4GOYWzXSASL4jLuFmfBIgTo+2NYx7qkjQ78qM9Z20h8fPuFk+MBHA==;24:zmzsL+dxayPoTWogcDpTkjSUHp2y2uqJ5cpWy1qlCke6gH+w/7oa445dwDJ8VyBMrEutlJcq5wmi7JF8bWQaT+N47s2TVZqRiwPdsaHL5G8=;20:JzSpEcd7vru4PMqXO0L2hsbQeOHJaAUYZbRm+EUlhMfw5BA/MaVoulxso1G22U7J8wu4dNYUdegt1FJeuND0B1h4vck98RPiZm+W2t4jI5WsenQx78UGLExj0xLgt/meGhYzl2fuCQ/ElAMBsnWQQB6tFiyx6vsDXcb82wxWz9IzRqBCUqUeJFZcf/kLz16iT/ufSGGpqkewVQygcyak3JbFIH/XD60zZjdoQeds2+jVaM20JqYPl8a3rj0iz6ZH SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2016 22:54:01.0595 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.221];Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0713 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 1/14/2016 4:46 PM, Borislav Petkov wrote: > On Thu, Jan 14, 2016 at 04:05:40PM -0600, Aravind Gopalakrishnan wrote: >> >> +/* SMCA defined MSR register set for AMD64 */ >> +#define MSR_AMD64_SMCA_MC0_CTL 0xc0002000 >> +#define MSR_AMD64_SMCA_MC0_STATUS 0xc0002001 >> +#define MSR_AMD64_SMCA_MC0_ADDR 0xc0002002 >> +#define MSR_AMD64_SMCA_MC0_MISC0 0xc0002003 >> +#define MSR_AMD64_SMCA_MC0_CONFIG 0xc0002004 >> >> + >> +#define MSR_AMD64_SMCA_MCx_CTL(x) (MSR_AMD64_SMCA_MC0_CTL + 0x10*(x)) >> +#define MSR_AMD64_SMCA_MCx_STATUS(x) (MSR_AMD64_SMCA_MC0_STATUS + 0x10*(x)) >> +#define MSR_AMD64_SMCA_MCx_ADDR(x) (MSR_AMD64_SMCA_MC0_ADDR + 0x10*(x)) >> +#define MSR_AMD64_SMCA_MCx_MISC(x) (MSR_AMD64_SMCA_MC0_MISC0 + 0x10*(x)) >> +#define MSR_AMD64_SMCA_MCx_CONFIG(x) (MSR_AMD64_SMCA_MC0_CONFIG + 0x10*(x)) >> > Please add MSRs only with the respective patch that uses them. > > AFAICT, you need to add only MSR_AMD64_SMCA_MCx_CONFIG() here. Ok, Will fix this. >> >> /* SMCA settings */ >> #define SMCA_THR_LVT_OFF 0xF000 >> +#define SMCA_MCAX_EN_OFF 0x1 > SMCA *and* MCAX. > > SMCA_EN_OFF is not enough? Well McaX is name of the field in the MSR. I retained the "SMCA" prefix as these are all still part of the ScalableMCA changes. I would prefer if "MCAX" is retained as it is indicative of which bit we are touching. So how about just MCAX_EN_OFF ? >> >> >> + >> + smca_high = (smca_high & ~SMCA_MCAX_EN_OFF) | 0x1; > So this can simply be: > > smca_high |= SMCA_MCAX_EN_OFF; > > ? Yes. Will fix this. Thanks, -Aravind.