From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QScrN-0004EU-2Y for qemu-devel@nongnu.org; Fri, 03 Jun 2011 18:28:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QScrL-0000s1-DN for qemu-devel@nongnu.org; Fri, 03 Jun 2011 18:28:53 -0400 Received: from mail-yi0-f45.google.com ([209.85.218.45]:64208) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QScrL-0000rt-9A for qemu-devel@nongnu.org; Fri, 03 Jun 2011 18:28:51 -0400 Received: by yib19 with SMTP id 19so1116020yib.4 for ; Fri, 03 Jun 2011 15:28:50 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20110603203640.GD14583@volta.aurel32.net> References: <1301595926-29059-1-git-send-email-jordan.l.justen@intel.com> <20110418084640.GA16178@volta.aurel32.net> <20110603203640.GD14583@volta.aurel32.net> Date: Fri, 3 Jun 2011 15:28:49 -0700 Message-ID: From: Jordan Justen Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3] hw/pc: Support system flash memory with -pflash parameter List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Aurelien Jarno Cc: Jordan Justen , Anthony Liguori , qemu-devel@nongnu.org On Fri, Jun 3, 2011 at 13:36, Aurelien Jarno wrote: > Ping? Cc:ed Anthony the maintainer of pc.c Sorry, I've been meaning to rebase this and add your reviewed-by. Would that be the right next step in this case? -Jordan > > On Mon, Apr 18, 2011 at 10:46:40AM +0200, Aurelien Jarno wrote: >> On Thu, Mar 31, 2011 at 11:25:26AM -0700, Jordan Justen wrote: >> > If -pflash is specified and -bios is specified then pflash will >> > be mapped just below the system rom using hw/pflash_cfi01.c. >> > >> > If -pflash is specified on the command line, but -bios is >> > not specified, then 'bios.bin' will NOT be loaded, and >> > instead the -pflash flash image will be mapped just below >> > 4GB in place of the normal rom image. >> > >> > Signed-off-by: Jordan Justen >> > --- >> > =A0default-configs/i386-softmmu.mak =A0 | =A0 =A01 + >> > =A0default-configs/x86_64-softmmu.mak | =A0 =A01 + >> > =A0hw/pc.c =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0| = =A0161 +++++++++++++++++++++++++++--------- >> > =A03 files changed, 125 insertions(+), 38 deletions(-) >> >> Reviewed-by: Aurelien Jarno >> >> > diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-s= oftmmu.mak >> > index 55589fa..8697cd4 100644 >> > --- a/default-configs/i386-softmmu.mak >> > +++ b/default-configs/i386-softmmu.mak >> > @@ -21,3 +21,4 @@ CONFIG_PIIX_PCI=3Dy >> > =A0CONFIG_SOUND=3Dy >> > =A0CONFIG_HPET=3Dy >> > =A0CONFIG_APPLESMC=3Dy >> > +CONFIG_PFLASH_CFI01=3Dy >> > diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_= 64-softmmu.mak >> > index 8895028..eca9284 100644 >> > --- a/default-configs/x86_64-softmmu.mak >> > +++ b/default-configs/x86_64-softmmu.mak >> > @@ -21,3 +21,4 @@ CONFIG_PIIX_PCI=3Dy >> > =A0CONFIG_SOUND=3Dy >> > =A0CONFIG_HPET=3Dy >> > =A0CONFIG_APPLESMC=3Dy >> > +CONFIG_PFLASH_CFI01=3Dy >> > diff --git a/hw/pc.c b/hw/pc.c >> > index 6939c04..4812310 100644 >> > --- a/hw/pc.c >> > +++ b/hw/pc.c >> > @@ -41,6 +41,7 @@ >> > =A0#include "sysemu.h" >> > =A0#include "blockdev.h" >> > =A0#include "ui/qemu-spice.h" >> > +#include "flash.h" >> > >> > =A0/* output Bochs bios info messages */ >> > =A0//#define DEBUG_BIOS >> > @@ -957,6 +958,124 @@ void pc_cpus_init(const char *cpu_model) >> > =A0 =A0 =A0} >> > =A0} >> > >> > +static void pc_isa_bios_init(ram_addr_t ram_offset, int ram_size) >> > +{ >> > + =A0 =A0int isa_bios_size; >> > + >> > + =A0 =A0/* map the last 128KB of the BIOS in ISA space */ >> > + =A0 =A0isa_bios_size =3D ram_size; >> > + =A0 =A0if (isa_bios_size > (128 * 1024)) { >> > + =A0 =A0 =A0 =A0isa_bios_size =3D 128 * 1024; >> > + =A0 =A0} >> > + =A0 =A0ram_offset =3D ram_offset + ram_size - isa_bios_size; >> > + =A0 =A0cpu_register_physical_memory(0x100000 - isa_bios_size, >> > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 isa_= bios_size, >> > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ram_= offset | IO_MEM_ROM); >> > +} >> > + >> > +static int pc_system_rom_init(void) >> > +{ >> > + =A0 =A0int ret; >> > + =A0 =A0int bios_size; >> > + =A0 =A0ram_addr_t bios_offset; >> > + =A0 =A0char *filename; >> > + >> > + =A0 =A0/* BIOS load */ >> > + =A0 =A0if (bios_name =3D=3D NULL) { >> > + =A0 =A0 =A0 =A0bios_name =3D BIOS_FILENAME; >> > + =A0 =A0} >> > + =A0 =A0filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); >> > + =A0 =A0if (filename) { >> > + =A0 =A0 =A0 =A0bios_size =3D get_image_size(filename); >> > + =A0 =A0} else { >> > + =A0 =A0 =A0 =A0bios_size =3D -1; >> > + =A0 =A0} >> > + >> > + =A0 =A0if (bios_size <=3D 0 || (bios_size % 65536) !=3D 0) { >> > + =A0 =A0 =A0 =A0ret =3D -1; >> > + =A0 =A0} else { >> > + =A0 =A0 =A0 =A0bios_offset =3D qemu_ram_alloc(NULL, "pc.bios", bios_= size); >> > + =A0 =A0 =A0 =A0ret =3D rom_add_file_fixed(bios_name, (uint32_t)(-bio= s_size), -1); >> > + =A0 =A0} >> > + >> > + =A0 =A0if (ret !=3D 0) { >> > + =A0 =A0 =A0 =A0fprintf(stderr, "qemu: could not load PC BIOS '%s'\n"= , bios_name); >> > + =A0 =A0 =A0 =A0exit(1); >> > + =A0 =A0} >> > + >> > + =A0 =A0if (filename) { >> > + =A0 =A0 =A0 =A0qemu_free(filename); >> > + =A0 =A0} >> > + >> > + =A0 =A0pc_isa_bios_init(bios_offset, bios_size); >> > + >> > + =A0 =A0/* map all the bios at the top of memory */ >> > + =A0 =A0cpu_register_physical_memory((uint32_t)(-bios_size), >> > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 bios= _size, bios_offset | IO_MEM_ROM); >> > + >> > + =A0 =A0return bios_size; >> > +} >> > + >> > +static void pc_system_flash_init(DriveInfo *pflash_drv, int rom_size) >> > +{ >> > + =A0 =A0BlockDriverState *bdrv; >> > + =A0 =A0int64_t size; >> > + =A0 =A0target_phys_addr_t phys_addr; >> > + =A0 =A0ram_addr_t addr; >> > + =A0 =A0int sector_bits, sector_size; >> > + >> > + =A0 =A0bdrv =3D NULL; >> > + >> > + =A0 =A0bdrv =3D pflash_drv->bdrv; >> > + =A0 =A0size =3D bdrv_getlength(pflash_drv->bdrv); >> > + =A0 =A0sector_bits =3D 12; >> > + =A0 =A0sector_size =3D 1 << sector_bits; >> > + >> > + =A0 =A0if ((size % sector_size) !=3D 0) { >> > + =A0 =A0 =A0 =A0fprintf(stderr, >> > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"qemu: -pflash size must be a multipl= e of 0x%x\n", >> > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0sector_size); >> > + =A0 =A0 =A0 =A0exit(1); >> > + =A0 =A0} >> > + >> > + =A0 =A0phys_addr =3D 0x100000000ULL - rom_size - size; >> > + =A0 =A0addr =3D qemu_ram_alloc(NULL, "system.flash", size); >> > + =A0 =A0DPRINTF("flash addr: 0x%lx\n", (int64_t)phys_addr); >> > + =A0 =A0pflash_cfi01_register(phys_addr, addr, bdrv, >> > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0sector_size, size= >> sector_bits, >> > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A04, 0x0000, 0x0000= , 0x0000, 0x0000, 0); >> > + >> > + =A0 =A0if (rom_size =3D=3D 0) { >> > + =A0 =A0 =A0 =A0pc_isa_bios_init(addr, size); >> > + =A0 =A0} >> > +} >> > + >> > +static void pc_system_firmware_init(void) >> > +{ >> > + =A0 =A0int flash_present, rom_present; >> > + =A0 =A0int rom_size; >> > + =A0 =A0DriveInfo *pflash_drv; >> > + >> > + =A0 =A0pflash_drv =3D drive_get(IF_PFLASH, 0, 0); >> > + =A0 =A0flash_present =3D (pflash_drv !=3D NULL); >> > + >> > + =A0 =A0/* Load rom if -bios is used or if -pflash is not used */ >> > + =A0 =A0rom_present =3D ((bios_name !=3D NULL) || !flash_present); >> > + >> > + =A0 =A0/* If rom is present, then it is mapped just below 4GB */ >> > + =A0 =A0if (rom_present) { >> > + =A0 =A0 =A0 =A0rom_size =3D pc_system_rom_init(); >> > + =A0 =A0} else { >> > + =A0 =A0 =A0 =A0rom_size =3D 0; >> > + =A0 =A0} >> > + >> > + =A0 =A0/* If flash is present, then it is mapped just below the rom,= or >> > + =A0 =A0 * just below 4GB when rom is not present. */ >> > + =A0 =A0if (flash_present) { >> > + =A0 =A0 =A0 =A0pc_system_flash_init(pflash_drv, rom_size); >> > + =A0 =A0} >> > +} >> > + >> > =A0void pc_memory_init(ram_addr_t ram_size, >> > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0const char *kernel_filename= , >> > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0const char *kernel_cmdline, >> > @@ -964,11 +1083,9 @@ void pc_memory_init(ram_addr_t ram_size, >> > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ram_addr_t *below_4g_mem_si= ze_p, >> > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ram_addr_t *above_4g_mem_si= ze_p) >> > =A0{ >> > - =A0 =A0char *filename; >> > - =A0 =A0int ret, linux_boot, i; >> > - =A0 =A0ram_addr_t ram_addr, bios_offset, option_rom_offset; >> > + =A0 =A0int linux_boot, i; >> > + =A0 =A0ram_addr_t ram_addr, option_rom_offset; >> > =A0 =A0 =A0ram_addr_t below_4g_mem_size, above_4g_mem_size =3D 0; >> > - =A0 =A0int bios_size, isa_bios_size; >> > =A0 =A0 =A0void *fw_cfg; >> > >> > =A0 =A0 =A0if (ram_size >=3D 0xe0000000 ) { >> > @@ -994,44 +1111,12 @@ void pc_memory_init(ram_addr_t ram_size, >> > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 ram_addr + below_4g_mem_size); >> > =A0 =A0 =A0} >> > >> > - =A0 =A0/* BIOS load */ >> > - =A0 =A0if (bios_name =3D=3D NULL) >> > - =A0 =A0 =A0 =A0bios_name =3D BIOS_FILENAME; >> > - =A0 =A0filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); >> > - =A0 =A0if (filename) { >> > - =A0 =A0 =A0 =A0bios_size =3D get_image_size(filename); >> > - =A0 =A0} else { >> > - =A0 =A0 =A0 =A0bios_size =3D -1; >> > - =A0 =A0} >> > - =A0 =A0if (bios_size <=3D 0 || >> > - =A0 =A0 =A0 =A0(bios_size % 65536) !=3D 0) { >> > - =A0 =A0 =A0 =A0goto bios_error; >> > - =A0 =A0} >> > - =A0 =A0bios_offset =3D qemu_ram_alloc(NULL, "pc.bios", bios_size); >> > - =A0 =A0ret =3D rom_add_file_fixed(bios_name, (uint32_t)(-bios_size),= -1); >> > - =A0 =A0if (ret !=3D 0) { >> > - =A0 =A0bios_error: >> > - =A0 =A0 =A0 =A0fprintf(stderr, "qemu: could not load PC BIOS '%s'\n"= , bios_name); >> > - =A0 =A0 =A0 =A0exit(1); >> > - =A0 =A0} >> > - =A0 =A0if (filename) { >> > - =A0 =A0 =A0 =A0qemu_free(filename); >> > - =A0 =A0} >> > - =A0 =A0/* map the last 128KB of the BIOS in ISA space */ >> > - =A0 =A0isa_bios_size =3D bios_size; >> > - =A0 =A0if (isa_bios_size > (128 * 1024)) >> > - =A0 =A0 =A0 =A0isa_bios_size =3D 128 * 1024; >> > - =A0 =A0cpu_register_physical_memory(0x100000 - isa_bios_size, >> > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 isa_= bios_size, >> > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 (bio= s_offset + bios_size - isa_bios_size) | IO_MEM_ROM); >> > + =A0 =A0/* Initialize ROM or flash ranges for PC firmware */ >> > + =A0 =A0pc_system_firmware_init(); >> > >> > =A0 =A0 =A0option_rom_offset =3D qemu_ram_alloc(NULL, "pc.rom", PC_ROM= _SIZE); >> > =A0 =A0 =A0cpu_register_physical_memory(PC_ROM_MIN_VGA, PC_ROM_SIZE, o= ption_rom_offset); >> > >> > - =A0 =A0/* map all the bios at the top of memory */ >> > - =A0 =A0cpu_register_physical_memory((uint32_t)(-bios_size), >> > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 bios= _size, bios_offset | IO_MEM_ROM); >> > - >> > =A0 =A0 =A0fw_cfg =3D bochs_bios_init(); >> > =A0 =A0 =A0rom_set_fw(fw_cfg); >> > >> > -- >> > 1.7.1 >> > >> > >> > >> >> -- >> Aurelien Jarno =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0GPG: 1= 024D/F1BCDB73 >> aurelien@aurel32.net =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 http://www.aurel32.= net >> >> > > -- > Aurelien Jarno =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0GPG: 10= 24D/F1BCDB73 > aurelien@aurel32.net =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 http://www.aurel32.n= et > >