Diff for /qemu/hw/etraxfs.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2018/04/24 16:48:44 version 1.1.1.2, 2018/04/24 16:53:21
Line 24 Line 24
 #include <time.h>  #include <time.h>
 #include <sys/time.h>  #include <sys/time.h>
 #include "hw.h"  #include "hw.h"
   #include "net.h"
   #include "flash.h"
 #include "sysemu.h"  #include "sysemu.h"
   #include "devices.h"
 #include "boards.h"  #include "boards.h"
   
 extern FILE *logfile;  #include "etraxfs.h"
   
   #define FLASH_SIZE 0x2000000
   #define INTMEM_SIZE (128 * 1024)
   
   static uint32_t bootstrap_pc;
   
 static void main_cpu_reset(void *opaque)  static void main_cpu_reset(void *opaque)
 {  {
     CPUState *env = opaque;      CPUState *env = opaque;
     cpu_reset(env);      cpu_reset(env);
 }  
   
 static uint32_t fs_mmio_readb (void *opaque, target_phys_addr_t addr)      env->pc = bootstrap_pc;
 {  
         CPUState *env = opaque;  
         uint32_t r = 0;  
         printf ("%s %x pc=%x\n", __func__, addr, env->pc);  
         return r;  
 }  
 static uint32_t fs_mmio_readw (void *opaque, target_phys_addr_t addr)  
 {  
         CPUState *env = opaque;  
         uint32_t r = 0;  
         printf ("%s %x pc=%x\n", __func__, addr, env->pc);  
         return r;  
 }  
   
 static uint32_t fs_mmio_readl (void *opaque, target_phys_addr_t addr)  
 {  
         CPUState *env = opaque;  
         uint32_t r = 0;  
         printf ("%s %x p=%x\n", __func__, addr, env->pc);  
         return r;  
 }  
   
 static void  
 fs_mmio_writeb (void *opaque, target_phys_addr_t addr, uint32_t value)  
 {  
         CPUState *env = opaque;  
         printf ("%s %x %x pc=%x\n", __func__, addr, value, env->pc);  
 }  
 static void  
 fs_mmio_writew (void *opaque, target_phys_addr_t addr, uint32_t value)  
 {  
         CPUState *env = opaque;  
         printf ("%s %x %x pc=%x\n", __func__, addr, value, env->pc);  
 }  
 static void  
 fs_mmio_writel (void *opaque, target_phys_addr_t addr, uint32_t value)  
 {  
         CPUState *env = opaque;  
         printf ("%s %x %x pc=%x\n", __func__, addr, value, env->pc);  
 }  
   
 static CPUReadMemoryFunc *fs_mmio_read[] = {  
     &fs_mmio_readb,  
     &fs_mmio_readw,  
     &fs_mmio_readl,  
 };  
   
 static CPUWriteMemoryFunc *fs_mmio_write[] = {  
     &fs_mmio_writeb,  
     &fs_mmio_writew,  
     &fs_mmio_writel,  
 };  
   
   
 /* Init functions for different blocks.  */  
 extern void etraxfs_timer_init(CPUState *env, qemu_irq *irqs);  
 extern void etraxfs_ser_init(CPUState *env, qemu_irq *irqs);  
   
 void etrax_ack_irq(CPUState *env, uint32_t mask)  
 {  
         env->pending_interrupts &= ~mask;  
 }  
   
 static void dummy_cpu_set_irq(void *opaque, int irq, int level)  
 {  
         CPUState *env = opaque;  
   
         /* Hmm, should this really be done here?  */  
         env->pending_interrupts |= 1 << irq;  
         cpu_interrupt(env, CPU_INTERRUPT_HARD);  
 }  }
   
 static  static
 void bareetraxfs_init (int ram_size, int vga_ram_size,  void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
                        const char *boot_device, DisplayState *ds,                         const char *boot_device,
                        const char *kernel_filename, const char *kernel_cmdline,                         const char *kernel_filename, const char *kernel_cmdline,
                        const char *initrd_filename, const char *cpu_model)                         const char *initrd_filename, const char *cpu_model)
 {  {
     CPUState *env;      CPUState *env;
     qemu_irq *irqs;      struct etraxfs_pic *pic;
       void *etraxfs_dmac;
       struct etraxfs_dma_client *eth[2] = {NULL, NULL};
     int kernel_size;      int kernel_size;
     int internal_regs;      int i;
       ram_addr_t phys_ram;
       ram_addr_t phys_flash;
       ram_addr_t phys_intmem;
   
     /* init CPUs */      /* init CPUs */
     if (cpu_model == NULL) {      if (cpu_model == NULL) {
         cpu_model = "crisv32";          cpu_model = "crisv32";
     }      }
     env = cpu_init(cpu_model);      env = cpu_init(cpu_model);
 /*    register_savevm("cpu", 0, 3, cpu_save, cpu_load, env); */  
     qemu_register_reset(main_cpu_reset, env);      qemu_register_reset(main_cpu_reset, env);
     irqs = qemu_allocate_irqs(dummy_cpu_set_irq, env, 32);  
   
     internal_regs = cpu_register_io_memory(0,  
                                            fs_mmio_read, fs_mmio_write, env);  
     /* 0xb0050000 is the last reg.  */  
     cpu_register_physical_memory (0xac000000, 0x4010000, internal_regs);  
     /* allocate RAM */      /* allocate RAM */
     cpu_register_physical_memory(0x40000000, ram_size, IO_MEM_RAM);      phys_ram = qemu_ram_alloc(ram_size);
       cpu_register_physical_memory(0x40000000, ram_size, phys_ram | IO_MEM_RAM);
   
     etraxfs_timer_init(env, irqs);      /* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the 
     etraxfs_ser_init(env, irqs);         internal memory.  */
       phys_intmem = qemu_ram_alloc(INTMEM_SIZE);
     kernel_size = load_image(kernel_filename, phys_ram_base + 0x4000);      cpu_register_physical_memory(0x38000000, INTMEM_SIZE,
     /* magic for boot.  */                                   phys_intmem | IO_MEM_RAM);
     env->regs[8] = 0x56902387;  
     env->regs[9] = 0x40004000 + kernel_size;  
     env->pc = 0x40004000;      phys_flash = qemu_ram_alloc(FLASH_SIZE);
       i = drive_get_index(IF_PFLASH, 0, 0);
     {      pflash_cfi02_register(0x0, phys_flash,
        unsigned char *ptr = phys_ram_base + 0x4000;                            i != -1 ? drives_table[i].bdrv : NULL, (64 * 1024),
        int i;                            FLASH_SIZE >> 16,
        for (i = 0; i < 8; i++)                            1, 2, 0x0000, 0x0000, 0x0000, 0x0000,
        {                            0x555, 0x2aa);
                 printf ("%2.2x ", ptr[i]);      pic = etraxfs_pic_init(env, 0x3001c000);
        }      etraxfs_dmac = etraxfs_dmac_init(env, 0x30000000, 10);
         printf("\n");      for (i = 0; i < 10; i++) {
           /* On ETRAX, odd numbered channels are inputs.  */
           etraxfs_dmac_connect(etraxfs_dmac, i, pic->irq + 7 + i, i & 1);
     }      }
   
     printf ("pc =%x\n", env->pc);      /* Add the two ethernet blocks.  */
     printf ("ram size =%d\n", ram_size);      eth[0] = etraxfs_eth_init(&nd_table[0], env, pic->irq + 25, 0x30034000, 1);
     printf ("kernel name =%s\n", kernel_filename);      if (nb_nics > 1)
     printf ("kernel size =%d\n", kernel_size);          eth[1] = etraxfs_eth_init(&nd_table[1], env,
     printf ("cpu haltd =%d\n", env->halted);                                    pic->irq + 26, 0x30036000, 2);
 }  
       /* The DMA Connector block is missing, hardwire things for now.  */
       etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]);
       etraxfs_dmac_connect_client(etraxfs_dmac, 1, eth[0] + 1);
       if (eth[1]) {
           etraxfs_dmac_connect_client(etraxfs_dmac, 6, eth[1]);
           etraxfs_dmac_connect_client(etraxfs_dmac, 7, eth[1] + 1);
       }
   
 void DMA_run(void)      /* 2 timers.  */
 {      etraxfs_timer_init(env, pic->irq + 0x1b, pic->nmi + 1, 0x3001e000);
 }      etraxfs_timer_init(env, pic->irq + 0x1b, pic->nmi + 1, 0x3005e000);
   
       for (i = 0; i < 4; i++) {
           if (serial_hds[i]) {
               etraxfs_ser_init(env, pic->irq + 0x14 + i,
                                serial_hds[i], 0x30026000 + i * 0x2000);
           }
       }
   
 void pic_info()      if (kernel_filename) {
 {          uint64_t entry, high;
 }          int kcmdline_len;
   
           /* Boots a kernel elf binary, os/linux-2.6/vmlinux from the axis 
              devboard SDK.  */
           kernel_size = load_elf(kernel_filename, -0x80000000LL,
                                  &entry, NULL, &high);
           bootstrap_pc = entry;
           if (kernel_size < 0) {
               /* Takes a kimage from the axis devboard SDK.  */
               kernel_size = load_image(kernel_filename, phys_ram_base + 0x4000);
               bootstrap_pc = 0x40004000;
               env->regs[9] = 0x40004000 + kernel_size;
           }
           env->regs[8] = 0x56902387; /* RAM init magic.  */
   
           if (kernel_cmdline && (kcmdline_len = strlen(kernel_cmdline))) {
               if (kcmdline_len > 256) {
                   fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n");
                   exit(1);
               }
               pstrcpy_targphys(high, 256, kernel_cmdline);
               /* Let the kernel know we are modifying the cmdline.  */
               env->regs[10] = 0x87109563;
               env->regs[11] = high;
           }
       }
       env->pc = bootstrap_pc;
   
 void irq_info()      printf ("pc =%x\n", env->pc);
 {      printf ("ram size =%ld\n", ram_size);
 }  }
   
 QEMUMachine bareetraxfs_machine = {  QEMUMachine bareetraxfs_machine = {
     "bareetraxfs",      .name = "bareetraxfs",
     "Bare ETRAX FS board",      .desc = "Bare ETRAX FS board",
     bareetraxfs_init,      .init = bareetraxfs_init,
       .ram_require = 0x8000000,
 };  };

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


unix.superglobalmegacorp.com