X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Futil.h;h=70d3c4c3271ff468925ae515f54c5dfb3ebbdc44;hb=refs%2Fheads%2Fcoreboot;hp=9c78e4c800f60799c55c056f2459022cd57ed2d2;hpb=575ffc8fd1127e3cb8fbb7f587cadfa85eb9b73d;p=seabios.git diff --git a/src/util.h b/src/util.h index 9c78e4c..70d3c4c 100644 --- a/src/util.h +++ b/src/util.h @@ -1,6 +1,6 @@ // Basic x86 asm functions and function defs. // -// Copyright (C) 2008,2009 Kevin O'Connor +// Copyright (C) 2008-2010 Kevin O'Connor // // This file may be distributed under the terms of the GNU LGPLv3 license. #ifndef __UTIL_H @@ -18,15 +18,14 @@ static inline void irq_enable(void) asm volatile("sti": : :"memory"); } -static inline unsigned long irq_save(void) +static inline u32 save_flags(void) { - unsigned long flags; - asm volatile("pushfl ; popl %0" : "=g" (flags)); - irq_disable(); + u32 flags; + asm volatile("pushfl ; popl %0" : "=rm" (flags)); return flags; } -static inline void irq_restore(unsigned long flags) +static inline void restore_flags(u32 flags) { asm volatile("pushl %0 ; popfl" : : "g" (flags) : "memory", "cc"); } @@ -36,12 +35,6 @@ static inline void cpu_relax(void) asm volatile("rep ; nop": : :"memory"); } -// Atomically enable irqs and sleep until an irq; then re-disable irqs. -static inline void wait_irq(void) -{ - asm volatile("sti ; hlt ; cli ; cld": : :"memory"); -} - static inline void nop(void) { asm volatile("nop"); @@ -49,24 +42,34 @@ static inline void nop(void) static inline void hlt(void) { - asm volatile("hlt"); + asm volatile("hlt": : :"memory"); } static inline void wbinvd(void) { - asm volatile("wbinvd"); + asm volatile("wbinvd": : :"memory"); } +#define CPUID_TSC (1 << 4) #define CPUID_MSR (1 << 5) #define CPUID_APIC (1 << 9) #define CPUID_MTRR (1 << 12) -static inline void cpuid(u32 index, u32 *eax, u32 *ebx, u32 *ecx, u32 *edx) +static inline void __cpuid(u32 index, u32 *eax, u32 *ebx, u32 *ecx, u32 *edx) { asm("cpuid" : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx) : "0" (index)); } +static inline u32 getcr0(void) { + u32 cr0; + asm("movl %%cr0, %0" : "=r"(cr0)); + return cr0; +} +static inline void setcr0(u32 cr0) { + asm("movl %0, %%cr0" : : "r"(cr0)); +} + static inline u64 rdmsr(u32 index) { u64 ret; @@ -116,6 +119,21 @@ static inline u32 __htonl(u32 val) { #define htons(x) __htons_constant(x) #define ntohs(x) htons(x) +static inline u16 cpu_to_le16(u16 x) +{ + return x; +} + +static inline u32 cpu_to_le32(u32 x) +{ + return x; +} + +static inline u32 le32_to_cpu(u32 x) +{ + return x; +} + static inline u32 getesp(void) { u32 esp; asm("movl %%esp, %0" : "=rm"(esp)); @@ -144,26 +162,33 @@ static inline u8 readb(const void *addr) { #define call16_simpint(nr, peax, pflags) do { \ ASSERT16(); \ asm volatile( \ + "pushl %%ebp\n" \ + "sti\n" \ "stc\n" \ "int %2\n" \ "pushfl\n" \ "popl %1\n" \ "cli\n" \ - "cld" \ - : "+a"(*peax), "=r"(*pflags) \ + "cld\n" \ + "popl %%ebp" \ + : "+a"(*peax), "=c"(*pflags) \ : "i"(nr) \ - : "cc", "memory"); \ + : "ebx", "edx", "esi", "edi", "cc", "memory"); \ } while (0) -// GDT bit manipulation -#define GDT_BASE(v) ((((u64)(v) & 0xff000000) << 32) \ - | (((u64)(v) & 0x00ffffff) << 16)) -#define GDT_LIMIT(v) ((((u64)(v) & 0x000f0000) << 32) \ - | (((u64)(v) & 0x0000ffff) << 0)) +// GDT bits #define GDT_CODE (0x9bULL << 40) // Code segment - P,R,A bits also set #define GDT_DATA (0x93ULL << 40) // Data segment - W,A bits also set #define GDT_B (0x1ULL << 54) // Big flag #define GDT_G (0x1ULL << 55) // Granularity flag +// GDT bits for segment base +#define GDT_BASE(v) ((((u64)(v) & 0xff000000) << 32) \ + | (((u64)(v) & 0x00ffffff) << 16)) +// GDT bits for segment limit (0-1Meg) +#define GDT_LIMIT(v) ((((u64)(v) & 0x000f0000) << 32) \ + | (((u64)(v) & 0x0000ffff) << 0)) +// GDT bits for segment limit (0-4Gig in 4K chunks) +#define GDT_GRANLIMIT(v) (GDT_G | GDT_LIMIT((v) >> 12)) struct descloc_s { u16 length; @@ -171,6 +196,7 @@ struct descloc_s { } PACKED; // util.c +void cpuid(u32 index, u32 *eax, u32 *ebx, u32 *ecx, u32 *edx); struct bregs; inline void call16(struct bregs *callregs); inline void call16big(struct bregs *callregs); @@ -179,7 +205,6 @@ inline void __call16_int(struct bregs *callregs, u16 offset); extern void irq_trampoline_ ##nr (); \ __call16_int((callregs), (u32)&irq_trampoline_ ##nr ); \ } while (0) -void check_irqs(void); u8 checksum_far(u16 buf_seg, void *buf_far, u32 len); u8 checksum(void *buf, u32 len); size_t strlen(const char *s); @@ -188,8 +213,10 @@ int strcmp(const char *s1, const char *s2); inline void memset_far(u16 d_seg, void *d_far, u8 c, size_t len); inline void memset16_far(u16 d_seg, void *d_far, u16 c, size_t len); void *memset(void *s, int c, size_t n); +void memset_fl(void *ptr, u8 val, size_t size); inline void memcpy_far(u16 d_seg, void *d_far , u16 s_seg, const void *s_far, size_t len); +void memcpy_fl(void *d_fl, const void *s_fl, size_t len); void *memcpy(void *d1, const void *s1, size_t len); #if MODESEGMENT == 0 #define memcpy __builtin_memcpy @@ -197,19 +224,26 @@ void *memcpy(void *d1, const void *s1, size_t len); void iomemcpy(void *d, const void *s, u32 len); void *memmove(void *d, const void *s, size_t len); char *strtcpy(char *dest, const char *src, size_t len); -void biosusleep(u32 usec); +char *strchr(const char *s, int c); +void nullTrailingSpace(char *buf); int get_keystroke(int msec); // stacks.c -inline u32 stack_hop(u32 eax, u32 edx, u32 ecx, void *func); +u32 call32(void *func, u32 eax, u32 errret); +inline u32 stack_hop(u32 eax, u32 edx, void *func); extern struct thread_info MainThread; -void thread_setup(void); +extern int CanPreempt; struct thread_info *getCurThread(void); void yield(void); +void wait_irq(void); void run_thread(void (*func)(void*), void *data); void wait_threads(void); +struct mutex_s { u32 isLocked; }; +void mutex_lock(struct mutex_s *mutex); +void mutex_unlock(struct mutex_s *mutex); void start_preempt(void); void finish_preempt(void); +int wait_preempt(void); void check_preempt(void); // output.c @@ -220,6 +254,8 @@ void printf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); int snprintf(char *str, size_t size, const char *fmt, ...) __attribute__ ((format (printf, 3, 4))); +char * znprintf(size_t size, const char *fmt, ...) + __attribute__ ((format (printf, 2, 3))); void __dprintf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); void __debug_enter(struct bregs *regs, const char *fname); @@ -227,6 +263,7 @@ void __debug_isr(const char *fname); void __debug_stub(struct bregs *regs, int lineno, const char *fname); void __warn_invalid(struct bregs *regs, int lineno, const char *fname); void __warn_unimplemented(struct bregs *regs, int lineno, const char *fname); +void __warn_internalerror(int lineno, const char *fname); void __warn_noalloc(int lineno, const char *fname); void __warn_timeout(int lineno, const char *fname); void __set_invalid(struct bregs *regs, int lineno, const char *fname); @@ -254,6 +291,8 @@ void hexdump(const void *d, int len); __warn_invalid((regs), __LINE__, __func__) #define warn_unimplemented(regs) \ __warn_unimplemented((regs), __LINE__, __func__) +#define warn_internalerror() \ + __warn_internalerror(__LINE__, __func__) #define warn_noalloc() \ __warn_noalloc(__LINE__, __func__) #define warn_timeout() \ @@ -288,9 +327,7 @@ void lpt_setup(void); // clock.c #define PIT_TICK_RATE 1193180 // Underlying HZ of PIT #define PIT_TICK_INTERVAL 65536 // Default interval for 18.2Hz timer -static inline int check_time(u64 end) { - return (s64)(rdtscll() - end) > 0; -} +int check_tsc(u64 end); void timer_setup(void); void ndelay(u32 count); void udelay(u32 count); @@ -300,12 +337,16 @@ void usleep(u32 count); void msleep(u32 count); u64 calc_future_tsc(u32 msecs); u64 calc_future_tsc_usec(u32 usecs); +u32 calc_future_timer_ticks(u32 count); +u32 calc_future_timer(u32 msecs); +int check_timer(u32 end); void handle_1583(struct bregs *regs); void handle_1586(struct bregs *regs); void useRTC(void); void releaseRTC(void); // apm.c +void apm_shutdown(void); void handle_1553(struct bregs *regs); // pcibios.c @@ -315,8 +356,10 @@ void bios32_setup(void); // shadow.c void make_bios_writable(void); void make_bios_readonly(void); +void qemu_prep_reset(void); // pciinit.c +extern const u8 pci_irqs[4]; void pci_setup(void); // smm.c @@ -327,24 +370,30 @@ extern u32 CountCPUs; extern u32 MaxCountCPUs; void wrmsr_smp(u32 index, u64 val); void smp_probe(void); -void smp_probe_setup(void); // coreboot.c +extern const char *CBvendor, *CBpart; struct cbfs_file; +struct cbfs_file *cbfs_finddatafile(const char *fname); struct cbfs_file *cbfs_findprefix(const char *prefix, struct cbfs_file *last); u32 cbfs_datasize(struct cbfs_file *file); const char *cbfs_filename(struct cbfs_file *file); int cbfs_copyfile(struct cbfs_file *file, void *dst, u32 maxlen); -int cbfs_copy_optionrom(void *dst, u32 maxlen, u32 vendev); void cbfs_run_payload(struct cbfs_file *file); - void coreboot_copy_biostable(void); +void cbfs_payload_setup(void); void coreboot_setup(void); +// biostable.c +void copy_pir(void *pos); +void copy_mptable(void *pos); +void copy_acpi_rsdp(void *pos); +void copy_smbios(void *pos); + // vgahooks.c -extern int VGAbdf; void handle_155f(struct bregs *regs); -void vgahook_setup(const char *vendor, const char *part); +struct pci_device; +void vgahook_setup(struct pci_device *pci); // optionroms.c void call_bcv(u16 seg, u16 ip); @@ -352,8 +401,15 @@ void optionrom_setup(void); void vga_setup(void); void s3_resume_vga_init(void); extern u32 RomEnd; +extern int ScreenAndDebug; + +// bootsplash.c +void enable_vga_console(void); +void enable_bootsplash(void); +void disable_bootsplash(void); // resume.c +extern int HaveRunPost; void init_dma(void); // pnpbios.c @@ -364,6 +420,7 @@ void pnp_setup(void); // pmm.c extern struct zone_s ZoneLow, ZoneHigh, ZoneFSeg, ZoneTmpLow, ZoneTmpHigh; void malloc_setup(void); +void malloc_fixupreloc(void); void malloc_finalize(void); void *pmm_malloc(struct zone_s *zone, u32 handle, u32 size, u32 align); int pmm_free(void *data); @@ -382,6 +439,9 @@ static inline void *malloc_high(u32 size) { static inline void *malloc_fseg(u32 size) { return pmm_malloc(&ZoneFSeg, PMM_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN); } +static inline void *malloc_tmplow(u32 size) { + return pmm_malloc(&ZoneTmpLow, PMM_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN); +} static inline void *malloc_tmphigh(u32 size) { return pmm_malloc(&ZoneTmpHigh, PMM_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN); } @@ -389,7 +449,7 @@ static inline void *malloc_tmp(u32 size) { void *ret = malloc_tmphigh(size); if (ret) return ret; - return pmm_malloc(&ZoneTmpLow, PMM_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN); + return malloc_tmplow(size); } static inline void *memalign_low(u32 align, u32 size) { return pmm_malloc(&ZoneLow, PMM_DEFAULT_HANDLE, size, align); @@ -397,9 +457,18 @@ static inline void *memalign_low(u32 align, u32 size) { static inline void *memalign_high(u32 align, u32 size) { return pmm_malloc(&ZoneHigh, PMM_DEFAULT_HANDLE, size, align); } +static inline void *memalign_tmplow(u32 align, u32 size) { + return pmm_malloc(&ZoneTmpLow, PMM_DEFAULT_HANDLE, size, align); +} static inline void *memalign_tmphigh(u32 align, u32 size) { return pmm_malloc(&ZoneTmpHigh, PMM_DEFAULT_HANDLE, size, align); } +static inline void *memalign_tmp(u32 align, u32 size) { + void *ret = memalign_tmphigh(align, size); + if (ret) + return ret; + return memalign_tmplow(align, size); +} static inline void free(void *data) { pmm_free(data); }