Patchwork [5/8] roms: use new fw_cfg file xfer support.

login
register
mail settings
Submitter Gerd Hoffmann
Date Dec. 18, 2009, 11:01 a.m.
Message ID <1261134074-11795-6-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/41386/
State New
Headers show

Comments

Gerd Hoffmann - Dec. 18, 2009, 11:01 a.m.
roms: use fw_cfg for vgabios and option rom loading, additionally to
deploying them the traditional way (copy to 0xc0000 -> 0xe0000 range).

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/loader.c |   25 ++++++++++++++++++++++---
 hw/loader.h |    5 +++--
 hw/pc.c     |    2 ++
 3 files changed, 27 insertions(+), 5 deletions(-)
Gleb Natapov - Dec. 20, 2009, 8:45 a.m.
On Fri, Dec 18, 2009 at 12:01:11PM +0100, Gerd Hoffmann wrote:
> roms: use fw_cfg for vgabios and option rom loading, additionally to
> deploying them the traditional way (copy to 0xc0000 -> 0xe0000 range).
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/loader.c |   25 ++++++++++++++++++++++---
>  hw/loader.h |    5 +++--
>  hw/pc.c     |    2 ++
>  3 files changed, 27 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/loader.c b/hw/loader.c
> index 2d7a2c4..ccc0ccc 100644
> --- a/hw/loader.c
> +++ b/hw/loader.c
> @@ -48,6 +48,7 @@
>  #include "sysemu.h"
>  #include "uboot_image.h"
>  #include "loader.h"
> +#include "fw_cfg.h"
>  
>  #include <zlib.h>
>  
> @@ -528,6 +529,8 @@ struct Rom {
>      uint8_t *data;
>      int align;
>      int isrom;
> +    char *fw_dir;
> +    char *fw_file;
>  
>      target_phys_addr_t min;
>      target_phys_addr_t max;
> @@ -556,7 +559,7 @@ static void rom_insert(Rom *rom)
>      QTAILQ_INSERT_TAIL(&roms, rom, next);
>  }
>  
> -int rom_add_file(const char *file,
> +int rom_add_file(const char *file, const char *fw_dir, const char *fw_file,
Currently file == fw_file except for rom_add_file_fixed. Is this always
going to be the case? If yes may be better to pass "bool fixed" instead
of "const char *fw_file"?

>                   target_phys_addr_t min, target_phys_addr_t max, int align)
>  {
>      Rom *rom;
> @@ -576,6 +579,8 @@ int rom_add_file(const char *file,
>          goto err;
>      }
>  
> +    rom->fw_dir  = fw_dir  ? qemu_strdup(fw_dir)  : NULL;
> +    rom->fw_file = fw_file ? qemu_strdup(fw_file) : NULL;
>      rom->align   = align;
>      rom->min     = min;
>      rom->max     = max;
> @@ -623,14 +628,16 @@ int rom_add_vga(const char *file)
>  {
>      if (!rom_enable_driver_roms)
>          return 0;
> -    return rom_add_file(file, PC_ROM_MIN_VGA, PC_ROM_MAX, PC_ROM_ALIGN);
> +    return rom_add_file(file, "vgaroms", file,
> +                        PC_ROM_MIN_VGA, PC_ROM_MAX, PC_ROM_ALIGN);
>  }
>  
>  int rom_add_option(const char *file)
>  {
>      if (!rom_enable_driver_roms)
>          return 0;
> -    return rom_add_file(file, PC_ROM_MIN_OPTION, PC_ROM_MAX, PC_ROM_ALIGN);
> +    return rom_add_file(file, "genroms", file,
> +                        PC_ROM_MIN_OPTION, PC_ROM_MAX, PC_ROM_ALIGN);
>  }
>  
>  static void rom_reset(void *unused)
> @@ -692,6 +699,18 @@ int rom_load_all(void)
>      return 0;
>  }
>  
> +int rom_load_fw(void *fw_cfg)
> +{
> +    Rom *rom;
> +
> +    QTAILQ_FOREACH(rom, &roms, next) {
> +        if (!rom->fw_file)
> +            continue;
> +        fw_cfg_add_file(fw_cfg, rom->fw_dir, rom->fw_file, rom->data, rom->romsize);
> +    }
> +    return 0;
> +}
> +
>  static Rom *find_rom(target_phys_addr_t addr)
>  {
>      Rom *rom;
> diff --git a/hw/loader.h b/hw/loader.h
> index b3311a3..634f7d5 100644
> --- a/hw/loader.h
> +++ b/hw/loader.h
> @@ -19,17 +19,18 @@ void pstrcpy_targphys(const char *name,
>                        target_phys_addr_t dest, int buf_size,
>                        const char *source);
>  
> -int rom_add_file(const char *file,
> +int rom_add_file(const char *file, const char *fw_dir, const char *fw_file,
>                   target_phys_addr_t min, target_phys_addr_t max, int align);
>  int rom_add_blob(const char *name, const void *blob, size_t len,
>                   target_phys_addr_t min, target_phys_addr_t max, int align);
>  int rom_load_all(void);
> +int rom_load_fw(void *fw_cfg);
>  int rom_copy(uint8_t *dest, target_phys_addr_t addr, size_t size);
>  void *rom_ptr(target_phys_addr_t addr);
>  void do_info_roms(Monitor *mon);
>  
>  #define rom_add_file_fixed(_f, _a)              \
> -    rom_add_file(_f, _a, 0, 0)
> +    rom_add_file(_f, NULL, NULL, _a, 0, 0)
>  #define rom_add_blob_fixed(_f, _b, _l, _a)      \
>      rom_add_blob(_f, _b, _l, _a, 0, 0)
>  
> diff --git a/hw/pc.c b/hw/pc.c
> index 147a9a7..be70f50 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -1248,6 +1248,8 @@ static void pc_init1(ram_addr_t ram_size,
>              }
>          }
>      }
> +
> +    rom_load_fw(fw_cfg);
>  }
>  
>  static void pc_init_pci(ram_addr_t ram_size,
> -- 
> 1.6.5.2
> 
> 
> _______________________________________________
> SeaBIOS mailing list
> SeaBIOS@seabios.org
> http://www.seabios.org/mailman/listinfo/seabios

--
			Gleb.

Patch

diff --git a/hw/loader.c b/hw/loader.c
index 2d7a2c4..ccc0ccc 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -48,6 +48,7 @@ 
 #include "sysemu.h"
 #include "uboot_image.h"
 #include "loader.h"
+#include "fw_cfg.h"
 
 #include <zlib.h>
 
@@ -528,6 +529,8 @@  struct Rom {
     uint8_t *data;
     int align;
     int isrom;
+    char *fw_dir;
+    char *fw_file;
 
     target_phys_addr_t min;
     target_phys_addr_t max;
@@ -556,7 +559,7 @@  static void rom_insert(Rom *rom)
     QTAILQ_INSERT_TAIL(&roms, rom, next);
 }
 
-int rom_add_file(const char *file,
+int rom_add_file(const char *file, const char *fw_dir, const char *fw_file,
                  target_phys_addr_t min, target_phys_addr_t max, int align)
 {
     Rom *rom;
@@ -576,6 +579,8 @@  int rom_add_file(const char *file,
         goto err;
     }
 
+    rom->fw_dir  = fw_dir  ? qemu_strdup(fw_dir)  : NULL;
+    rom->fw_file = fw_file ? qemu_strdup(fw_file) : NULL;
     rom->align   = align;
     rom->min     = min;
     rom->max     = max;
@@ -623,14 +628,16 @@  int rom_add_vga(const char *file)
 {
     if (!rom_enable_driver_roms)
         return 0;
-    return rom_add_file(file, PC_ROM_MIN_VGA, PC_ROM_MAX, PC_ROM_ALIGN);
+    return rom_add_file(file, "vgaroms", file,
+                        PC_ROM_MIN_VGA, PC_ROM_MAX, PC_ROM_ALIGN);
 }
 
 int rom_add_option(const char *file)
 {
     if (!rom_enable_driver_roms)
         return 0;
-    return rom_add_file(file, PC_ROM_MIN_OPTION, PC_ROM_MAX, PC_ROM_ALIGN);
+    return rom_add_file(file, "genroms", file,
+                        PC_ROM_MIN_OPTION, PC_ROM_MAX, PC_ROM_ALIGN);
 }
 
 static void rom_reset(void *unused)
@@ -692,6 +699,18 @@  int rom_load_all(void)
     return 0;
 }
 
+int rom_load_fw(void *fw_cfg)
+{
+    Rom *rom;
+
+    QTAILQ_FOREACH(rom, &roms, next) {
+        if (!rom->fw_file)
+            continue;
+        fw_cfg_add_file(fw_cfg, rom->fw_dir, rom->fw_file, rom->data, rom->romsize);
+    }
+    return 0;
+}
+
 static Rom *find_rom(target_phys_addr_t addr)
 {
     Rom *rom;
diff --git a/hw/loader.h b/hw/loader.h
index b3311a3..634f7d5 100644
--- a/hw/loader.h
+++ b/hw/loader.h
@@ -19,17 +19,18 @@  void pstrcpy_targphys(const char *name,
                       target_phys_addr_t dest, int buf_size,
                       const char *source);
 
-int rom_add_file(const char *file,
+int rom_add_file(const char *file, const char *fw_dir, const char *fw_file,
                  target_phys_addr_t min, target_phys_addr_t max, int align);
 int rom_add_blob(const char *name, const void *blob, size_t len,
                  target_phys_addr_t min, target_phys_addr_t max, int align);
 int rom_load_all(void);
+int rom_load_fw(void *fw_cfg);
 int rom_copy(uint8_t *dest, target_phys_addr_t addr, size_t size);
 void *rom_ptr(target_phys_addr_t addr);
 void do_info_roms(Monitor *mon);
 
 #define rom_add_file_fixed(_f, _a)              \
-    rom_add_file(_f, _a, 0, 0)
+    rom_add_file(_f, NULL, NULL, _a, 0, 0)
 #define rom_add_blob_fixed(_f, _b, _l, _a)      \
     rom_add_blob(_f, _b, _l, _a, 0, 0)
 
diff --git a/hw/pc.c b/hw/pc.c
index 147a9a7..be70f50 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1248,6 +1248,8 @@  static void pc_init1(ram_addr_t ram_size,
             }
         }
     }
+
+    rom_load_fw(fw_cfg);
 }
 
 static void pc_init_pci(ram_addr_t ram_size,