kotovalexarian-likes-gitlab/bztsrc--bootboot
1
0
Fork 0
mirror of https://gitlab.com/bztsrc/bootboot.git synced 2023-02-13 20:54:32 -05:00
Code Releases Activity

SIPI moved after ExitBootServices

Browse source
This commit is contained in:
bzt 2020-09-23 15:49:20 +02:00
parent 8bd257a5c2
commit ebcb629943
10 changed files with 60 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
dist/bootboot.efi vendored
View file

Binary file not shown.

BIN
dist/bootboot.rom vendored
View file

Binary file not shown.

BIN
images/disk-x86.img.gz
View file

Binary file not shown.

BIN
mkbootimg-Linux.zip
View file

Binary file not shown.

BIN
mkbootimg-Win.zip
View file

Binary file not shown.

2
mkbootimg/data.c
View file

File diff suppressed because one or more lines are too long

2
mkbootimg/data.h
View file

@ -2,7 +2,7 @@
extern unsigned char binary_boot_bin[512];
extern unsigned char binary_bootboot_bin[12288];
extern unsigned char binary_bootboot_efi[100420];
extern unsigned char binary_bootboot_efi[100932];
extern unsigned char binary_bootboot_img[34672];
extern unsigned char binary_LICENCE_broadcom[1594];
extern unsigned char binary_bootcode_bin[52480];

2
x86_64-efi/Makefile
View file

@ -3,7 +3,7 @@ GNUEFI_INCLUDES = -I/usr/include -I. -I/usr/include/efi -I/usr/include/efi/$(
GNUEFI_CRT_OBJS = crt0-efi-$(ARCH).o
GNUEFI_LDS = elf_$(ARCH)_efi.lds
CFLAGS = -mno-red-zone -mno-mmx -mno-sse -O2 -fpic -Wall -Wextra -Werror -fshort-wchar -fno-strict-aliasing -ffreestanding -fno-stack-protector -fno-stack-check -DCONFIG_$(ARCH) -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
CFLAGS = -mno-red-zone -mno-mmx -mno-sse -O2 -fpic -Wall -Wextra -Werror -fshort-wchar -fno-strict-aliasing -ffreestanding -fno-stack-protector -fno-stack-check -DCONFIG_$(ARCH) -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
LDFLAGS = -nostdlib
LDFLAGS += -shared -Bsymbolic -L. $(GNUEFI_CRT_OBJS)

60
x86_64-efi/bootboot.c
View file

@ -1437,6 +1437,8 @@ efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab)
EFI_MP_SERVICES_PROTOCOL *mp = NULL;
UINT8 pibuffer[100];
EFI_PROCESSOR_INFORMATION *pibuf=(EFI_PROCESSOR_INFORMATION*)pibuffer;
#else
UINT64 ncycles = 0, currtime, endtime;
#endif
EFI_GUID SerIoGuid = EFI_SERIAL_IO_PROTOCOL_GUID;
EFI_SERIAL_IO_PROTOCOL *ser = NULL;
@ -1493,6 +1495,33 @@ efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab)
"shrl $24, %%ebx;"
"mov %%bx,%0"
: "=b"(bootboot->bspid) : : );
#if !defined(USE_MP_SERVICES) || !USE_MP_SERVICES
// should be no need to check for RDSTC, available since Pentium, therefore
// all long mode capable CPUs should have it. But just to be on the safe side
__asm__ __volatile__ (
"mov $0x80000007, %%eax; xor %%edx, %%edx;"
"cpuid;"
: "=d"(desc_version) : : );
if(desc_version & (1<<8)) {
// calibrate CPU clock cycles
__asm__ __volatile__ ( "rdtsc" : "=A"(currtime));
uefi_call_wrapper(BS->Stall, 1, 1);
__asm__ __volatile__ ( "rdtsc" : "=A"(ncycles));
ncycles -= currtime;
ncycles /= 5;
if(ncycles < 1) ncycles = 1;
} else {
// fallback to dummy loops without RDTSC (should never happen)
ncycles = 0;
}
desc_version = 0;
#define sleep(n) do { if(ncycles) { \
__asm__ __volatile__ ( "rdtsc" : "=A"(endtime)); endtime += n*ncycles; \
do { __asm__ __volatile__ ( "rdtsc" : "=A"(currtime)); } while(currtime < endtime); \
} else \
for(i = 0; i < n*1000000; i++) __asm__ __volatile__ ("pause" : : : "memory"); \
} while(0)
#endif
// locate InitRD in ROM
DBG(L" * Locate initrd in Option ROMs%s\n",L"");
@ -1891,20 +1920,13 @@ gzerr: return report(EFI_COMPROMISED_DATA,L"Unable to uncompress");
// save UEFI's 64 bit system registers for the trampoline code
__asm__ __volatile__ (
"movq %%cr3, %%rax; movq %%rax, 0x80C0;"
"movl %%cs, %%eax; movl %%eax, 0x80C8;"
"movl %%ds, %%eax; movl %%eax, 0x80CC;"
"movl %%cs, %%eax; movl %%eax, 0x80CC;"
"movl %%ds, %%eax; movl %%eax, 0x80D0;"
"sgdt 0x80E0" : : : );
// save relocated address, relocation record doesn't work in Assembly
*((uint64_t*)0x80D0) = (uint64_t)bootboot_startcore;
// send Broadcast INIT IPI
*((volatile uint32_t*)(lapic_addr + 0x300)) = 0x0C4500;
uefi_call_wrapper(BS->Stall, 1, 10);
// send Broadcast STARTUP IPI
*((volatile uint32_t*)(lapic_addr + 0x300)) = 0x0C4608; // start at 0800:0000h
uefi_call_wrapper(BS->Stall, 1, 1);
// send second SIPI
*((volatile uint32_t*)(lapic_addr + 0x300)) = 0x0C4608;
}
*((uint64_t*)0x80D8) = (uint64_t)bootboot_startcore;
} else
bootboot->numcores = 1;
#endif
// query size of memory map
@ -2024,6 +2046,20 @@ get_memory_map:
return report(status,L"ExitBootServices");
}
#if !defined(USE_MP_SERVICES) || !USE_MP_SERVICES
// start APs
if(bootboot->numcores > 1) {
// send Broadcast INIT IPI
*((volatile uint32_t*)(lapic_addr + 0x300)) = 0x0C4500;
sleep(50);
// send Broadcast STARTUP IPI
*((volatile uint32_t*)(lapic_addr + 0x300)) = 0x0C4608; // start at 0800:0000h
sleep(1);
// send second SIPI
*((volatile uint32_t*)(lapic_addr + 0x300)) = 0x0C4608;
}
#endif
// clear the screen
for(j=y=0;y<bootboot->fb_height;y++) {
i=j;

18
x86_64-efi/smp.S
View file

@ -66,6 +66,7 @@ _L8040:
_L8060:
movw $16, %ax
movw %ax, %ds
movw %ax, %ss
movl $0x368, %eax // Set PAE, MCE, PGE; OSFXSR, OSXMMEXCPT (enable SSE)
movl %eax, %cr4
movl 0x80C0, %eax // let's hope it's in the first 4G...
@ -77,14 +78,12 @@ _L8060:
movl $0x0C0000011, %eax // clear EM, MP (enable SSE) and WP
movl %eax, %cr0
lgdtl 0x80E0
movl 0x80C8, %eax
push %eax
push $0x80A0
movl $0x80C8, %esp // we can't use "ljmp $8, $0x80A0", because we don't know cs
retf
.align 32
.code64
_L80A0:
movl 0x80CC, %eax // load long mode segments
movl 0x80D0, %eax // load long mode segments
movw %ax, %ds
movw %ax, %es
movw %ax, %ss
@ -92,16 +91,17 @@ _L80A0:
movw %ax, %gs
// some linkers (GNU ld) generates bad relocation record for this
// jmp bootboot_startcode
movq 0x80D0, %rax
movq 0x80D8, %rax
jmp *%rax
.align 32
_L80C0_cr3_value:
.long 0, 0
_L80C8_cs_value:
.long 0x80A0
_L80CC_cs_value:
.long 0
_L80CC_ds_value:
.long 0
_L80D0_bootboot_startcore:
_L80D0_ds_value:
.long 0, 0
_L80D8_bootboot_startcore:
.long 0, 0
_L80E0_gdt_value:
.long 0, 0, 0, 0