gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ihk_ikc_irq and ihk_ikc_irq_apicid

Browse Source
This commit is contained in:
bgerofi@riken.jp
2014-10-20 16:11:15 +09:00
committed by Balazs Gerofi bgerofi@riken.jp
parent ff47261337
commit b388f59ebd
4 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/kernel/cpu.c
View File

@@ -272,6 +272,9 @@ void ihk_mc_init_ap(void)
kprintf("# of cpus : %d\n", cpu_info->ncpus); kprintf("# of cpus : %d\n", cpu_info->ncpus);
init_processors_local(cpu_info->ncpus); init_processors_local(cpu_info->ncpus);
kprintf("IKC IRQ vector: %d, CPU APIC: %d\n",
ihk_ikc_irq, ihk_ikc_irq_apicid);
/* Do initialization for THIS cpu (BSP) */ /* Do initialization for THIS cpu (BSP) */
assign_processor_id(); assign_processor_id();
@@ -596,6 +599,8 @@ void ihk_mc_boot_cpu(int cpuid, unsigned long pc)
memcpy(p, trampoline_code_data, memcpy(p, trampoline_code_data,
trampoline_code_data_end - trampoline_code_data); trampoline_code_data_end - trampoline_code_data);
kprintf("trampoline length: %d\n",
trampoline_code_data_end - trampoline_code_data);
p[1] = (unsigned long)virt_to_phys(get_init_page_table()); p[1] = (unsigned long)virt_to_phys(get_init_page_table());
p[2] = (unsigned long)setup_x86_ap; p[2] = (unsigned long)setup_x86_ap;

2
arch/x86/kernel/include/arch-memory.h
View File

@@ -248,7 +248,7 @@ void *map_fixed_area(unsigned long phys, unsigned long size, int uncachable);
extern unsigned long ap_trampoline; extern unsigned long ap_trampoline;
//#define AP_TRAMPOLINE 0x10000 //#define AP_TRAMPOLINE 0x10000
#define AP_TRAMPOLINE_SIZE 0x4000 #define AP_TRAMPOLINE_SIZE 0x2000
/* Local is cachable */ /* Local is cachable */
#define IHK_IKC_QUEUE_PT_ATTR (PTATTR_NO_EXECUTE | PTATTR_WRITABLE | PTATTR_UNCACHABLE) #define IHK_IKC_QUEUE_PT_ATTR (PTATTR_NO_EXECUTE | PTATTR_WRITABLE | PTATTR_UNCACHABLE)

2
executer/kernel/control.c
View File

@@ -37,6 +37,8 @@
#include <asm/io.h> #include <asm/io.h>
#include "mcctrl.h" #include "mcctrl.h"
//#define DEBUG
#ifdef DEBUG #ifdef DEBUG
#define dprintk printk #define dprintk printk
#else #else

3
lib/include/ihk/cpu.h
View File

@@ -99,4 +99,7 @@ enum ihk_asr_type {
int ihk_mc_arch_set_special_register(enum ihk_asr_type, unsigned long value); int ihk_mc_arch_set_special_register(enum ihk_asr_type, unsigned long value);
int ihk_mc_arch_get_special_register(enum ihk_asr_type, unsigned long *value); int ihk_mc_arch_get_special_register(enum ihk_asr_type, unsigned long *value);
extern unsigned int ihk_ikc_irq;
extern unsigned int ihk_ikc_irq_apicid;
#endif #endif