From patchwork Sun Jan 6 13:09:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 209754 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A54E72C0084 for ; Mon, 7 Jan 2013 00:09:49 +1100 (EST) Received: from localhost ([::1]:53331 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Trpz1-0002Rp-Gx for incoming@patchwork.ozlabs.org; Sun, 06 Jan 2013 08:09:47 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Trpyt-0002Ri-JA for qemu-devel@nongnu.org; Sun, 06 Jan 2013 08:09:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Trpys-0000Pn-Ct for qemu-devel@nongnu.org; Sun, 06 Jan 2013 08:09:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54579) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Trpys-0000Od-4w for qemu-devel@nongnu.org; Sun, 06 Jan 2013 08:09:38 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r06D9aVw010595 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 6 Jan 2013 08:09:36 -0500 Received: from dhcp-1-237.tlv.redhat.com (dhcp-4-26.tlv.redhat.com [10.35.4.26]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r06D9Zxv006234; Sun, 6 Jan 2013 08:09:36 -0500 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 9812718D479; Sun, 6 Jan 2013 15:09:35 +0200 (IST) Date: Sun, 6 Jan 2013 15:09:35 +0200 From: Gleb Natapov To: Alexander Graf Message-ID: <20130106130935.GE3440@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCHv2] linuxboot optionrom: do not jump into loaded kernel in a big real mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Big real mode is fully emulated by KVM now, so if control is passed to the loaded kernel while one of the segment registers is in big real mode all the real mode part of the Linux start up is emulated. This slows boot process down. Fix that by resetting ES limit to 0xffff before jumping into the kernel. The patch also removes unused code segment definition from GDT and changes ES register to be 16bit in protected mode since CS stays 16bit too and it is CS segment that determines effective operands and addresses length. Signed-off-by: Gleb Natapov Reviewed-by: Alexander Graf --- v1->v2 - add patch for binary linuxboot.bin -- Gleb. diff --git a/pc-bios/linuxboot.bin b/pc-bios/linuxboot.bin index e7c36694f997c3c34f7f4af3c2923bd2ef6094e7..435cac4ebff3fcd83cab4bf74de11f7071ab5aa6 100644 GIT binary patch delta 72 zcmZqRXyBNj#oWTwIZ^izW6s78X^grY3=9l?2hw%`DF%L}13f4D4!pei7sLaB|Nnu+ PBpBVlxtghlk#QmbUy&EH delta 68 zcmZqRXyBNj#azSGI8pZyW6H)4X^g52K)|nbpyx#2ftL^ef_NbC|38qJbsj=bI={J@ NsfKa#1||;1e*hia7ytkO diff --git a/pc-bios/optionrom/linuxboot.S b/pc-bios/optionrom/linuxboot.S index 748c831..afe39a5 100644 --- a/pc-bios/optionrom/linuxboot.S +++ b/pc-bios/optionrom/linuxboot.S @@ -101,18 +101,20 @@ copy_kernel: mov $1, %eax mov %eax, %cr0 - /* So we can set ES to a 32-bit segment */ + /* So we can enlarge ES segment limit */ mov $0x10, %eax mov %eax, %es - /* We're now running in 16-bit CS, but 32-bit ES! */ - /* Load kernel and initrd */ read_fw_blob_addr32(FW_CFG_KERNEL) read_fw_blob_addr32(FW_CFG_INITRD) read_fw_blob_addr32(FW_CFG_CMDLINE) read_fw_blob_addr32(FW_CFG_SETUP) + /* Do not leave ES in big real mode */ + mov $0x08, %eax + mov %eax, %es + /* And now jump into Linux! */ mov $0, %eax mov %eax, %cr0 @@ -130,10 +132,10 @@ gdt: /* 0x00 */ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - /* 0x08: code segment (base=0, limit=0xfffff, type=32bit code exec/read, DPL=0, 4k) */ -.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x9a, 0xcf, 0x00 + /* 0x08: data segment (base=0, limit=0xffff, type=16bit data read/write, DPL=0, 4k) */ +.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0x00, 0x00 - /* 0x10: data segment (base=0, limit=0xfffff, type=32bit data read/write, DPL=0, 4k) */ -.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0xcf, 0x00 + /* 0x10: data segment (base=0, limit=0xfffff, type=16bit data read/write, DPL=0, 4k) */ +.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0x8f, 0x00 BOOT_ROM_END