x86/mrst changes for v2.6.37
Linus,
Please pull the latest x86-mrst-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-mrst-for-linus
Thanks,
Ingo
------------------>
Feng Tang (3):
x86: Add two helper macros for fixed address mapping x86, earlyprintk: Add earlyprintk for Intel Moorestown platform x86, earlyprintk: Add hsu early console for Intel Medfield platform
H. Peter Anvin (1):
x86, mrst: A function in a header file needs to be marked "inline"
Thomas Gleixner (1):
x86: sfi: Make local functions static
arch/x86/Kconfig.debug | 4 + arch/x86/include/asm/fixmap.h | 15 ++ arch/x86/include/asm/mrst.h | 10 +- arch/x86/kernel/Makefile | 1 + arch/x86/kernel/early_printk.c | 13 ++ arch/x86/kernel/early_printk_mrst.c | 319 +++++++++++++++++++++++++++++++++++ arch/x86/kernel/sfi.c | 4 +- 7 files changed, 363 insertions(+), 3 deletions(-) create mode 100644 arch/x86/kernel/early_printk_mrst.c
arch/x86/Kconfig.debug +4 -0
@@ -43,6 +43,10 @@ config EARLY_PRINTK with klogd/syslogd or the X server. You should normally N here, unless you want to debug such a crash. +config EARLY_PRINTK_MRST + bool "Early printk for MRST platform support" + depends on EARLY_PRINTK && X86_MRST + config EARLY_PRINTK_DBGP bool "Early printk via EHCI debug port" depends on EARLY_PRINTK && PCI
arch/x86/include/asm/fixmap.h +15 -0
@@ -214,5 +214,20 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)BUG_ON (vaddr >=FIXADDR_TOP || vaddr <FIXADDR_START );return __virt_to_fix (vaddr); } + +/* Return an pointer with offset calculated */ +static inline unsigned long __set_fixmap_offset (enum fixed_addresses idx, +phys_addr_t phys,pgprot_t flags) +{ +__set_fixmap (idx, phys, flags); +return fix_to_virt (idx) + (phys & (PAGE_SIZE -1 )); +} + +#define set_fixmap_offset (idx, phys) \ + __set_fixmap_offset(idx, phys, PAGE_KERNEL) + +#define set_fixmap_offset_nocache (idx, phys) \ + __set_fixmap_offset(idx, phys, PAGE_KERNEL_NOCACHE) +#endif /* !__ASSEMBLY__ */ #endif /* _ASM_X86_FIXMAP_H */
arch/x86/include/asm/mrst.h +9 -1
@@ -10,6 +10,9 @@*/ #ifndef _ASM_X86_MRST_H#define _ASM_X86_MRST_H + +#include <linux/sfi.h> +extern int pci_mrst_init (void );int __init sfi_parse_mrtc (struct sfi_table_header *table);
@@ -26,7 +29,7 @@ enum mrst_cpu_type { };extern enum mrst_cpu_type __mrst_cpu_chip; -static enum mrst_cpu_type mrst_identify_cpu (void ) +static inline enum mrst_cpu_type mrst_identify_cpu (void ) {return __mrst_cpu_chip; }
@@ -42,4 +45,9 @@ extern enum mrst_timer_options mrst_timer_options;#define SFI_MTMR_MAX_NUM 8#define SFI_MRTC_MAX 8 +extern struct console early_mrst_console; +extern void mrst_early_console_init (void ); + +extern struct console early_hsu_console; +extern void hsu_early_console_init (void );#endif /* _ASM_X86_MRST_H */
arch/x86/kernel/Makefile +1 -0
@@ -85,6 +85,7 @@ obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_VM86) += vm86_32.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +obj-$(CONFIG_EARLY_PRINTK_MRST) += early_printk_mrst.o obj-$(CONFIG_HPET_TIMER) += hpet.o obj-$(CONFIG_APB_TIMER) += apb_timer.o
arch/x86/kernel/early_printk.c +13 -0
@@ -14,6 +14,7 @@#include <xen/hvc-console.h> #include <asm/pci-direct.h> #include <asm/fixmap.h> +#include <asm/mrst.h> #include <asm/pgtable.h> #include <linux/usb/ehci_def.h>
@@ -239,6 +240,18 @@ static int __init setup_early_printk(char *buf)if (!strncmp (buf,"xen" ,3 ))early_console_register (&xenboot_console, keep);#endif +#ifdef CONFIG_X86_MRST_EARLY_PRINTK +if (!strncmp (buf,"mrst" ,4 )) { +mrst_early_console_init (); +early_console_register (&early_mrst_console, keep); + } + +if (!strncmp (buf,"hsu" ,3 )) { +hsu_early_console_init (); +early_console_register (&early_hsu_console, keep); + } + +#endif buf++; }return 0 ;
arch/x86/kernel/early_printk_mrst.c new file +319 -0
319 lines not on this page · raw message
arch/x86/kernel/sfi.c +2 -2
@@ -34,7 +34,7 @@#ifdef CONFIG_X86_LOCAL_APIC static unsigned long sfi_lapic_addr__initdata =APIC_DEFAULT_PHYS_BASE ; -void __init mp_sfi_register_lapic_address (unsigned long address) +static void __init mp_sfi_register_lapic_address (unsigned long address) { mp_lapic_addr = address;
@@ -46,7 +46,7 @@ void __init mp_sfi_register_lapic_address(unsigned long address) }/* All CPUs enumerated by SFI must be present and enabled */ -void __cpuinit mp_sfi_register_lapic (u8 id) +static void __cpuinit mp_sfi_register_lapic (u8 id) {if (MAX_APICS - id <=0 ) { pr_warning("Processor #%d invalid (max %d)\n",