projects / openwrt.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
[xburst] Fix image generation for qi_lb60 subtarget
[openwrt.git] / target / linux / brcm63xx / patches-2.6.32 / 040-bcm963xx_flashmap.patch
1 From e734ace5baa04e0e8af1d4483475fbd6bd2b32a1 Mon Sep 17 00:00:00 2001
2 From: Axel Gembe <ago@bastart.eu.org>
3 Date: Mon, 12 May 2008 18:54:09 +0200
4 Subject: [PATCH] bcm963xx: flashmap support
5
6
7 Signed-off-by: Axel Gembe <ago@bastart.eu.org>
8 ---
9 drivers/mtd/maps/Kconfig | 7 +++++++
10 drivers/mtd/maps/Makefile | 1 +
11 drivers/mtd/redboot.c | 13 ++++++++++---
12 3 files changed, 18 insertions(+), 3 deletions(-)
13
14 Index: linux-2.6.32.9/drivers/mtd/maps/Kconfig
15 ===================================================================
16 --- linux-2.6.32.9.orig/drivers/mtd/maps/Kconfig 2010-02-28 18:16:50.000000000 +0100
17 +++ linux-2.6.32.9/drivers/mtd/maps/Kconfig 2010-02-28 18:18:20.000000000 +0100
18 @@ -259,6 +259,13 @@
19 help
20 Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
21
22 +config MTD_BCM963XX
23 + tristate "BCM963xx Flash device"
24 + depends on MIPS && BCM63XX
25 + help
26 + Flash memory access on BCM963xx boards. Currently only works with
27 + RedBoot and CFE.
28 +
29 config MTD_DILNETPC
30 tristate "CFI Flash device mapped on DIL/Net PC"
31 depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
32 Index: linux-2.6.32.9/drivers/mtd/redboot.c
33 ===================================================================
34 --- linux-2.6.32.9.orig/drivers/mtd/redboot.c 2010-02-28 18:16:50.000000000 +0100
35 +++ linux-2.6.32.9/drivers/mtd/redboot.c 2010-02-28 18:18:20.000000000 +0100
36 @@ -39,7 +39,7 @@
37 return 1;
38 }
39
40 -static int parse_redboot_partitions(struct mtd_info *master,
41 +int parse_redboot_partitions(struct mtd_info *master,
42 struct mtd_partition **pparts,
43 unsigned long fis_origin)
44 {
45 @@ -162,6 +162,14 @@
46 goto out;
47 }
48
49 + if (!fis_origin) {
50 + for (i = 0; i < numslots; i++) {
51 + if (!strncmp(buf[i].name, "RedBoot", 8)) {
52 + fis_origin = (buf[i].flash_base & (master->size << 1) - 1);
53 + }
54 + }
55 + }
56 +
57 for (i = 0; i < numslots; i++) {
58 struct fis_list *new_fl, **prev;
59
60 @@ -184,9 +192,8 @@
61 new_fl->img = &buf[i];
62 if (fis_origin) {
63 buf[i].flash_base -= fis_origin;
64 - } else {
65 - buf[i].flash_base &= master->size-1;
66 }
67 + buf[i].flash_base &= (master->size << 1) - 1;
68
69 /* I'm sure the JFFS2 code has done me permanent damage.
70 * I now think the following is _normal_
71 Index: linux-2.6.32.9/drivers/mtd/maps/Makefile
72 ===================================================================
73 --- linux-2.6.32.9.orig/drivers/mtd/maps/Makefile 2010-02-28 18:16:50.000000000 +0100
74 +++ linux-2.6.32.9/drivers/mtd/maps/Makefile 2010-02-28 18:18:20.000000000 +0100
75 @@ -61,3 +61,4 @@
76 obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o
77 obj-$(CONFIG_MTD_VMU) += vmu-flash.o
78 obj-$(CONFIG_MTD_GPIO_ADDR) += gpio-addr-flash.o
79 +obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o
80 Index: linux-2.6.32.9/drivers/mtd/maps/bcm963xx-flash.c
81 ===================================================================
82 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
83 +++ linux-2.6.32.9/drivers/mtd/maps/bcm963xx-flash.c 2010-02-28 18:18:20.000000000 +0100
84 @@ -0,0 +1,399 @@
85 +/*
86 + * Copyright (C) 2006-2008 Florian Fainelli <florian@openwrt.org>
87 + * Mike Albon <malbon@openwrt.org>
88 + *
89 + * This program is free software; you can redistribute it and/or modify
90 + * it under the terms of the GNU General Public License as published by
91 + * the Free Software Foundation; either version 2 of the License, or
92 + * (at your option) any later version.
93 + *
94 + * This program is distributed in the hope that it will be useful,
95 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
96 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
97 + * GNU General Public License for more details.
98 + *
99 + * You should have received a copy of the GNU General Public License
100 + * along with this program; if not, write to the Free Software
101 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
102 + */
103 +
104 +#include <linux/init.h>
105 +#include <linux/kernel.h>
106 +#include <linux/mtd/map.h>
107 +#include <linux/mtd/mtd.h>
108 +#include <linux/mtd/partitions.h>
109 +#include <linux/vmalloc.h>
110 +#include <linux/platform_device.h>
111 +
112 +#include <bcm_tag.h>
113 +#include <asm/io.h>
114 +
115 +#define BUSWIDTH 2 /* Buswidth */
116 +#define EXTENDED_SIZE 0xBFC00000 /* Extended flash address */
117 +
118 +#define PFX KBUILD_MODNAME ": "
119 +
120 +extern int parse_redboot_partitions(struct mtd_info *master, struct mtd_partition **pparts, unsigned long fis_origin);
121 +static struct mtd_partition *parsed_parts;
122 +
123 +static struct mtd_info *bcm963xx_mtd_info;
124 +
125 +static struct map_info bcm963xx_map = {
126 + .name = "bcm963xx",
127 + .bankwidth = BUSWIDTH,
128 +};
129 +
130 +static struct tagiddesc_t tagidtab[NUM_TAGID] = TAGID_DEFINITIONS;
131 +
132 +static uint32_t tagcrc32tab[256] = {
133 + 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
134 + 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
135 + 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
136 + 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
137 + 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
138 + 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
139 + 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
140 + 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
141 + 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
142 + 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
143 + 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
144 + 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
145 + 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
146 + 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
147 + 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
148 + 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
149 + 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
150 + 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
151 + 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
152 + 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
153 + 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
154 + 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
155 + 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
156 + 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
157 + 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
158 + 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
159 + 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
160 + 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
161 + 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
162 + 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
163 + 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
164 + 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
165 +};
166 +
167 +static uint32_t tagcrc32(uint32_t crc, uint8_t *data, size_t len)
168 +{
169 + while (len--)
170 + crc = (crc >> 8) ^ tagcrc32tab[(crc ^ *data++) & 0xFF];
171 +
172 + return crc;
173 +}
174 +
175 +static int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition **pparts)
176 +{
177 + int nrparts = 3, curpart = 0; /* CFE,NVRAM and global LINUX are always present. */
178 + union bcm_tag *buf;
179 + struct mtd_partition *parts;
180 + int ret;
181 + size_t retlen;
182 + unsigned int rootfsaddr, kerneladdr, spareaddr;
183 + unsigned int rootfslen, kernellen, sparelen, totallen;
184 + unsigned char *tagid;
185 + int namelen = 0;
186 + int i;
187 + uint32_t tagidcrc;
188 + uint32_t calctagidcrc;
189 + bool tagid_match = false;
190 + char *boardid;
191 + char *tagversion;
192 + char *matchtagid;
193 +
194 + /* Allocate memory for buffer */
195 + buf = vmalloc(sizeof(union bcm_tag));
196 + if (!buf)
197 + return -ENOMEM;
198 +
199 + /* Get the tag */
200 + ret = master->read(master,master->erasesize,sizeof(union bcm_tag), &retlen, (void *)buf);
201 + if (retlen != sizeof(union bcm_tag)){
202 + vfree(buf);
203 + return -EIO;
204 + }
205 +
206 + /* tagId isn't in the same location, so we check each tagid against the
207 + * tagid CRC. If the CRC is valid we have found the right tag and so
208 + * use that tag
209 + */
210 +
211 + for (i = 0; i < NUM_TAGID; i++) {
212 + switch(i) {
213 + case 0:
214 + matchtagid = "bccfe";
215 + tagid = &(buf->bccfe.tagId[0]);
216 + sscanf(buf->bccfe.rootAddress,"%u", &rootfsaddr);
217 + sscanf(buf->bccfe.rootLength, "%u", &rootfslen);
218 + sscanf(buf->bccfe.kernelAddress, "%u", &kerneladdr);
219 + sscanf(buf->bccfe.kernelLength, "%u", &kernellen);
220 + sscanf(buf->bccfe.totalLength, "%u", &totallen);
221 + tagidcrc = *(uint32_t *)&(buf->bccfe.tagIdCRC[0]);
222 + tagversion = &(buf->bccfe.tagVersion[0]);
223 + boardid = &(buf->bccfe.boardid[0]);
224 + break;
225 + case 1:
226 + matchtagid = "bc300";
227 + tagid = &(buf->bc300.tagId[0]);
228 + sscanf(buf->bc300.rootAddress,"%u", &rootfsaddr);
229 + sscanf(buf->bc300.rootLength, "%u", &rootfslen);
230 + sscanf(buf->bc300.kernelAddress, "%u", &kerneladdr);
231 + sscanf(buf->bc300.kernelLength, "%u", &kernellen);
232 + sscanf(buf->bc300.totalLength, "%u", &totallen);
233 + tagidcrc = *(uint32_t *)&(buf->bc300.tagIdCRC[0]);
234 + tagversion = &(buf->bc300.tagVersion[0]);
235 + boardid = &(buf->bc300.boardid[0]);
236 + break;
237 + case 2:
238 + matchtagid = "ag306";
239 + tagid = &(buf->ag306.tagId[0]);
240 + sscanf(buf->ag306.rootAddress,"%u", &rootfsaddr);
241 + sscanf(buf->ag306.rootLength, "%u", &rootfslen);
242 + sscanf(buf->ag306.kernelAddress, "%u", &kerneladdr);
243 + sscanf(buf->ag306.kernelLength, "%u", &kernellen);
244 + sscanf(buf->ag306.totalLength, "%u", &totallen);
245 + tagidcrc = *(uint32_t *)&(buf->ag306.tagIdCRC[0]);
246 + tagversion = &(buf->ag306.tagVersion[0]);
247 + boardid = &(buf->ag306.boardid[0]);
248 + break;
249 + case 3:
250 + matchtagid = "bc221";
251 + tagid = &(buf->bc221.tagId[0]);
252 + sscanf(buf->bc221.rootAddress,"%u", &rootfsaddr);
253 + sscanf(buf->bc221.rootLength, "%u", &rootfslen);
254 + sscanf(buf->bc221.kernelAddress, "%u", &kerneladdr);
255 + sscanf(buf->bc221.kernelLength, "%u", &kernellen);
256 + sscanf(buf->bc221.totalLength, "%u", &totallen);
257 + tagidcrc = *(uint32_t *)&(buf->bc221.tagIdCRC[0]);
258 + tagversion = &(buf->bc221.tagVersion[0]);
259 + boardid = &(buf->bc221.boardid[0]);
260 + break;
261 + case 4:
262 + matchtagid = "bc310";
263 + tagid = &(buf->bc310.tagId[0]);
264 + sscanf(buf->bc310.rootAddress,"%u", &rootfsaddr);
265 + sscanf(buf->bc310.rootLength, "%u", &rootfslen);
266 + sscanf(buf->bc310.kernelAddress, "%u", &kerneladdr);
267 + sscanf(buf->bc310.kernelLength, "%u", &kernellen);
268 + sscanf(buf->bc310.totalLength, "%u", &totallen);
269 + tagidcrc = *(uint32_t *)&(buf->bc310.tagIdCRC[0]);
270 + tagversion = &(buf->bc310.tagVersion[0]);
271 + boardid = &(buf->bc310.boardid[0]);
272 + break;
273 + }
274 + if (strncmp(tagid, matchtagid, TAGID_LEN) != 0) {
275 + continue;
276 + }
277 +
278 + calctagidcrc = htonl(tagcrc32(IMAGETAG_CRC_START, tagid, TAGID_LEN));
279 + if (tagidcrc == calctagidcrc) {
280 + tagid_match = true;
281 + break;
282 + }
283 + }
284 +
285 + if (!tagid_match) {
286 + tagid = "bcram";
287 + sscanf(buf->bccfe.rootAddress,"%u", &rootfsaddr);
288 + sscanf(buf->bccfe.rootLength, "%u", &rootfslen);
289 + sscanf(buf->bccfe.kernelAddress, "%u", &kerneladdr);
290 + sscanf(buf->bccfe.kernelLength, "%u", &kernellen);
291 + sscanf(buf->bccfe.totalLength, "%u", &totallen);
292 + tagidcrc = *(uint32_t *)&(buf->bccfe.tagIdCRC[0]);
293 + tagversion = &(buf->bccfe.tagVersion[0]);
294 + boardid = &(buf->bccfe.boardid[0]);
295 + }
296 +
297 + printk(KERN_INFO PFX "CFE boot tag found with version %s, board type %s, and tagid %s.\n",tagversion,boardid,tagid);
298 +
299 + rootfsaddr = rootfsaddr - EXTENDED_SIZE;
300 + kerneladdr = kerneladdr - EXTENDED_SIZE;
301 + spareaddr = roundup(totallen,master->erasesize) + master->erasesize;
302 + sparelen = master->size - spareaddr - master->erasesize;
303 +
304 + /* Determine number of partitions */
305 + namelen = 8;
306 + if (rootfslen > 0){
307 + nrparts++;
308 + namelen =+ 6;
309 + };
310 + if (kernellen > 0) {
311 + nrparts++;
312 + namelen =+ 6;
313 + };
314 +
315 + /* Ask kernel for more memory */
316 + parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);
317 + if (!parts) {
318 + vfree(buf);
319 + return -ENOMEM;
320 + };
321 +
322 + /* Start building partition list */
323 + parts[curpart].name = "CFE";
324 + parts[curpart].offset = 0;
325 + parts[curpart].size = master->erasesize;
326 + curpart++;
327 +
328 + if (kernellen > 0) {
329 + parts[curpart].name = "kernel";
330 + parts[curpart].offset = kerneladdr;
331 + parts[curpart].size = kernellen;
332 + curpart++;
333 + };
334 +
335 + if (rootfslen > 0) {
336 + parts[curpart].name = "rootfs";
337 + parts[curpart].offset = rootfsaddr;
338 + parts[curpart].size = rootfslen;
339 + if (sparelen > 0)
340 + parts[curpart].size += sparelen;
341 + curpart++;
342 + };
343 +
344 + parts[curpart].name = "nvram";
345 + parts[curpart].offset = master->size - master->erasesize;
346 + parts[curpart].size = master->erasesize;
347 +
348 + /* Global partition "linux" to make easy firmware upgrade */
349 + curpart++;
350 + parts[curpart].name = "linux";
351 + parts[curpart].offset = parts[0].size;
352 + parts[curpart].size = master->size - parts[0].size - parts[3].size;
353 +
354 + for (i = 0; i < nrparts; i++)
355 + printk(KERN_INFO PFX "Partition %d is %s offset %lx and length %lx\n", i, parts[i].name, parts[i].offset, parts[i].size);
356 +
357 + printk(KERN_INFO PFX "Spare partition is %x offset and length %x\n", spareaddr, sparelen);
358 + *pparts = parts;
359 + vfree(buf);
360 +
361 + return nrparts;
362 +};
363 +
364 +static int bcm963xx_detect_cfe(struct mtd_info *master)
365 +{
366 + int idoffset = 0x4e0;
367 + static char idstring[8] = "CFE1CFE1";
368 + char buf[9];
369 + int ret;
370 + size_t retlen;
371 +
372 + ret = master->read(master, idoffset, 8, &retlen, (void *)buf);
373 + buf[retlen] = 0;
374 + printk(KERN_INFO PFX "Read Signature value of %s\n", buf);
375 +
376 + return strncmp(idstring, buf, 8);
377 +}
378 +
379 +static int bcm963xx_probe(struct platform_device *pdev)
380 +{
381 + int err = 0;
382 + int parsed_nr_parts = 0;
383 + char *part_type;
384 + struct resource *r;
385 +
386 + r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
387 + bcm963xx_map.phys = r->start;
388 + bcm963xx_map.size = (r->end - r->start) + 1;
389 + bcm963xx_map.virt = ioremap(r->start, r->end - r->start + 1);
390 +
391 + if (!bcm963xx_map.virt) {
392 + printk(KERN_ERR PFX "Failed to ioremap\n");
393 + return -EIO;
394 + }
395 + printk(KERN_INFO PFX "0x%08lx at 0x%08x\n", bcm963xx_map.size, bcm963xx_map.phys);
396 +
397 + simple_map_init(&bcm963xx_map);
398 +
399 + bcm963xx_mtd_info = do_map_probe("cfi_probe", &bcm963xx_map);
400 + if (!bcm963xx_mtd_info) {
401 + printk(KERN_ERR PFX "Failed to probe using CFI\n");
402 + err = -EIO;
403 + goto err_probe;
404 + }
405 +
406 + bcm963xx_mtd_info->owner = THIS_MODULE;
407 +
408 + /* This is mutually exclusive */
409 + if (bcm963xx_detect_cfe(bcm963xx_mtd_info) == 0) {
410 + printk(KERN_INFO PFX "CFE bootloader detected\n");
411 + if (parsed_nr_parts == 0) {
412 + int ret = parse_cfe_partitions(bcm963xx_mtd_info, &parsed_parts);
413 + if (ret > 0) {
414 + part_type = "CFE";
415 + parsed_nr_parts = ret;
416 + }
417 + }
418 + } else {
419 + printk(KERN_INFO PFX "assuming RedBoot bootloader\n");
420 + if (bcm963xx_mtd_info->size > 0x00400000) {
421 + printk(KERN_INFO PFX "Support for extended flash memory size : 0x%lx ; ONLY 64MBIT SUPPORT\n", bcm963xx_mtd_info->size);
422 + bcm963xx_map.virt = (u32)(EXTENDED_SIZE);
423 + }
424 +
425 +#ifdef CONFIG_MTD_REDBOOT_PARTS
426 + if (parsed_nr_parts == 0) {
427 + int ret = parse_redboot_partitions(bcm963xx_mtd_info, &parsed_parts, 0);
428 + if (ret > 0) {
429 + part_type = "RedBoot";
430 + parsed_nr_parts = ret;
431 + }
432 + }
433 +#endif
434 + }
435 +
436 + return add_mtd_partitions(bcm963xx_mtd_info, parsed_parts, parsed_nr_parts);
437 +
438 +err_probe:
439 + iounmap(bcm963xx_map.virt);
440 + return err;
441 +}
442 +
443 +static int bcm963xx_remove(struct platform_device *pdev)
444 +{
445 + if (bcm963xx_mtd_info) {
446 + del_mtd_partitions(bcm963xx_mtd_info);
447 + map_destroy(bcm963xx_mtd_info);
448 + }
449 +
450 + if (bcm963xx_map.virt) {
451 + iounmap(bcm963xx_map.virt);
452 + bcm963xx_map.virt = 0;
453 + }
454 +
455 + return 0;
456 +}
457 +
458 +static struct platform_driver bcm63xx_mtd_dev = {
459 + .probe = bcm963xx_probe,
460 + .remove = bcm963xx_remove,
461 + .driver = {
462 + .name = "bcm963xx-flash",
463 + .owner = THIS_MODULE,
464 + },
465 +};
466 +
467 +static int __init bcm963xx_mtd_init(void)
468 +{
469 + return platform_driver_register(&bcm63xx_mtd_dev);
470 +}
471 +
472 +static void __exit bcm963xx_mtd_exit(void)
473 +{
474 + platform_driver_unregister(&bcm63xx_mtd_dev);
475 +}
476 +
477 +module_init(bcm963xx_mtd_init);
478 +module_exit(bcm963xx_mtd_exit);
479 +
480 +MODULE_LICENSE("GPL");
481 +MODULE_DESCRIPTION("Broadcom BCM63xx MTD partition parser/mapping for CFE and RedBoot");
482 +MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
483 +MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>");
484 Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm_tag.h
485 ===================================================================
486 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
487 +++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm_tag.h 2010-02-28 18:18:20.000000000 +0100
488 @@ -0,0 +1,178 @@
489 +#ifndef __BCM63XX_TAG_H
490 +#define __BCM63XX_TAG_H
491 +
492 +#define IMAGE_LEN 10 /* Length of Length Field */
493 +#define ADDRESS_LEN 12 /* Length of Address field */
494 +#define TAGID_LEN 6 /* Length of tag ID */
495 +#define TAGINFO_LEN 20 /* Length of vendor information field in tag */
496 +#define TAGVER_LEN 4 /* Length of Tag Version */
497 +#define TAGLAYOUT_LEN 4 /* Length of FlashLayoutVer */
498 +
499 +#define NUM_TAGID 5
500 +#define IMAGETAG_CRC_START 0xFFFFFFFF
501 +
502 +struct tagiddesc_t {
503 + char tagid[TAGID_LEN + 1];
504 + char tagiddesc[80];
505 +};
506 +
507 + // bc221 is used by BT Voyager and should be right
508 + // bc310 should be right, and may apply to 3.08 code as well
509 +#define TAGID_DEFINITIONS { \
510 + { "bccfe", "Broadcom CFE flash image" }, \
511 + { "bc300", "Broadcom code version 3.00-3.06 and all ftp/tftp flash" }, \
512 + { "ag306", "Alice Gate (Pirelli, based on Broadcom 3.06)" }, \
513 + { "bc221", "Broadcom code version 2.21" }, \
514 + { "bc310", "Broadcom code version 3.10-3.12" }, \
515 +}
516 +
517 +struct bcm_tag_bccfe {
518 + unsigned char tagVersion[TAGVER_LEN]; // 0-3: Version of the image tag
519 + unsigned char sig_1[20]; // 4-23: Company Line 1
520 + unsigned char sig_2[14]; // 24-37: Company Line 2
521 + unsigned char chipid[6]; // 38-43: Chip this image is for
522 + unsigned char boardid[16]; // 44-59: Board name
523 + unsigned char big_endian[2]; // 60-61: Map endianness -- 1 BE 0 LE
524 + unsigned char totalLength[IMAGE_LEN]; // 62-71: Total length of image
525 + unsigned char cfeAddress[ADDRESS_LEN]; // 72-83: Address in memory of CFE
526 + unsigned char cfeLength[IMAGE_LEN]; // 84-93: Size of CFE
527 + unsigned char rootAddress[ADDRESS_LEN]; // 94-105: Address in memory of rootfs
528 + unsigned char rootLength[IMAGE_LEN]; // 106-115: Size of rootfs
529 + unsigned char kernelAddress[ADDRESS_LEN]; // 116-127: Address in memory of kernel
530 + unsigned char kernelLength[IMAGE_LEN]; // 128-137: Size of kernel
531 + unsigned char dualImage[2]; // 138-139: Unused at present
532 + unsigned char inactiveFlag[2]; // 140-141: Unused at present
533 + unsigned char information1[TAGINFO_LEN]; // 142-161: Unused at present
534 + unsigned char tagId[TAGID_LEN]; // 162-167: Identifies which type of tag this is, currently two-letter company code, and then three digits for version of broadcom code in which this tag was first introduced
535 + unsigned char tagIdCRC[4]; // 168-171: CRC32 of tagId
536 + unsigned char reserved1[44]; // 172-215: Reserved area not in use
537 + unsigned char imageCRC[4]; // 216-219: CRC32 of images
538 + unsigned char reserved2[16]; // 220-235: Unused at present
539 + unsigned char headerCRC[4]; // 236-239: CRC32 of header excluding tagVersion
540 + unsigned char reserved3[16]; // 240-255: Unused at present
541 +};
542 +
543 +struct bcm_tag_bc300 {
544 + unsigned char tagVersion[TAGVER_LEN]; // 0-3: Version of the image tag
545 + unsigned char sig_1[20]; // 4-23: Company Line 1
546 + unsigned char sig_2[14]; // 24-37: Company Line 2
547 + unsigned char chipid[6]; // 38-43: Chip this image is for
548 + unsigned char boardid[16]; // 44-59: Board name
549 + unsigned char big_endian[2]; // 60-61: Map endianness -- 1 BE 0 LE
550 + unsigned char totalLength[IMAGE_LEN]; // 62-71: Total length of image
551 + unsigned char cfeAddress[ADDRESS_LEN]; // 72-83: Address in memory of CFE
552 + unsigned char cfeLength[IMAGE_LEN]; // 84-93: Size of CFE
553 + unsigned char flashImageStart[ADDRESS_LEN]; // 94-105: Address in memory of kernel (start of image)
554 + unsigned char flashRootLength[IMAGE_LEN]; // 106-115: Size of rootfs + deadcode (web flash uses this + kernelLength to determine the size of the kernel+rootfs flash image)
555 + unsigned char kernelAddress[ADDRESS_LEN]; // 116-127: Address in memory of kernel
556 + unsigned char kernelLength[IMAGE_LEN]; // 128-137: Size of kernel
557 + unsigned char dualImage[2]; // 138-139: Unused at present
558 + unsigned char inactiveFlag[2]; // 140-141: Unused at present
559 + unsigned char information1[TAGINFO_LEN]; // 142-161: Unused at present
560 + unsigned char tagId[TAGID_LEN]; // 162-167: Identifies which type of tag this is, currently two-letter company code, and then three digits for version of broadcom code in which this tag was first introduced
561 + unsigned char tagIdCRC[4]; // 168-173: CRC32 to ensure validity of tagId
562 + unsigned char rootAddress[ADDRESS_LEN]; // 174-183: Address in memory of rootfs partition
563 + unsigned char rootLength[IMAGE_LEN]; // 184-193: Size of rootfs partition
564 + unsigned char reserved1[22]; // 194-215: Reserved area not in use
565 + unsigned char imageCRC[4]; // 216-219: CRC32 of images
566 + unsigned char reserved2[16]; // 220-235: Unused at present
567 + unsigned char headerCRC[4]; // 236-239: CRC32 of header excluding tagVersion
568 + unsigned char reserved3[16]; // 240-255: Unused at present
569 +};
570 +
571 +struct bcm_tag_ag306 {
572 + unsigned char tagVersion[TAGVER_LEN]; // 0-3: Version of the image tag
573 + unsigned char sig_1[20]; // 4-23: Company Line 1
574 + unsigned char sig_2[14]; // 24-37: Company Line 2
575 + unsigned char chipid[6]; // 38-43: Chip this image is for
576 + unsigned char boardid[16]; // 44-59: Board name
577 + unsigned char big_endian[2]; // 60-61: Map endianness -- 1 BE 0 LE
578 + unsigned char totalLength[IMAGE_LEN]; // 62-71: Total length of image
579 + unsigned char cfeAddress[ADDRESS_LEN]; // 72-83: Address in memory of CFE
580 + unsigned char cfeLength[IMAGE_LEN]; // 84-93: Size of CFE
581 + unsigned char flashImageStart[ADDRESS_LEN]; // 94-105: Address in memory of kernel (start of image)
582 + unsigned char flashRootLength[IMAGE_LEN]; // 106-115: Size of rootfs + deadcode (web flash uses this + kernelLength to determine the size of the kernel+rootfs flash image)
583 + unsigned char kernelAddress[ADDRESS_LEN]; // 116-127: Address in memory of kernel
584 + unsigned char kernelLength[IMAGE_LEN]; // 128-137: Size of kernel
585 + unsigned char dualImage[2]; // 138-139: Unused at present
586 + unsigned char inactiveFlag[2]; // 140-141: Unused at present
587 + unsigned char information1[TAGINFO_LEN]; // 142-161: Unused at present
588 + unsigned char information2[54]; // 162-215: Compilation and related information (not generated/used by OpenWRT)
589 + unsigned char kernelCRC[4] ; // 216-219: CRC32 of images
590 + unsigned char rootAddress[ADDRESS_LEN]; // 220-231: Address in memory of rootfs partition
591 + unsigned char tagIdCRC[4]; // 232-235: Checksum to ensure validity of tagId
592 + unsigned char headerCRC[4]; // 236-239: CRC32 of header excluding tagVersion
593 + unsigned char rootLength[IMAGE_LEN]; // 240-249: Size of rootfs
594 + unsigned char tagId[TAGID_LEN]; // 250-255: Identifies which type of tag this is, currently two-letter company code, and then three digits for version of broadcom code in which this tag was first introduced
595 +};
596 +
597 +struct bcm_tag_bc221 {
598 + unsigned char tagVersion[TAGVER_LEN]; // 0-3: Version of the image tag
599 + unsigned char sig_1[20]; // 4-23: Company Line 1
600 + unsigned char sig_2[14]; // 24-37: Company Line 2
601 + unsigned char chipid[6]; // 38-43: Chip this image is for
602 + unsigned char boardid[16]; // 44-59: Board name
603 + unsigned char big_endian[2]; // 60-61: Map endianness -- 1 BE 0 LE
604 + unsigned char totalLength[IMAGE_LEN]; // 62-71: Total length of image
605 + unsigned char cfeAddress[ADDRESS_LEN]; // 72-83: Address in memory of CFE
606 + unsigned char cfeLength[IMAGE_LEN]; // 84-93: Size of CFE
607 + unsigned char flashImageStart[ADDRESS_LEN]; // 94-105: Address in memory of kernel (start of image)
608 + unsigned char flashRootLength[IMAGE_LEN]; // 106-115: Size of rootfs + deadcode (web flash uses this + kernelLength to determine the size of the kernel+rootfs flash image)
609 + unsigned char kernelAddress[ADDRESS_LEN]; // 116-127: Address in memory of kernel
610 + unsigned char kernelLength[IMAGE_LEN]; // 128-137: Size of kernel
611 + unsigned char dualImage[2]; // 138-139: Unused at present
612 + unsigned char inactiveFlag[2]; // 140-141: Unused at present
613 + unsigned char rsa_signature[TAGINFO_LEN]; // 142-161: RSA Signature (unused at present; some vendors may use this)
614 + unsigned char reserved5[2]; // 162-163: Unused at present
615 + unsigned char tagId[TAGID_LEN]; // 164-169: Identifies which type of tag this is, currently two-letter company code, and then three digits for version of broadcom code in which this tag was first introduced
616 + unsigned char rootAddress[ADDRESS_LEN]; // 170-181: Address in memory of rootfs partition
617 + unsigned char rootLength[IMAGE_LEN]; // 182-191: Size of rootfs partition
618 + unsigned char flashLayoutVer[4]; // 192-195: Version flash layout
619 + unsigned char fskernelCRC[4]; // 196-199: Guessed to be kernel CRC
620 + unsigned char reserved4[16]; // 200-215: Reserved area; unused at present
621 + unsigned char imageCRC[4]; // 216-219: CRC32 of images
622 + unsigned char reserved2[12]; // 220-231: Unused at present
623 + unsigned char tagIdCRC[4]; // 232-235: CRC32 to ensure validity of tagId
624 + unsigned char headerCRC[4]; // 236-239: CRC32 of header excluding tagVersion
625 + unsigned char reserved3[16]; // 240-255: Unused at present
626 +};
627 +
628 +struct bcm_tag_bc310 {
629 + unsigned char tagVersion[4]; // 0-3: Version of the image tag
630 + unsigned char sig_1[20]; // 4-23: Company Line 1
631 + unsigned char sig_2[14]; // 24-37: Company Line 2
632 + unsigned char chipid[6]; // 38-43: Chip this image is for
633 + unsigned char boardid[16]; // 44-59: Board name
634 + unsigned char big_endian[2]; // 60-61: Map endianness -- 1 BE 0 LE
635 + unsigned char totalLength[IMAGE_LEN]; // 62-71: Total length of image
636 + unsigned char cfeAddress[ADDRESS_LEN]; // 72-83: Address in memory of CFE
637 + unsigned char cfeLength[IMAGE_LEN]; // 84-93: Size of CFE
638 + unsigned char flashImageStart[ADDRESS_LEN]; // 94-105: Address in memory of kernel (start of image)
639 + unsigned char flashRootLength[IMAGE_LEN]; // 106-115: Size of rootfs + deadcode (web flash uses this + kernelLength to determine the size of the kernel+rootfs flash image)
640 + unsigned char kernelAddress[ADDRESS_LEN]; // 116-127: Address in memory of kernel
641 + unsigned char kernelLength[IMAGE_LEN]; // 128-137: Size of kernel
642 + unsigned char dualImage[2]; // 138-139: Unused at present
643 + unsigned char inactiveFlag[2]; // 140-141: Unused at present
644 + unsigned char information1[TAGINFO_LEN]; // 142-161: Unused at present; Some vendors use this for optional information
645 + unsigned char tagId[6]; // 162-167: Identifies which type of tag this is, currently two-letter company code, and then three digits for version of broadcom code in which this tag was first introduced
646 + unsigned char tagIdCRC[4]; // 168-171: CRC32 to ensure validity of tagId
647 + unsigned char rootAddress[ADDRESS_LEN]; // 172-183: Address in memory of rootfs partition
648 + unsigned char rootLength[IMAGE_LEN]; // 184-193: Size of rootfs partition
649 + unsigned char reserved1[22]; // 193-215: Reserved area not in use
650 + unsigned char imageCRC[4]; // 216-219: CRC32 of images
651 + unsigned char rootfsCRC[4]; // 220-227: CRC32 of rootfs partition
652 + unsigned char kernelCRC[4]; // 224-227: CRC32 of kernel partition
653 + unsigned char reserved2[8]; // 228-235: Unused at present
654 + unsigned char headerCRC[4]; // 235-239: CRC32 of header excluding tagVersion
655 + unsigned char reserved3[16]; // 240-255: Unused at present
656 +};
657 +
658 +union bcm_tag {
659 + struct bcm_tag_bccfe bccfe;
660 + struct bcm_tag_bc300 bc300;
661 + struct bcm_tag_ag306 ag306;
662 + struct bcm_tag_bc221 bc221;
663 + struct bcm_tag_bc310 bc310;
664 +};
665 +
666 +#endif /* __BCM63XX_TAG_H */
667 Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
668 ===================================================================
669 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:23:48.000000000 +0100
670 +++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:24:06.000000000 +0100
671 @@ -722,20 +722,6 @@
672 return 0;
673 }
674
675 -static struct mtd_partition mtd_partitions[] = {
676 - {
677 - .name = "cfe",
678 - .offset = 0x0,
679 - .size = 0x40000,
680 - }
681 -};
682 -
683 -static struct physmap_flash_data flash_data = {
684 - .width = 2,
685 - .nr_parts = ARRAY_SIZE(mtd_partitions),
686 - .parts = mtd_partitions,
687 -};
688 -
689 static struct resource mtd_resources[] = {
690 {
691 .start = 0, /* filled at runtime */
692 @@ -745,12 +731,9 @@
693 };
694
695 static struct platform_device mtd_dev = {
696 - .name = "physmap-flash",
697 + .name = "bcm963xx-flash",
698 .resource = mtd_resources,
699 .num_resources = ARRAY_SIZE(mtd_resources),
700 - .dev = {
701 - .platform_data = &flash_data,
702 - },
703 };
704
705 /*
Personal OpenWRT clone
This page took 0.071299 seconds and 5 git commands to generate.