From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932692AbdBPPpS (ORCPT ); Thu, 16 Feb 2017 10:45:18 -0500 Received: from mail-co1nam03on0083.outbound.protection.outlook.com ([104.47.40.83]:15777 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932276AbdBPPpL (ORCPT ); Thu, 16 Feb 2017 10:45:11 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; From: Tom Lendacky Subject: [RFC PATCH v4 13/28] efi: Update efi_mem_type() to return defined EFI mem types To: , , , , , , , , CC: Rik van Riel , Radim =?utf-8?b?S3LEjW3DocWZ?= , Toshimitsu Kani , Arnd Bergmann , Jonathan Corbet , Matt Fleming , "Michael S. Tsirkin" , Joerg Roedel , Konrad Rzeszutek Wilk , Paolo Bonzini , Brijesh Singh , Ingo Molnar , Alexander Potapenko , Andy Lutomirski , "H. Peter Anvin" , Borislav Petkov , Andrey Ryabinin , Thomas Gleixner , Larry Woodman , Dmitry Vyukov Date: Thu, 16 Feb 2017 09:44:57 -0600 Message-ID: <20170216154457.19244.5369.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20170216154158.19244.66630.stgit@tlendack-t1.amdoffice.net> References: <20170216154158.19244.66630.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: CY4PR13CA0013.namprd13.prod.outlook.com (10.168.161.151) To BN6PR12MB1138.namprd12.prod.outlook.com (10.168.226.140) X-MS-Office365-Filtering-Correlation-Id: e067d8aa-7614-4797-36aa-08d45682c5c2 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081);SRVR:BN6PR12MB1138; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1138;3:2LMr0VERFjFkJyHg59T+3pXMK1I4CJC5gX4raQE25fWaQ7htWM1y8qC6zAjrjeZfJRQelxszFHdLKg7t12r0xAiQboX8Bh9ZG6ycVO2LX7DmopXcYwbgpi6Q5xvjf9Et1isBfwLQUXTW267eZU85joWIlThiT8aF7+DeBjx+4I9ZfHJIbxNN9vDXOLS890z6zZeCj6QjYVyD4JcETBjobjbxUbtGlGYZgK7qfyf+IQDv2GnbGtEVtOsDNOpQ5AtjZtWTIWpd1h9UeeNoEpHmeofjAGVYq8yUWY+nXFOyvBY=;25:AmDP1GUjNbOPS7q3z/8zvqYptIGg3DqK6LZuNyiUYR7Xtldj30ZQTTdvWj/k4oB8nShFkrZDkfddzRl/uFRcR8zXlc4R6WIYEChlPHFIqX8btmQUq9DrdTCNiMzvEEhtZa+8DkpgEu4Hqz5r/C3IG9XiNEGJb/tofFvmvd3w/m3ZCDCNaPNhr33wO7arieYsEAMvRIRlSf0Oe8L/cmkjDcWa3EPZEY5mendBU1eyGbeLHlfEET19rbcXeQntil29qMXKCeBJDFbKHOSBsiWpZFHTxoSRlk2CmVrHMp1hXesWyCczC14F2bPJfC6jNIhakIjNxy6HDtkudRRJoRB1XAibZgQ1Tfn6iXH9/D0WpF8cGJzdMCnKse3BTU5I/tqLLxhEqONavi3e6Yiy33WnUvMpoMsVKn1BTbVT9WnR5kDLWGuA5UjJO15gDDbQDEpnhifQI+gg4JEz7nJ4FrDehg== X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1138;31:Wcb8YbOvXVVX0HUTIHNf1Rs0PEWMjCvuTO1XIWA+xK8gCNKVG4a1z1BSjICGB6/CBY5RxGJ9QHAbY0g5Ng3RMxDDg+EyMLqyXyND4ZqO2+1K3dfyLTQH0gxGWdL0arxi+D6+6WWCpa0rXOtADc77knALkvNKBTgHMbRcjT42Fjtku+WRFrFyNRukdckPoQyDflC0ha6bnUvEKSeqHXzR9yHegZK6CWvJxfN8qe23WUwvkEazskcg7AE06Qhir2YdE3Ydf8v/xKx1DYpRo7cQ3A==;20:rBuKEApJp5WVwJtPXYsMzOTRatvhT+apKbNQguFHZolFDj48/JlU7H1JHLPHOIKqRC0gGy2vpb228I3DMwbifOz4cbYZqVfdM1H6XRGSVQFCNdIgDkEMm4g3Y/JNlEquYJFYF1KaF/HELUxvdqx1Gp1P9nuQ8oOKS/8ZjzUb1lex9+RMjOTqz4Ou8ELJ+HGNjomWkXIfs9VdtCUJFoKzpcLbzslv6N7BIrxA18++SQZDeGIKxdXK44nv9IuvAJdnRwi47nCTFevlucv9ms6KDwX6FEiVMfg6rR7TALa7PQylR5Ep+HcHIGpq/YxtGl0LdSGU6nAiVkG7JISWbpvoqwktJ6TK95BETZBhz+KTp/4jjwwF/YsLrNhYJD4j9h7y8xzTSz1Y7QeeGBT7279Jws7bfgbAHT577D0//PeG/dbhtoAezHZ9gUuhgIRvFADzN+qqTiZPHoy2kmRLtiGozrgLf0b4jQ978wDExV7p/SEXgQMcMvVGdHk7IWlSQWjQ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123564025)(20161123560025)(20161123555025)(20161123558025)(6072148);SRVR:BN6PR12MB1138;BCL:0;PCL:0;RULEID:;SRVR:BN6PR12MB1138; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1138;4:JZsJw0/kJ7U11gPh8vFfHAVaQTGhfxB0KnvGbREBIRpHpYV/6znGSxJ8ljOfPkcbgqqaTjmt/iAsvA4HEUQPCjOFe88e7Ppn/TbaI2a1l7x7kDyj79sNknCJ4CvjaI0LZGxmUcyFLyb4D7xuAHVUNIUu5SdEV53/B5NDTI8ErtX1AxZxuQicOZffqUV/UZIbvjqNw0XH/90AxMomywp9MxejoBg9WU3qDKiLYg6ybfQ0KmujWabUVJe3LmllcEhrzSghba1xfC+6ms/t3bE5YqmyX9xXEjm31G3VCb8jXcJ68rN1moRcSgcBcCBpLgKc5H8Mdrs9eJ15vpzfood5YDBDFV5C6ejNMzGc/WodI50k6v6BBrONAJy4hHf91O+sxWHa6JN6F1SCWhzAawEiJ358IUiC7b01bnpEIwwx6oLGFBxxJssF4225MO756fYytuolTqAtbalMvd6iSLmMCoEbgucn339n0gN5coAOBngTYcgwUlkIfa3H3qvrVS/AZZdiaCEQeQ8Q0LlvmgZTwpX/DyHUZpXLmnKJ1sglIJnFNDxo+tv7PmtNmxjxKmSyDW/SJTre/u4HoieKUPHYGjl0T7G5B+q03EKEaDSmWx/8Qv361l6jXPv6VwNfpmsIZwyuR8iLrwyZGSmOiDp5RmIzQpiT+XieNm6sjPlhqvM= X-Forefront-PRVS: 0220D4B98D X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39860400002)(39450400003)(39840400002)(39410400002)(39850400002)(199003)(189002)(5660300001)(7736002)(305945005)(7416002)(33646002)(6666003)(101416001)(83506001)(42186005)(68736007)(23676002)(106356001)(2950100002)(69596002)(53416004)(389900003)(189998001)(50986999)(15650500001)(76176999)(54356999)(4001350100001)(105586002)(103116003)(97736004)(25786008)(2201001)(55016002)(81156014)(86362001)(66066001)(9686003)(1076002)(81166006)(6116002)(4326007)(2906002)(3846002)(8676002)(54906002)(47776003)(53936002)(50466002)(38730400002)(92566002)(6506006)(97746001)(230700001)(71626007)(217873001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR12MB1138;H:tlendack-t1.amdoffice.net;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMTM4OzIzOnJuYmxoNjhRVjZyYmtodTdoN1VnV211WlRN?= =?utf-8?B?Snp6UEVLOTE3M2VTbGtPK1AvY1lSSWJ6eURDdVA0djFqWTNnU3B4RVlWbDR0?= =?utf-8?B?cjZsMWZGY0tsUEo3ZUpiVno3NHVISElLL0xRanYxN1ZseFVMbUxKWTdyMWpU?= =?utf-8?B?UXY0VDc4MVNCMDAreGlPZitZSGQ5RHE3N1RlbmdvYkNqbFZqMlo5WDhmeW82?= =?utf-8?B?M0l1NkR4Rzk2ZzhaZlplcTRXanU4UFBsL0ppbExyN3BIUzJzSjhnQnRibjJj?= =?utf-8?B?VGlOQ01ER3FCZHQxbjk2OFhXRVhlLzc4TUtuSml0S1NOWlB3MVJhZDVvZ1Yy?= =?utf-8?B?aTZpYnJ5VWhlVEFNNEN0N29YZVBlRUNLT2daZE01YkRJMlNZdVo5UHZSb2xY?= =?utf-8?B?dkQ0b1h1MFNkVUQ2eWszM24yYmVocUVwbFh4TjFRQTRPNUxib3I5dXI1Y0Ja?= =?utf-8?B?d1pGclo1aElVQThpZ21FYUc2ZFFSdDFTbGEzTzMyNHYvMjFCTTlGWFVXYmpI?= =?utf-8?B?Q3VDdU9tamFMTW5NSm5ROW5lTTZZTWVkYmgvV1NibjBHcTFWZXB3Q2REMGNH?= =?utf-8?B?c2VzRkZPdWpkeCtvY09VZzRyYmExUSs2MmhsTTRjSE9yQzB3TnJ2L1FIZmQv?= =?utf-8?B?K3BLbW5rV2c3NXhVOE9QTndHaWdBZ1o5U29RQmpyZGZwcDNNck1oSks2YXFP?= =?utf-8?B?NXlwQUloZUw5SG9mUjcrQVcvMU1ia2Vta0d1cFdrRTdSekJpNysra2NYdGU4?= =?utf-8?B?a0xPYll3a2ErejhNYlBCQWc3a2FwVExacDAzOTNqelhDdXpUSUZGT1J3VGdB?= =?utf-8?B?RnNVYThEdGtPOE5KLzk5Q1dqaTZsVmJmSDFhUEs5QisrKzdod3NzYkp5dFll?= =?utf-8?B?bFRieXhXbllvc2w2b0RTMFNROWROOG9qblRhMXIxWjdqR2dVQzlucW9kT3VR?= =?utf-8?B?blRzQjVsYVhlSisxK1JCV3J5aVl1dXY3VEhPOGFZdmgvc0psK1Yya0lycnBu?= =?utf-8?B?amEwOXJ1d2VPSzF5Y1Q2ek9ja216R2xJOEsrUEttZjhYRzdXb3E5QXdtVTA0?= =?utf-8?B?Ykp3c0syLzFXdDdQdlhBa2pmeXV0YnEremFkbDBOTFV5TGVLTzk1VTl1M0Jz?= =?utf-8?B?Zis4Tm1yUDIrdThjUHh2S3FQM1BTWnAxZVhqYnQzZ3pDMzRnZitESlpZZnpn?= =?utf-8?B?ZmxyUmF2YXROZzlxQ09TV0JPMWtvUUM1a0Rrd2hzWjYwOS9BSkFOa2xCT3Fo?= =?utf-8?B?U0JDU29qSGFXT1h1N0t4UUplZFlYMm5DQm5DUnp6N0xJZmp3RzF2ZHlKRGky?= =?utf-8?B?dS8rTlFqSmdXbUM1ZzFwR2J1RTIwRkhOb2VjM1k2VHpiT2xlY25lVFV3R1hI?= =?utf-8?B?NnVkdVNvV0pGQi9mME13SWhvcEtCK0hvV0Jja2J0YUF6a2xWV28rM3pkdXRy?= =?utf-8?B?Mkc2T0MwQUxnMERwSUh5WkJpcnNkUEFGQkxrRWhVVFE4NDlaeXZBdVZtYkEz?= =?utf-8?B?cXBDcmJrVE0xTTYwOHBFSkpjL2tReTB3QnVDbCtrYlhod1VXYVo2Ky9wNDJ5?= =?utf-8?B?WmRXOTM4a2daTlpKYUMvdXdzTTNkTFVLTi9wQnhCR1pqVFdyNEZPQllOSFdv?= =?utf-8?B?QWtVU2JWUEYzTnpKdnptZDIyM1k4ZTVLTExYUG9pOVVIMHR4dWRQU2t3OXpE?= =?utf-8?B?QU1EK0dzemg3SHg3WGdyMERZeE9Rdmtaa2JFZVA3YW4rN3N1WUpESnA3eFdB?= =?utf-8?B?V2pLdTBVdmRGVXM5S0FaajgrbUREYmh5bFA5bmVHUkRLRS9QTkFtSmw1ekJO?= =?utf-8?B?Y3VJLzB6U3FxVlBVN3ZYdUFYQWlnK0J6MXdEcmNuQ2FtN1JzUUxlL240c1Fw?= =?utf-8?B?NXN1Ym9QbDArS0RtUmNmS1F4SG50MkRTa1BaUmYvMHJORnpicURlU3BKWmIv?= =?utf-8?Q?WEB6VABvx3Guv2H1YkT45bp8sUBhF4=3D?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1138;6:vR92nztQp+uoxFeJs3Bek/ueUcBhWhuXslq9eF3DrSVxe8QjGjTlTwsMcoM8hy/+ycQv56dXiKImOo3uDNKCICsx7LbDak/m2isUiUG0egD7cmJo2aThJgPavUpM3zwds+LYsRbfeFcps+/Jrudf6AQkl1z6XO2d6vEECmTgHr2nyctZCDjAySGZbCOCF0nDL9niLrs7WdBzAkJ9PfvudtIsgwu+gQaETodWm9daIoA6+4FGA+OObf5c3DyMc9V7TymTcEMo/87qbb82gAMqkZcDXpbz9Ho1R1FObSJ1HgnqEc1dYLR6y5vJ3aai1UtI4jwBD6xbcFALIb7Ukr+0hoF3g5JF7Lke+gs3UenQAe8WoYFDaZSiEue2cuuoJ/c9/hJUFu9GlxoC04zAMawKbrAfx1WWF+uJsTsF1kMyBdo=;5:5x/7W9GDVLEykTqXkRMzJYgSICtBvozMoGeDH01yIh8EVu9z6MDLhL/Uh13Um09GR28l5NODAxhZI+Smunttf81meNPtDsH8iLjGaAYPfbaDsn7Zv3rjAEvsmc0M5A+VMDtUwBMg0HzdF286J43SAA==;24:VLhCvHdKL3KtQaUdofv67XCLlY/ZiicoaitwEsCUV87U1BUnA5pszGlxhnzqP9OVAoW9o8S/MlpwFC7dAvNNYMAqxlHcv4ekkrM9UeirY2o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1138;7:y9JLitZ5c/MoXhH+CEGcgqYHZXNTc6qPk13NDGgzCNgu7D8uOU3LTAe0+QAqk0jMPaQYBqjRNoGFb3D2PQZ20/mNW2lZf/MFoGecpZ1B0mGw4i9KuhU+brZT5SnRJ8AiqAcduBeMScn+5f6sXGdApLcAy0JBOrzBNbRkqTjwBxpRR08Gx/pA+kAaqK5ot+MXt0zUSCVHqi2nSaqnVclfGMui3FlCHsNBt2tjXMO86w0WJ98C+mb9Mq5k62uRduhQ7bKG74vW633Q9FxuTVgQwpGucSvhVlc6CHVqJ/eZxthPbvLkBLfGeUHOrLHAHp3sr782Y+W1BBgvoL2C1QQw9A==;20:G6MgnhPlDcqmVk4jVAP8VMGdYsUM6I984HFd/+CZGZhXrFUclYHC8Ca14laRAD1yJfv2Zr2Lb/gaDput1hJJ8yv+Ovzmo38K4h9cbCV8FqjTqlfenPvBBPTO3rewl7aWdpSAJiquOWcr+D5y4pz6TN+GmDNWjH6he5k9LkE2fuAL7ar8Wa1BbdetF1M71+vK75Sw3aEuVC2frd3p+XYbJ9KQUDOl+ttFVuKTaxJZo7N5hv19yCa6jVSHl0QHn0xX X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2017 15:45:00.2966 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1138 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update the efi_mem_type() to return EFI_RESERVED_TYPE instead of a hardcoded 0. Signed-off-by: Tom Lendacky --- arch/x86/platform/efi/efi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index a15cf81..6407103 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -1037,7 +1037,7 @@ u32 efi_mem_type(unsigned long phys_addr) efi_memory_desc_t *md; if (!efi_enabled(EFI_MEMMAP)) - return 0; + return EFI_RESERVED_TYPE; for_each_efi_memory_desc(md) { if ((md->phys_addr <= phys_addr) && @@ -1045,7 +1045,7 @@ u32 efi_mem_type(unsigned long phys_addr) (md->num_pages << EFI_PAGE_SHIFT)))) return md->type; } - return 0; + return EFI_RESERVED_TYPE; } static int __init arch_parse_efi_cmdline(char *str) From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Lendacky Subject: [RFC PATCH v4 13/28] efi: Update efi_mem_type() to return defined EFI mem types Date: Thu, 16 Feb 2017 09:44:57 -0600 Message-ID: <20170216154457.19244.5369.stgit@tlendack-t1.amdoffice.net> References: <20170216154158.19244.66630.stgit@tlendack-t1.amdoffice.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20170216154158.19244.66630.stgit-qCXWGYdRb2BnqfbPTmsdiZQ+2ll4COg0XqFh9Ls21Oc@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kasan-dev-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: Rik van Riel , Larry Woodman , Brijesh Singh , Toshimitsu Kani , Arnd Bergmann , Jonathan Corbet , Matt Fleming , Radim =?utf-8?b?S3LEjW3DocWZ?= , Andrey Ryabinin , Ingo Molnar , "Michael S. Tsirkin" , Andy Lutomirski , "H. Peter Anvin" , Borislav Petkov , Paolo Bonzini , Alexander Potapenko , Thomas Gleixner , Dmitry Vyukov List-Id: linux-efi@vger.kernel.org Update the efi_mem_type() to return EFI_RESERVED_TYPE instead of a hardcoded 0. Signed-off-by: Tom Lendacky --- arch/x86/platform/efi/efi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index a15cf81..6407103 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -1037,7 +1037,7 @@ u32 efi_mem_type(unsigned long phys_addr) efi_memory_desc_t *md; if (!efi_enabled(EFI_MEMMAP)) - return 0; + return EFI_RESERVED_TYPE; for_each_efi_memory_desc(md) { if ((md->phys_addr <= phys_addr) && @@ -1045,7 +1045,7 @@ u32 efi_mem_type(unsigned long phys_addr) (md->num_pages << EFI_PAGE_SHIFT)))) return md->type; } - return 0; + return EFI_RESERVED_TYPE; } static int __init arch_parse_efi_cmdline(char *str) From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-co1nam03on0083.outbound.protection.outlook.com ([104.47.40.83]:15777 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932276AbdBPPpL (ORCPT ); Thu, 16 Feb 2017 10:45:11 -0500 From: Tom Lendacky Subject: [RFC PATCH v4 13/28] efi: Update efi_mem_type() to return defined EFI mem types Date: Thu, 16 Feb 2017 09:44:57 -0600 Message-ID: <20170216154457.19244.5369.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20170216154158.19244.66630.stgit@tlendack-t1.amdoffice.net> References: <20170216154158.19244.66630.stgit@tlendack-t1.amdoffice.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-arch@vger.kernel.org, linux-efi@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, iommu@lists.linux-foundation.org Cc: Rik van Riel , Radim =?utf-8?b?S3LEjW3DocWZ?= , Toshimitsu Kani , Arnd Bergmann , Jonathan Corbet , Matt Fleming , "Michael S. Tsirkin" , Joerg Roedel , Konrad Rzeszutek Wilk , Paolo Bonzini , Brijesh Singh , Ingo Molnar , Alexander Potapenko , Andy Lutomirski , "H. Peter Anvin" , Borislav Petkov , Andrey Ryabinin , Thomas Gleixner , Larry Woodman , Dmitry Vyukov Message-ID: <20170216154457.jxH_r5rvwhvISOZN6ww4FK19SL7jUtx5qe8w0_SW_z0@z> Update the efi_mem_type() to return EFI_RESERVED_TYPE instead of a hardcoded 0. Signed-off-by: Tom Lendacky --- arch/x86/platform/efi/efi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index a15cf81..6407103 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -1037,7 +1037,7 @@ u32 efi_mem_type(unsigned long phys_addr) efi_memory_desc_t *md; if (!efi_enabled(EFI_MEMMAP)) - return 0; + return EFI_RESERVED_TYPE; for_each_efi_memory_desc(md) { if ((md->phys_addr <= phys_addr) && @@ -1045,7 +1045,7 @@ u32 efi_mem_type(unsigned long phys_addr) (md->num_pages << EFI_PAGE_SHIFT)))) return md->type; } - return 0; + return EFI_RESERVED_TYPE; } static int __init arch_parse_efi_cmdline(char *str) From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Lendacky Subject: [RFC PATCH v4 13/28] efi: Update efi_mem_type() to return defined EFI mem types Date: Thu, 16 Feb 2017 09:44:57 -0600 Message-ID: <20170216154457.19244.5369.stgit@tlendack-t1.amdoffice.net> References: <20170216154158.19244.66630.stgit@tlendack-t1.amdoffice.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Rik van Riel , Larry Woodman , Brijesh Singh , Toshimitsu Kani , Arnd Bergmann , Jonathan Corbet , Matt Fleming , Radim =?utf-8?b?S3LEjW3DocWZ?= , Andrey Ryabinin , Ingo Molnar , "Michael S. Tsirkin" , Andy Lutomirski , "H. Peter Anvin" , Borislav Petkov , Paolo Bonzini , Alexander Potapenko , Thomas Gleixner , Dmitry Vyukov To: , , , , , , , , Return-path: In-Reply-To: <20170216154158.19244.66630.stgit-qCXWGYdRb2BnqfbPTmsdiZQ+2ll4COg0XqFh9Ls21Oc@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org List-Id: kvm.vger.kernel.org Update the efi_mem_type() to return EFI_RESERVED_TYPE instead of a hardcoded 0. Signed-off-by: Tom Lendacky --- arch/x86/platform/efi/efi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index a15cf81..6407103 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -1037,7 +1037,7 @@ u32 efi_mem_type(unsigned long phys_addr) efi_memory_desc_t *md; if (!efi_enabled(EFI_MEMMAP)) - return 0; + return EFI_RESERVED_TYPE; for_each_efi_memory_desc(md) { if ((md->phys_addr <= phys_addr) && @@ -1045,7 +1045,7 @@ u32 efi_mem_type(unsigned long phys_addr) (md->num_pages << EFI_PAGE_SHIFT)))) return md->type; } - return 0; + return EFI_RESERVED_TYPE; } static int __init arch_parse_efi_cmdline(char *str) From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id 60C04680FFB for ; Thu, 16 Feb 2017 10:45:05 -0500 (EST) Received: by mail-pf0-f199.google.com with SMTP id g80so27146156pfb.3 for ; Thu, 16 Feb 2017 07:45:05 -0800 (PST) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0067.outbound.protection.outlook.com. [104.47.40.67]) by mx.google.com with ESMTPS id q21si7251694pgi.412.2017.02.16.07.45.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Feb 2017 07:45:04 -0800 (PST) From: Tom Lendacky Subject: [RFC PATCH v4 13/28] efi: Update efi_mem_type() to return defined EFI mem types Date: Thu, 16 Feb 2017 09:44:57 -0600 Message-ID: <20170216154457.19244.5369.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20170216154158.19244.66630.stgit@tlendack-t1.amdoffice.net> References: <20170216154158.19244.66630.stgit@tlendack-t1.amdoffice.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: linux-arch@vger.kernel.org, linux-efi@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, iommu@lists.linux-foundation.org Cc: Rik van Riel , Radim =?utf-8?b?S3LEjW3DocWZ?= , Toshimitsu Kani , Arnd Bergmann , Jonathan Corbet , Matt Fleming , "Michael S. Tsirkin" , Joerg Roedel , Konrad Rzeszutek Wilk , Paolo Bonzini , Brijesh Singh , Ingo Molnar , Alexander Potapenko , Andy Lutomirski , "H. Peter Anvin" , Borislav Petkov , Andrey Ryabinin , Thomas Gleixner , Larry Woodman , Dmitry Vyukov Update the efi_mem_type() to return EFI_RESERVED_TYPE instead of a hardcoded 0. Signed-off-by: Tom Lendacky --- arch/x86/platform/efi/efi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index a15cf81..6407103 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -1037,7 +1037,7 @@ u32 efi_mem_type(unsigned long phys_addr) efi_memory_desc_t *md; if (!efi_enabled(EFI_MEMMAP)) - return 0; + return EFI_RESERVED_TYPE; for_each_efi_memory_desc(md) { if ((md->phys_addr <= phys_addr) && @@ -1045,7 +1045,7 @@ u32 efi_mem_type(unsigned long phys_addr) (md->num_pages << EFI_PAGE_SHIFT)))) return md->type; } - return 0; + return EFI_RESERVED_TYPE; } static int __init arch_parse_efi_cmdline(char *str) -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org