From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751104AbdE3UHd (ORCPT ); Tue, 30 May 2017 16:07:33 -0400 Received: from mail-by2nam03on0053.outbound.protection.outlook.com ([104.47.42.53]:39904 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750815AbdE3UH0 (ORCPT ); Tue, 30 May 2017 16:07:26 -0400 Authentication-Results: google.com; dkim=none (message not signed) header.d=none;google.com; dmarc=none action=none header.from=amd.com; Subject: Re: [PATCH v5 26/32] x86, drm, fbdev: Do not specify encrypted memory for video mappings To: Borislav Petkov CC: , , , , , , , , , , Rik van Riel , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , Toshimitsu Kani , Arnd Bergmann , Jonathan Corbet , Matt Fleming , "Michael S. Tsirkin" , Joerg Roedel , Konrad Rzeszutek Wilk , Paolo Bonzini , Larry Woodman , Brijesh Singh , Ingo Molnar , Andy Lutomirski , "H. Peter Anvin" , Andrey Ryabinin , Alexander Potapenko , Dave Young , Thomas Gleixner , Dmitry Vyukov References: <20170418211612.10190.82788.stgit@tlendack-t1.amdoffice.net> <20170418212056.10190.25468.stgit@tlendack-t1.amdoffice.net> <20170516173541.q2rbh5dhkluzsjae@pd.tnic> From: Tom Lendacky Message-ID: <766ddfd1-d1fe-213f-1720-5e10356398f0@amd.com> Date: Tue, 30 May 2017 15:07:05 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <20170516173541.q2rbh5dhkluzsjae@pd.tnic> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: MWHPR15CA0047.namprd15.prod.outlook.com (10.173.226.161) To DM5PR12MB1146.namprd12.prod.outlook.com (10.168.236.141) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR12MB1146: X-MS-Office365-Filtering-Correlation-Id: d42fc21d-6504-4c50-c250-08d4a7977be8 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081)(201703131423075)(201703031133081);SRVR:DM5PR12MB1146; X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1146;3:HRE3KHu0LrZnER1MZf0FGsjq+KZJAtF4e3VK9QMMztz1LN4/FQvz/i7NQMtNh0tXQPLLQs5gtjeGfLgTnNz4iT/GZPatHkziSk5C06La4YQ27hhB75s5bPQiDK6fIV8Ryn94j0kO5flHQVzhAdff/VulkN0oKeHJqCI+et+VLYADviNr4Uc1sOCY10wF+lgXWYHTjcRDZ55ubgAZdIAcbJPjcOgfgVc5Geu2ifUk8RdfsqhE2RpUPR/Cb5LnTW52rO61Gq53odDf/IZASd1i1/zUxxCxwD7paTzerUrmMIMM/CoUC2p/FI62ra0z1VnH16xUtJ29b/KQqhz5df2ulfvaEbPlGhkrmdKFOTB8gbk=;25:ZzNIES9LY5TFuMsdJ9AKLNGzUNIXdCeXcBYOR1ogxMZVPrfNavBLgdBzfcDMprzZwbeVcwHMsk2TXbc63PtJQs1Ohsr95CqzIDopU4crpqEUc3w7rsht87DwSU6w0D05LjY+hX1Vz/LpZmkjLeGwJ7AUEbtoLmnY87CoqxFDrBNWM/xxlbYAy/O6o/RTmTCSLwbXEH2IvlZm59PtLlQQf2wJ0uCNQPk0jQErEbXrPcrvsNudc2BRdtgeaILWKe1B1cyOMYG7twOvs9Vx78Cs4vN8hofgH3DEppTHc9b8SXmiJMX8tVzRbUkF5VcMHfkdVh9SNor6VBx3xMZWyirfdLBkLt9RwyIJWhQxsHuCyPgNYuC9KnZsVJDSXPHIyq8b1vBstPOAeGCRU//Wh1Is2L7HgEMYgKxhQXn1EPHxS/R0E6uJIz6Ibo40FfmcOCEVIUUBF0YdE7NXYA0ZdrAkZ1lqhjWr3TU3b7ddCFwsAcI= X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1146;31:qcBZgOEkRspH+wIcoV8p7nsbtuiyWWlY9hV67Q0K9EJ55Ldz1LcP+wZIE8pivK9jPbF4qFNgqnztP70QiLEKyK8T51JHGf5MHj6kwB8xtfN7/3eg57f6rVDt008jOxYfhN7Sbc4i3e2zqp6Qn4OFKk9fFYQ7fi8KYL0vPyAeVsmCH0/tNjnoUiRifZlgbsZwf1AFLNDNJDAwXVKTC2FLjAj1LXnBd3dxB14N8++yarQ=;20:PYUNY7nQIQAQjLLTBwUTpUthgfEgjwdgvlWyERsFzl8hR+8PHHHDeO6vLZnOpd22NaW0WlMML1y4e3XFIs5Iz9VhLiDhOX8TGYn8ES65JLB/wdwfgqQBMjQagw4Kf+sYdNf5LhDbgcYlRvSJSmIXG27U66i6J67MBnQAszNC/Hn++6e0pKv9BfDCaS/cu05NrLTLaieHrz6Fplnwg6N9+YbPfGGRJPMOj1qqBd1aB5m6iY6cjdV5Q9ot0PiAqEwLerLK7n1VXY16vVRwYjgaWoomSESqfMbEo/whFGapn44C2/OK8Jjs3nb+wOrE0AcgYMhdrOK2cxoVLbNHp9qIbs1WqbN7HbORmeqCNAgwfS24Kf/o42/bLAQB9MljiaOMao/GwZ31aeR1RJ3UiRLJPDDqSDgcfWQRtwQNpvm70B8UY2Nztu9jWuHbc546JJmPMWwfwGWy0pfcuI80mW3zSzSvIIwRbmaiU9pg/g1hbIZXHk6AYiqjSpFZec5BNiwM X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700073)(100105000095)(100000701073)(100105300095)(100000702073)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(100000703073)(100105400095)(93006095)(93001095)(6055026)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(6072148)(100000704073)(100105200095)(100000705073)(100105500095);SRVR:DM5PR12MB1146;BCL:0;PCL:0;RULEID:(100000800073)(100110000095)(100000801073)(100110300095)(100000802073)(100110100095)(100000803073)(100110400095)(100000804073)(100110200095)(100000805073)(100110500095);SRVR:DM5PR12MB1146; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjEyTUIxMTQ2OzQ6V1EwS0pwWmF3YUswRENiWUk4c0lJWUsyY0Zs?= =?utf-8?B?UDlkQUNVcnVSUjFzWmd3S2dCQ3p0d00ycnNMcS9DSnhZQzR6b05Rbm1BYlJF?= =?utf-8?B?cG0rbGlMYnd1eFBhanBMNytQdjJVOEhhUUFHK0dLc3VwZ3F0UzFBaGJCZnBl?= =?utf-8?B?SXoxVDdzK2Fqcm9IN21rZE9SMTBabis3R1hrakNuaSt0OWg3RmF4V0VTRndS?= =?utf-8?B?RkFuZXVTMTFLL0F4RzNjeWZrRUNTRkVpbElwbTJmazQwbW03VitGd1ZIelpt?= =?utf-8?B?WTJWS001ZGR2cnBrU2ozUUZIWFBzMmFkaVQ5dWE5azI1M1o3dmpZWGFKay9N?= =?utf-8?B?azBjUDh1YlJYSXM2cVQ4bFF0UU9VNnZzR09VRDFoeDhOdlc5dENPY3VZcnA4?= =?utf-8?B?enFuL0s3TXQ0a0FENmlhaWVKemU3dFNFd3JBTUVXMDE0TEo0Uk1BNWNsek1Y?= =?utf-8?B?UVNXenZPUkJhUnhhbnZqZU4yaDFhNXRmajQrVGlaRCtPaFZNcy9wZklnemhh?= =?utf-8?B?dXpLTTJyejRyWGFGWnNzZ2NnQm0xVE5oQSsrQUloMTNKeUkzTll3M2phdUEv?= =?utf-8?B?M01qZDRpWmpWSkRJSGZuN3VQQkdpMHdLcS9HaW5CK0IyZWRhOEdWM3p3U3lV?= =?utf-8?B?ZGJVV1FJdlV0UkViU2JEMGFRZUxXOUhSVm1NM0w4QlZnY1plam82UUhMU2Nh?= =?utf-8?B?dGI5M0VsUTdZOUxaZittdEVnZFQrRENpbmIrM0VrRWlXSjRQbUFpVTNnNU1R?= =?utf-8?B?OVh6V2JNSEx4V0VHbjNtaWFTMHZTK0N2WTZwNDFvNVhncE5HU2tPaUFldWdh?= =?utf-8?B?RjNGNXJ5WjZwbDF2d3pGdnpKU1d3UndlSmc2bENZaDczN2V4U2MzWno4Y1Ax?= =?utf-8?B?Zjg4RHZSbVdmaVpqeW9lWEs1MDlyYVdLRDVYM0VON29KSE5XeEdUaXRCeldw?= =?utf-8?B?WnRaS0dtekVxZDhybWNsdFdNOXIzK0pBZWtzOE9TOGZkVi9GK1BNU2Rmb3Zq?= =?utf-8?B?OUFna3V2YmE4d25YbTRSeFg0SWZETmh1WE0wSEovOXFLZDJhUi90enpmbWlE?= =?utf-8?B?Z01xejJYRU1DdkQ3MWtZcHh5N2lGSW1hOWx5b2RQdWxUbU0xbG0weWo4YVhU?= =?utf-8?B?QURhTGFXM253WTV5eHRXdGJDMk5PdERjNG9CY1lNeno0VnZWRzJQOFNVTkMy?= =?utf-8?B?aG5yd3ZMaHgveEpGUXphbmFtMkltWFBsN1lsOEIveStHbjExL2lZUTZDTkFW?= =?utf-8?B?c0p4Y08zOGNZTXpCcFppZGN4elZ2bndZTHlMSllvK2lHUVJNb3NKSVhKR0Zx?= =?utf-8?B?MXVYSGUzUDh0bUpYK3VzeEpkU2dVa05zVldRZlJQU2w5QkpneFQxb2FnNEl4?= =?utf-8?B?MFBwWHEvZ3pXaHdUSThBNHQxK09PN1c1QWNlUWU4R1d3VlRXSTgrbEN6NzNT?= =?utf-8?B?STJlTWc0WkNrMWNBcVh3dG4yR3NMS25lSTRGdDQ0b2c4VFZORk16eml1NE9B?= =?utf-8?B?UG9XeDhMT1dqVCtGbkE4NkZBOWM3ODd1dGthN2tnSnZ0Zmg1UTVQUXpncSsy?= =?utf-8?B?NGswakZMdGdlWjAvNG5pOFBGK2UzRW5ISSttcHNnRE4xRE4rTHIzNkxURmRk?= =?utf-8?Q?DIvdAlkqw1xeV5dnoGu?= X-Forefront-PRVS: 032334F434 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6049001)(6009001)(39840400002)(39450400003)(39410400002)(39850400002)(39860400002)(39400400002)(24454002)(377454003)(305945005)(38730400002)(54906002)(7736002)(31686004)(7406005)(4326008)(23676002)(2950100002)(50466002)(6666003)(77096006)(81166006)(6916009)(110136004)(6486002)(53936002)(4001350100001)(6246003)(229853002)(8676002)(5660300001)(7416002)(86362001)(42186005)(189998001)(2906002)(47776003)(6116002)(3846002)(33646002)(36756003)(76176999)(72206003)(25786009)(66066001)(83506001)(53546009)(31696002)(478600001)(230700001)(65806001)(50986999)(54356999)(65956001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1146;H:[10.236.64.250];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjEyTUIxMTQ2OzIzOkVzcDJTWFEvSDJORU5QaGU0NmdDSTVsejEx?= =?utf-8?B?TVpZN2l3bUIyZmRjNEFUZFRpZThZMEZxWlBNVVZmWjVOTnNsVEZxV1BiQTBk?= =?utf-8?B?SFhycmFPUjV0eE9YM0dtSE5TcVRnM01QQ3hZQ2Y5YzRkdHdWZnY0WktDcE04?= =?utf-8?B?WURuQXlyVmpoOGxRa0pTTW9vbUxrTllOTkNsVEVRSFRQMVY3YjY3UjJLMFBl?= =?utf-8?B?dUVZK2R2OS93d00rMWIzK21Ea0RTMWhhdGd1UFRDcDU1TzdWWUtPcDM2VHZS?= =?utf-8?B?elk3allQOE9UTCs0Y25RREUwSi9pTEFVbTdZdW1BNTdhR2dlT2xTK3paMyth?= =?utf-8?B?UnF2cysyTHBNdSsvZmRqWHE5N29ONUxUdzViZVdMeVlncURZdWNUZlhYc3hE?= =?utf-8?B?dXZ2bDZtUjh1RE1Ra1hNYzg3azhtanA0OWdWblI0Rk1mQWx0U2hoVnRUbk5Q?= =?utf-8?B?OGJ2Y21JMXhLdGRKNkJiQjJkVS9lSk40SzA3RWlVS0lzK0s4dmxSYUlYbjhn?= =?utf-8?B?RFBOdTUxMVU0b3NzY1pWY042MXZ6bllVWm5ZQ3pCaDVSd2RhZjhIb0VIcHRG?= =?utf-8?B?b3U1dFQ5VjVwNlEySVA0RkpUV21rU24yT1ljVFQwT2ZKRytWWEttU0xiU1VM?= =?utf-8?B?WnlqMi9BTnlVcGczc0xmTHg3Qm05UjRhUWdFT1NtbGpsYzM5UHk3ZmpIMml5?= =?utf-8?B?TEEvbTh0aFp6cHNwbTlsZGF4ZEhBODk5NnlpbENkUHlrNElINHNCNzV0Y1Zv?= =?utf-8?B?cTNtUTBpc2xCMUd1RTdxeWpiRmhLQkk5ZlQ0RCtUU0FnQUp4ZzdYcXBlWCtZ?= =?utf-8?B?TndrR2NqSUpZUDJWSWxBUko5OEI1TTlkY1Y2bXZtcDZHK3pCSUZaQXlsaGpV?= =?utf-8?B?LzdQL1J4NHlQNDgxTEl1dGp1VzJBbmJDYjI4SWhiZE0yVFBGeG81VDJLOG9s?= =?utf-8?B?Vlg2Y1czNTVpS1pqL1QzdEVhNWUyTkFQVTcrZVI1VVBJb0IwaGp1K3h2VElN?= =?utf-8?B?VC9jTlRVbHB3TUg2K0lxK2JkMGx4S1lCVkl6cXpSVGFES3lKTy9TVmRXdmJN?= =?utf-8?B?cHBHcFhXNWg2WEQ2OWVNWHhndTNWdTRhdGwrdEpEbzZURngrQjRwRXRBOGJF?= =?utf-8?B?TERGem92UmlMdmtzK2ZiWlBTWE1uaXlzeFlwb3QzOW9QRitZRk5iQ2xSeEY2?= =?utf-8?B?UTdna2dwYTBlS1ZTT3RLbmtra25XNmRzNHlXTEdxLytBZDJrd0VyNVI0bWhV?= =?utf-8?B?WjlmRVdtdjljZ2tSYmlRUTVDenNYSGptcExseWNMNnJ5dGpUdHNzZVA1dCs3?= =?utf-8?B?L3NNdldRdzZSeFZEaFdjWmhPYVdoa2s1a0tBRExCSGgvVURXeUxHMDJxK0FE?= =?utf-8?B?U3gyOHJUc09qU25Ob0t0eGdaT0xKTXZuTWRvVmQvWVpaNnByRGlCUGduTU5t?= =?utf-8?B?dFlQVnE0Si9SYTkrTGdyZElxendldU5BTm9PblQxQlp5am5JcHFvVUlsbVRz?= =?utf-8?B?dXZZSzFJOUJqNmsrZGl4L2VOY3NiSitCOGc2Z0hxUW9RTGVYNnd2OW91eFpv?= =?utf-8?B?ZjIwV1ZFUWVmVFBRYjd1QTZtLzlPTHROZk45cTc3Yk8zVStsK0FvaEJ2TmFn?= =?utf-8?B?NW53Q0tzbkNsY2NyZENqczZiZ3VVTE9SclNFemE3MHpkRjlPZkpkOFo0RVho?= =?utf-8?B?bDlCTVgwbGtnNzVlczJNczFneFkyK0dZSHlXSmd2UmlmbUJLREsxZ08vR3l3?= =?utf-8?B?UmlIQ0N2Rm14VkFsMzQxUmw2VlROQ2FxdWJ6SThwWXBmRm1ONUxGZ2VTU1R6?= =?utf-8?B?WHFoN0ZTd1c5ZjVuRzRJeUtMdUNIRUg3T3BtVThvbnIrY3lZR2lrWUhNeXd6?= =?utf-8?Q?BB2ZDds4ga4=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1146;6:DWkCuF4izaUUaissw8JK5jfJ1MSt+gz+TJ/0YQ7mlQJpBNTOCIiJ10LWCHBB+Ar+V8qTOvOzcjsuctqgL13mrKIYa6De/jLQ1wDChBzMktjfQQij8aMV2Y1IlKe5zGP6J7FYn7MixRwo/pZam6LB0Fxk4Nbht2KPoxK54v8mSo/39WBiF69Fz9NCtwjfn1pqBSsxdEN9UAvT2+/0S1kEw5x2oV0c+r/SN2prck5zHQpYQpFL1rw3Bt6MAjvjFYot/t+/ORsLixiRNe0SZo7r6J5eNXPL+p8DBigvfcgcJYWfnGTlcBjtSSsW+3jeDXjkEdbLh2cOh4IUSpTYjvnBtltOfpRdVLdaRYLIM6oyDOnE9iiKVs/42AKZIVS4ulNift0kqXrM+QZ2Xk4cu1w05ApRTSBOeIQTsNi8rcnJ8MiZrdx/JYjA3RZJnaXmaWfDFSviKCJZ8yGFc3Hjb1EPyN0KEd3V4vQoZFsS/uM/+0s0HoJBYRRuAGrRR2lWohaxK5dCgJWMLbbMKQDBg3kHFYWijbq0IsOGDdnK4wK+CVQ= X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1146;5:nSRMIxP8S/iR5WxT1JuC8UlLjQVtWL6OWDGDRkfXAN/QzBRc9a+ZzudnpB3/fT33fsKcDjSN+4pDsFrKvUe8w3O6goot5rrE+5IQhAbSb5Ob1es1v9v1nBvhrEmKQ1AKqc9R2G1+dGkI6xXmM8nffG098kt963MZYdnhdvD5bQxAIOz2M1WzuhibWuUzxrnaZq3Vw2afA55jaKbV9cd5vM51pqymMm6JtYwYGMCRBu2YFnO/2XNqmCJt5t0coGJ8mEFZr6sYwrl5VTuYK2NyYFJfjDQ7J+nWJgey83iuKyNqHnJ5oiJ6thh/MwfTLJBnbcf1psB8rIchuhjzz4pAlC36wdCPfnmkpX/YrgeogISxuYWkxVic679qdkO0CjXjU6MAEJZNdHGEQk2O5fWx8UfXDtidL2oQi9VXTV+i50+ziBdvFbjrmDsx9WtwYF5bx6e+fKnPhmrYV+VC4sYcOn9SbA7itcQIpFSmdy7FDPxMq9et+vcEOiDxCn183Qfh;24:vPjjJKWqs3mfLiM9TQxpxTB27DXRggx/qlGyl+TLqd2z3JC6qEwmOwoq9Q/NiBISt0GTy365M4NiWOpivUcM3XFfd5FhTwvnAIi8Xsz+c3g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1146;7:Nh0TzjkmaZiXA8yizbi0DEvifhvm+09BRcteiMSk/anZ7XYoEXRGrOnhjPLs8gkesZOGHOs6FPGw0e9fkY9IB/clztThL2HtMHIA0ajgEmlYr9wBUJ5arQjx/ij16MClRi0WXjjrYwjjFaFd89klQft7k/NUp6r/7owDXcI8mhF9lm7q6Gop/a0gM6nY6HElL6x/iZox17B+e6H+AwOJa4vFhNmnh1U+bjYsFr8ygDtfjinKp3YYM2FVPnFYqt8JzK5ESYgkZUB2fY7C6kn6C8uBQtc8yoaNFQ7If7TqEHJmefBiIu7ueTkWTErTi4VVngV6S5EQbOEI0VaMUjaXZw==;20:UgnRTkM+vNqPJQaAVd54MLbXhhAnWV8kNfPeIjNx/SuyMZAAvHqFhjnA6ORwdwKp43lLeRtovdmq0nai7PM2wbCyeXPmtEJUcDWdEvrfA3w+oyCpyp62l96ZJgDGxi6iXWfPWlPrdinh4133jrZ4dcyUID5mKmvAuP9D0eHzDULRQTQ46bvrdbvQ8gyZziTsC9JNjew3qYoHiuuHDkRzyYhny8jGoUGj7BZWvTPG5OhLjBKyz3T0XGQpY+XVPCY2 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2017 20:07:14.1392 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1146 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/16/2017 12:35 PM, Borislav Petkov wrote: > On Tue, Apr 18, 2017 at 04:20:56PM -0500, Tom Lendacky wrote: >> Since video memory needs to be accessed decrypted, be sure that the >> memory encryption mask is not set for the video ranges. >> >> Signed-off-by: Tom Lendacky >> --- >> arch/x86/include/asm/vga.h | 13 +++++++++++++ >> arch/x86/mm/pageattr.c | 2 ++ >> drivers/gpu/drm/drm_gem.c | 2 ++ >> drivers/gpu/drm/drm_vm.c | 4 ++++ >> drivers/gpu/drm/ttm/ttm_bo_vm.c | 7 +++++-- >> drivers/gpu/drm/udl/udl_fb.c | 4 ++++ >> drivers/video/fbdev/core/fbmem.c | 12 ++++++++++++ >> 7 files changed, 42 insertions(+), 2 deletions(-) >> >> diff --git a/arch/x86/include/asm/vga.h b/arch/x86/include/asm/vga.h >> index c4b9dc2..5c7567a 100644 >> --- a/arch/x86/include/asm/vga.h >> +++ b/arch/x86/include/asm/vga.h >> @@ -7,12 +7,25 @@ >> #ifndef _ASM_X86_VGA_H >> #define _ASM_X86_VGA_H >> >> +#include >> + >> /* >> * On the PC, we can just recalculate addresses and then >> * access the videoram directly without any black magic. >> + * To support memory encryption however, we need to access >> + * the videoram as decrypted memory. >> */ >> >> +#ifdef CONFIG_AMD_MEM_ENCRYPT >> +#define VGA_MAP_MEM(x, s) \ >> +({ \ >> + unsigned long start = (unsigned long)phys_to_virt(x); \ >> + set_memory_decrypted(start, (s) >> PAGE_SHIFT); \ >> + start; \ >> +}) >> +#else >> #define VGA_MAP_MEM(x, s) (unsigned long)phys_to_virt(x) >> +#endif > > Can we push the check in and save us the ifdeffery? > > #define VGA_MAP_MEM(x, s) \ > ({ \ > unsigned long start = (unsigned long)phys_to_virt(x); \ > \ > if (IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT)) \ > set_memory_decrypted(start, (s) >> PAGE_SHIFT); \ > \ > start; \ > }) > > It does build here. :) > That works for me and it's a lot cleaner. I'll make the change. Thanks, Tom