Implement mapping for ROM files

* pci-arbiter/device_map.h:
* pci-arbiter/device_map.c:
  * New function: device_map_rom
    * Copies the whole rom in the arbiter space.
* pci-arbiter/pcifs.h:
  * struct pcifs_dirent:
    * New field to store the mapping address for each device rom.
o pci-arbiter/func_files.h:
* pci-arbiter/func_files.c:
  * read_rom_file:
    * Retrieves the rom contents from the local space instead of
      libpciaccess.
* pci-arbiter/netfs_impl.c:
  * netfs_attempt_read:get_filemap_region
    * Update call to read_rom_file.
  * get_filemap_region:
    * Uses the old code at netfs_get_filemap to get a proxy to
      the device memory region.
  * get_filemap_rom:
    * Returns a proxy to the locally mapped device rom.
  * netfs_get_filemap:
    * Checks the requested file to map and calls get_filemap_rom,
      get_filemap_region or returns en error.
Message-Id: <20220815161520.6059-2-jlledom@mailfence.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/pci-arbiter/func_files.c b/pci-arbiter/func_files.c
index 40706135..27a72209 100644
--- a/pci-arbiter/func_files.c
+++ b/pci-arbiter/func_files.c
@@ -104,28 +104,28 @@ io_config_file (struct pci_device * dev, off_t offset, size_t * len,
 
 /* Read the mapped ROM */
 error_t
-read_rom_file (struct pci_device * dev, off_t offset, size_t * len,
+read_rom_file (struct pcifs_dirent * e, off_t offset, size_t * len,
 	       void *data)
 {
-  void *fullrom;
+  error_t err;
 
   /* This should never happen */
-  assert_backtrace (dev != 0);
+  assert_backtrace (e->device != 0);
 
   /* Don't exceed the ROM size */
-  if (offset > dev->rom_size)
+  if (offset > e->device->rom_size)
     return EINVAL;
-  if ((offset + *len) > dev->rom_size)
-    *len = dev->rom_size - offset;
+  if ((offset + *len) > e->device->rom_size)
+    *len = e->device->rom_size - offset;
 
-  /* Grab the full rom first */
-  fullrom = calloc(1, dev->rom_size);
-  pci_device_read_rom(dev, fullrom);
+  /* Ensure the rom is mapped */
+  err = device_map_rom (e->device, &e->rom_map);
+  if (err)
+    return err;
 
-  /* Return the requested amount */
-  memcpy (data, fullrom + offset, *len);
+  /* Return the requested tange */
+  memcpy (data, e->rom_map + offset, *len);
 
-  free(fullrom);
   return 0;
 }