source: trunk/layout.c

Last change on this file was 1601, checked in by stefanct, 9 months ago

Add a bunch of new/tested stuff and various small changes 14.

Tested Mainboards:
OK:

NOT OK:

ASUS CUSL2-C has been tested to be working with the board enable once
implemented for the TUSL2-C board. They seem to have the same PCI IDs
as shown in the links below. Since only the CUSL2-C board enable has been
tested yet, we distinguish the two by DMI strings.
http://paste.flashrom.org/view.php?id=1393
http://www.flashrom.org/pipermail/flashrom/attachments/20091206/ddca2c6c/attachment-0002.eml

Tested flash chips:

Tested chipsets:

Board enables:

Miscellaneous:

  • Add remaining Intel 7 series chipset (LPC) PCI IDs
  • Add generic SPI detection for chips from Winbond
  • Minor manpage changes
  • Minor other cleanups
  • Escape full stops after abbreviations in the manpage.
  • Add ICH9 and successors to spi_get_valid_read_addr

Signed-off-by: Stefan Tauner <stefan.tauner@…>
Acked-by: Stefan Tauner <stefan.tauner@…>

File size: 6.2 KB
Line 
1/*
2 * This file is part of the flashrom project.
3 *
4 * Copyright (C) 2005-2008 coresystems GmbH
5 * (Written by Stefan Reinauer <stepan@coresystems.de> for coresystems GmbH)
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; version 2 of the License.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
19 */
20
21#include <stdio.h>
22#include <stdlib.h>
23#include <string.h>
24#include <limits.h>
25#include "flash.h"
26#include "programmer.h"
27
28static int romimages = 0;
29
30#define MAX_ROMLAYOUT   32
31
32typedef struct {
33        unsigned int start;
34        unsigned int end;
35        unsigned int included;
36        char name[256];
37} romlayout_t;
38
39/* include_args lists arguments specified at the command line with -i. They
40 * must be processed at some point so that desired regions are marked as
41 * "included" in the rom_entries list.
42 */
43static char *include_args[MAX_ROMLAYOUT];
44static int num_include_args = 0; /* the number of valid entries. */
45static romlayout_t rom_entries[MAX_ROMLAYOUT];
46
47#ifndef __LIBPAYLOAD__
48int read_romlayout(char *name)
49{
50        FILE *romlayout;
51        char tempstr[256];
52        int i;
53
54        romlayout = fopen(name, "r");
55
56        if (!romlayout) {
57                msg_gerr("ERROR: Could not open ROM layout (%s).\n",
58                        name);
59                return -1;
60        }
61
62        while (!feof(romlayout)) {
63                char *tstr1, *tstr2;
64
65                if (romimages >= MAX_ROMLAYOUT) {
66                        msg_gerr("Maximum number of ROM images (%i) in layout "
67                                 "file reached.\n", MAX_ROMLAYOUT);
68                        return 1;
69                }
70                if (2 != fscanf(romlayout, "%s %s\n", tempstr, rom_entries[romimages].name))
71                        continue;
72#if 0
73                // fscanf does not like arbitrary comments like that :( later
74                if (tempstr[0] == '#') {
75                        continue;
76                }
77#endif
78                tstr1 = strtok(tempstr, ":");
79                tstr2 = strtok(NULL, ":");
80                if (!tstr1 || !tstr2) {
81                        msg_gerr("Error parsing layout file. Offending string: \"%s\"\n", tempstr);
82                        fclose(romlayout);
83                        return 1;
84                }
85                rom_entries[romimages].start = strtol(tstr1, (char **)NULL, 16);
86                rom_entries[romimages].end = strtol(tstr2, (char **)NULL, 16);
87                rom_entries[romimages].included = 0;
88                romimages++;
89        }
90
91        for (i = 0; i < romimages; i++) {
92                msg_gdbg("romlayout %08x - %08x named %s\n",
93                             rom_entries[i].start,
94                             rom_entries[i].end, rom_entries[i].name);
95        }
96
97        fclose(romlayout);
98
99        return 0;
100}
101#endif
102
103/* returns the index of the entry (or a negative value if it is not found) */
104int find_include_arg(const char *const name)
105{
106        unsigned int i;
107        for (i = 0; i < num_include_args; i++) {
108                if (!strcmp(include_args[i], name))
109                        return i;
110        }
111        return -1;
112}
113
114/* register an include argument (-i) for later processing */
115int register_include_arg(char *name)
116{
117        if (num_include_args >= MAX_ROMLAYOUT) {
118                msg_gerr("Too many regions included (%i).\n", num_include_args);
119                return 1;
120        }
121
122        if (name == NULL) {
123                msg_gerr("<NULL> is a bad region name.\n");
124                return 1;
125        }
126
127        if (find_include_arg(name) != -1) {
128                msg_gerr("Duplicate region name: \"%s\".\n", name);
129                return 1;
130        }
131
132        include_args[num_include_args] = name;
133        num_include_args++;
134        return 0;
135}
136
137/* returns the index of the entry (or a negative value if it is not found) */
138static int find_romentry(char *name)
139{
140        int i;
141
142        if (!romimages)
143                return -1;
144
145        msg_gspew("Looking for region \"%s\"... ", name);
146        for (i = 0; i < romimages; i++) {
147                if (!strcmp(rom_entries[i].name, name)) {
148                        rom_entries[i].included = 1;
149                        msg_gspew("found.\n");
150                        return i;
151                }
152        }
153        msg_gspew("not found.\n");
154        return -1;
155}
156
157/* process -i arguments
158 * returns 0 to indicate success, >0 to indicate failure
159 */
160int process_include_args(void)
161{
162        int i;
163        unsigned int found = 0;
164
165        if (num_include_args == 0)
166                return 0;
167
168        /* User has specified an area, but no layout file is loaded. */
169        if (!romimages) {
170                msg_gerr("Region requested (with -i \"%s\"), "
171                         "but no layout data is available.\n",
172                         include_args[0]);
173                return 1;
174        }
175
176        for (i = 0; i < num_include_args; i++) {
177                if (find_romentry(include_args[i]) < 0) {
178                        msg_gerr("Invalid region specified: \"%s\".\n",
179                                 include_args[i]);
180                        return 1;
181                }
182                found++;
183        }
184
185        msg_ginfo("Using region%s: \"%s\"", num_include_args > 1 ? "s" : "",
186                  include_args[0]);
187        for (i = 1; i < num_include_args; i++)
188                msg_ginfo(", \"%s\"", include_args[i]);
189        msg_ginfo(".\n");
190        return 0;
191}
192
193romlayout_t *get_next_included_romentry(unsigned int start)
194{
195        int i;
196        unsigned int best_start = UINT_MAX;
197        romlayout_t *best_entry = NULL;
198        romlayout_t *cur;
199
200        /* First come, first serve for overlapping regions. */
201        for (i = 0; i < romimages; i++) {
202                cur = &rom_entries[i];
203                if (!cur->included)
204                        continue;
205                /* Already past the current entry? */
206                if (start > cur->end)
207                        continue;
208                /* Inside the current entry? */
209                if (start >= cur->start)
210                        return cur;
211                /* Entry begins after start. */
212                if (best_start > cur->start) {
213                        best_start = cur->start;
214                        best_entry = cur;
215                }
216        }
217        return best_entry;
218}
219
220int handle_romentries(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents)
221{
222        unsigned int start = 0;
223        romlayout_t *entry;
224        unsigned int size = flash->chip->total_size * 1024;
225
226        /* If no regions were specified for inclusion, assume
227         * that the user wants to write the complete new image.
228         */
229        if (num_include_args == 0)
230                return 0;
231
232        /* Non-included romentries are ignored.
233         * The union of all included romentries is used from the new image.
234         */
235        while (start < size) {
236                entry = get_next_included_romentry(start);
237                /* No more romentries for remaining region? */
238                if (!entry) {
239                        memcpy(newcontents + start, oldcontents + start,
240                               size - start);
241                        break;
242                }
243                /* For non-included region, copy from old content. */
244                if (entry->start > start)
245                        memcpy(newcontents + start, oldcontents + start,
246                               entry->start - start);
247                /* Skip to location after current romentry. */
248                start = entry->end + 1;
249                /* Catch overflow. */
250                if (!start)
251                        break;
252        }
253        return 0;
254}
Note: See TracBrowser for help on using the repository browser.