target/linux/brcm63xx/patches-2.6.35/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 --- a/drivers/mtd/maps/Kconfig
  15 +++ b/drivers/mtd/maps/Kconfig
  16 @@ -251,6 +251,13 @@ config MTD_NETtel
  17         help
  18           Support for flash chips on NETtel/SecureEdge/SnapGear boards.
  19
  20 +config MTD_BCM963XX
  21 +        tristate "BCM963xx Flash device"
  22 +        depends on MIPS && BCM63XX
  23 +        help
  24 +         Flash memory access on BCM963xx boards. Currently only works with
  25 +         RedBoot and CFE.
  26 +
  27  config MTD_DILNETPC
  28         tristate "CFI Flash device mapped on DIL/Net PC"
  29         depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
  30 --- a/drivers/mtd/redboot.c
  31 +++ b/drivers/mtd/redboot.c
  32 @@ -39,7 +39,7 @@ static inline int redboot_checksum(struc
  33         return 1;
  34  }
  35
  36 -static int parse_redboot_partitions(struct mtd_info *master,
  37 +int parse_redboot_partitions(struct mtd_info *master,
  38                               struct mtd_partition **pparts,
  39                               unsigned long fis_origin)
  40  {
  41 @@ -162,6 +162,14 @@ static int parse_redboot_partitions(stru
  42                 goto out;
  43         }
  44
  45 +       if (!fis_origin) {
  46 +               for (i = 0; i < numslots; i++) {
  47 +                       if (!strncmp(buf[i].name, "RedBoot", 8)) {
  48 +                               fis_origin = (buf[i].flash_base & (master->size << 1) - 1);
  49 +                       }
  50 +               }
  51 +       }
  52 +
  53         for (i = 0; i < numslots; i++) {
  54                 struct fis_list *new_fl, **prev;
  55
  56 @@ -184,9 +192,8 @@ static int parse_redboot_partitions(stru
  57                 new_fl->img = &buf[i];
  58                  if (fis_origin) {
  59                          buf[i].flash_base -= fis_origin;
  60 -                } else {
  61 -                        buf[i].flash_base &= master->size-1;
  62                  }
  63 +               buf[i].flash_base &= (master->size << 1) - 1;
  64
  65                 /* I'm sure the JFFS2 code has done me permanent damage.
  66                  * I now think the following is _normal_
  67 --- a/drivers/mtd/maps/Makefile
  68 +++ b/drivers/mtd/maps/Makefile
  69 @@ -59,3 +59,4 @@ obj-$(CONFIG_MTD_BFIN_ASYNC)  += bfin-asy
  70  obj-$(CONFIG_MTD_RBTX4939)     += rbtx4939-flash.o
  71  obj-$(CONFIG_MTD_VMU)          += vmu-flash.o
  72  obj-$(CONFIG_MTD_GPIO_ADDR)    += gpio-addr-flash.o
  73 +obj-$(CONFIG_MTD_BCM963XX)     += bcm963xx-flash.o
  74 --- /dev/null
  75 +++ b/drivers/mtd/maps/bcm963xx-flash.c
  76 @@ -0,0 +1,288 @@
  77 +/*
  78 + * Copyright (C) 2006-2008  Florian Fainelli <florian@openwrt.org>
  79 + *                         Mike Albon <malbon@openwrt.org>
  80 + *
  81 + * This program is free software; you can redistribute it and/or modify
  82 + * it under the terms of the GNU General Public License as published by
  83 + * the Free Software Foundation; either version 2 of the License, or
  84 + * (at your option) any later version.
  85 + *
  86 + * This program is distributed in the hope that it will be useful,
  87 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  88 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  89 + * GNU General Public License for more details.
  90 + *
  91 + * You should have received a copy of the GNU General Public License
  92 + * along with this program; if not, write to the Free Software
  93 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  94 + */
  95 +
  96 +#include <linux/init.h>
  97 +#include <linux/kernel.h>
  98 +#include <linux/mtd/map.h>
  99 +#include <linux/mtd/mtd.h>
 100 +#include <linux/mtd/partitions.h>
 101 +#include <linux/slab.h>
 102 +#include <linux/vmalloc.h>
 103 +#include <linux/platform_device.h>
 104 +#include <linux/magic.h>
 105 +#include <linux/jffs2.h>
 106 +
 107 +#include <bcm_tag.h>
 108 +#include <asm/io.h>
 109 +
 110 +#define BUSWIDTH 2                     /* Buswidth */
 111 +#define EXTENDED_SIZE 0xBFC00000       /* Extended flash address */
 112 +
 113 +#define PFX KBUILD_MODNAME ": "
 114 +
 115 +struct squashfs_super_block {
 116 +       __le32 s_magic;
 117 +       __le32 pad0[9];
 118 +       __le64 bytes_used;
 119 +};
 120 +
 121 +extern int parse_redboot_partitions(struct mtd_info *master, struct mtd_partition **pparts, unsigned long fis_origin);
 122 +static struct mtd_partition *parsed_parts;
 123 +
 124 +static struct mtd_info *bcm963xx_mtd_info;
 125 +
 126 +static struct map_info bcm963xx_map = {
 127 +       .name           = "bcm963xx",
 128 +       .bankwidth      = BUSWIDTH,
 129 +};
 130 +
 131 +static int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition **pparts)
 132 +{
 133 +       int nrparts = 3, curpart = 0; /* CFE,NVRAM and global LINUX are always present. */
 134 +       struct bcm_tag *buf;
 135 +       struct mtd_partition *parts;
 136 +       int ret;
 137 +       size_t retlen;
 138 +       unsigned int rootfsaddr, kerneladdr, spareaddr;
 139 +       unsigned int rootfslen, kernellen, sparelen, totallen;
 140 +       int namelen = 0;
 141 +       int i, offset;
 142 +       char *boardid;
 143 +    char *tagversion;
 144 +       struct squashfs_super_block sb;
 145 +
 146 +       /* Allocate memory for buffer */
 147 +       buf = vmalloc(sizeof(struct bcm_tag));
 148 +       if (!buf)
 149 +               return -ENOMEM;
 150 +
 151 +       /* Get the tag */
 152 +       ret = master->read(master, master->erasesize, sizeof(struct bcm_tag), &retlen, (void *)buf);
 153 +       if (retlen != sizeof(struct bcm_tag)){
 154 +               vfree(buf);
 155 +               return -EIO;
 156 +       }
 157 +
 158 +       sscanf(buf->kernelAddress, "%u", &kerneladdr);
 159 +       sscanf(buf->kernelLength, "%u", &kernellen);
 160 +       sscanf(buf->totalLength, "%u", &totallen);
 161 +       sscanf(buf->rootLength, "%u", &rootfslen);
 162 +       tagversion = &(buf->tagVersion[0]);
 163 +       boardid = &(buf->boardid[0]);
 164 +
 165 +       printk(KERN_INFO PFX "CFE boot tag found with version %s and board type %s\n",tagversion, boardid);
 166 +
 167 +       kerneladdr = kerneladdr - EXTENDED_SIZE;
 168 +       rootfsaddr = kerneladdr + kernellen;
 169 +
 170 +       //      offset = master->erasesize + sizeof(struct bcm_tag) + kernellen;
 171 +       offset = rootfsaddr;
 172 +       ret = master->read(master, offset, sizeof(sb), &retlen, (void *) &sb);
 173 +       if (ret || (retlen != sizeof(sb))) {
 174 +         printk(KERN_ALERT PFX "parse_cfe_partitions: error occured while reading "
 175 +                        "from \"%s\"\n", master->name);
 176 +         return -EINVAL;
 177 +       }
 178 +
 179 +       rootfslen = ( ( rootfslen % master->erasesize ) > 0 ? (((rootfslen / master->erasesize) + 1 ) * master->erasesize) : rootfslen);
 180 +       totallen = rootfslen + kernellen + sizeof(struct bcm_tag);
 181 +
 182 +       spareaddr = roundup(totallen, master->erasesize) + master->erasesize;
 183 +       sparelen = master->size - spareaddr - master->erasesize;
 184 +
 185 +       /* Determine number of partitions */
 186 +       namelen = 8;
 187 +       if (rootfslen > 0){
 188 +               nrparts++;
 189 +               namelen =+ 6;
 190 +       };
 191 +       if (kernellen > 0) {
 192 +               nrparts++;
 193 +               namelen =+ 6;
 194 +       };
 195 +
 196 +       /* Ask kernel for more memory */
 197 +       parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);
 198 +       if (!parts) {
 199 +               vfree(buf);
 200 +               return -ENOMEM;
 201 +       };
 202 +
 203 +       /* Start building partition list */
 204 +       parts[curpart].name = "CFE";
 205 +       parts[curpart].offset = 0;
 206 +       parts[curpart].size = master->erasesize;
 207 +       curpart++;
 208 +
 209 +       if (kernellen > 0) {
 210 +               parts[curpart].name = "kernel";
 211 +               parts[curpart].offset = kerneladdr;
 212 +               parts[curpart].size = kernellen;
 213 +               curpart++;
 214 +       };
 215 +
 216 +       if (rootfslen > 0) {
 217 +               parts[curpart].name = "rootfs";
 218 +               parts[curpart].offset = rootfsaddr;
 219 +               parts[curpart].size = rootfslen;
 220 +               if (sparelen > 0)
 221 +                       parts[curpart].size += sparelen;
 222 +               curpart++;
 223 +       };
 224 +
 225 +       parts[curpart].name = "nvram";
 226 +       parts[curpart].offset = master->size - master->erasesize;
 227 +       parts[curpart].size = master->erasesize;
 228 +
 229 +       /* Global partition "linux" to make easy firmware upgrade */
 230 +       curpart++;
 231 +       parts[curpart].name = "linux";
 232 +       parts[curpart].offset = parts[0].size;
 233 +       parts[curpart].size = master->size - parts[0].size - parts[3].size;
 234 +
 235 +       for (i = 0; i < nrparts; i++)
 236 +               printk(KERN_INFO PFX "Partition %d is %s offset %lx and length %lx\n", i, parts[i].name, (long unsigned int)(parts[i].offset), (long unsigned int)(parts[i].size));
 237 +
 238 +       printk(KERN_INFO PFX "Spare partition is %x offset and length %x\n", spareaddr, sparelen);
 239 +       *pparts = parts;
 240 +       vfree(buf);
 241 +
 242 +       return nrparts;
 243 +};
 244 +
 245 +static int bcm963xx_detect_cfe(struct mtd_info *master)
 246 +{
 247 +       int idoffset = 0x4e0;
 248 +       static char idstring[8] = "CFE1CFE1";
 249 +       char buf[9];
 250 +       int ret;
 251 +       size_t retlen;
 252 +
 253 +       ret = master->read(master, idoffset, 8, &retlen, (void *)buf);
 254 +       buf[retlen] = 0;
 255 +       printk(KERN_INFO PFX "Read Signature value of %s\n", buf);
 256 +
 257 +       return strncmp(idstring, buf, 8);
 258 +}
 259 +
 260 +static int bcm963xx_probe(struct platform_device *pdev)
 261 +{
 262 +       int err = 0;
 263 +       int parsed_nr_parts = 0;
 264 +       char *part_type;
 265 +       struct resource *r;
 266 +
 267 +       r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 268 +       bcm963xx_map.phys = r->start;
 269 +       bcm963xx_map.size = (r->end - r->start) + 1;
 270 +       bcm963xx_map.virt = ioremap(r->start, r->end - r->start + 1);
 271 +
 272 +       if (!bcm963xx_map.virt) {
 273 +               printk(KERN_ERR PFX "Failed to ioremap\n");
 274 +               return -EIO;
 275 +       }
 276 +       printk(KERN_INFO PFX "0x%08lx at 0x%08x\n", bcm963xx_map.size, bcm963xx_map.phys);
 277 +
 278 +       simple_map_init(&bcm963xx_map);
 279 +
 280 +       bcm963xx_mtd_info = do_map_probe("cfi_probe", &bcm963xx_map);
 281 +       if (!bcm963xx_mtd_info) {
 282 +               printk(KERN_ERR PFX "Failed to probe using CFI\n");
 283 +               err = -EIO;
 284 +               goto err_probe;
 285 +       }
 286 +
 287 +       bcm963xx_mtd_info->owner = THIS_MODULE;
 288 +
 289 +       /* This is mutually exclusive */
 290 +       if (bcm963xx_detect_cfe(bcm963xx_mtd_info) == 0) {
 291 +               printk(KERN_INFO PFX "CFE bootloader detected\n");
 292 +               if (parsed_nr_parts == 0) {
 293 +                       int ret = parse_cfe_partitions(bcm963xx_mtd_info, &parsed_parts);
 294 +                       if (ret > 0) {
 295 +                               part_type = "CFE";
 296 +                               parsed_nr_parts = ret;
 297 +                       }
 298 +               }
 299 +       } else {
 300 +               printk(KERN_INFO PFX "assuming RedBoot bootloader\n");
 301 +               if (bcm963xx_mtd_info->size > 0x00400000) {
 302 +                       printk(KERN_INFO PFX "Support for extended flash memory size : 0x%lx ; ONLY 64MBIT SUPPORT\n", bcm963xx_mtd_info->size);
 303 +                       bcm963xx_map.virt = (u32)(EXTENDED_SIZE);
 304 +               }
 305 +
 306 +#ifdef CONFIG_MTD_REDBOOT_PARTS
 307 +               if (parsed_nr_parts == 0) {
 308 +                       int ret = parse_redboot_partitions(bcm963xx_mtd_info, &parsed_parts, 0);
 309 +                       if (ret > 0) {
 310 +                               part_type = "RedBoot";
 311 +                               parsed_nr_parts = ret;
 312 +                       }
 313 +               }
 314 +#endif
 315 +       }
 316 +
 317 +       return add_mtd_partitions(bcm963xx_mtd_info, parsed_parts, parsed_nr_parts);
 318 +
 319 +err_probe:
 320 +       iounmap(bcm963xx_map.virt);
 321 +       return err;
 322 +}
 323 +
 324 +static int bcm963xx_remove(struct platform_device *pdev)
 325 +{
 326 +       if (bcm963xx_mtd_info) {
 327 +               del_mtd_partitions(bcm963xx_mtd_info);
 328 +               map_destroy(bcm963xx_mtd_info);
 329 +       }
 330 +
 331 +       if (bcm963xx_map.virt) {
 332 +               iounmap(bcm963xx_map.virt);
 333 +               bcm963xx_map.virt = 0;
 334 +       }
 335 +
 336 +       return 0;
 337 +}
 338 +
 339 +static struct platform_driver bcm63xx_mtd_dev = {
 340 +       .probe  = bcm963xx_probe,
 341 +       .remove = bcm963xx_remove,
 342 +       .driver = {
 343 +               .name   = "bcm963xx-flash",
 344 +               .owner  = THIS_MODULE,
 345 +       },
 346 +};
 347 +
 348 +static int __init bcm963xx_mtd_init(void)
 349 +{
 350 +       return platform_driver_register(&bcm63xx_mtd_dev);
 351 +}
 352 +
 353 +static void __exit bcm963xx_mtd_exit(void)
 354 +{
 355 +       platform_driver_unregister(&bcm63xx_mtd_dev);
 356 +}
 357 +
 358 +module_init(bcm963xx_mtd_init);
 359 +module_exit(bcm963xx_mtd_exit);
 360 +
 361 +MODULE_LICENSE("GPL");
 362 +MODULE_DESCRIPTION("Broadcom BCM63xx MTD partition parser/mapping for CFE and RedBoot");
 363 +MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
 364 +MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>");
 365 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 366 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
 367 @@ -816,20 +816,6 @@ void __init board_setup(void)
 368                 panic("unexpected CPU for bcm963xx board");
 369  }
 370
 371 -static struct mtd_partition mtd_partitions[] = {
 372 -       {
 373 -               .name           = "cfe",
 374 -               .offset         = 0x0,
 375 -               .size           = 0x40000,
 376 -       }
 377 -};
 378 -
 379 -static struct physmap_flash_data flash_data = {
 380 -       .width                  = 2,
 381 -       .nr_parts               = ARRAY_SIZE(mtd_partitions),
 382 -       .parts                  = mtd_partitions,
 383 -};
 384 -
 385  static struct resource mtd_resources[] = {
 386         {
 387                 .start          = 0,    /* filled at runtime */
 388 @@ -839,12 +825,9 @@ static struct resource mtd_resources[] =
 389  };
 390
 391  static struct platform_device mtd_dev = {
 392 -       .name                   = "physmap-flash",
 393 +       .name                   = "bcm963xx-flash",
 394         .resource               = mtd_resources,
 395         .num_resources          = ARRAY_SIZE(mtd_resources),
 396 -       .dev                    = {
 397 -               .platform_data  = &flash_data,
 398 -       },
 399  };
 400
 401  static struct gpio_led_platform_data bcm63xx_led_data;