| /trunk/kernel/arch/ia64/Makefile.inc |
|---|
| 88,7 → 88,6 |
| ifeq ($(MACHINE),ski) |
| ARCH_SOURCES += arch/$(ARCH)/src/ski/ski.c |
| DEFS += -DSKI |
| # BFD = elf64-ia64-little |
| BFD = binary |
| endif |
| /trunk/kernel/arch/ia64/src/ia64.c |
|---|
| 74,7 → 74,6 |
| { |
| /* Setup usermode init tasks. */ |
| //#ifdef I460GX |
| unsigned int i; |
| init.cnt = bootinfo->taskmap.count; |
| 83,26 → 82,6 |
| init.tasks[i].addr = ((unsigned long) bootinfo->taskmap.tasks[i].addr) | VRN_MASK; |
| init.tasks[i].size = bootinfo->taskmap.tasks[i].size; |
| } |
| /* |
| #else |
| init.cnt = 8; |
| init.tasks[0].addr = INIT0_ADDRESS; |
| init.tasks[0].size = INIT0_SIZE; |
| init.tasks[1].addr = INIT0_ADDRESS + 0x400000; |
| init.tasks[1].size = INIT0_SIZE; |
| init.tasks[2].addr = INIT0_ADDRESS + 0x800000; |
| init.tasks[2].size = INIT0_SIZE; |
| init.tasks[3].addr = INIT0_ADDRESS + 0xc00000; |
| init.tasks[3].size = INIT0_SIZE; |
| init.tasks[4].addr = INIT0_ADDRESS + 0x1000000; |
| init.tasks[4].size = INIT0_SIZE; |
| init.tasks[5].addr = INIT0_ADDRESS + 0x1400000; |
| init.tasks[5].size = INIT0_SIZE; |
| init.tasks[6].addr = INIT0_ADDRESS + 0x1800000; |
| init.tasks[6].size = INIT0_SIZE; |
| init.tasks[7].addr = INIT0_ADDRESS + 0x1c00000; |
| init.tasks[7].size = INIT0_SIZE; |
| #endif*/ |
| } |
| void arch_pre_mm_init(void) |
| /trunk/kernel/arch/ia64/src/smp/smp.c |
|---|
| 102,7 → 102,6 |
| myid=ia64_get_cpu_id(); |
| myeid=ia64_get_cpu_eid(); |
| //printf("Sending ipi %d on %d\n",ipi,CPU->id); |
| for(id=0;id<256;id++) |
| for(eid=0;eid<256;eid++) |
| if((id!=myid) || (eid!=myeid)) |
| 149,9 → 148,6 |
| if((id!=myid) || (eid!=myeid)) |
| if(cpu_by_id_eid_list[id][eid]!=0){ |
| if(cpu_by_id_eid_list[id][eid]==1){ |
| //config.cpu_count++; |
| //cpu_by_id_eid_list[id][eid]=2; |
| printf("Found Late CPU ID:%d EDI:%d Not added to system!!!\n",id,eid); |
| continue; |
| } |
| /trunk/kernel/arch/ia64/src/mm/tlb.c |
|---|
| 135,48 → 135,39 |
| ps = PAGE_WIDTH; |
| break; |
| case 1: /*cnt 4-15*/ |
| /*cnt=((cnt-1)/4)+1;*/ |
| ps = PAGE_WIDTH+2; |
| va &= ~((1<<ps)-1); |
| break; |
| case 2: /*cnt 16-63*/ |
| /*cnt=((cnt-1)/16)+1;*/ |
| ps = PAGE_WIDTH+4; |
| va &= ~((1<<ps)-1); |
| break; |
| case 3: /*cnt 64-255*/ |
| /*cnt=((cnt-1)/64)+1;*/ |
| ps = PAGE_WIDTH+6; |
| va &= ~((1<<ps)-1); |
| break; |
| case 4: /*cnt 256-1023*/ |
| /*cnt=((cnt-1)/256)+1;*/ |
| ps = PAGE_WIDTH+8; |
| va &= ~((1<<ps)-1); |
| break; |
| case 5: /*cnt 1024-4095*/ |
| /*cnt=((cnt-1)/1024)+1;*/ |
| ps = PAGE_WIDTH+10; |
| va &= ~((1<<ps)-1); |
| break; |
| case 6: /*cnt 4096-16383*/ |
| /*cnt=((cnt-1)/4096)+1;*/ |
| ps = PAGE_WIDTH+12; |
| va &= ~((1<<ps)-1); |
| break; |
| case 7: /*cnt 16384-65535*/ |
| case 8: /*cnt 65536-(256K-1)*/ |
| /*cnt=((cnt-1)/16384)+1;*/ |
| ps = PAGE_WIDTH+14; |
| va &= ~((1<<ps)-1); |
| break; |
| default: |
| /*cnt=((cnt-1)/(16384*16))+1;*/ |
| ps=PAGE_WIDTH+18; |
| va&=~((1<<ps)-1); |
| break; |
| } |
| /*cnt+=(page!=va);*/ |
| for(; va<(page+cnt*(PAGE_SIZE)); va += (1<<ps)) { |
| asm volatile ( |
| "ptc.l %0,%1;;" |
| 502,8 → 493,6 |
| uint64_t io_page=(va & ((1<<IO_PAGE_WIDTH)-1)) >> (USPACE_IO_PAGE_WIDTH); |
| if(is_io_page_accessible(io_page)){ |
| //printf("Insert %llX\n",va); |
| uint64_t page,frame; |
| page = IO_OFFSET + (1 << USPACE_IO_PAGE_WIDTH) * io_page; |
| 521,10 → 510,10 |
| entry.d = true; /* already dirty */ |
| entry.pl = PL_USER; |
| entry.ar = AR_READ | AR_WRITE; |
| entry.ppn = frame >> PPN_SHIFT; //MUSIM spocitat frame |
| entry.ppn = frame >> PPN_SHIFT; |
| entry.ps = USPACE_IO_PAGE_WIDTH; |
| dtc_mapping_insert(page, TASK->as->asid, entry); //Musim zjistit ASID |
| dtc_mapping_insert(page, TASK->as->asid, entry); |
| return 1; |
| }else { |
| fault_if_from_uspace(istate,"IO access fault at %p",va); |
| /trunk/kernel/arch/ia64/src/mm/frame.c |
|---|
| 40,13 → 40,6 |
| #include <align.h> |
| #include <macros.h> |
| /* |
| * This is Ski-specific and certainly not sufficient |
| * for real ia64 systems that provide memory map. |
| */ |
| #define MEMORY_SIZE (256 * 1024 * 1024) |
| #define MEMORY_BASE (0 * 64 * 1024 * 1024) |
| #define KERNEL_RESERVED_AREA_BASE (0x4400000) |
| #define KERNEL_RESERVED_AREA_SIZE (16*1024*1024) |
| 83,8 → 76,6 |
| } |
| } |
| //zone_create(MEMORY_BASE >> FRAME_WIDTH, SIZE2FRAMES(MEMORY_SIZE), (MEMORY_SIZE) >> FRAME_WIDTH, 0); |
| /* |
| * Blacklist ROM regions. |
| */ |
| /trunk/boot/arch/ia64/loader/main.c |
|---|
| 79,11 → 79,7 |
| bootinfo_t *bootinfo=&binfo; |
| //for(ii=0;ii<KERNEL_SIZE;ii++) ((char *)(0x100000))[ii] = ((char *)KERNEL_START)[ii+1]; |
| //((int *)(0x100000))[0]++; |
| version_print(); |