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
 
 typedef struct {
         unsigned int start;
         unsigned int end;
         unsigned int included;
         char name[256];
         char file[256];  /* file[0]=='\0' means not specified. */
 } romlayout_t;
 
 /*
  * include_args lists arguments specified at the command line with -i. They
  * must be processed at some point so that desired regions are marked as
  * "included" in the master rom_entries list.
  */
 static char *include_args[MAX_ROMLAYOUT];

[Louis, 2011/03/04 23:33:16]

Did you accidentally include code from CL 6625011?

[dhendrix, 2011/03/05 00:25:30]

I think that is due to git... I have this patch set up in a branch that tracks
the other CL, so "git cl" might think that the change belongs in both patches.

 static romlayout_t rom_entries[MAX_ROMLAYOUT];
 
 #if CONFIG_INTERNAL == 1 /* FIXME: Move the whole block to cbtable.c? */
 static char *def_name = "DEFAULT";
 
 int show_id(uint8_t *bios, int size, int force)
 {
         unsigned int *walk;
         unsigned int mb_part_offset, mb_vendor_offset;
         char *mb_part, *mb_vendor;
@@ skipping 133 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;
+
+                /*
+                 * Flashrom rom entries use absolute addresses. So for non-zero
+                 * length entries, we need to subtract 1 from offset + size to
+                 * determine the end address.
+                 */
+                rom_entries[romimages].end = fmap->areas[i].offset +
+                                             fmap->areas[i].size;
+                if (fmap->areas[i].size)
+                        rom_entries[romimages].end--;
+
+                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;
+                strcpy(rom_entries[romimages].file, "");
+
+                msg_gdbg("added fmap region \"%s\" (file=\"%s\") as %sincluded,"
+                         " offset: 0x%08x, size: 0x%08x\n",
+                          rom_entries[romimages].name,
+                          rom_entries[romimages].file,
+                          rom_entries[romimages].included ? "" : "not ",
+                          rom_entries[romimages].start,
+                          rom_entries[romimages].end);
+                romimages++;
+        }
+
+        return fmap->nareas;
+}
+
 /* register an include argument (-i) for later processing */
 int register_include_arg(char *name)
 {
         static int i = 0;
 
         if (i >= MAX_ROMLAYOUT) {
                 msg_gerr("too many regions included\n");
                 return -1;
         }
 
@@ skipping 108 matching lines @@
         }
         return 0;
 }
 
 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 */

[Louis, 2011/03/04 23:33:16]

Oooops. I guess you forgot to remove this comment.  :-)

[dhendrix, 2011/03/05 00:25:30]

Fixed (note: this call and the updated comment are in doit() in flashrom.c now)

+        add_fmap_entries(oldcontents, size);
+
         /* 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) {
@@ skipping 85 matching lines @@
 
                 /* Skip to location after current romentry. */
                 start = rom_entries[entry].end + 1;
                 /* Catch overflow. */
                 if (!start)
                         break;
         }
 
         return count;
 }