hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86: clean up arch/x86/kernel/aperture_64.c printk()s 

clean up arch/x86/kernel/aperture_64.c printk()s.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Ingo Molnar 2008-01-30 13:30:10 +01:00
parent c140df973c
commit 31183ba8fd
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
arch/x86/kernel/aperture_64.c
View File

@ -66,14 +66,15 @@ static u32 __init allocate_aperture(void)
*/ */
p = __alloc_bootmem_nopanic(aper_size, aper_size, 0); p = __alloc_bootmem_nopanic(aper_size, aper_size, 0);
if (!p || __pa(p)+aper_size > 0xffffffff) { if (!p || __pa(p)+aper_size > 0xffffffff) {
printk("Cannot allocate aperture memory hole (%p,%uK)\n", printk(KERN_ERR
p, aper_size>>10); "Cannot allocate aperture memory hole (%p,%uK)\n",
p, aper_size>>10);
if (p) if (p)
free_bootmem(__pa(p), aper_size); free_bootmem(__pa(p), aper_size);
return 0; return 0;
} }
printk("Mapping aperture over %d KB of RAM @ %lx\n", printk(KERN_INFO "Mapping aperture over %d KB of RAM @ %lx\n",
aper_size >> 10, __pa(p)); aper_size >> 10, __pa(p));
insert_aperture_resource((u32)__pa(p), aper_size); insert_aperture_resource((u32)__pa(p), aper_size);
return (u32)__pa(p); return (u32)__pa(p);
@ -83,18 +84,20 @@ static int __init aperture_valid(u64 aper_base, u32 aper_size)
{ {
if (!aper_base) if (!aper_base)
return 0; return 0;
if (aper_size < 64*1024*1024) { if (aper_size < 64*1024*1024) {
printk("Aperture too small (%d MB)\n", aper_size>>20); printk(KERN_ERR "Aperture too small (%d MB)\n", aper_size>>20);
return 0; return 0;
} }
if (aper_base + aper_size > 0x100000000UL) { if (aper_base + aper_size > 0x100000000UL) {
printk("Aperture beyond 4GB. Ignoring.\n"); printk(KERN_ERR "Aperture beyond 4GB. Ignoring.\n");
return 0; return 0;
} }
if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) { if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) {
printk("Aperture pointing to e820 RAM. Ignoring.\n"); printk(KERN_ERR "Aperture pointing to e820 RAM. Ignoring.\n");
return 0; return 0;
} }
return 1; return 1;
} }
@ -133,10 +136,10 @@ static __u32 __init read_agp(int num, int slot, int func, int cap, u32 *order)
u32 aper_low, aper_hi; u32 aper_low, aper_hi;
u64 aper; u64 aper;
printk("AGP bridge at %02x:%02x:%02x\n", num, slot, func); printk(KERN_INFO "AGP bridge at %02x:%02x:%02x\n", num, slot, func);
apsizereg = read_pci_config_16(num, slot, func, cap + 0x14); apsizereg = read_pci_config_16(num, slot, func, cap + 0x14);
if (apsizereg == 0xffffffff) { if (apsizereg == 0xffffffff) {
printk("APSIZE in AGP bridge unreadable\n"); printk(KERN_ERR "APSIZE in AGP bridge unreadable\n");
return 0; return 0;
} }
@ -153,8 +156,8 @@ static __u32 __init read_agp(int num, int slot, int func, int cap, u32 *order)
aper_hi = read_pci_config(num, slot, func, 0x14); aper_hi = read_pci_config(num, slot, func, 0x14);
aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32);
printk("Aperture from AGP @ %Lx size %u MB (APSIZE %x)\n", printk(KERN_INFO "Aperture from AGP @ %Lx size %u MB (APSIZE %x)\n",
aper, 32 << *order, apsizereg); aper, 32 << *order, apsizereg);
if (!aperture_valid(aper, (32*1024*1024) << *order)) if (!aperture_valid(aper, (32*1024*1024) << *order))
return 0; return 0;
@ -210,7 +213,7 @@ static __u32 __init search_agp_bridge(u32 *order, int *valid_agp)
} }
} }
} }
printk("No AGP bridge found\n"); printk(KERN_INFO "No AGP bridge found\n");
return 0; return 0;
} }
@ -240,8 +243,8 @@ void __init gart_iommu_hole_init(void)
aper_base = read_pci_config(0, num, 3, 0x94) & 0x7fff; aper_base = read_pci_config(0, num, 3, 0x94) & 0x7fff;
aper_base <<= 25; aper_base <<= 25;
printk("CPU %d: aperture @ %Lx size %u MB\n", num-24, printk(KERN_INFO "CPU %d: aperture @ %Lx size %u MB\n",
aper_base, aper_size>>20); num-24, aper_base, aper_size>>20);
if (!aperture_valid(aper_base, aper_size)) { if (!aperture_valid(aper_base, aper_size)) {
fix = 1; fix = 1;
@ -277,10 +280,13 @@ void __init gart_iommu_hole_init(void)
force_iommu || force_iommu ||
valid_agp || valid_agp ||
fallback_aper_force) { fallback_aper_force) {
printk("Your BIOS doesn't leave a aperture memory hole\n"); printk(KERN_ERR
printk("Please enable the IOMMU option in the BIOS setup\n"); "Your BIOS doesn't leave a aperture memory hole\n");
printk("This costs you %d MB of RAM\n", printk(KERN_ERR
32 << fallback_aper_order); "Please enable the IOMMU option in the BIOS setup\n");
printk(KERN_ERR
"This costs you %d MB of RAM\n",
32 << fallback_aper_order);
aper_order = fallback_aper_order; aper_order = fallback_aper_order;
aper_alloc = allocate_aperture(); aper_alloc = allocate_aperture();