From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751385AbdK3Wqv (ORCPT ); Thu, 30 Nov 2017 17:46:51 -0500 Received: from mail-by2nam01on0084.outbound.protection.outlook.com ([104.47.34.84]:39008 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750994AbdK3Wqt (ORCPT ); Thu, 30 Nov 2017 17:46:49 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; From: Tom Lendacky Subject: [PATCH] x86/microcode/AMD: Add support for fam17h microcode loading To: x86@kernel.org Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , linux-kernel@vger.kernel.org, "H. Peter Anvin" Date: Thu, 30 Nov 2017 16:46:40 -0600 Message-ID: <20171130224640.15391.40247.stgit@tlendack-t1.amdoffice.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR18CA0028.namprd18.prod.outlook.com (10.175.9.142) To BN6PR12MB1140.namprd12.prod.outlook.com (10.168.226.142) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2ad60024-56f0-4ac2-473b-08d538443c80 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(48565401081)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603286);SRVR:BN6PR12MB1140; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1140;3:9oM2Uvi49pepwQP+uQ6Ak4+JnW6XeC8ek8hA/STxGrs9018e5ZbxF/ZYQ3IZXLIIcLE30QfpsBbjIiTOY+kgSQMgpWC+jYN+Ll40ii69lOieQupjv0Ny7gEtrM95do0IXm0uNLSHnRQx4TWyeP98FdC9TziTPGy8bjudT3IDDt6Dj05phRdeF6UFoZv1V9BsU+yNEHWWqwtXMb5JAeHEhQEadfxjzeYl0uh34C+IEVRkKOxLm2qAnegeI9bU4u1k;25:yQedQsIm34vdN0wJkNak5jQNT3P3PQYQPlkZl52eTOsCWK+1OP8ydTTu25t7R2EtDdotucGEdjr2N34T3beNJhKYCDgRXK6hujjXAdNIHe9fjSk8R2VI2pLLQeq9Mx6IIXi/oZGGQg++HZNBO5IDcwNS+zQHbwOV2uft85aqI64FuvocoRltdFEk831h7nB67oJzxKqNiQi5E56WBM2iuZC6TmOPkUk6K2Zc/fSEtqBUNocJ55bpzkJysCJCXIxOYufJVXcoSHr7j2hvsRZryRXOTEyGheIuuyOjJ6or6eRQarwBrFdQp4XshYJkFfzUX8pbaxK0/YjhiR41+mrUQg==;31:VEL56ISVKbVxVIzISaLzm6M2Zg9Ka9j1xn84hn6BQPGCc13VW52gvZ/tiTZHLgc2G/KK2N3lamsBcJEtXIkz+fQCVuEj+CdkLrACw7zqh3LgRUkb1E4SuOR+3K2qz4zvZ8ojFLGFidlfz2H1mKJHM0jPjsH48Ydup0dgenkCAj9/rsRUMAcvAjwwLpa786O9O+9V98sBUWNI/np6qY8cnAaHHgycIVG3PHs76zxRbME= X-MS-TrafficTypeDiagnostic: BN6PR12MB1140: X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1140;20:S6y480DjPKZiDcI2P/+OOC5r8kJxAr5PDtCGMkIN+DSKsh1gm/c3AJdFy6AglV/o56kc9g9EhOAK1VdOyt25f3sKoUknEZzZeckZ6Myrpsbufrd1HPmyFRW2+Op9TV//orMfMyW6IyU6aUfoX2+DWwKi9Gt442QSsOibxI8rKi3m6PPRx5h5KcvpNidfeV5dL/vwbJBkK7G4SkTjoM5z/MYYKHzsrIJO3EY9qfaQSkOyWWZO+5EMhHK5lKAzp7+QX3RRLlyd0VbFa4Mh/1BECcf8hPgkSkPYKhOkEpZ9BlBIMjyg9Jt6Gv8pq0Xb+JRMoCM/6fLJvi2Hg37Cdb2hFzL/q0hlovz3mhLQ1Xe9IZ1HCU5hU6CssTFfzZ7tXYd0aTRbMnG1wjXu2B2tFgl16evHe6Y5IBsoGHLxtu/uWyr28eRFpiiL1zsKLstxnah12u/8+bRM5kx69pYb5u6Wn2725YTxuFsSh5Z7ERYgKQYB8qk8S8tYBeIRNLhPcacM;4:p8EatuY2g5KQ2uCpesCGShGlo3CxpPwOzLNwTy9/e41QLjVxpFUVgbj/yPajucRkFV+R/IlQnB5Xf3DnLb5GZtRu3m9D2CFENOGCQPzQfoTqDeIqkc16AZWQWhQ1u+75fI1F7utPUJ9llrTF8Zqz0oYPwJ72XgNhEMQA7jKSTSuQFo9Zj26nyxgqwJY54Qu6aLWXd1FnaqOVqdrb/SdTMbpnXJCFu86GzDtUomleCIMNCVXdghM+a9Wo2+ej50YAYNSo8UbiGgbvl+7MGoDG9w4Bf9fq5EcSy41faMF8vfysdZmIlk9c1oHFCEc/ADKqjDkKd0VCI59K0yyO7CCBLg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(2401047)(5005006)(8121501046)(10201501046)(3002001)(3231022)(93006095)(93001095)(6055026)(6041248)(20161123562025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(20161123555025)(6072148)(201708071742011);SRVR:BN6PR12MB1140;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:BN6PR12MB1140; X-Forefront-PRVS: 05079D8470 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(366004)(376002)(346002)(39860400002)(199003)(189002)(2351001)(6666003)(2906002)(7696005)(6116002)(47776003)(68736007)(6506006)(106356001)(3846002)(53936002)(69596002)(54906003)(1076002)(6916009)(23676004)(52116002)(55016002)(2361001)(9686003)(54356011)(105586002)(16526018)(53416004)(230700001)(103116003)(66066001)(97746001)(25786009)(316002)(7736002)(58126008)(81156014)(8676002)(81166006)(2486003)(101416001)(189998001)(33646002)(97736004)(50466002)(8936002)(86362001)(83506002)(305945005)(72206003)(5660300001)(4326008)(478600001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR12MB1140;H:tlendack-t1.amdoffice.net;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMTQwOzIzOlBWb2pZeTdDWkkyc2N2dEVOdi81NFU4YWVB?= =?utf-8?B?MlQySi9zSEpkaklZS3p2N1l2SXlWYXFlMCtvVHZZOUhqVmkwTDV6ajFRMTdW?= =?utf-8?B?U3pWdVVDWFA0YzE0MXVrQmZjbTJhQzlkY1FWOFZaRGZSbjZLcStZWkZPcitG?= =?utf-8?B?akIvRmZxcU14OEQ1M3lkeGkyMklmUmVsWFppb3Avd2FsTEN1TjNOVW9hRlI1?= =?utf-8?B?M2dDR05nTWxBRWVvcjNSR1p1TmZjeTJ0MU5neWhBMmxsV1puSTJYbVltdlgy?= =?utf-8?B?dHcrcDRRdC9ubTNJdGFaNmxYbzIxd08xMk5sbldDaFZnaU9CcUhPcDhJMmhW?= =?utf-8?B?U0Z0NktGSXJFK0dTcEVWZHl2a04vTzdFOU5ZUjRpKzJ1Wi9KTWJxSDNZRTZs?= =?utf-8?B?VUlrMG53aDZnVTdzWG9sTDQxS0VxVG1BcXo4eDF1U3Z4eHZoSkJaWjJxbk9W?= =?utf-8?B?WWpRNm5ZMnFna2RnQ3BpaG1HVVNRUnd5SjE3QmRJNldodkhLRWpqb2xvRVlY?= =?utf-8?B?dWdON3U0bmo1WUROWDd5MW1xWWpTU1hqQmFvQlJ0dXp0ZUpsejA2cWVpZ2k0?= =?utf-8?B?azUyY2F1V1RWZHUrY0U4bkI4VzdBZFdKUUJud05OSm54Z0VrY1RpaTJkd2Rn?= =?utf-8?B?TjVYNkJuWGdzUjNrZGRMbkgzWnRvTVRUTU9aYk40dDNZM2VPQWg1UGhicWhY?= =?utf-8?B?KzFpcDNZK0ZRditBb3pjVWwrNjZFWWUrKzI4Ym0xS2FEWXZ3d0RXSzZBS2lN?= =?utf-8?B?UkE0OCtDYXA5WDJjMU1KalRNbnljUTU1MXdUUWVvUC9wQWczV1hpcUttcUds?= =?utf-8?B?enBMZjFFYTArMXNocTV0OUVkMGRlemxZTDhQc0pQeXN4eFZ1aFhqczhDSERB?= =?utf-8?B?VTVRM3djRmNNNjVGWE9TdXZ6U3JSNWFrZlZqODlUWUxiTnBnL3J5eFFmY3F6?= =?utf-8?B?ZXlMcG5lTWF1anRndDlLZEFLaG9iRzUvcVZPZENWUURwNWsxQUoyRFYxQ2lt?= =?utf-8?B?YlI5WEtPZDQ5aXhIcjVyTkQwcXdCV1RhbWtNb3hIQXN1SFUxdzFiRlZiU3NU?= =?utf-8?B?WUR5NGV6TEVTVkJPcVlJUDRSSFF0T3lxKzJoRzJHRFQweWFqeVpEdUJEYWJK?= =?utf-8?B?TGg1dnhyMExlRmYwSHg0aUpHZGUrT3hlRGNMQTEzVTFaTStHaUVCbHAzT3Rz?= =?utf-8?B?REx2dUM1ckNYNGppUExPeGJGdlpLcXNKVUpNdEZNWndGTGVGWTc0S1ErQTZR?= =?utf-8?B?cVN4VFUyNlRpWm9IdVJSUWhXcWNqZTJxMTFObkpXNzgybk95WDZPYWhSY1dj?= =?utf-8?B?VjJ6MUtjYkJNMjlFekhUdGJzRUhZbWlFTkl2dWordGNKVmdyblk2TitnN3c3?= =?utf-8?B?NXdEWEIyeU9kclk1WUd0Y2VpOTJFS1ZDSEM2SWtZdzlmSW5XUXR0WUsyRnhC?= =?utf-8?B?S0MwWGVZSWF2WmxrOHhGdmtuR2UwaFZjd0ZnaU9NL3pieWE4UTdIa1JNKzRP?= =?utf-8?B?UTBqNFI1dWIxN0txWmdPU1YrdHNoWGVaQ2NpVUxTKzJORTJHZ0piamdtV1hR?= =?utf-8?B?TDBzZHZ4WS90bjJpeDNYSXNWSkIxSjBQN3ZJMHFjbXEzZTQyRnp5aEVVTmJ2?= =?utf-8?B?YUZWYkZDaExtT2N6dXNNWUs1dVVSRE5IVWl5Q2ZhLzFVYXZPRXR0VjVEaUVJ?= =?utf-8?Q?mKSDZCRbK2jIf3ayr/Yj4+pz22Vx63Daw61Grm/?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1140;6:iRaHR9DzALNqe5iCKyUZuuPosVoUzpuoxj7Gwaj7BRfztcTMz3EXG9w6Ve3mzu1YsbziOwHSz3aHSObg1Fc0Hm1ye9GRq6tsO9Duv/N3K2LFW6jhbwNQ6sen6AvuU1pnDTnKQZcGXf3H+gIkXVP9ztunnOQFR+5Cl1T1a4EaxpjZLDwTIkcSxJmJ81B3QeCmZzresF4C7RCaga7TZRS1b0KnN1a6Vq3FJ+mq0SenlwNvb9WiMW0FjPSYJJvrOn+Pp8kysiOHmJSm7pOEFIsdACYIgvwrezmKxEvezYoBz2dMOHtwVofMGrroIxipsEx0zYGuo0W4ZnS/Ddd/cHb7LdZx2qIKQ1gROsFw/lcLKMg=;5:2Ha0NOOZVokfpzMLiQSQZAOl0Ht9F0Tr9L8tFVa4n4ueRylvvVUC+iHqJBIms01tr6cBobiv+glS0o9OfLU3R0q3IwEmtXGD+lg+vtgSdtCCW448xQdD7aDH4L4Fdkfd3NCwCfgSf7sGos0hRP12jUuNH/vFMm2A/Rf/8EnfiPU=;24:KTvcL6kwfHWHwUUupXJsq2zOC33rrvz6KHlyP3PEL0cMPmbiQWfRwqP1x53gHKuKTm227GScSMgAHZZ9cdu27BbnhJ3LklPNnYrIv5TuEhs=;7:9cp8rFl/iV+kfAMbdkO5DRvlQJcBESUgmcuU7vDC4ZvSxnZG3BwloEJO/vbQDdi8CfAtSBScy1Okvabs79mR5eY+4WyVOAKEqDcBUZ27blYhxYGcL3GL72vifq/hGoc4pQ8Ghd7bxLT16s/S7cnt1WVTb3qBMpyontUMy8SLo2mz9ngOAoc2asYaMiTtMP4Rt6EbsOO1HTTMqrq5qFmT3/QVIWBIdejmIwawHgV7aXcQhW2m3w8vkdKc5spgEZpo SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1140;20:3fE6CeH2BK5lANop2+pWICw1Kv+k4QnTUHzmXlPOpLCEdn4rqW7w0A8GCS+E2h6Ox8OFh4n0IDcTNOZ66o3CjTgWQHWDnydQafx3k2Kt2jbfmwjp3vKEr7HOQOGsEwJbFThsmX4m/hg5S1u54y8twduSRq3rLcqY/dFCzSbXGGxezpQl9ycAE5d8IzPDPUOTOMRVvZtYD7mVHmBMQyrvJAN7oW+bs8wy1a9omlXG2u2Ma0nqeS/JIMbMkf2EnxLa X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2017 22:46:45.5202 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ad60024-56f0-4ac2-473b-08d538443c80 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1140 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The size for the Microcode Patch Block (MPB) for an AMD family 17h processor is 3200 bytes. Add a #define for fam17h so that it does not default to 2048 bytes and fail a microcode load/update. Cc: # 4.1.x Signed-off-by: Tom Lendacky --- arch/x86/kernel/cpu/microcode/amd.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index c6daec4..330b846 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -470,6 +470,7 @@ static unsigned int verify_patch_size(u8 family, u32 patch_size, #define F14H_MPB_MAX_SIZE 1824 #define F15H_MPB_MAX_SIZE 4096 #define F16H_MPB_MAX_SIZE 3458 +#define F17H_MPB_MAX_SIZE 3200 switch (family) { case 0x14: @@ -481,6 +482,9 @@ static unsigned int verify_patch_size(u8 family, u32 patch_size, case 0x16: max_size = F16H_MPB_MAX_SIZE; break; + case 0x17: + max_size = F17H_MPB_MAX_SIZE; + break; default: max_size = F1XH_MPB_MAX_SIZE; break;