Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-51
Creator: Yinghai Lu <yhlu@tyan.com> cache_as_ram for AMD and some intel git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1967 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
@@ -104,7 +104,7 @@ static inline unsigned int cpuid_edx(unsigned int op)
|
||||
#define X86_VENDOR_SIS 10
|
||||
#define X86_VENDOR_UNKNOWN 0xff
|
||||
|
||||
#ifndef __ROMCC__
|
||||
#if !defined( __ROMCC__ ) && defined( __GNUC__)
|
||||
#include <device/device.h>
|
||||
|
||||
|
||||
|
@@ -1,19 +1,15 @@
|
||||
#ifndef ARCH_HLT_H
|
||||
#define ARCH_HLT_H
|
||||
|
||||
#ifdef __ROMCC__
|
||||
#if defined( __ROMCC__) && !defined(__GNUC__)
|
||||
static void hlt(void)
|
||||
{
|
||||
__builtin_hlt();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__) && !defined(__ROMCC__)
|
||||
#else
|
||||
static inline void hlt(void)
|
||||
{
|
||||
asm("hlt");
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@@ -9,8 +9,7 @@
|
||||
* (insb/insw/insl/outsb/outsw/outsl). You can also use "pausing"
|
||||
* versions of the single-IO instructions (inb_p/inw_p/..).
|
||||
*/
|
||||
|
||||
#ifdef __ROMCC__
|
||||
#if defined( __ROMCC__ ) && !defined (__GNUC__)
|
||||
static inline void outb(uint8_t value, uint16_t port)
|
||||
{
|
||||
__builtin_outb(value, port);
|
||||
@@ -42,7 +41,6 @@ static inline uint32_t inl(uint16_t port)
|
||||
{
|
||||
return __builtin_inl(port);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
static inline void outb(uint8_t value, uint16_t port)
|
||||
@@ -81,7 +79,7 @@ static inline uint32_t inl(uint16_t port)
|
||||
return value;
|
||||
}
|
||||
|
||||
#endif /* __ROMCC__ */
|
||||
#endif /* __ROMCC__ && !__GNUC__*/
|
||||
|
||||
static inline void outsb(uint16_t port, const void *addr, unsigned long count)
|
||||
{
|
||||
|
@@ -33,8 +33,7 @@ static inline void write32(unsigned long addr, uint32_t value)
|
||||
{
|
||||
*((volatile uint32_t *)(addr)) = value;
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
typedef __builtin_div_t div_t;
|
||||
typedef __builtin_ldiv_t ldiv_t;
|
||||
typedef __builtin_udiv_t udiv_t;
|
||||
@@ -72,6 +71,32 @@ inline int log2(int value)
|
||||
*/
|
||||
return __builtin_bsr(value);
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline int log2(int value)
|
||||
{
|
||||
unsigned int r = 0;
|
||||
__asm__ volatile (
|
||||
"bsrl %1, %0\n\t"
|
||||
"jnz 1f\n\t"
|
||||
"movl $-1, %0\n\t"
|
||||
"1:\n\t"
|
||||
: "=r" (r) : "r" (value));
|
||||
return r;
|
||||
|
||||
}
|
||||
static inline int log2f(int value)
|
||||
{
|
||||
unsigned int r = 0;
|
||||
__asm__ volatile (
|
||||
"bsfl %1, %0\n\t"
|
||||
"jnz 1f\n\t"
|
||||
"movl $-1, %0\n\t"
|
||||
"1:\n\t"
|
||||
: "=r" (r) : "r" (value));
|
||||
return r;
|
||||
|
||||
}
|
||||
|
||||
#define PCI_ADDR(BUS, DEV, FN, WHERE) ( \
|
||||
(((BUS) & 0xFF) << 16) | \
|
||||
|
@@ -37,6 +37,7 @@
|
||||
|
||||
#include "crt0_includes.h"
|
||||
|
||||
#if USE_DCACHE_RAM == 0
|
||||
#ifndef CONSOLE_DEBUG_TX_STRING
|
||||
/* uses: esp, ebx, ax, dx */
|
||||
# define __CRT_CONSOLE_TX_STRING(string) \
|
||||
@@ -219,3 +220,5 @@ str_pre_main: .string "Jumping to LinuxBIOS.\r\n"
|
||||
.previous
|
||||
|
||||
#endif /* ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG */
|
||||
|
||||
#endif /* USE_DCACHE_RAM */
|
||||
|
@@ -46,6 +46,7 @@ SECTIONS
|
||||
_rom = .;
|
||||
*(.rom.text);
|
||||
*(.rom.data);
|
||||
*(.rom.data.*);
|
||||
. = ALIGN(16);
|
||||
_erom = .;
|
||||
}
|
||||
|
@@ -1,6 +1,13 @@
|
||||
uses CONFIG_USE_INIT
|
||||
|
||||
object c_start.S
|
||||
object cpu.c
|
||||
object pci_ops_conf1.c
|
||||
object pci_ops_conf2.c
|
||||
object pci_ops_auto.c
|
||||
object exception.c
|
||||
|
||||
if CONFIG_USE_INIT
|
||||
initobject printk_init.o
|
||||
end
|
||||
|
||||
|
@@ -15,9 +15,10 @@ _start:
|
||||
movl %eax, %fs
|
||||
movl %eax, %gs
|
||||
|
||||
intel_chip_post_macro(0x13) /* post 12 */
|
||||
intel_chip_post_macro(0x13) /* post 13 */
|
||||
|
||||
/** clear stack */
|
||||
cld
|
||||
leal _stack, %edi
|
||||
movl $_estack, %ecx
|
||||
subl %edi, %ecx
|
||||
@@ -80,7 +81,7 @@ _start:
|
||||
call hardwaremain
|
||||
/*NOTREACHED*/
|
||||
.Lhlt:
|
||||
intel_chip_post_macro(0xee) /* post fe */
|
||||
intel_chip_post_macro(0xee) /* post ee */
|
||||
hlt
|
||||
jmp .Lhlt
|
||||
|
||||
|
@@ -1,5 +1,6 @@
|
||||
#include <console/loglevel.h>
|
||||
|
||||
#if CONFIG_USE_INIT == 0
|
||||
static void __console_tx_byte(unsigned char byte)
|
||||
{
|
||||
uart_tx_byte(byte);
|
||||
@@ -120,7 +121,7 @@ static void print_spew_hex32(unsigned int value) { __console_tx_hex32(BIOS_SPEW,
|
||||
static void print_spew(const char *str) { __console_tx_string(BIOS_SPEW, str); }
|
||||
|
||||
/* Non inline versions.... */
|
||||
|
||||
#if 0
|
||||
static void print_alert_char_(unsigned char value) NOINLINE { print_alert_char(value); }
|
||||
static void print_alert_hex8_(unsigned char value) NOINLINE { print_alert_hex8(value); }
|
||||
static void print_alert_hex16_(unsigned short value) NOINLINE { print_alert_hex16(value); }
|
||||
@@ -168,6 +169,111 @@ static void print_spew_hex8_(unsigned char value) NOINLINE { print_spew_hex8(v
|
||||
static void print_spew_hex16_(unsigned short value) NOINLINE { print_spew_hex16(value); }
|
||||
static void print_spew_hex32_(unsigned int value) NOINLINE { print_spew_hex32(value); }
|
||||
static void print_spew_(const char *str) NOINLINE { print_spew(str); }
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
extern int do_printk(int msg_level, const char *fmt, ...);
|
||||
|
||||
#define printk_emerg(fmt, arg...) do_printk(BIOS_EMERG ,fmt, ##arg)
|
||||
#define printk_alert(fmt, arg...) do_printk(BIOS_ALERT ,fmt, ##arg)
|
||||
#define printk_crit(fmt, arg...) do_printk(BIOS_CRIT ,fmt, ##arg)
|
||||
#define printk_err(fmt, arg...) do_printk(BIOS_ERR ,fmt, ##arg)
|
||||
#define printk_warning(fmt, arg...) do_printk(BIOS_WARNING ,fmt, ##arg)
|
||||
#define printk_notice(fmt, arg...) do_printk(BIOS_NOTICE ,fmt, ##arg)
|
||||
#define printk_info(fmt, arg...) do_printk(BIOS_INFO ,fmt, ##arg)
|
||||
#define printk_debug(fmt, arg...) do_printk(BIOS_DEBUG ,fmt, ##arg)
|
||||
#define printk_spew(fmt, arg...) do_printk(BIOS_SPEW ,fmt, ##arg)
|
||||
|
||||
#if MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_EMERG
|
||||
#undef printk_emerg
|
||||
#define printk_emerg(fmt, arg...) do {} while(0)
|
||||
#endif
|
||||
#if MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_ALERT
|
||||
#undef printk_alert
|
||||
#define printk_alart(fmt, arg...) do {} while(0)
|
||||
#endif
|
||||
#if MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_CRIT
|
||||
#undef printk_crit
|
||||
#define printk_crit(fmt, arg...) do {} while(0)
|
||||
#endif
|
||||
#if MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_ERR
|
||||
#undef printk_err
|
||||
#define printk_err(fmt, arg...) do {} while(0)
|
||||
#endif
|
||||
#if MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_WARNING
|
||||
#undef printk_warning
|
||||
#define printk_warning(fmt, arg...) do {} while(0)
|
||||
#endif
|
||||
#if MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_NOTICE
|
||||
#undef printk_notice
|
||||
#define printk_notice(fmt, arg...) do {} while(0)
|
||||
#endif
|
||||
#if MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_INFO
|
||||
#undef printk_info
|
||||
#define printk_info(fmt, arg...) do {} while(0)
|
||||
#endif
|
||||
#if MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_DEBUG
|
||||
#undef printk_debug
|
||||
#define printk_debug(fmt, arg...) do {} while(0)
|
||||
#endif
|
||||
#if MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_SPEW
|
||||
#undef printk_spew
|
||||
#define printk_spew(fmt, arg...) do {} while(0)
|
||||
#endif
|
||||
|
||||
#define print_emerg(STR) printk_emerg ("%s", (STR))
|
||||
#define print_alert(STR) printk_alert ("%s", (STR))
|
||||
#define print_crit(STR) printk_crit ("%s", (STR))
|
||||
#define print_err(STR) printk_err ("%s", (STR))
|
||||
#define print_warning(STR) printk_warning("%s", (STR))
|
||||
#define print_notice(STR) printk_notice ("%s", (STR))
|
||||
#define print_info(STR) printk_info ("%s", (STR))
|
||||
#define print_debug(STR) printk_debug ("%s", (STR))
|
||||
#define print_spew(STR) printk_spew ("%s", (STR))
|
||||
|
||||
#define print_emerg_char(CH) printk_emerg ("%c", (CH))
|
||||
#define print_alert_char(CH) printk_alert ("%c", (CH))
|
||||
#define print_crit_char(CH) printk_crit ("%c", (CH))
|
||||
#define print_err_char(CH) printk_err ("%c", (CH))
|
||||
#define print_warning_char(CH) printk_warning("%c", (CH))
|
||||
#define print_notice_char(CH) printk_notice ("%c", (CH))
|
||||
#define print_info_char(CH) printk_info ("%c", (CH))
|
||||
#define print_debug_char(CH) printk_debug ("%c", (CH))
|
||||
#define print_spew_char(CH) printk_spew ("%c", (CH))
|
||||
|
||||
#define print_emerg_hex8(HEX) printk_emerg ("%02x", (HEX))
|
||||
#define print_alert_hex8(HEX) printk_alert ("%02x", (HEX))
|
||||
#define print_crit_hex8(HEX) printk_crit ("%02x", (HEX))
|
||||
#define print_err_hex8(HEX) printk_err ("%02x", (HEX))
|
||||
#define print_warning_hex8(HEX) printk_warning("%02x", (HEX))
|
||||
#define print_notice_hex8(HEX) printk_notice ("%02x", (HEX))
|
||||
#define print_info_hex8(HEX) printk_info ("%02x", (HEX))
|
||||
#define print_debug_hex8(HEX) printk_debug ("%02x", (HEX))
|
||||
#define print_spew_hex8(HEX) printk_spew ("%02x", (HEX))
|
||||
|
||||
#define print_emerg_hex16(HEX) printk_emerg ("%04x", (HEX))
|
||||
#define print_alert_hex16(HEX) printk_alert ("%04x", (HEX))
|
||||
#define print_crit_hex16(HEX) printk_crit ("%04x", (HEX))
|
||||
#define print_err_hex16(HEX) printk_err ("%04x", (HEX))
|
||||
#define print_warning_hex16(HEX) printk_warning("%04x", (HEX))
|
||||
#define print_notice_hex16(HEX) printk_notice ("%04x", (HEX))
|
||||
#define print_info_hex16(HEX) printk_info ("%04x", (HEX))
|
||||
#define print_debug_hex16(HEX) printk_debug ("%04x", (HEX))
|
||||
#define print_spew_hex16(HEX) printk_spew ("%04x", (HEX))
|
||||
|
||||
#define print_emerg_hex32(HEX) printk_emerg ("%08x", (HEX))
|
||||
#define print_alert_hex32(HEX) printk_alert ("%08x", (HEX))
|
||||
#define print_crit_hex32(HEX) printk_crit ("%08x", (HEX))
|
||||
#define print_err_hex32(HEX) printk_err ("%08x", (HEX))
|
||||
#define print_warning_hex32(HEX) printk_warning("%08x", (HEX))
|
||||
#define print_notice_hex32(HEX) printk_notice ("%08x", (HEX))
|
||||
#define print_info_hex32(HEX) printk_info ("%08x", (HEX))
|
||||
#define print_debug_hex32(HEX) printk_debug ("%08x", (HEX))
|
||||
#define print_spew_hex32(HEX) printk_spew ("%08x", (HEX))
|
||||
|
||||
|
||||
#endif /* CONFIG_USE_INIT == 0 */
|
||||
|
||||
#ifndef LINUXBIOS_EXTRA_VERSION
|
||||
#define LINUXBIOS_EXTRA_VERSION ""
|
||||
|
46
src/arch/i386/lib/printk_init.c
Normal file
46
src/arch/i386/lib/printk_init.c
Normal file
@@ -0,0 +1,46 @@
|
||||
/*
|
||||
* blantantly copied from linux/kernel/printk.c
|
||||
*
|
||||
* Copyright (C) 1991, 1992 Linus Torvalds
|
||||
*
|
||||
* by yhlu moved from arch/ppc/lib/printk_init.c, removed the global variable console_loglevel
|
||||
*/
|
||||
#include <stdarg.h>
|
||||
#include <console/loglevel.h>
|
||||
|
||||
/* printk's without a loglevel use this.. */
|
||||
#define DEFAULT_MESSAGE_LOGLEVEL 4 /* BIOS_WARNING */
|
||||
|
||||
/* Keep together for sysctl support */
|
||||
/* Using an global varible can cause problem when we reset the stack from cache as ram to ram*/
|
||||
#if 0
|
||||
int console_loglevel = DEFAULT_CONSOLE_LOGLEVEL;
|
||||
#else
|
||||
#define console_loglevel ASM_CONSOLE_LOGLEVEL
|
||||
#endif
|
||||
|
||||
extern int vtxprintf(void (*)(unsigned char), const char *, va_list);
|
||||
extern void uart8250_tx_byte(unsigned, unsigned char);
|
||||
|
||||
void console_tx_byte(unsigned char byte)
|
||||
{
|
||||
if (byte == '\n')
|
||||
uart8250_tx_byte(TTYS0_BASE, '\r');
|
||||
uart8250_tx_byte(TTYS0_BASE, byte);
|
||||
}
|
||||
|
||||
int do_printk(int msg_level, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
int i;
|
||||
|
||||
if (msg_level >= console_loglevel) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
va_start(args, fmt);
|
||||
i = vtxprintf(console_tx_byte, fmt, args);
|
||||
va_end(args);
|
||||
|
||||
return i;
|
||||
}
|
Reference in New Issue
Block a user