Changeset 59e4864 in mainline for boot/arch/ia64/loader/gefi/HelenOS/hello.c

Timestamp:

2008-11-11T08:00:42Z (16 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f3c4a26

Parents:

a2a5529

Message:

Alfa of SMP support on IA64

File:

• boot/arch/ia64/loader/gefi/HelenOS/hello.c (modified) (7 diffs)

boot/arch/ia64/loader/gefi/HelenOS/hello.c

@@ -2 +2 @@
 #include <efilib.h>
 
+#include <../../../../../../kernel/arch/ia64/include/bootinfo.h>
+
 #define KERNEL_LOAD_ADDRESS 0x4400000
+
+//Link image as a data array into hello - usefull with network boot
+//#define IMAGE_LINKED
+
+bootinfo_t *bootinfo=(bootinfo_t *)BOOTINFO_ADDRESS;
+
+
+#ifdef IMAGE_LINKED
+extern char HOSimage[];
+extern int HOSimagesize;
+#endif
+
 
 
@@ -16 +30 @@
         return mem;
 }
-char HEX[256];
-
-char hexs[]="0123456789ABCDEF";
-/*
-void to_hex(unsigned long long num)
-{
-    int a;
-    for(a=15;a>=0;a--)    
-    {
-        char c=num - (num & 0xfffffffffffffff0LL);
-        num/=16;
-        c=hexs[c];
-        HEX[a]=c;
-    }
-
-}
-*/
 
 EFI_STATUS
@@ -73 +70 @@
 
         BS->HandleProtocol(LoadedImage->DeviceHandle, &FileSystemProtocol, &Vol);
-        Vol->OpenVolume (Vol, &CurDir);
 
         char FileName[1024];
         char *OsKernelBuffer;
         int i;
+        int defaultLoad;
+        int imageLoad;
         UINTN Size;
 
@@ -98 +96 @@
         while(LoadOptions[i]==L' ') if(LoadOptions[i++]==0) break;
         
-        if(LoadOptions[i++]==0)
+        if(LoadOptions[i++]==0){
                 StrCat(FileName,L"\\image.bin");
+                defaultLoad=1;
+        }       
         else{
                 CHAR16 buf[1024];
@@ -109 +109 @@
                 buf[j+1]=0;
                 StrCat(FileName,buf);
-        }
-        
-        //Print(L"%s\n",FileName);
-
-        EFI_STATUS stat;
-        stat=CurDir->Open(CurDir, &FileHandle, FileName, EFI_FILE_MODE_READ, 0);
-        if(EFI_ERROR(stat)){
-                Print(L"Error Opening Image %s\n",FileName);
-                return 0;
+                defaultLoad=0;
+        }
+
+        imageLoad=1;
+#ifdef IMAGE_LINKED
+        if(defaultLoad) {
+            Print(L"Using Linked Image\n");
+            imageLoad=0;
         }    
-        Size = 0x00400000;
-        BS->AllocatePool(EfiLoaderData, Size, &OsKernelBuffer);
-        FileHandle->Read(FileHandle, &Size, OsKernelBuffer);
-        FileHandle->Close(FileHandle);
-
-        if(Size<1) return 0;
-
-
-        char *  HOS = OsKernelBuffer;  
+#endif  
+        
+
+        char *  HOS;
+        if(imageLoad)
+        {
+                Size = 0x00400000;
+
+                Vol->OpenVolume (Vol, &CurDir);
+
+                EFI_STATUS stat;
+                stat=CurDir->Open(CurDir, &FileHandle, FileName, EFI_FILE_MODE_READ, 0);
+                if(EFI_ERROR(stat)){
+                        Print(L"Error Opening Image %s\n",FileName);
+                        return 0;
+                }
+                BS->AllocatePool(EfiLoaderData, Size, &OsKernelBuffer);
+                FileHandle->Read(FileHandle, &Size, OsKernelBuffer);
+                FileHandle->Close(FileHandle);
+                HOS = OsKernelBuffer;  
+                if(Size<1) return 0;
+
+        }           
+#ifdef IMAGE_LINKED
+        else {
+            HOS = HOSimage;  
+            Size = HOSimagesize;
+            Print(L"Image start %llX\n",(long long)HOS);
+            Print(L"Image size %llX\n",(long long)Size);
+            Print(L"Image &size %llX\n",(long long)&Size);
+        }
+#endif  
         int HOSSize = Size;  
+
+
+        rArg rSAL;
+        //Setup AP's wake up address
+
+        LibSalProc(0x01000000,2,0x4400200,0,0,0,0,0,&rSAL);
+
+
+        UINT64 sapic;
+        LibGetSalIpiBlock(&sapic);
+        Print (L"SAPIC:%X\n", sapic);
+        bootinfo->sapic=sapic;
+
+
+        int wakeup_intno;
+        wakeup_intno=0xf0;
+        Print (L"WAKEUP INTNO:%X\n", wakeup_intno);
+        bootinfo->wakeup_intno=wakeup_intno;
+
+
+
 
 
@@ -168 +211 @@
             ((char *)(0x4400000))[a]=HOS[a];
         }
+        bootinfo->sapic=(unsigned long *)sapic;
+        bootinfo->wakeup_intno=wakeup_intno;
         
         //Run Kernel
@@ -178 +223 @@
            
         
-        while(1){
-            ((volatile int *)(0x80000000000b8000))[0]++;
-        }
+        //Not reached      
         return EFI_SUCCESS;
 }