mirror of https://github.com/hak5/openwrt-owl.git
bcm63xx MTD driver cleanup and fixes: - convert to platform_driver - get the window_size/addr from the board setup code - indentation fixes - remove duplicate code - move bcm_tag declaration out of the MTD driver
SVN-Revision: 13379owl
Florian Fainelli
parent
bbad86e098
commit
cc2e43992d
|
|
@ -312,20 +312,6 @@ static int board_get_mac_address(u8 *mac)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct mtd_partition mtd_partitions[] = {
|
||||
{
|
||||
.name = "cfe",
|
||||
.offset = 0x0,
|
||||
.size = 0x40000,
|
||||
}
|
||||
};
|
||||
|
||||
static struct physmap_flash_data flash_data = {
|
||||
.width = 2,
|
||||
.nr_parts = ARRAY_SIZE(mtd_partitions),
|
||||
.parts = mtd_partitions,
|
||||
};
|
||||
|
||||
static struct resource mtd_resources[] = {
|
||||
{
|
||||
.start = 0, /* filled at runtime */
|
||||
|
|
@ -335,12 +321,9 @@ static struct resource mtd_resources[] = {
|
|||
};
|
||||
|
||||
static struct platform_device mtd_dev = {
|
||||
.name = "physmap-flash",
|
||||
.name = "bcm963xx-flash",
|
||||
.resource = mtd_resources,
|
||||
.num_resources = ARRAY_SIZE(mtd_resources),
|
||||
.dev = {
|
||||
.platform_data = &flash_data,
|
||||
},
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
/*
|
||||
* $Id$
|
||||
* Copyright (C) 2006 Florian Fainelli <florian@openwrt.org>
|
||||
* Copyright (C) 2006-2008 Florian Fainelli <florian@openwrt.org>
|
||||
* Mike Albon <malbon@openwrt.org>
|
||||
* Copyright (C) $Date$ $Author$
|
||||
*
|
||||
* 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
|
||||
|
|
@ -19,75 +17,36 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
/* This is the BCM963xx flash map driver, in its actual state it only supports BCM96348 devices
|
||||
* this driver is able to manage both bootloader we found on these boards : CFE and RedBoot
|
||||
*
|
||||
* RedBoot :
|
||||
* - this bootloader allows us to parse partitions and therefore deduce the MTD partition table
|
||||
*
|
||||
* CFE :
|
||||
* - CFE partitionning can be detected as for BCM947xx devices
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/mtd/map.h>
|
||||
#include <linux/mtd/mtd.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <bcm_tag.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#define WINDOW_ADDR 0x1FC00000 /* Real address of the flash */
|
||||
#define WINDOW_SIZE 0x400000 /* Size of flash */
|
||||
#define BUSWIDTH 2 /* Buswidth */
|
||||
#define EXTENDED_SIZE 0xBFC00000 /* Extended flash address */
|
||||
#define IMAGE_LEN 10 /* Length of Length Field */
|
||||
#define ADDRESS_LEN 12 /* Length of Address field */
|
||||
#define ROUNDUP(x, y) ((((x)+((y)-1))/(y))*(y))
|
||||
|
||||
extern int boot_loader_type; /* For RedBoot / CFE detection */
|
||||
#define PFX KBUILD_MODNAME ": "
|
||||
|
||||
extern int parse_redboot_partitions(struct mtd_info *master, struct mtd_partition **pparts, unsigned long fis_origin);
|
||||
static struct mtd_partition *parsed_parts;
|
||||
|
||||
static void __exit bcm963xx_mtd_cleanup(void);
|
||||
|
||||
static struct mtd_info *bcm963xx_mtd_info;
|
||||
|
||||
static struct map_info bcm963xx_map = {
|
||||
.name = "bcm963xx",
|
||||
.size = WINDOW_SIZE,
|
||||
.bankwidth = BUSWIDTH,
|
||||
.phys = WINDOW_ADDR,
|
||||
};
|
||||
|
||||
|
||||
int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition **pparts)
|
||||
static int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition **pparts)
|
||||
{
|
||||
int nrparts = 2, curpart = 0; // CFE and NVRAM always present.
|
||||
struct bcm963xx_cfe_map {
|
||||
unsigned char tagVersion[4]; // Version of the image tag
|
||||
unsigned char sig_1[20]; // Company Line 1
|
||||
unsigned char sig_2[14]; // Company Line 2
|
||||
unsigned char chipid[6]; // Chip this image is for
|
||||
unsigned char boardid[16]; // Board name
|
||||
unsigned char bigEndian[2]; // Map endianness -- 1 BE 0 LE
|
||||
unsigned char totalLength[IMAGE_LEN]; //Total length of image
|
||||
unsigned char cfeAddress[ADDRESS_LEN]; // Address in memory of CFE
|
||||
unsigned char cfeLength[IMAGE_LEN]; // Size of CFE
|
||||
unsigned char rootAddress[ADDRESS_LEN]; // Address in memory of rootfs
|
||||
unsigned char rootLength[IMAGE_LEN]; // Size of rootfs
|
||||
unsigned char kernelAddress[ADDRESS_LEN]; // Address in memory of kernel
|
||||
unsigned char kernelLength[IMAGE_LEN]; // Size of kernel
|
||||
unsigned char dualImage[2]; // Unused at present
|
||||
unsigned char inactiveFlag[2]; // Unused at present
|
||||
unsigned char reserved1[74]; // Reserved area not in use
|
||||
unsigned char imageCRC[4]; // CRC32 of images
|
||||
unsigned char reserved2[16]; // Unused at present
|
||||
unsigned char headerCRC[4]; // CRC32 of header excluding tagVersion
|
||||
unsigned char reserved3[16]; // Unused at present
|
||||
} *buf;
|
||||
int nrparts = 2, curpart = 0; /* CFE and NVRAM are always present. */
|
||||
struct bcm_tag *buf;
|
||||
struct mtd_partition *parts;
|
||||
int ret;
|
||||
size_t retlen;
|
||||
|
|
@ -95,20 +54,21 @@ int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition **pparts
|
|||
unsigned int rootfslen, kernellen, sparelen, totallen;
|
||||
int namelen = 0;
|
||||
int i;
|
||||
// Allocate memory for buffer
|
||||
buf = vmalloc(sizeof(struct bcm963xx_cfe_map));
|
||||
|
||||
/* Allocate memory for buffer */
|
||||
buf = vmalloc(sizeof(struct bcm_tag));
|
||||
if (!buf)
|
||||
return -ENOMEM;
|
||||
|
||||
// Get the tag
|
||||
ret = master->read(master,master->erasesize,sizeof(struct bcm963xx_cfe_map), &retlen, (void *)buf);
|
||||
if (retlen != sizeof(struct bcm963xx_cfe_map)){
|
||||
/* Get the tag */
|
||||
ret = master->read(master,master->erasesize,sizeof(struct bcm_tag), &retlen, (void *)buf);
|
||||
if (retlen != sizeof(struct bcm_tag)){
|
||||
vfree(buf);
|
||||
return -EIO;
|
||||
};
|
||||
printk("bcm963xx: CFE boot tag found with version %s and board type %s.\n",buf->tagVersion,buf->boardid);
|
||||
// Get the values and calculate
|
||||
}
|
||||
printk(KERN_INFO PFX "CFE boot tag found with version %s and board type %s.\n",buf->tagVersion,buf->boardid);
|
||||
|
||||
/* Get the values and calculate */
|
||||
sscanf(buf->rootAddress,"%u", &rootfsaddr);
|
||||
rootfsaddr = rootfsaddr - EXTENDED_SIZE;
|
||||
sscanf(buf->rootLength, "%u", &rootfslen);
|
||||
|
|
@ -116,37 +76,41 @@ int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition **pparts
|
|||
kerneladdr = kerneladdr - EXTENDED_SIZE;
|
||||
sscanf(buf->kernelLength, "%u", &kernellen);
|
||||
sscanf(buf->totalLength, "%u", &totallen);
|
||||
spareaddr = ROUNDUP(totallen,master->erasesize) + master->erasesize;
|
||||
spareaddr = roundup(totallen,master->erasesize) + master->erasesize;
|
||||
sparelen = master->size - spareaddr - master->erasesize;
|
||||
// Determine number of partitions
|
||||
|
||||
/* Determine number of partitions */
|
||||
namelen = 8;
|
||||
if (rootfslen > 0){
|
||||
nrparts++;
|
||||
namelen =+ 6;
|
||||
};
|
||||
if (kernellen > 0){
|
||||
if (kernellen > 0) {
|
||||
nrparts++;
|
||||
namelen =+ 6;
|
||||
};
|
||||
// Ask kernel for more memory.
|
||||
parts = kmalloc(sizeof(*parts)*nrparts+10*nrparts, GFP_KERNEL);
|
||||
if (!parts){
|
||||
|
||||
/* Ask kernel for more memory */
|
||||
parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);
|
||||
if (!parts) {
|
||||
vfree(buf);
|
||||
return -ENOMEM;
|
||||
};
|
||||
memset(parts,0,sizeof(*parts)*nrparts+10*nrparts);
|
||||
// Start building partition list
|
||||
|
||||
/* Start building partition list */
|
||||
parts[curpart].name = "CFE";
|
||||
parts[curpart].offset = 0;
|
||||
parts[curpart].size = master->erasesize;
|
||||
curpart++;
|
||||
if (kernellen > 0){
|
||||
|
||||
if (kernellen > 0) {
|
||||
parts[curpart].name = "kernel";
|
||||
parts[curpart].offset = kerneladdr;
|
||||
parts[curpart].size = kernellen;
|
||||
curpart++;
|
||||
};
|
||||
if (rootfslen > 0){
|
||||
|
||||
if (rootfslen > 0) {
|
||||
parts[curpart].name = "rootfs";
|
||||
parts[curpart].offset = rootfsaddr;
|
||||
parts[curpart].size = rootfslen;
|
||||
|
|
@ -157,22 +121,16 @@ int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition **pparts
|
|||
parts[curpart].name = "nvram";
|
||||
parts[curpart].offset = master->size - master->erasesize;
|
||||
parts[curpart].size = master->erasesize;
|
||||
for (i = 0; i < nrparts; i++) {
|
||||
printk("bcm963xx: Partition %d is %s offset %x and length %x\n", i, parts[i].name, parts[i].offset, parts[i].size);
|
||||
}
|
||||
|
||||
for (i = 0; i < nrparts; i++)
|
||||
printk(KERN_INFO PFX "Partition %d is %s offset %x and length %x\n", i, parts[i].name, parts[i].offset, parts[i].size);
|
||||
|
||||
*pparts = parts;
|
||||
vfree(buf);
|
||||
|
||||
return nrparts;
|
||||
};
|
||||
|
||||
static struct mtd_partition bcm963xx_parts[] = {
|
||||
{ name: "bootloader", size: 0, offset: 0, mask_flags: MTD_WRITEABLE },
|
||||
{ name: "rootfs", size: 0, offset: 0},
|
||||
{ name: "jffs2", size: 5 * 0x10000, offset: 57*0x10000}
|
||||
};
|
||||
|
||||
static int bcm963xx_parts_size = sizeof(bcm963xx_parts) / sizeof(bcm963xx_parts[0]);
|
||||
|
||||
static int bcm963xx_detect_cfe(struct mtd_info *master)
|
||||
{
|
||||
int idoffset = 0x4e0;
|
||||
|
|
@ -183,35 +141,43 @@ static int bcm963xx_detect_cfe(struct mtd_info *master)
|
|||
|
||||
ret = master->read(master, idoffset, 8, &retlen, (void *)buf);
|
||||
buf[retlen] = 0;
|
||||
printk("bcm963xx: Read Signature value of %s\n", buf);
|
||||
printk(KERN_INFO PFX "Read Signature value of %s\n", buf);
|
||||
|
||||
return strncmp(idstring, buf, 8);
|
||||
}
|
||||
|
||||
static int __init bcm963xx_mtd_init(void)
|
||||
static int bcm963xx_probe(struct platform_device *pdev)
|
||||
{
|
||||
printk("bcm963xx: 0x%08x at 0x%08x\n", WINDOW_SIZE, WINDOW_ADDR);
|
||||
bcm963xx_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
|
||||
int err = 0;
|
||||
int parsed_nr_parts = 0;
|
||||
char *part_type;
|
||||
struct resource *r;
|
||||
|
||||
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
bcm963xx_map.phys = r->start;
|
||||
bcm963xx_map.size = (r->end - r->start);
|
||||
bcm963xx_map.virt = ioremap(r->start, r->end - r->start);
|
||||
|
||||
if (!bcm963xx_map.virt) {
|
||||
printk("bcm963xx: Failed to ioremap\n");
|
||||
printk(KERN_ERR PFX "Failed to ioremap\n");
|
||||
return -EIO;
|
||||
}
|
||||
printk(KERN_INFO PFX "0x%08x at 0x%08x\n", r->end - r->start, r->start);
|
||||
|
||||
simple_map_init(&bcm963xx_map);
|
||||
|
||||
bcm963xx_mtd_info = do_map_probe("cfi_probe", &bcm963xx_map);
|
||||
if (!bcm963xx_mtd_info) {
|
||||
printk(KERN_ERR PFX "Failed to probe using CFI\n");
|
||||
err = -EIO;
|
||||
goto err_probe;
|
||||
}
|
||||
|
||||
if (bcm963xx_mtd_info) {
|
||||
bcm963xx_mtd_info->owner = THIS_MODULE;
|
||||
|
||||
//if (boot_loader_type == BOOT_CFE)
|
||||
if (bcm963xx_detect_cfe(bcm963xx_mtd_info) == 0)
|
||||
{
|
||||
int parsed_nr_parts = 0;
|
||||
char * part_type;
|
||||
printk("bcm963xx: CFE bootloader detected\n");
|
||||
//add_mtd_device(bcm963xx_mtd_info);
|
||||
//add_mtd_partitions(bcm963xx_mtd_info, bcm963xx_parts, bcm963xx_parts_size);
|
||||
/* This is mutually exclusive */
|
||||
if (bcm963xx_detect_cfe(bcm963xx_mtd_info) == 0) {
|
||||
printk(KERN_INFO PFX "CFE bootloader detected\n");
|
||||
if (parsed_nr_parts == 0) {
|
||||
int ret = parse_cfe_partitions(bcm963xx_mtd_info, &parsed_parts);
|
||||
if (ret > 0) {
|
||||
|
|
@ -219,17 +185,11 @@ static int __init bcm963xx_mtd_init(void)
|
|||
parsed_nr_parts = ret;
|
||||
}
|
||||
}
|
||||
add_mtd_partitions(bcm963xx_mtd_info, parsed_parts, parsed_nr_parts);
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
int parsed_nr_parts = 0;
|
||||
char * part_type;
|
||||
|
||||
} else {
|
||||
printk(KERN_INFO PFX "assuming RedBoot bootloader\n");
|
||||
if (bcm963xx_mtd_info->size > 0x00400000) {
|
||||
printk("Support for extended flash memory size : 0x%08X ; ONLY 64MBIT SUPPORT\n", bcm963xx_mtd_info->size);
|
||||
bcm963xx_map.virt = (unsigned long)(EXTENDED_SIZE);
|
||||
printk(KERN_INFO PFX "Support for extended flash memory size : 0x%08X ; ONLY 64MBIT SUPPORT\n", bcm963xx_mtd_info->size);
|
||||
bcm963xx_map.virt = (u32)(EXTENDED_SIZE);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_MTD_REDBOOT_PARTS
|
||||
|
|
@ -241,16 +201,16 @@ static int __init bcm963xx_mtd_init(void)
|
|||
}
|
||||
}
|
||||
#endif
|
||||
add_mtd_partitions(bcm963xx_mtd_info, parsed_parts, parsed_nr_parts);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return add_mtd_partitions(bcm963xx_mtd_info, parsed_parts, parsed_nr_parts);
|
||||
|
||||
err_probe:
|
||||
iounmap(bcm963xx_map.virt);
|
||||
return -ENXIO;
|
||||
return err;
|
||||
}
|
||||
|
||||
static void __exit bcm963xx_mtd_cleanup(void)
|
||||
static int bcm963xx_remove(struct platform_device *pdev)
|
||||
{
|
||||
if (bcm963xx_mtd_info) {
|
||||
del_mtd_partitions(bcm963xx_mtd_info);
|
||||
|
|
@ -261,10 +221,33 @@ static void __exit bcm963xx_mtd_cleanup(void)
|
|||
iounmap(bcm963xx_map.virt);
|
||||
bcm963xx_map.virt = 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver bcm63xx_mtd_dev = {
|
||||
.probe = bcm963xx_probe,
|
||||
.remove = bcm963xx_remove,
|
||||
.driver = {
|
||||
.name = "bcm963xx-flash",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init bcm963xx_mtd_init(void)
|
||||
{
|
||||
return platform_driver_register(&bcm63xx_mtd_dev);
|
||||
}
|
||||
|
||||
static void __exit bcm963xx_mtd_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&bcm63xx_mtd_dev);
|
||||
}
|
||||
|
||||
module_init(bcm963xx_mtd_init);
|
||||
module_exit(bcm963xx_mtd_cleanup);
|
||||
module_exit(bcm963xx_mtd_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org> Mike Albon <malbon@openwrt.org>");
|
||||
MODULE_DESCRIPTION("Broadcom BCM63xx MTD partition parser/mapping for CFE and RedBoot");
|
||||
MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
|
||||
MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>");
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
#ifndef __BCM63XX_TAG_H
|
||||
#define __BCM63XX_TAG_H
|
||||
|
||||
#define IMAGE_LEN 10 /* Length of Length Field */
|
||||
#define ADDRESS_LEN 12 /* Length of Address field */
|
||||
|
||||
struct bcm_tag {
|
||||
unsigned char tagVersion[4]; // Version of the image tag
|
||||
unsigned char sig_1[20]; // Company Line 1
|
||||
unsigned char sig_2[14]; // Company Line 2
|
||||
unsigned char chipid[6]; // Chip this image is for
|
||||
unsigned char boardid[16]; // Board name
|
||||
unsigned char big_endian[2]; // Map endianness -- 1 BE 0 LE
|
||||
unsigned char totalLength[IMAGE_LEN]; //Total length of image
|
||||
unsigned char cfeAddress[ADDRESS_LEN]; // Address in memory of CFE
|
||||
unsigned char cfeLength[IMAGE_LEN]; // Size of CFE
|
||||
unsigned char rootAddress[ADDRESS_LEN]; // Address in memory of rootfs
|
||||
unsigned char rootLength[IMAGE_LEN]; // Size of rootfs
|
||||
unsigned char kernelAddress[ADDRESS_LEN]; // Address in memory of kernel
|
||||
unsigned char kernelLength[IMAGE_LEN]; // Size of kernel
|
||||
unsigned char dualImage[2]; // Unused at present
|
||||
unsigned char inactiveFlag[2]; // Unused at present
|
||||
unsigned char reserved1[74]; // Reserved area not in use
|
||||
unsigned char imageCRC[4]; // CRC32 of images
|
||||
unsigned char reserved2[16]; // Unused at present
|
||||
unsigned char headerCRC[4]; // CRC32 of header excluding tagVersion
|
||||
unsigned char reserved3[16]; // Unused at present
|
||||
};
|
||||
|
||||
#endif /* __BCM63XX_TAG_H */
|
||||
Loading…
Reference in New Issue