From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753717AbcDZW6S (ORCPT ); Tue, 26 Apr 2016 18:58:18 -0400 Received: from mail-bl2on0071.outbound.protection.outlook.com ([65.55.169.71]:12082 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753632AbcDZW6M (ORCPT ); Tue, 26 Apr 2016 18:58:12 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=amd.com; From: Tom Lendacky Subject: [RFC PATCH v1 12/18] x86: Access device tree in the clear To: , , , , , , , , CC: Radim =?utf-8?b?S3LEjW3DocWZ?= , Arnd Bergmann , Jonathan Corbet , Matt Fleming , Joerg Roedel , "Konrad Rzeszutek Wilk" , Paolo Bonzini , "Ingo Molnar" , Borislav Petkov , "H. Peter Anvin" , Andrey Ryabinin , "Alexander Potapenko" , Thomas Gleixner , "Dmitry Vyukov" Date: Tue, 26 Apr 2016 17:58:00 -0500 Message-ID: <20160426225800.13567.99120.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20160426225553.13567.19459.stgit@tlendack-t1.amdoffice.net> References: <20160426225553.13567.19459.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: BLUPR0301CA0014.namprd03.prod.outlook.com (10.162.113.152) To CY1PR1201MB1113.namprd12.prod.outlook.com (10.169.19.17) X-MS-Office365-Filtering-Correlation-Id: 115e17b3-de2e-4446-3a54-08d36e263b1f X-Microsoft-Exchange-Diagnostics: 1;CY1PR1201MB1113;2:op1sCq/pDxG4wc3DYNaWYSOEG0Uv9wctBLHkktCSK67yGHTZZ7tipjV4VaLmuTNAiHHzy+ldI1SVHEjJxPRGySkkxmfKkLduVEYeWUCRoqXlawpWllfdODoKX/9h9zVOrblruCswcs76RzsWPrgBH/P+XRIDeasSTDe01nEPYOIdDAg3r6kbebfTN0vcErn+;3:ef90hOU8Vx1//Xhvg0SvXXj+TMvqFLpj+wjq+j6CMr+Jl4yKUp11YUx1BaZqjw0ILlXccisZLpF3XjiUQtjTF8prMjNQSsGLf9fLAZp7xE4VXJSvoeset9N7a0xCnPrJ;25:o/E9tbgem/5gsbYMcqq/aEP11HHygb0l6fcfmQAiNXSwFtmyvk4lwFVKEfTEfIYqcWK3MSp78fT86i5VfyUv9qMBu8/N+Y+Bo8JPYW7PH4xN1u8wW0FOJkIa3moLd+aWHqRitsdTglILYTyHjnr8qq9MbCazxWzaE+oQmNS8pD4Sk8N0BKeOf4JBwc9BlzEX2QH83rzO3IAUd6NB5/TyB7UZi98JKm2u/2Ka3CqKYDNDpyZNXS0YPWv/qFkBrdPmu0btfPEJs1+Bj+2OXf5dGwoMIhdLuReswsCJC38BTc7PQ3KTtKs3r7MdwWqZ6lS3Z0+rPGUFCdAcBbn4h4TkIg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR1201MB1113; X-Microsoft-Exchange-Diagnostics: 1;CY1PR1201MB1113;20:/OF7SeEcJXtCvmvw045zXdkynLfViYWpZ7uB6blu7SaKeEqse5kSwHnmociD6pKsid2e455cjAVnl5sv4iqRa9p7jV2bxtqJVQhhbGomRFnB+Mb4gM6aQX1uGHDFznNdZ2VBKMRrFTiLTzLn3hvGnzk4JZ+jK1EQns0X6gwO/axmVXKApSwJPl8vTwSgEvvc8PQ+ELRECdCwS0/I9D09Y6x91ZK6yoLp/nDjfg5cYpVxmsQGQxVlEJmNIEr2wVizPlclUrvgLLHnPeBEhzVqi/3ZsK5+whdLg4zC6beIYW5c+QWqDqINjjuiX4kUtg+J3F3t8d1o1Edc6fy/1dT0Iu5gOa8f+9g+j8Fuu8RzujkdSSRyaUS3iJutiFaNtqvVxdqJnC4Xlyp6eaU2HXF0EV0HCqqPW45QyuCtgpB7WXKr4iS5rZLfnD5TqohWfUnq58QgunkaAvyeMHlkayS5pX+2CnDNCs/OwU9rNoNxda7Eqi/VFySK3PhUS5rpMZUL;4:bij1Hv59sOE4P/QXv/499b/F8BLsoiEv6X9Tl2vWb21ZpKq7rV9jUDOwzYc7LgsYJuJbiSqgvzKsduWgiRgeqk/yvwo85uWHf1bykhLy20c30zTyDWhDaX0b6CXADzFvQMcci+nRukncE3JJ0Cqq5vds3jEHh2Wx6UMrElcsx+pKW5n+2i1ZRa2cOvWSVqtrtVID/XCn0UAAaT06oDwr2RzgodV82BdwOO7Kjxpn1CLeHXoD3oiqVs54vz36JpYCUV4f/fgRapWymWlfbarPV+WZhRFyci9OWry0AT81F83KRL/Y31ngb+7klTSmx2/TIN2TWVTQ5mwkSOcfj+PRY4o0aq2dWMML6CGvVlxoGibIdFlgAwiR1f4Ip/MPfXMW8yF5q1XiAHkJgMf7dunIRZ4+3qtN1BQNq4afJyg1V18= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(9101521072)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026);SRVR:CY1PR1201MB1113;BCL:0;PCL:0;RULEID:;SRVR:CY1PR1201MB1113; X-Forefront-PRVS: 0924C6A0D5 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(2201001)(1096002)(103116003)(50466002)(86362001)(5008740100001)(92566002)(230700001)(5004730100002)(23676002)(4326007)(97746001)(2950100001)(33646002)(2906002)(50986999)(19580395003)(76176999)(54356999)(47776003)(19580405001)(66066001)(189998001)(53416004)(5001770100001)(229853001)(81166005)(586003)(4001350100001)(77096005)(6116002)(1076002)(9686002)(42186005)(71626007)(217873001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR1201MB1113;H:tlendack-t1.amdoffice.net;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTFQUjEyMDFNQjExMTM7MjM6YTF4aEZsQ1NEWGNxZkR4R0w5aUtFcjdv?= =?utf-8?B?TWFXY25DK3BibEdHWWJvK1BVcFlEckcvd2c2b3VpNWJaRXhLQ2ppOG51RjJr?= =?utf-8?B?WmtnWTZYa01OdnFPMGtZek04MkNtK21kU3VCNkpzUkh6RTV2VThSKzRTeTJq?= =?utf-8?B?NTNIZzMrMEVoRGRyQUc3dFQrNFBHdVRGY0pJVm1TQis2dys5WDY0S2c1TVRH?= =?utf-8?B?V2dEa2pqOXlBNlFJNFJjaEhIQVQ0MGxDT0FocWxVcEZvcGVEbUlVL29EeHBo?= =?utf-8?B?MzJEeDJCZTZYbmpJcVBvcnNUc1Mvd3NTRVQ4MnVzY1dBZHlQQk9QbEEyczdO?= =?utf-8?B?Qmd2K0pkWDJxaTZHUjVDZmZVK0N1c2RzSGhHNVFacGxaOE0vaUVsZWhIT2Fv?= =?utf-8?B?ZGNzY25IZWtQOTBkMzNSVFdhaHl1NG1uNHpxU2RTcUlFK0ZlaDBhblhQaUZU?= =?utf-8?B?czgySVFYVUI1dlNBUlpoWlNPNlo2N0VLM2ZtT1JhMkFiT0t4TFNOQUM0NUpQ?= =?utf-8?B?SGJCVVEzZjV3eGRnRjYrS0tWWGJuZWU2T2lJdUxWdUExQm84L2EyV2l2NDVl?= =?utf-8?B?eERoaDUwd3ZMQ0hFNk1jMDY4WnRYaTArQW5ScEluTmk4WUhKZ0dOOStoN2l3?= =?utf-8?B?Q1dpaEVXU3JqS0hIQmhCUGFNbm5ZTVhoT1dnTWVaSEpGTkFwdzdXdWlHcUhI?= =?utf-8?B?NE5lOW91em1TYTN6MHdHSW4xaFZqcHZQM0NrNXFtQXpqQzNCam40WjM0QzhI?= =?utf-8?B?OThFNHpFbGRDSDhNQ25YR2NKQVV3M050N1FuT0ZhT2tkK3I3cXdwTFhNMmVI?= =?utf-8?B?eHV2NHpicEtBcVNlMksrMDNCUkdPTDRaQnpHU3pXOEtUNEFRay9MWEhKbHl0?= =?utf-8?B?azBENStSd2wyOWtmTFRGbGlLSStsN3VsbTkwYVNNcHFwVG55VDVHOUJKQXZ6?= =?utf-8?B?dVpWUUNsc3RIUkp5c1RpWFpiUDN2cDBuQ3pKZ2F1TmhkYlRhU2RDTG12VzJl?= =?utf-8?B?R1RmTlZMb0Nrd056UEwyTkNoNUJEblFPcXZpT05JVWttVlViL0lKalc2b2Jk?= =?utf-8?B?MlR0dmV3OUJ2cmxyWitaUEwzcHJCMkVVUENod0FGeGVkSlFPeGx0SUdJRlBB?= =?utf-8?B?c2RYRDJreG92NnJwVFZZcDZjeHNHK2l3QnNIYTNEaEIvTmVsZ1FYc3lNWUxq?= =?utf-8?B?VVQ0c3hDNS91cklVSzBBWEFSam42T3p4NTBXQjE5RHBpVWx2dXFiakN5bExL?= =?utf-8?B?M0NHTGVDZ3hpaFRTbVY0THJLZHBydnYzNlEwZml6VVh6Rjc2VXI2MzdKVXpj?= =?utf-8?B?aXNoNjQxdmdrVEdsZnB1SEJ6WVVWZzRQc0ZudlFpSzRZbzFJc1BkbURKb3JZ?= =?utf-8?B?b3gvVE13V2hyZkZOazJLaFRhcWxnTE1ybi9IKzlEamc9PQ==?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR1201MB1113;5:r87wqlaJGVvx89cAvO53cbJI81Hj2bVtTZ7mubCAkxfVhZQ/8mQUjWqHwJaGsSKblg9SyuvBQIwzqtE69NJ0qx0+YHfXAvp9NMoCy/XfA3vSTD8c15Fw8WdPrXgcwX8jaedQEi0AN7VMESsafoCR8A==;24:P98ZzIW4rOrRBUkmIlOiilJiNo2ts/33T/7lN8HNs05rSYuxAOkmDsmKQzPrM0epffV+WUp/TcUlTu4z5HTHOy4Kbs44SZCP/2Pv5GPeaKg=;7:581BFzbK2b0hebtDpR2//t7yrLzT3MwYqUm85XV9lLjBWHe8zZlvtcNy3Egp5D7zZqTTkNnmUQ6ZYbTMzRNmhXDffC1JhTjZOVXUEZRKWVt9YDsYGCI1qHgmPDOInljNtMk4e2+mLiQCX7wDKfu9PJX1GjuaXvCpIV8H223tMu4=;20:zb/OsaLcfjaYtbzG8qZDaqIcxIk0bXumbqXBwljfCeHrFuPcvBojqC2wyl39uWWJUpjQdFTHIq0nB199cPCY+kneK2UXX3UF5BIhuACobyCUKQO8mubCCRTp+V/AykKsTX6x4Kwz1tIDe1aaEx3b07GFtN8ScDG/UrW2AsyvzDbDeyc+KK5rbInkNq5UZdrVpPtqtg58Us19sUfUC1z2lNKI7Ccf0DSrsdbZbxj+mt/FtGH7K0MRmTPK/H6pkHdX X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2016 22:58:04.5335 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR1201MB1113 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The device tree is not encrypted and needs to be accessed as such. Be sure to memmap it without the encryption mask set. Signed-off-by: Tom Lendacky --- arch/x86/kernel/devicetree.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index 3fe45f8..ff11f7a 100644 --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c @@ -22,6 +22,7 @@ #include #include #include +#include __initdata u64 initial_dtb; char __initdata cmd_line[COMMAND_LINE_SIZE]; @@ -276,11 +277,12 @@ static void __init x86_flattree_get_config(void) map_len = max(PAGE_SIZE - (initial_dtb & ~PAGE_MASK), (u64)128); - initial_boot_params = dt = early_memremap(initial_dtb, map_len); + initial_boot_params = dt = sme_early_memremap(initial_dtb, map_len); size = of_get_flat_dt_size(); if (map_len < size) { early_memunmap(dt, map_len); - initial_boot_params = dt = early_memremap(initial_dtb, size); + initial_boot_params = dt = sme_early_memremap(initial_dtb, + size); map_len = size; }