ia64/xen-unstable

changeset 19035:b169db55faf3

hvmloader: remove videoram allocation; move reserve base to 0xfc000000.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Jan 13 15:42:47 2009 +0000 (2009-01-13)
parents d8267d3d2665
children 4f6a2bbdff3f
files tools/firmware/hvmloader/config.h tools/firmware/hvmloader/hvmloader.c
line diff
     1.1 --- a/tools/firmware/hvmloader/config.h	Tue Jan 13 15:29:06 2009 +0000
     1.2 +++ b/tools/firmware/hvmloader/config.h	Tue Jan 13 15:42:47 2009 +0000
     1.3 @@ -19,8 +19,8 @@
     1.4  #define PCI_MEM_END         0xfc000000
     1.5  extern unsigned long pci_mem_start, pci_mem_end;
     1.6  
     1.7 -/* We reserve 16MB at the top of the 4GB memory hole. */
     1.8 -#define RESERVED_MEMBASE    0xff000000
     1.9 +/* We reserve 16MB for special BIOS mappings, etc. */
    1.10 +#define RESERVED_MEMBASE    0xfc000000
    1.11  #define RESERVED_MEMSIZE    0x01000000
    1.12  
    1.13  #define ROMBIOS_SEG            0xF000
     2.1 --- a/tools/firmware/hvmloader/hvmloader.c	Tue Jan 13 15:29:06 2009 +0000
     2.2 +++ b/tools/firmware/hvmloader/hvmloader.c	Tue Jan 13 15:42:47 2009 +0000
     2.3 @@ -622,7 +622,11 @@ static void build_e820_table(void)
     2.4      e820[nr].type = E820_RAM;
     2.5      nr++;
     2.6  
     2.7 -    /* Explicitly reserve space for special pages. */
     2.8 +    /*
     2.9 +     * Explicitly reserve space for special pages.
    2.10 +     * This space starts at RESERVED_MEMBASE an extends to cover various
    2.11 +     * fixed hardware mappings (e.g., LAPIC, IOAPIC, default SVGA framebuffer).
    2.12 +     */
    2.13      e820[nr].addr = RESERVED_MEMBASE;
    2.14      e820[nr].size = (uint32_t)-e820[nr].addr;
    2.15      e820[nr].type = E820_RESERVED;
    2.16 @@ -644,7 +648,7 @@ int main(void)
    2.17  {
    2.18      int option_rom_sz = 0, vgabios_sz = 0, etherboot_sz = 0;
    2.19      int rombios_sz, smbios_sz;
    2.20 -    uint32_t etherboot_phys_addr, option_rom_phys_addr, vga_ram = 0;
    2.21 +    uint32_t etherboot_phys_addr, option_rom_phys_addr;
    2.22      uint16_t xen_pfiob;
    2.23  
    2.24      printf("HVM Loader\n");
    2.25 @@ -692,12 +696,6 @@ int main(void)
    2.26          break;
    2.27      }
    2.28  
    2.29 -    if ( virtual_vga != VGA_none )
    2.30 -    {
    2.31 -        vga_ram = virt_to_phys(mem_alloc(8 << 20, 4096));
    2.32 -        printf("VGA RAM at %08x\n", vga_ram);
    2.33 -    }
    2.34 -
    2.35      etherboot_phys_addr = VGABIOS_PHYSICAL_ADDRESS + vgabios_sz;
    2.36      if ( etherboot_phys_addr < OPTIONROM_PHYSICAL_ADDRESS )
    2.37          etherboot_phys_addr = OPTIONROM_PHYSICAL_ADDRESS;
    2.38 @@ -739,8 +737,6 @@ int main(void)
    2.39                 ROMBIOS_PHYSICAL_ADDRESS + rombios_sz - 1);
    2.40  
    2.41      xen_pfiob = init_xen_platform_io_base();
    2.42 -    if ( xen_pfiob && vga_ram )
    2.43 -        outl(xen_pfiob + 4, vga_ram);
    2.44  
    2.45      build_e820_table();
    2.46