Add flashmap (fmap) support to Flashrom

layout.c

 /*
  * This file is part of the flashrom project.
  *
  * Copyright (C) 2005-2008 coresystems GmbH
  * (Written by Stefan Reinauer <stepan@coresystems.de> for coresystems GmbH)
+ * Portions (C) 2010 Google Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
 #include "flash.h"
+#include "fmap.h"
 #include "programmer.h"
 
 #if CONFIG_INTERNAL == 1
 char *mainboard_vendor = NULL;
 char *mainboard_part = NULL;
 #endif
 static int romimages = 0;
 
 #define MAX_ROMLAYOUT   64
 
@@ skipping 149 matching lines @@
                              rom_entries[i].start,
                              rom_entries[i].end, rom_entries[i].name);
         }
 
         fclose(romlayout);
 
         return 0;
 }
 #endif
 
+/* returns the number of entries added, or <0 to indicate error */
+static int add_fmap_entries(uint8_t *image, int size)
+{
+        int i;
+        struct fmap *fmap;
+        long int fmap_offset;
+
+        if ((fmap_offset = fmap_find(image, size)) < 0)
+                return 0;
+        fmap = (struct fmap *)(image + fmap_offset);;
+
+        for (i = 0; i < fmap->nareas; i++) {
+                if (romimages >= MAX_ROMLAYOUT) {
+                        msg_gerr("ROM image contains too many regions\n");
+                        return -1;
+                }
+                rom_entries[romimages].start = fmap->areas[i].offset;
+                rom_entries[romimages].end = fmap->areas[i].offset +
+                                             fmap->areas[i].size - 1;
+                memset(rom_entries[romimages].name, 0,
+                       sizeof(rom_entries[romimages].name));
+                memcpy(rom_entries[romimages].name, fmap->areas[i].name,
+                       min(sizeof(rom_entries[romimages].name),
+                           sizeof(fmap->areas[i].name)));
+
+                rom_entries[romimages].included = 0;
+
+                msg_gdbg("%s(): added region \"%s\" as %sincluded, offset: 0x%08x, size: 0x%08x\n",

[Louis, 2011/03/04 00:40:59]

nit: exceeds 80 columns.

[dhendrix, 2011/03/04 08:04:46]

good catch -- fixed.

+                          __func__,
+                          rom_entries[romimages].name,
+                          rom_entries[romimages].included ? "" : "not ",
+                          rom_entries[romimages].start,
+                          rom_entries[romimages].end);
+                romimages++;
+        }
+
+        return fmap->nareas;
+}
+
+
 int find_romentry(char *name)
 {
         int i;
 
         if (!romimages)
                 return -1;
 
         msg_gdbg("Looking for \"%s\"... ", name);
 
         for (i = 0; i < romimages; i++) {
@@ skipping 32 matching lines @@
         }
         return best_entry;
 }
 
 int handle_romentries(struct flashchip *flash, uint8_t *oldcontents, uint8_t *newcontents)
 {
         unsigned int start = 0;
         int entry;
         unsigned int size = flash->total_size * 1024;
 
+        /* add entries for non-readonly regions specified in flashmap */
+        add_fmap_entries(oldcontents, size);

[Louis, 2011/03/04 00:40:59]

I thought add_fmap_entries() should be called around read_romlayout()?

[dhendrix, 2011/03/04 08:04:46]

When responding to this comment, I realized that we need to do this
differently... add_fmap_entries() should be called from doit() along with the
new -i argument processing function.

+
         /* If no layout file was specified or the layout file was empty, assume
          * that the user wants to flash the complete new image.
          */
         if (!romimages)
                 return 0;
         /* Non-included romentries are ignored.
          * The union of all included romentries is used from the new image.
          */
         while (start < size) {
                 entry = find_next_included_romentry(start);
                 /* No more romentries for remaining region? */
                 if (entry < 0) {
                         memcpy(newcontents + start, oldcontents + start,
                                size - start);
                         break;
                 }
                 if (rom_entries[entry].start > start)
                         memcpy(newcontents + start, oldcontents + start,
                                rom_entries[entry].start - start);
                 /* Skip to location after current romentry. */
                 start = rom_entries[entry].end + 1;
                 /* Catch overflow. */
                 if (!start)
                         break;
         }
                         
         return 0;
 }