Add load_firmware_test utility program

utility/dump_fmap.c

 /*
  * Copyright (c) 2010 The Chromium OS Authors. All rights reserved.

[gauravsh, 2011/02/10 20:02:05]

2011

[Che-Liang Chiou, 2011/02/14 02:27:53]

Done.

  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "fmap.h"
+
 /* global variables */
 static int opt_extract = 0;
 static char *progname;

[gauravsh, 2011/02/10 20:02:05]

(optional nit): for consistency with the rest of vboot_reference, please change
all pointer references to use "type* varname" instead of "type *varname".

if you are trying to be consistent to the rest of this file, it may be worth
just cleaning the whole thing up. 

[Che-Liang Chiou, 2011/02/14 02:27:53]

Done.

 static void *base_of_rom;
 
-/* FMAP structs. See http://code.google.com/p/flashmap/wiki/FmapSpec */
-#define FMAP_SIGLEN 8
-#define FMAP_NAMELEN 32
-#define FMAP_SEARCH_STRIDE 4
-typedef struct _FmapHeader {
-  char        fmap_signature[FMAP_SIGLEN]; /* avoiding endian issues */
-  uint8_t     fmap_ver_major;
-  uint8_t     fmap_ver_minor;
-  uint64_t    fmap_base;
-  uint32_t    fmap_size;
-  char        fmap_name[FMAP_NAMELEN];
-  uint16_t    fmap_nareas;
-} __attribute__((packed)) FmapHeader;
-
-typedef struct _AreaHeader {
-  uint32_t area_offset;
-  uint32_t area_size;
-  char     area_name[FMAP_NAMELEN];
-  uint16_t area_flags;
-} __attribute__((packed)) AreaHeader;
-
 
 /* Return 0 if successful */
-static int dump_fmap(void *ptr) {
+static int dump_fmap(const void *ptr) {

[gauravsh, 2011/02/10 20:02:05]

const void*

[Che-Liang Chiou, 2011/02/14 02:27:53]

Done.

   int i,retval = 0;
   char buf[80];                         // DWR: magic number
-  FmapHeader *fmh = (FmapHeader *)ptr;
-  AreaHeader *ah = (AreaHeader *)(ptr + sizeof(FmapHeader));
+  const FmapHeader *fmh = (const FmapHeader *) ptr;

[Randall Spangler, 2011/02/11 17:26:04]

const FmapHeader* fmh

[Che-Liang Chiou, 2011/02/14 02:27:53]

Done.

+  const FmapAreaHeader *ah = (const FmapAreaHeader *)(ptr + sizeof(FmapHeader));
 
   snprintf(buf, FMAP_SIGLEN+1, "%s", fmh->fmap_signature);
   printf("fmap_signature   %s\n", buf);
   printf("fmap_version:    %d.%d\n", fmh->fmap_ver_major, fmh->fmap_ver_minor);
   printf("fmap_base:       0x%" PRIx64 "\n", fmh->fmap_base);
   printf("fmap_size:       0x%08x (%d)\n", fmh->fmap_size, fmh->fmap_size);
   snprintf(buf, FMAP_NAMELEN+1, "%s", fmh->fmap_name);
   printf("fmap_name:       %s\n", buf);
   printf("fmap_nareas:     %d\n", fmh->fmap_nareas);
 
@@ skipping 31 matching lines @@
 
   return retval;
 }
 
 
 int main(int argc, char *argv[]) {
   int c;
   int errorcnt = 0;
   struct stat sb;
   int fd;
-  char *s;
-  size_t i;
+  const char *fmap;

[gauravsh, 2011/02/10 20:02:05]

const char*

[Che-Liang Chiou, 2011/02/14 02:27:53]

Done.

   int retval = 1;
 
   progname = strrchr(argv[0], '/');
   if (progname)
     progname++;
   else
     progname = argv[0];
 
   opterr = 0;                     /* quiet, you */
   while ((c=getopt(argc, argv, ":x")) != -1) {
@@ skipping 49 matching lines @@
   if (base_of_rom == (char *)-1) {
     fprintf(stderr, "%s: can't mmap %s: %s\n",
             progname,
             argv[optind],
             strerror(errno));
     close(fd);
     return 1;
   }
   close(fd);                            /* done with this now */
 
-  s = (char *)base_of_rom;
-  for (i=0; i<sb.st_size; i += FMAP_SEARCH_STRIDE) {
-    if (0 == strncmp(s, "__FMAP__", 8)) {
-      printf("hit at 0x%08x\n", (uint32_t)i);
-      retval = dump_fmap(s);
-      break;
-    }
-    s += FMAP_SEARCH_STRIDE;
+  fmap = FindFmap((char *) base_of_rom, sb.st_size);
+  if (fmap) {
+    printf("hit at 0x%08x\n", (uint32_t) (fmap - (char *) base_of_rom));
+    retval = dump_fmap(fmap);
   }
 
   if (0 != munmap(base_of_rom, sb.st_size)) {
     fprintf(stderr, "%s: can't munmap %s: %s\n",
             progname,
             argv[optind],
             strerror(errno));
     return 1;
   }
 
   return retval;
 }