From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753158AbdFMKPO (ORCPT ); Tue, 13 Jun 2017 06:15:14 -0400 Received: from terminus.zytor.com ([65.50.211.136]:49947 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752580AbdFMKPM (ORCPT ); Tue, 13 Jun 2017 06:15:12 -0400 Date: Tue, 13 Jun 2017 03:06:16 -0700 From: "tip-bot for Kirill A. Shutemov" Message-ID: Cc: matt@codeblueprint.co.uk, hpa@zytor.com, jpoimboe@redhat.com, akpm@linux-foundation.org, luto@kernel.org, brgerst@gmail.com, bp@alien8.de, peterz@infradead.org, torvalds@linux-foundation.org, luto@amacapital.net, dave.hansen@intel.com, mingo@kernel.org, dvlasenk@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, kirill.shutemov@linux.intel.com Reply-To: bp@alien8.de, peterz@infradead.org, torvalds@linux-foundation.org, luto@amacapital.net, dvlasenk@redhat.com, mingo@kernel.org, dave.hansen@intel.com, tglx@linutronix.de, kirill.shutemov@linux.intel.com, linux-kernel@vger.kernel.org, matt@codeblueprint.co.uk, hpa@zytor.com, jpoimboe@redhat.com, akpm@linux-foundation.org, brgerst@gmail.com, luto@kernel.org In-Reply-To: <20170606113133.22974-5-kirill.shutemov@linux.intel.com> References: <20170606113133.22974-5-kirill.shutemov@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/boot/efi: Fix __KERNEL_CS definition of GDT entry on 64-bit configurations Git-Commit-ID: 4c94117c7fa1bea36a15157022dbe5efee474340 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4c94117c7fa1bea36a15157022dbe5efee474340 Gitweb: http://git.kernel.org/tip/4c94117c7fa1bea36a15157022dbe5efee474340 Author: Kirill A. Shutemov AuthorDate: Tue, 6 Jun 2017 14:31:23 +0300 Committer: Ingo Molnar CommitDate: Tue, 13 Jun 2017 08:56:52 +0200 x86/boot/efi: Fix __KERNEL_CS definition of GDT entry on 64-bit configurations Define __KERNEL_CS GDT entry as long mode (.L=1, .D=0) on 64-bit configurations. Signed-off-by: Kirill A. Shutemov Reviewed-by: Matt Fleming Cc: Andrew Morton Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-arch@vger.kernel.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20170606113133.22974-5-kirill.shutemov@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/boot/compressed/eboot.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index 1d5093d..b75c20f 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -1059,8 +1059,13 @@ struct boot_params *efi_main(struct efi_config *c, desc->p = 1; desc->limit = 0xf; desc->avl = 0; - desc->l = 0; - desc->d = SEG_OP_SIZE_32BIT; + if (IS_ENABLED(CONFIG_X86_64)) { + desc->l = 1; + desc->d = 0; + } else { + desc->l = 0; + desc->d = SEG_OP_SIZE_32BIT; + } desc->g = SEG_GRANULARITY_4KB; desc->base2 = 0x00; desc++;