--- upstream/dynamips-0.2.5/dev_c3600.c 2007/10/06 16:01:44 1 +++ upstream/dynamips-0.2.6-RC2/dev_c3600.c 2007/10/06 16:05:34 3 @@ -28,7 +28,7 @@ /* ======================================================================== */ /* Cisco 3620 mainboard EEPROM */ -static m_uint16_t eeprom_c3620_mainboard[64] = { +static m_uint16_t eeprom_c3620_mainboard_data[64] = { 0x0001, 0x0000, 0x0000, 0x0000, 0x0AFF, 0x7318, 0x5011, 0x0020, 0x0000, 0x0000, 0xA0FF, 0x9904, 0x19FF, 0xFFFF, 0xFFFF, 0x0002, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, @@ -39,8 +39,14 @@ 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, }; +struct cisco_eeprom eeprom_c3620_mainboard = { + "C3620 Mainboard", + eeprom_c3620_mainboard_data, + sizeof(eeprom_c3620_mainboard_data)/2, +}; + /* Cisco 3640 mainboard EEPROM */ -static m_uint16_t eeprom_c3640_mainboard[64] = { +static m_uint16_t eeprom_c3640_mainboard_data[64] = { 0x0001, 0x0000, 0x0000, 0x0000, 0x0AFF, 0x7316, 0x8514, 0x0040, 0x0000, 0x0000, 0xA1FF, 0x0102, 0x22FF, 0xFFFF, 0xFFFF, 0x0002, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, @@ -51,8 +57,14 @@ 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, }; +struct cisco_eeprom eeprom_c3640_mainboard = { + "C3640 Mainboard", + eeprom_c3640_mainboard_data, + sizeof(eeprom_c3640_mainboard_data)/2, +}; + /* Cisco 3660 backplane EEPROM */ -static m_uint16_t eeprom_c3660_backplane[64] = { +static m_uint16_t eeprom_c3660_backplane_data[64] = { 0x04FF, 0x4000, 0xC841, 0x0100, 0xC046, 0x0320, 0x0012, 0x8402, 0x4243, 0x3080, 0x0000, 0x0000, 0x0202, 0xC18B, 0x4841, 0x4430, 0x3434, 0x3431, 0x3135, 0x4A03, 0x0081, 0x0000, 0x0000, 0x0400, @@ -63,6 +75,12 @@ 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, }; +struct cisco_eeprom eeprom_c3660_backplane = { + "C3660 Backplane", + eeprom_c3660_backplane_data, + sizeof(eeprom_c3660_backplane_data)/2, +}; + /* ======================================================================== */ /* Chassis Drivers */ /* ======================================================================== */ @@ -71,14 +89,10 @@ static int c3660_init(c3600_t *router); static struct c3600_chassis_driver chassis_drivers[] = { - { "3620" , 3620, 1, c3620_init, - eeprom_c3620_mainboard, sizeof(eeprom_c3620_mainboard)/2 }, - { "3640" , 3640, 1, c3640_init, - eeprom_c3640_mainboard, sizeof(eeprom_c3640_mainboard)/2 }, - { "3660" , 3660, 1, c3660_init, - eeprom_c3660_backplane, sizeof(eeprom_c3660_backplane)/2 }, - - { NULL , -1, 0, NULL }, + { "3620" , 3620, 1, c3620_init, &eeprom_c3620_mainboard }, + { "3640" , 3640, 1, c3640_init, &eeprom_c3640_mainboard }, + { "3660" , 3660, 1, c3660_init, &eeprom_c3660_backplane }, + { NULL , -1, 0, NULL, NULL }, }; /* ======================================================================== */ @@ -90,6 +104,7 @@ &dev_c3600_nm_1fe_tx_driver, &dev_c3600_nm_4t_driver, &dev_c3600_leopard_2fe_driver, + &dev_c3600_nm_16esw_driver, NULL, }; @@ -101,7 +116,7 @@ ssize_t c3600_nvram_extract_config(vm_instance_t *vm,char **buffer) { struct vdevice *nvram_dev; - m_uint32_t start,end,clen,nvlen; + m_uint32_t start,nvlen; m_uint16_t magic1,magic2; m_uint64_t addr; @@ -119,46 +134,23 @@ } start = physmem_copy_u32_from_vm(vm,addr+0x10) + 1; - end = physmem_copy_u32_from_vm(vm,addr+0x14); nvlen = physmem_copy_u32_from_vm(vm,addr+0x18); - clen = end - start; - if ((clen + 1) != nvlen) { + if (nvlen <= 10) { vm_error(vm,"invalid configuration size (0x%x)\n",nvlen); return(-1); } - if (!(*buffer = malloc(clen+1))) { - vm_error(vm,"unable to allocate config buffer (%u bytes)\n",clen); + if (!(*buffer = malloc(nvlen+1))) { + vm_error(vm,"unable to allocate config buffer (%u bytes)\n",nvlen); return(-1); } - physmem_copy_from_vm(vm,*buffer,addr+start+0x08,clen); - (*buffer)[clen] = 0; - return(clen); + physmem_copy_from_vm(vm,*buffer,addr+start+0x08,nvlen-1); + (*buffer)[nvlen-1] = 0; + return(nvlen-1); } -/* Compute NVRAM checksum */ -static u_int16_t nvram_cksum(vm_instance_t *vm,m_uint64_t addr,size_t count) -{ - m_uint32_t sum = 0; - - while(count > 1) { - sum = sum + physmem_copy_u16_from_vm(vm,addr); - addr += sizeof(m_uint16_t); - count -= sizeof(m_uint16_t); - } - - if (count > 0) - sum = sum + ((physmem_copy_u16_from_vm(vm,addr) & 0xFF) << 8); - - while(sum>>16) - sum = (sum & 0xffff) + (sum >> 16); - - return(~sum); -} - - /* Directly push the IOS configuration to the NVRAM device */ int c3600_nvram_push_config(vm_instance_t *vm,char *buffer,size_t len) { @@ -173,7 +165,7 @@ addr = nvram_dev->phys_addr + vm->nvram_rom_space; cfg_offset = 0x2c; - cfg_addr = addr + cfg_offset;; + cfg_addr = addr + cfg_offset; /* Write IOS tag, uncompressed config... */ physmem_copy_u16_to_vm(vm,addr+0x06,0xF0A5); @@ -252,6 +244,9 @@ /* Shutdown all Network Modules */ c3600_nm_shutdown_all(router); + /* Free mainboard EEPROM */ + cisco_eeprom_free(&router->mb_eeprom); + /* Free all resources used by VM */ vm_free(vm); @@ -329,20 +324,18 @@ /* Set NM EEPROM definition */ int c3600_nm_set_eeprom(c3600_t *router,u_int nm_bay, - const struct c3600_eeprom *eeprom) + const struct cisco_eeprom *eeprom) { if (nm_bay >= C3600_MAX_NM_BAYS) { vm_error(router->vm,"c3600_nm_set_eeprom: invalid NM Bay %u.\n",nm_bay); return(-1); } - /* 3620/3640 */ - router->nm_bay[nm_bay].eeprom_data = eeprom->data; - router->nm_bay[nm_bay].eeprom_data_len = eeprom->len; - - /* 3660 */ - router->c3660_nm_eeprom_def[nm_bay].data = eeprom->data; - router->c3660_nm_eeprom_def[nm_bay].data_len = eeprom->len; + if (cisco_eeprom_copy(&router->nm_bay[nm_bay].eeprom,eeprom) == -1) { + vm_error(router->vm,"c3600_nm_set_eeprom: no memory.\n"); + return(-1); + } + return(0); } @@ -354,13 +347,7 @@ return(-1); } - /* 3620/3640 */ - router->nm_bay[nm_bay].eeprom_data = NULL; - router->nm_bay[nm_bay].eeprom_data_len = 0; - - /* 3660 */ - router->c3660_nm_eeprom_def[nm_bay].data = NULL; - router->c3660_nm_eeprom_def[nm_bay].data_len = 0; + cisco_eeprom_free(&router->nm_bay[nm_bay].eeprom); return(0); } @@ -370,7 +357,7 @@ if (nm_bay >= C3600_MAX_NM_BAYS) return(FALSE); - return((router->nm_bay[nm_bay].eeprom_data != NULL) ? TRUE : FALSE); + return(cisco_eeprom_valid(&router->nm_bay[nm_bay].eeprom)); } /* Get bay info */ @@ -745,6 +732,23 @@ return(0); } +/* Show info about all NMs */ +int c3600_nm_show_all_info(c3600_t *router) +{ + struct c3600_nm_bay *bay; + int i; + + for(i=0;inm_driver) + continue; + + if (bay->nm_driver->nm_show_info != NULL) + bay->nm_driver->nm_show_info(router,i); + } + + return(0); +} + /* Maximum number of tokens in a NM description */ #define NM_DESC_MAX_TOKENS 8 @@ -953,30 +957,29 @@ } /* Set the base MAC address of the chassis */ -static int c3600_burn_mac_addr(m_uint16_t *data,size_t data_len, - n_eth_addr_t *addr) +static int c3600_burn_mac_addr(c3600_t *router,n_eth_addr_t *addr) { m_uint8_t eeprom_ver; size_t offset; /* Read EEPROM format version */ - cisco_eeprom_get_byte(data,data_len,0,&eeprom_ver); + cisco_eeprom_get_byte(&router->mb_eeprom,0,&eeprom_ver); switch(eeprom_ver) { case 0: - cisco_eeprom_set_region(data,data_len,2,addr->eth_addr_byte,6); + cisco_eeprom_set_region(&router->mb_eeprom,2,addr->eth_addr_byte,6); break; case 4: - if (!cisco_eeprom_v4_find_field(data,data_len,0xC3,&offset)) { - cisco_eeprom_set_region(data,data_len,offset, + if (!cisco_eeprom_v4_find_field(&router->mb_eeprom,0xC3,&offset)) { + cisco_eeprom_set_region(&router->mb_eeprom,offset, addr->eth_addr_byte,6); } break; default: - fprintf(stderr,"c3600_burn_mac_addr: unable to handle " - "EEPROM version %u\n",eeprom_ver); + vm_error(router->vm,"c3600_burn_mac_addr: unable to handle " + "EEPROM version %u\n",eeprom_ver); return(-1); } @@ -992,8 +995,7 @@ } /* Set the chassis base MAC address */ - c3600_burn_mac_addr(router->mb_eeprom_data,sizeof(router->mb_eeprom_data), - &router->mac_addr); + c3600_burn_mac_addr(router,&router->mac_addr); return(0); } @@ -1015,14 +1017,13 @@ router->chassis_driver = driver; /* Copy the mainboard EEPROM */ - memcpy(router->mb_eeprom_data,driver->mb_eeprom,driver->mb_eeprom_len << 1); + if (cisco_eeprom_copy(&router->mb_eeprom,driver->eeprom) == -1) { + vm_error(router->vm,"unable to set chassis EEPROM '%s'.\n",chassis_type); + return(-1); + } /* Set the chassis base MAC address */ - c3600_burn_mac_addr(router->mb_eeprom_data,sizeof(router->mb_eeprom_data), - &router->mac_addr); - - router->mb_eeprom.data = router->mb_eeprom_data; - router->mb_eeprom.data_len = driver->mb_eeprom_len; + c3600_burn_mac_addr(router,&router->mac_addr); return(0); } @@ -1315,7 +1316,7 @@ } /* Initialize the NS16552 DUART */ - dev_ns16552_init(vm,C3600_DUART_ADDR,0x1000,C3600_DUART_IRQ, + dev_ns16552_init(vm,C3600_DUART_ADDR,0x1000,3,C3600_DUART_IRQ, vm->vtty_con,vm->vtty_aux); /* Cirrus Logic PD6729 (PCI-to-PCMCIA host adapter) */ @@ -1380,7 +1381,7 @@ vm_log(vm,"C3600_BOOT", "starting instance (CPU0 PC=0x%llx,idle_pc=0x%llx,JIT %s)\n", vm->boot_cpu->pc,vm->boot_cpu->idle_pc,vm->jit_use ? "on":"off"); - + /* Start main CPU */ vm->status = VM_STATUS_RUNNING; cpu_start(vm->boot_cpu);