X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmtd%2Fmaps%2Famd76xrom.c;h=60ca04b5f94e7657dba8b9cacb140158c319d145;hb=5e3b93f248c98873cc843e83092bb8da92ac85a2;hp=7f3ab37689041a2125ac77dbbd2c918363820ed0;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c index 7f3ab3768..60ca04b5f 100644 --- a/drivers/mtd/maps/amd76xrom.c +++ b/drivers/mtd/maps/amd76xrom.c @@ -2,7 +2,7 @@ * amd76xrom.c * * Normal mappings of chips in physical memory - * $Id: amd76xrom.c,v 1.12 2004/07/14 14:44:31 thayne Exp $ + * $Id: amd76xrom.c,v 1.8 2003/05/28 15:44:28 dwmw2 Exp $ */ #include @@ -17,60 +17,25 @@ #include -#define xstr(s) str(s) -#define str(s) #s -#define MOD_NAME xstr(KBUILD_BASENAME) - -#define MTD_DEV_NAME_LENGTH 16 - struct amd76xrom_map_info { struct map_info map; struct mtd_info *mtd; unsigned long window_addr; u32 window_start, window_size; struct pci_dev *pdev; - struct resource window_rsrc; - struct resource rom_rsrc; - char mtd_name[MTD_DEV_NAME_LENGTH]; }; static struct amd76xrom_map_info amd76xrom_map = { .map = { - .name = MOD_NAME, + .name = "AMD76X rom", .size = 0, - .bankwidth = 1, - } - /* remaining fields of structure are initialized to 0 */ + .buswidth = 1, + }, + .mtd = 0, + .window_addr = 0, }; - -static void amd76xrom_cleanup(struct amd76xrom_map_info *info) -{ - u8 byte; - - /* Disable writes through the rom window */ - pci_read_config_byte(info->pdev, 0x40, &byte); - pci_write_config_byte(info->pdev, 0x40, byte & ~1); - - if (info->mtd) { - del_mtd_device(info->mtd); - map_destroy(info->mtd); - info->mtd = NULL; - info->map.virt = 0; - } - if (info->rom_rsrc.parent) - release_resource(&info->rom_rsrc); - if (info->window_rsrc.parent) - release_resource(&info->window_rsrc); - - if (info->window_addr) { - iounmap((void *)(info->window_addr)); - info->window_addr = 0; - } -} - - static int __devinit amd76xrom_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -80,10 +45,6 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev, u8 segen_bits; }; static struct rom_window rom_window[] = { - /* - * Need the 5MiB window for chips that have block lock/unlock - * registers located below 4MiB window. - */ { 0xffb00000, 5*1024*1024, (1<<7) | (1<<6), }, { 0xffc00000, 4*1024*1024, (1<<7), }, { 0xffff0000, 64*1024, 0 }, @@ -92,141 +53,87 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev, static const u32 rom_probe_sizes[] = { 5*1024*1024, 4*1024*1024, 2*1024*1024, 1024*1024, 512*1024, 256*1024, 128*1024, 64*1024, 0}; - static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL }; + static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", 0 }; u8 byte; struct amd76xrom_map_info *info = &amd76xrom_map; struct rom_window *window; int i; u32 rom_size; - info->pdev = pdev; window = &rom_window[0]; - while (window->size) { - /* - * Try to reserve the window mem region. If this fails then - * it is likely due to a fragment of the window being - * "reseved" by the BIOS. In the case that the - * request_mem_region() fails then once the rom size is - * discovered we will try to reserve the unreserved fragment. - */ - info->window_rsrc.name = MOD_NAME; - info->window_rsrc.start = window->start; - info->window_rsrc.end = window->start + window->size - 1; - info->window_rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY; - if (request_resource(&iomem_resource, &info->window_rsrc)) { - info->window_rsrc.parent = NULL; - printk(KERN_ERR MOD_NAME - " %s(): Unable to register resource" - " 0x%.08lx-0x%.08lx - kernel bug?\n", - __func__, - info->window_rsrc.start, info->window_rsrc.end); + /* disabled because it fights with BIOS reserved regions */ +#define REQUEST_MEM_REGION 0 +#if REQUEST_MEM_REGION + while(window->size) { + if (request_mem_region(window->start, window->size, "amd76xrom")) { + break; } + window++; + } + if (!window->size) { + printk(KERN_ERR "amd76xrom: cannot reserve rom window\n"); + goto err_out_none; + } +#endif /* REQUEST_MEM_REGION */ - /* Enable the selected rom window */ - pci_read_config_byte(pdev, 0x43, &byte); - pci_write_config_byte(pdev, 0x43, byte | window->segen_bits); + /* Enable the selected rom window */ + pci_read_config_byte(pdev, 0x43, &byte); + pci_write_config_byte(pdev, 0x43, byte | window->segen_bits); - /* Enable writes through the rom window */ - pci_read_config_byte(pdev, 0x40, &byte); - pci_write_config_byte(pdev, 0x40, byte | 1); + /* Enable writes through the rom window */ + pci_read_config_byte(pdev, 0x40, &byte); + pci_write_config_byte(pdev, 0x40, byte | 1); - /* FIXME handle registers 0x80 - 0x8C the bios region locks */ + /* FIXME handle registers 0x80 - 0x8C the bios region locks */ - printk(KERN_NOTICE MOD_NAME " window : %x at %x\n", - window->size, window->start); - /* For write accesses caches are useless */ - info->window_addr = - (unsigned long)ioremap_nocache(window->start, - window->size); + printk(KERN_NOTICE "amd76xrom window : %x at %x\n", + window->size, window->start); + /* For write accesses caches are useless */ + info->window_addr = (unsigned long)ioremap_nocache(window->start, window->size); - if (!info->window_addr) { - printk(KERN_ERR "Failed to ioremap\n"); + if (!info->window_addr) { + printk(KERN_ERR "Failed to ioremap\n"); + goto err_out_free_mmio_region; + } + info->mtd = 0; + for(i = 0; (rom_size = rom_probe_sizes[i]); i++) { + char **chip_type; + if (rom_size > window->size) { continue; } - - info->mtd = NULL; - - for(i = 0; (rom_size = rom_probe_sizes[i]); i++) { - char **chip_type; - if (rom_size > window->size) { - continue; - } - info->map.phys = window->start + window->size - rom_size; - info->map.virt = - info->window_addr + window->size - rom_size; - info->map.size = rom_size; - simple_map_init(&info->map); - chip_type = rom_probe_types; - for(; !info->mtd && *chip_type; chip_type++) { - info->mtd = do_map_probe(*chip_type, &amd76xrom_map.map); - } - if (info->mtd) goto found_mtd; + info->map.phys = window->start + window->size - rom_size; + info->map.virt = + info->window_addr + window->size - rom_size; + info->map.size = rom_size; + simple_map_init(&info->map); + chip_type = rom_probe_types; + for(; !info->mtd && *chip_type; chip_type++) { + info->mtd = do_map_probe(*chip_type, &amd76xrom_map.map); + } + if (info->mtd) { + break; } - iounmap((void *)(info->window_addr)); - info->window_addr = 0; - - /* Disable writes through the rom window */ - pci_read_config_byte(pdev, 0x40, &byte); - pci_write_config_byte(pdev, 0x40, byte & ~1); - - window++; } - goto failed; - - found_mtd: - printk(KERN_NOTICE MOD_NAME " chip at offset: 0x%x\n", + if (!info->mtd) { + goto err_out_iounmap; + } + printk(KERN_NOTICE "amd76xrom chip at offset: 0x%x\n", window->size - rom_size); - + info->mtd->owner = THIS_MODULE; - - if (!info->window_rsrc.parent) { - /* failed to reserve entire window - try fragments */ - info->window_rsrc.name = MOD_NAME; - info->window_rsrc.start = window->start; - info->window_rsrc.end = window->start + window->size - rom_size - 1; - info->window_rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY; - if (request_resource(&iomem_resource, &info->window_rsrc)) { - printk(KERN_ERR MOD_NAME - ": cannot reserve window resource fragment\n"); -#if 0 - /* - * The BIOS e820 usually reserves this so it isn't - * usually an error. - */ - goto failed; -#endif - } - } - add_mtd_device(info->mtd); info->window_start = window->start; info->window_size = window->size; - - if (info->window_rsrc.parent) { - /* - * Registering the MTD device in iomem may not be possible - * if there is a BIOS "reserved" and BUSY range. If this - * fails then continue anyway. - */ - snprintf(info->mtd_name, MTD_DEV_NAME_LENGTH, - "mtd%d", info->mtd->index); - - info->rom_rsrc.name = info->mtd_name; - info->rom_rsrc.start = window->start + window->size - rom_size; - info->rom_rsrc.end = window->start + window->size - 1; - info->rom_rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY; - if (request_resource(&info->window_rsrc, &info->rom_rsrc)) { - printk(KERN_ERR MOD_NAME - ": cannot reserve MTD resource\n"); - info->rom_rsrc.parent = NULL; - } - } - return 0; - failed: - amd76xrom_cleanup(info); +err_out_iounmap: + iounmap((void *)(info->window_addr)); +err_out_free_mmio_region: +#if REQUEST_MEM_REGION + release_mem_region(window->start, window->size); +err_out_none: +#endif /* REQUEST_MEM_REGION */ return -ENODEV; } @@ -234,8 +141,23 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev, static void __devexit amd76xrom_remove_one (struct pci_dev *pdev) { struct amd76xrom_map_info *info = &amd76xrom_map; + u8 byte; + + del_mtd_device(info->mtd); + map_destroy(info->mtd); + info->mtd = 0; + info->map.virt = 0; + + iounmap((void *)(info->window_addr)); + info->window_addr = 0; + + /* Disable writes through the rom window */ + pci_read_config_byte(pdev, 0x40, &byte); + pci_write_config_byte(pdev, 0x40, byte & ~1); - amd76xrom_cleanup(info); +#if REQUEST_MEM_REGION + release_mem_region(info->window_start, info->window_size); +#endif /* REQUEST_MEM_REGION */ } static struct pci_device_id amd76xrom_pci_tbl[] = { @@ -251,7 +173,7 @@ MODULE_DEVICE_TABLE(pci, amd76xrom_pci_tbl); #if 0 static struct pci_driver amd76xrom_driver = { - .name = MOD_NAME, + .name = "amd76xrom", .id_table = amd76xrom_pci_tbl, .probe = amd76xrom_init_one, .remove = amd76xrom_remove_one, @@ -262,9 +184,9 @@ int __init init_amd76xrom(void) { struct pci_dev *pdev; struct pci_device_id *id; - pdev = NULL; + pdev = 0; for(id = amd76xrom_pci_tbl; id->vendor; id++) { - pdev = pci_find_device(id->vendor, id->device, NULL); + pdev = pci_find_device(id->vendor, id->device, 0); if (pdev) { break; }