Skip to content

L
linux
Commit c2d9e81f authored by Dave Jones's avatar Dave Jones Committed by Dave Jones
Browse files
Options

[AGPGART] Missing prefixes in printk's

parent 766bb1bf
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
drivers/char/agp/alpha-agp.c
View file @ c2d9e81f
...@@ -183,7 +183,7 @@ alpha_core_agp_setup(void) ...@@ -183,7 +183,7 @@ alpha_core_agp_setup(void)
alpha_bridge->dev = pdev; alpha_bridge->dev = pdev;
alpha_bridge->mode = agp->capability.lw; alpha_bridge->mode = agp->capability.lw;
printk(KERN_INFO "Detected AGP on hose %d\n", agp->hose->index); printk(KERN_INFO PFX "Detected AGP on hose %d\n", agp->hose->index);
return agp_add_bridge(alpha_bridge); return agp_add_bridge(alpha_bridge);
fail: fail:
......
drivers/char/agp/amd64-agp.c
View file @ c2d9e81f
...@@ -252,15 +252,15 @@ static int __init aperture_valid(u64 aper, u32 size) ...@@ -252,15 +252,15 @@ static int __init aperture_valid(u64 aper, u32 size)
static int not_first_call; static int not_first_call;
u32 pfn, c; u32 pfn, c;
if (aper == 0) { if (aper == 0) {
printk(KERN_ERR "No aperture\n"); printk(KERN_ERR PFX "No aperture\n");
return 0; return 0;
} }
if (size < 32*1024*1024) { if (size < 32*1024*1024) {
printk(KERN_ERR "Aperture too small (%d MB)\n", size>>20); printk(KERN_ERR PFX "Aperture too small (%d MB)\n", size>>20);
return 0; return 0;
} }
if (aper + size > 0xffffffff) { if (aper + size > 0xffffffff) {
printk(KERN_ERR "Aperture out of bounds\n"); printk(KERN_ERR PFX "Aperture out of bounds\n");
return 0; return 0;
} }
pfn = aper >> PAGE_SHIFT; pfn = aper >> PAGE_SHIFT;
...@@ -268,7 +268,7 @@ static int __init aperture_valid(u64 aper, u32 size) ...@@ -268,7 +268,7 @@ static int __init aperture_valid(u64 aper, u32 size)
if (!pfn_valid(pfn + c)) if (!pfn_valid(pfn + c))
break; break;
if (!PageReserved(pfn_to_page(pfn + c))) { if (!PageReserved(pfn_to_page(pfn + c))) {
printk(KERN_ERR "Aperture pointing to RAM\n"); printk(KERN_ERR PFX "Aperture pointing to RAM\n");
return 0; return 0;
} }
} }
...@@ -279,7 +279,7 @@ static int __init aperture_valid(u64 aper, u32 size) ...@@ -279,7 +279,7 @@ static int __init aperture_valid(u64 aper, u32 size)
Maybe better to use pci_assign_resource/pci_enable_device instead trusting Maybe better to use pci_assign_resource/pci_enable_device instead trusting
the bridges? */ the bridges? */
if (!not_first_call && request_mem_region(aper, size, "aperture") < 0) { if (!not_first_call && request_mem_region(aper, size, "aperture") < 0) {
printk(KERN_ERR "Aperture conflicts with PCI mapping.\n"); printk(KERN_ERR PFX "Aperture conflicts with PCI mapping.\n");
return 0; return 0;
} }
...@@ -328,7 +328,7 @@ static __init int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, ...@@ -328,7 +328,7 @@ static __init int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp,
pci_read_config_dword(agp, 0x10, &aper_low); pci_read_config_dword(agp, 0x10, &aper_low);
pci_read_config_dword(agp, 0x14, &aper_hi); pci_read_config_dword(agp, 0x14, &aper_hi);
aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32);
printk(KERN_INFO "Aperture from AGP @ %Lx size %u MB\n", aper, 32 << order); printk(KERN_INFO PFX "Aperture from AGP @ %Lx size %u MB\n", aper, 32 << order);
if (order < 0 || !aperture_valid(aper, (32*1024*1024)<<order)) if (order < 0 || !aperture_valid(aper, (32*1024*1024)<<order))
return -1; return -1;
...@@ -347,17 +347,17 @@ static __init int cache_nbs (struct pci_dev *pdev, u32 cap_ptr) ...@@ -347,17 +347,17 @@ static __init int cache_nbs (struct pci_dev *pdev, u32 cap_ptr)
while ((loop_dev = pci_find_device(PCI_VENDOR_ID_AMD, 0x1103, loop_dev)) while ((loop_dev = pci_find_device(PCI_VENDOR_ID_AMD, 0x1103, loop_dev))
!= NULL) { != NULL) {
if (fix_northbridge(loop_dev, pdev, cap_ptr) < 0) { if (fix_northbridge(loop_dev, pdev, cap_ptr) < 0) {
printk("No usable aperture found.\n"); printk(KERN_INFO PFX "No usable aperture found.\n");
#ifdef __x86_64__ #ifdef __x86_64__
/* should port this to i386 */ /* should port this to i386 */
printk("Consider rebooting with iommu=memaper=2 to get a good aperture.\n"); printk(KERN_INFO PFX "Consider rebooting with iommu=memaper=2 to get a good aperture.\n");
#endif #endif
return -1; return -1;
} }
hammers[i++] = loop_dev; hammers[i++] = loop_dev;
nr_garts = i; nr_garts = i;
if (i == MAX_HAMMER_GARTS) { if (i == MAX_HAMMER_GARTS) {
printk(KERN_INFO "Too many northbridges for AGP\n"); printk(KERN_INFO PFX "Too many northbridges for AGP\n");
return -1; return -1;
} }
} }
...@@ -498,11 +498,11 @@ int __init agp_amd64_init(void) ...@@ -498,11 +498,11 @@ int __init agp_amd64_init(void)
if (pci_module_init(&agp_amd64_pci_driver) > 0) { if (pci_module_init(&agp_amd64_pci_driver) > 0) {
struct pci_dev *dev; struct pci_dev *dev;
if (!agp_try_unsupported && !agp_try_unsupported_boot) { if (!agp_try_unsupported && !agp_try_unsupported_boot) {
printk(KERN_INFO "No supported AGP bridge found.\n"); printk(KERN_INFO PFX "No supported AGP bridge found.\n");
#ifdef MODULE #ifdef MODULE
printk(KERN_INFO "You can try agp_try_unsupported=1\n"); printk(KERN_INFO PFX "You can try agp_try_unsupported=1\n");
#else #else
printk(KERN_INFO "You can boot with agp=try_unsupported\n"); printk(KERN_INFO PFX "You can boot with agp=try_unsupported\n");
#endif #endif
return -ENODEV; return -ENODEV;
} }
......
drivers/char/agp/ati-agp.c
View file @ c2d9e81f
...@@ -214,7 +214,7 @@ static int ati_configure(void) ...@@ -214,7 +214,7 @@ static int ati_configure(void)
/* /*
pci_read_config_dword(agp_bridge.dev, AGP_APBASE, &temp); pci_read_config_dword(agp_bridge.dev, AGP_APBASE, &temp);
agp_bridge.gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK); agp_bridge.gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
printk(KERN_INFO "IGP320 gart_bus_addr: %x\n", agp_bridge.gart_bus_addr); printk(KERN_INFO PFX "IGP320 gart_bus_addr: %x\n", agp_bridge.gart_bus_addr);
*/ */
OUTREG32(ati_generic_private.registers, ATI_GART_FEATURE_ID, 0x60000); OUTREG32(ati_generic_private.registers, ATI_GART_FEATURE_ID, 0x60000);
......
drivers/char/agp/intel-agp.c
View file @ c2d9e81f
...@@ -445,7 +445,7 @@ static int intel_i830_insert_entries(struct agp_memory *mem,off_t pg_start, ...@@ -445,7 +445,7 @@ static int intel_i830_insert_entries(struct agp_memory *mem,off_t pg_start,
num_entries = A_SIZE_FIX(temp)->num_entries; num_entries = A_SIZE_FIX(temp)->num_entries;
if (pg_start < intel_i830_private.gtt_entries) { if (pg_start < intel_i830_private.gtt_entries) {
printk (KERN_DEBUG "pg_start == 0x%.8lx,intel_i830_private.gtt_entries == 0x%.8x\n", printk (KERN_DEBUG PFX "pg_start == 0x%.8lx,intel_i830_private.gtt_entries == 0x%.8x\n",
pg_start,intel_i830_private.gtt_entries); pg_start,intel_i830_private.gtt_entries);
printk (KERN_INFO PFX "Trying to insert into local/stolen memory\n"); printk (KERN_INFO PFX "Trying to insert into local/stolen memory\n");
......
drivers/char/agp/nvidia-agp.c
View file @ c2d9e81f
...@@ -196,7 +196,7 @@ static void nvidia_tlbflush(struct agp_memory *mem) ...@@ -196,7 +196,7 @@ static void nvidia_tlbflush(struct agp_memory *mem)
pci_read_config_dword(nvidia_private.dev_1, pci_read_config_dword(nvidia_private.dev_1,
NVIDIA_1_WBC, &wbc_reg); NVIDIA_1_WBC, &wbc_reg);
if ((signed)(end - jiffies) <= 0) { if ((signed)(end - jiffies) <= 0) {
printk(KERN_ERR printk(KERN_ERR PFX
"TLB flush took more than 3 seconds.\n"); "TLB flush took more than 3 seconds.\n");
} }
} while (wbc_reg & nvidia_private.wbc_mask); } while (wbc_reg & nvidia_private.wbc_mask);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7