Expand shadow memory area for using option ROM v.2
cover Expand shadow memory area for using option ROM v.2
Hi,
This patch expands shadow memory of guest BIOS. Currently the shadow memory is 0xc0000 - 0xdffff.
It is used by VGA, gPXE, option ROM, but the size of these ROMs is around 40k->64k, so the area is not enough.
I updated the previous patch.
http://lists.xensource.com/archives/html/xen-devel/2008-12/msg01117.html
I separate it into 2 parts.
[1/2] replace e820 from 0xe0000 to oxeb000 (using E820_PHYSICAL_ADDRESS macro). [2/2] expand shadow mem from 0xc0000-0xdffff to 0xc0000-0xe8fff.
Best Regards,
Akio Takebe
PATCH 1/2 replace e820 from 0xe0000 to oxeb000
Hi,
This patch replaces e820 from 0xe0000 to oxeb000.
Best Regards,
Akio Takebe
tools/firmware/hvmloader/config.h +1 -0
@@ -26,6 +26,7 @@#define SMBIOS_PHYSICAL_ADDRESS 0x000E9000#define SMBIOS_MAXIMUM_SIZE 0x00001000#define ACPI_PHYSICAL_ADDRESS 0x000EA000 +#define E820_PHYSICAL_ADDRESS 0x000EB000#define ROMBIOS_PHYSICAL_ADDRESS 0x000F0000#define SCRATCH_PHYSICAL_ADDRESS 0x00010000
tools/firmware/rombios/rombios.c +14 -11
@@ -1409,10 +1409,11 @@ {Bit8u nr_entries =read_byte (0x9000 ,0x1e8 );Bit32u base_mem; +Bit16u e820_seg=E820_PHYSICAL_ADDRESS >>4 ;if (nr_entries >32 ) nr_entries =32 ; -write_word (0xe000 ,0x8 , nr_entries); -memcpyb (0xe000 ,0x10 ,0x9000 ,0x2d0 , nr_entries *0x14 ); +write_word (e820_seg,0x8 , nr_entries); +memcpyb (e820_seg,0x10 ,0x9000 ,0x2d0 , nr_entries *0x14 );/* Report the proper base memory size at address 0x0413: otherwise * non-e820 code will clobber things if BASE_MEM_IN_K is bigger than * the first e820 entry. Get the size by reading the second 64bit
@@ -4669,7 +4670,8 @@ {#ifdef HVMASSIST case 0x20 : { -Bit16u e820_table_size =read_word (0xe000 ,0x8 ) *0x14 ; +Bit16u e820_seg=E820_PHYSICAL_ADDRESS >>4 ; +Bit16u e820_table_size =read_word (e820_seg,0x8 ) *0x14 ;if (regs.u.r32.edx !=0x534D4150 )/* SMAP */ goto int15_unimplemented;
@@ -4677,7 +4679,7 @@if ((regs.u.r16.bx /0x14 ) *0x14 == regs.u.r16.bx) {if (regs.u.r16.bx +0x14 <= e820_table_size)memcpyb (ES , regs.u.r16.di, -0xe000 ,0x10 + regs.u.r16.bx,0x14 ); + e820_seg,0x10 + regs.u.r16.bx,0x14 ); regs.u.r32.ebx +=0x14 ;if ((regs.u.r32.ebx +0x14 -1 ) > e820_table_size) regs.u.r32.ebx =0 ;
@@ -4685,8 +4687,8 @@Bit32u base, type;Bit16u off;for (off =0 ; off < e820_table_size; off +=0x14 ) { - base =read_dword (0xe000 ,0x10 + off); - type =read_dword (0xe000 ,0x20 + off); + base =read_dword (e820_seg,0x10 + off); + type =read_dword (e820_seg,0x20 + off);if ((base >=0x100000 ) && (type ==1 ))break ; }
@@ -4694,7 +4696,7 @@SET_CF ();break ; } -memcpyb (ES , regs.u.r16.di,0xe000 ,0x10 + off,0x14 ); +memcpyb (ES , regs.u.r16.di, e820_seg,0x10 + off,0x14 ); regs.u.r32.ebx =0 ; }else {/* AX=E820, DX=534D4150, BX unrecognized */ goto int15_unimplemented;
@@ -4707,7 +4709,8 @@ }case 0x01 : { -Bit16u off, e820_table_size =read_word (0xe000 ,0x8 ) *0x14 ; +Bit16u e820_seg=E820_PHYSICAL_ADDRESS >>4 ; +Bit16u off, e820_table_size =read_word (e820_seg,0x8 ) *0x14 ;Bit32u base, type, size;// do we have any reason to fail here ?
@@ -4723,8 +4726,8 @@// Find first RAM E820 entry >= 1MB. for (off =0 ; off < e820_table_size; off +=0x14 ) { - base =read_dword (0xe000 ,0x10 + off); - type =read_dword (0xe000 ,0x20 + off); + base =read_dword (e820_seg,0x10 + off); + type =read_dword (e820_seg,0x20 + off);if ((base >=0x100000 ) && (type ==1 ))break ; }
@@ -4732,7 +4735,7 @@// If there is RAM above 16MB, return amount in 64kB chunks. regs.u.r16.dx =0 ;if (off != e820_table_size) { - size = base +read_dword (0xe000 ,0x18 + off); + size = base +read_dword (e820_seg,0x18 + off);if (size >0x1000000 ) { size -=0x1000000 ; regs.u.r16.dx = (Bit16u)(size >>16 );
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
PATCH 2/2 expand shadow mem from 0xc0000-0xdffff to 0xc0000-0xe8fff
In reply to Akio TakebeHi,
This patch expands shadow mem from 0xc0000-0xdffff to 0xc0000-0xe8fff
Best Regards,
Akio Takebe
tools/firmware/hvmloader/hvmloader.c +1 -1
@@ -401,7 +401,7 @@printf (" - Product name: %s\n" , (char *)rom + pnph->product_name_offset); -if ( (dest + rom->rom_size *512 +1 ) >0xe0000u ) +if ( (dest + rom->rom_size *512 +1 ) >0xe9000u ) {printf ("Option ROM size %x exceeds available space\n" , rom->rom_size *512 );
tools/firmware/rombios/rombios.c +3 -3
@@ -10444,8 +10444,8 @@ rom_scan: ;; Scan for existence of valid expansion ROMS. ;; Video ROM: from 0xC0000..0xC7FFF in 2k increments - ;; General ROM: from 0xC8000..0xDFFFF in 2k increments - ;; System ROM: only 0xE0000 + ;; General ROM: from 0xC8000..0xE8FFF in 2k increments + ;; System ROM: only 0xE9000 ;; ;; Header: ;;Offset Value
@@ -11021,7 +11021,7 @@ call _init_boot_vectors mov cx, #0xc800 ;; init option roms - mov ax, #0xe000 + mov ax, #0xe900 call rom_scan#if BX_ELTORITO_BOOT
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel