Changeset 482

Timestamp:

Jan 1, 2015, 8:35:26 PM (9 years ago)

Author:

alain

Message:

The GIET_NIC_BUFSIZE, GIET_NIC_NBUFS, and GIET_NIC_TIMEOUT have been removed from the hiet_config.h file.

Location:

soft/giet_vm

Files:

• Makefile (modified) (3 diffs)
• giet_config.h (modified) (1 diff)
• hard_config.h (modified) (5 diffs)

soft/giet_vm/Makefile

@@ -10 +10 @@
 # Parameters definition
 ARCH      ?= ../tsar-trunk-svn-2013/platforms/tsar_generic_iob
-X_SIZE    ?= 1
-Y_SIZE    ?= 1
-NB_PROCS  ?= 4
+X_SIZE    ?= 8
+Y_SIZE    ?= 4
+NB_PROCS  ?= 2
 NB_TTYS   ?= 1
 FBF_WIDTH ?= 128
@@ -44 +44 @@
 
 ### Objects to be linked for kernel.elf
-KERNEL_OBJS  = build/common/utils.o        \
-               build/common/locks.o        \
+KERNEL_OBJS  = build/common/utils.o         \
+               build/common/locks.o         \
                build/common/tty0.o          \
-               build/common/vmem.o         \
-               build/fat32/fat32.o         \
-               build/kernel/giet.o         \
-               build/kernel/switch.o       \
-               build/kernel/ctx_handler.o  \
-               build/kernel/exc_handler.o  \
-               build/kernel/sys_handler.o  \
-               build/kernel/irq_handler.o  \
+               build/common/vmem.o          \
+               build/common/kernel_malloc.o \
+               build/fat32/fat32.o          \
+               build/kernel/giet.o          \
+               build/kernel/switch.o        \
+               build/kernel/ctx_handler.o   \
+               build/kernel/exc_handler.o   \
+               build/kernel/sys_handler.o   \
+               build/kernel/irq_handler.o   \
                build/kernel/kernel_init.o
 
 ### Objects to be linked for boot.elf
-BOOT_OBJS    = build/common/utils.o        \
-               build/common/locks.o        \
+BOOT_OBJS    = build/common/utils.o         \
+               build/common/locks.o         \
                build/common/tty0.o          \
-               build/common/pmem.o         \
-               build/common/vmem.o         \
-               build/fat32/fat32.o         \
-               build/kernel/ctx_handler.o  \
-               build/kernel/switch.o       \
-               build/boot/boot.o           \
+               build/common/pmem.o          \
+               build/common/vmem.o          \
+               build/common/kernel_malloc.o \
+               build/fat32/fat32.o          \
+               build/kernel/ctx_handler.o   \
+               build/kernel/switch.o        \
+               build/boot/boot.o            \
                build/boot/boot_entry.o
 
@@ -363 +365 @@
         $(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
 
+build/common/kernel_malloc.o: giet_common/kernel_malloc.c \
+                     giet_common/kernel_malloc.h \
+                     hard_config.h      \
+                     giet_config.h
+        $(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
+
 ########################
 ### boot compilation

soft/giet_vm/giet_config.h

@@ -46 +46 @@
 /* software parameters */
 
-#define GIET_ELF_BUFFER_SIZE     0x80000    /* buffer for .elf files in seg_boot_data */
+#define GIET_ELF_BUFFER_SIZE     0x80000    /* buffer for .elf files (seg_boot_data) */
 #define GIET_IDLE_TASK_PERIOD    0x10000000 /* Idle Task message period */
 #define GIET_OPEN_FILES_MAX      16         /* max simultaneously open files */
 #define GIET_NB_VSPACE_MAX       16         /* max number of virtual spaces */
-#define GIET_TICK_VALUE          0x00100000 /* context switch period (number of cycles) */
+#define GIET_TICK_VALUE          0x00100000 /* context switch period (cycles) */
 #define GIET_USE_IOMMU           0          /* IOMMU activated when non zero */
 #define GIET_NO_HARD_CC          0          /* No hard cache coherence when non zero */
-#define GIET_NIC_NBUFS           2          /* Number of buffers for the NIC chbuf */
-#define GIET_NIC_NFAKE           6          /* Number of fake buffers (for chbuf alignment) */
-#define GIET_NIC_BUFSIZE         4096       /* Buffer size for the NIC chbuf */
-#define GIET_NIC_TIMEOUT         100        /* Max number of iterations for chbuf access */
 #define GIET_NIC_MAC4            0x12345678 /* 32 LSB bits of the MAC address */
 #define GIET_NIC_MAC2            0xBEBE     /* 16 MSB bits of the MAC address */
-#define GIET_LOCK_MAX_TICKET     1000000    /* max ticket value for the queueing locks */
+#define GIET_LOCK_MAX_TICKET     1000000    /* max ticket value for queueing locks */
 
 #endif

soft/giet_vm/hard_config.h

@@ -1 @@
-/* Generated by genmap for tsar_iob_1_1_4_1_128_classif */
+/* Generated by genmap for tsar_iob_8_4_2_1_128_classif */
 
 #ifndef HARD_CONFIG_H
@@ -6 +6 @@
 /* General platform parameters */
 
-#define X_SIZE                 1
-#define Y_SIZE                 1
+#define X_SIZE                 8
+#define Y_SIZE                 4
 #define X_WIDTH                4
 #define Y_WIDTH                4
@@ -13 +13 @@
 #define X_IO                   0
 #define Y_IO                   0
-#define NB_PROCS_MAX           4
+#define NB_PROCS_MAX           2
 #define IRQ_PER_PROCESSOR      4
 #define RESET_ADDRESS          0xbfc00000
-#define NB_TOTAL_PROCS         4
+#define NB_TOTAL_PROCS         64
 
 /* Peripherals */
@@ -22 +22 @@
 #define NB_TTY_CHANNELS        1
 #define NB_IOC_CHANNELS        1
-#define NB_NIC_CHANNELS        2
-#define NB_CMA_CHANNELS        4
+#define NB_NIC_CHANNELS        1
+#define NB_CMA_CHANNELS        2
 #define NB_TIM_CHANNELS        0
-#define NB_DMA_CHANNELS        4
+#define NB_DMA_CHANNELS        2
 
 #define USE_XCU                1
@@ -45 +45 @@
 
 #define SEG_RAM_BASE           0x0
-#define SEG_RAM_SIZE           0x4000000
+#define SEG_RAM_SIZE           0x1000000
 
 #define SEG_CMA_BASE           0xb6000000
-#define SEG_CMA_SIZE           0x4000
+#define SEG_CMA_SIZE           0x2000
 
 #define SEG_DMA_BASE           0xb1000000