x86: ucode-amd: Convert printk(KERN_*...) to pr_*(...)
Subsystems (5)
A message that is not in the archive (sent off-list or not yet received): [email protected]
Joe Perches
maintainerarch/x86/kernel/microcode_amd.c
Quoted 5 lines · Linux Kernel Mailing List
Commit:
1a74357066369be91e6f4f431621a00b052df964arch/x86/kernel/microcode_amd.c +0
-0
[]
arch/x86/kernel/microcode_amd.c static int get_matching_microcode(int cpu, void *mc, int rev) · line 119
Quoted 9 lines
arch/x86/kernel/microcode_amd.c +1
-1@@ -113,7 +113,7 @@ static int get_matching_microcode(int cpu, void *mc, int rev)/* ucode might be chipset specific -- currently we don't support this */ if (mc_header->nb_dev_id || mc_header->sb_dev_id) { -printk (KERN_ERR "microcode: CPU%d: loading of chipset " +pr_err (KERN_ERR "microcode: CPU%d: loading of chipset " "specific code not yet supported\n" , cpu);return 0 ; }
Duplicates KERN_ERR
I think this one was better:
http://patchwork.kernel.org/patch/51654/
Quoted 9 lines · Joe Perches
arch/x86/kernel/microcode_amd.c
Quoted 5 lines · Linux Kernel Mailing List
Commit:
1a74357066369be91e6f4f431621a00b052df964arch/x86/kernel/microcode_amd.c +0
-0[]
Quoted 2 lines
arch/x86/kernel/microcode_amd.c +0
-0@@ -113,7 +113,7 @@ static int get_matching_microcode(int cpu, void *mc, int rev)
Quoted 9 lines
arch/x86/kernel/microcode_amd.c static int get_matching_microcode(int cpu, void *mc, int rev) · line 119
Quoted 7 lines
arch/x86/kernel/microcode_amd.c +1
-1/* ucode might be chipset specific -- currently we don't support this */ if (mc_header->nb_dev_id || mc_header->sb_dev_id) { -printk (KERN_ERR "microcode: CPU%d: loading of chipset " +pr_err (KERN_ERR "microcode: CPU%d: loading of chipset " "specific code not yet supported\n" , cpu);return 0 ; }Duplicates
KERN_ERR
Indeed - please send a delta fix as this has been merged already.
( Andy: i suspect checkpatch could also grow a new warning perhaps, the
'\<pr_.*(KERN_.*' pattern will i suspect pinpoint something fishy in most cases. )
Ingo
Joe Perches
maintainerPATCH 1/1 arch/x86/kernel/microcode*: Use pr_fmt and remove duplicated KERN_ERR prefix
Quoted 4 lines · Ingo Molnar
Quoted 3 lines
Review
Quoted 2 lines
(quoted diff) +1
-1- printk(KERN_ERR "microcode: CPU%d: loading of chipset " + pr_err(KERN_ERR "microcode: CPU%d: loading of chipset "Duplicates
KERN_ERRIndeed - please send a delta fix as this has been merged already.
Use #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove "microcode: " prefix from each pr_<level> Fix duplicated KERN_ERR prefix
Coalesce pr_<level> format strings
Add a space after an exclamation point No other change in output
--- arch/x86/kernel/microcode_amd.c | 40 +++++++++++++++---------------- arch/x86/kernel/microcode_core.c | 26 +++++++++++--------- arch/x86/kernel/microcode_intel.c | 47 +++++++++++++++--------------------- 3 files changed, 53 insertions(+), 60 deletions(-)
arch/x86/kernel/microcode_amd.c +19 -21
@@ -13,6 +13,9 @@* Licensed under the terms of the GNU General Public * License version 2. See file COPYING for details. */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/firmware.h> #include <linux/pci_ids.h> #include <linux/uaccess.h>
@@ -81,7 +84,7 @@ static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)memset (csig,0 ,sizeof (*csig));rdmsr (MSR_AMD64_PATCH_LEVEL , csig->rev, dummy); -pr_info ("microcode: CPU%d: patch_level=0x%x\n" , cpu, csig->rev); +pr_info ("CPU%d: patch_level=0x%x\n" , cpu, csig->rev);return 0 ; }
@@ -111,8 +114,8 @@ static int get_matching_microcode(int cpu, void *mc, int rev)/* ucode might be chipset specific -- currently we don't support this */ if (mc_header->nb_dev_id || mc_header->sb_dev_id) { -pr_err (KERN_ERR "microcode: CPU%d: loading of chipset " -"specific code not yet supported\n" , cpu); +pr_err ("CPU%d: loading of chipset specific code not yet supported\n" , + cpu);return 0 ; }
@@ -141,12 +144,12 @@ static int apply_microcode_amd(int cpu)/* check current patch id and patch's id for match */ if (rev != mc_amd->hdr.patch_id) { -pr_err ("microcode: CPU%d: update failed " -"(for patch_level=0x%x)\n" , cpu, mc_amd->hdr.patch_id); +pr_err ("CPU%d: update failed (for patch_level=0x%x)\n" , + cpu, mc_amd->hdr.patch_id);return -1 ; } -pr_info ("microcode: CPU%d: updated (new patch_level=0x%x)\n" , cpu, rev); +pr_info ("CPU%d: updated (new patch_level=0x%x)\n" , cpu, rev); uci->cpu_sig.rev = rev;return 0 ;
@@ -169,15 +172,14 @@ get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)return NULL ;if (section_hdr[0 ] !=UCODE_UCODE_TYPE ) { -pr_err ("microcode: error: invalid type field in " -"container file section header\n" ); +pr_err ("error: invalid type field in container file section header\n" );return NULL ; } total_size = (unsigned long ) (section_hdr[4 ] + (section_hdr[5 ] <<8 ));if (total_size > size || total_size >UCODE_MAX_SIZE ) { -pr_err ("microcode: error: size mismatch\n" ); +pr_err ("error: size mismatch\n" );return NULL ; }
@@ -206,14 +208,13 @@ static int install_equiv_cpu_table(const u8 *buf) size = buf_pos[2 ];if (buf_pos[1 ] !=UCODE_EQUIV_CPU_TABLE_TYPE || !size) { -pr_err ("microcode: error: invalid type field in " -"container file section header\n" ); +pr_err ("error: invalid type field in container file section header\n" );return 0 ; } equiv_cpu_table = (struct equiv_cpu_entry *)vmalloc (size);if (!equiv_cpu_table) { -pr_err ("microcode: failed to allocate equivalent CPU table\n" ); +pr_err ("failed to allocate equivalent CPU table\n" );return 0 ; }
@@ -246,7 +247,7 @@ generic_load_microcode(int cpu, const u8 *data, size_t size) offset =install_equiv_cpu_table (ucode_ptr);if (!offset) { -pr_err ("microcode: failed to create equivalent cpu table\n" ); +pr_err ("failed to create equivalent cpu table\n" );return UCODE_ERROR ; }
@@ -277,8 +278,7 @@ generic_load_microcode(int cpu, const u8 *data, size_t size)if (!leftover) {vfree (uci->mc); uci->mc = new_mc; -pr_debug ("microcode: CPU%d found a matching microcode " -"update with version 0x%x (current=0x%x)\n" , +pr_debug ("CPU%d found a matching microcode update with version 0x%x (current=0x%x)\n" , cpu, new_rev, uci->cpu_sig.rev); }else {vfree (new_mc);
@@ -300,7 +300,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)return UCODE_NFOUND ;if (*(u32 *)firmware->data !=UCODE_MAGIC ) { -pr_err ("microcode: invalid UCODE_MAGIC (0x%08x)\n" , +pr_err ("invalid UCODE_MAGIC (0x%08x)\n" , *(u32 *)firmware->data);return UCODE_ERROR ; }
@@ -313,8 +313,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)static enum ucode_state request_microcode_user (int cpu,const void __user *buf,size_t size) { -pr_info ("microcode: AMD microcode update via " -"/dev/cpu/microcode not supported\n" ); +pr_info ("AMD microcode update via /dev/cpu/microcode not supported\n" );return UCODE_ERROR ; }
@@ -334,14 +333,13 @@ void init_microcode_amd(struct device *device)WARN_ON (c->x86_vendor !=X86_VENDOR_AMD );if (c->x86 <0x10 ) { -pr_warning ("microcode: AMD CPU family 0x%x not supported\n" , - c->x86); +pr_warning ("AMD CPU family 0x%x not supported\n" , c->x86);return ; } supported_cpu =1 ;if (request_firmware (&firmware, fw_name, device)) -pr_err ("microcode: failed to load file %s\n" , fw_name); +pr_err ("failed to load file %s\n" , fw_name); }void fini_microcode_amd (void )
arch/x86/kernel/microcode_core.c +14 -12
@@ -70,6 +70,9 @@* Fix sigmatch() macro to handle old CPUs with pf == 0. * Thanks to Stuart Swales for pointing out this bug. */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/platform_device.h> #include <linux/miscdevice.h> #include <linux/capability.h>
@@ -209,7 +212,7 @@ static ssize_t microcode_write(struct file *file, const char __user *buf,ssize_t ret = -EINVAL ;if ((len >>PAGE_SHIFT ) > totalram_pages) { -pr_err ("microcode: too much data (max %ld pages)\n" , totalram_pages); +pr_err ("too much data (max %ld pages)\n" , totalram_pages);return ret; }
@@ -244,7 +247,7 @@ static int __init microcode_dev_init(void) error =misc_register (µcode_dev);if (error) { -pr_err ("microcode: can't misc_register on minor=%d\n" ,MICROCODE_MINOR ); +pr_err ("can't misc_register on minor=%d\n" ,MICROCODE_MINOR );return error; }
@@ -359,7 +362,7 @@ static enum ucode_state microcode_resume_cpu(int cpu)if (!uci->mc)return UCODE_NFOUND ; -pr_debug ("microcode: CPU%d updated upon resume\n" , cpu); +pr_debug ("CPU%d updated upon resume\n" , cpu);apply_microcode_on_target (cpu);return UCODE_OK ;
@@ -379,7 +382,7 @@ static enum ucode_state microcode_init_cpu(int cpu) ustate = microcode_ops->request_microcode_fw (cpu, µcode_pdev->dev);if (ustate ==UCODE_OK ) { -pr_debug ("microcode: CPU%d updated upon init\n" , cpu); +pr_debug ("CPU%d updated upon init\n" , cpu);apply_microcode_on_target (cpu); }
@@ -406,7 +409,7 @@ static int mc_sysdev_add(struct sys_device *sys_dev)if (!cpu_online (cpu))return 0 ; -pr_debug ("microcode: CPU%d added\n" , cpu); +pr_debug ("CPU%d added\n" , cpu); err =sysfs_create_group (&sys_dev->kobj, &mc_attr_group);if (err)
@@ -425,7 +428,7 @@ static int mc_sysdev_remove(struct sys_device *sys_dev)if (!cpu_online (cpu))return 0 ; -pr_debug ("microcode: CPU%d removed\n" , cpu); +pr_debug ("CPU%d removed\n" , cpu);microcode_fini_cpu (cpu);sysfs_remove_group (&sys_dev->kobj, &mc_attr_group);return 0 ;
@@ -473,15 +476,15 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)microcode_update_cpu (cpu);case CPU_DOWN_FAILED :case CPU_DOWN_FAILED_FROZEN : -pr_debug ("microcode: CPU%d added\n" , cpu); +pr_debug ("CPU%d added\n" , cpu);if (sysfs_create_group (&sys_dev->kobj, &mc_attr_group)) -pr_err ("microcode: Failed to create group for CPU%d\n" , cpu); +pr_err ("Failed to create group for CPU%d\n" , cpu);break ;case CPU_DOWN_PREPARE :case CPU_DOWN_PREPARE_FROZEN :/* Suspend is in progress, only remove the interface */ sysfs_remove_group (&sys_dev->kobj, &mc_attr_group); -pr_debug ("microcode: CPU%d removed\n" , cpu); +pr_debug ("CPU%d removed\n" , cpu);break ;case CPU_DEAD :case CPU_UP_CANCELED_FROZEN :
@@ -507,7 +510,7 @@ static int __init microcode_init(void) microcode_ops =init_amd_microcode ();if (!microcode_ops) { -pr_err ("microcode: no support for this CPU vendor\n" ); +pr_err ("no support for this CPU vendor\n" );return -ENODEV ; }
@@ -541,8 +544,7 @@ static int __init microcode_init(void)register_hotcpu_notifier (&mc_cpu_notifier);pr_info ("Microcode Update Driver: v" MICROCODE_VERSION -" <[email protected]>," -" Peter Oruba\n" ); +" <[email protected]>, Peter Oruba\n" );return 0 ; }
arch/x86/kernel/microcode_intel.c +20 -27
129 lines not on this page · raw message
Re: [PATCH] arch/x86/kernel/microcode*: Use pr_fmt and remove duplicated KERN_ERR prefix
Quoted 13 lines · Joe Perches
Quoted 4 lines · Ingo Molnar
Quoted 3 lines
Review
Quoted 2 lines
(quoted diff) +1
-1- printk(KERN_ERR "microcode: CPU%d: loading of chipset " + pr_err(KERN_ERR "microcode: CPU%d: loading of chipset "Duplicates
KERN_ERRIndeed - please send a delta fix as this has been merged already.
Use #define
pr_fmt(fmt)KBUILD_MODNAME": " fmt Remove "microcode: " prefix from each pr_<level> Fix duplicatedKERN_ERRprefix
Coalesce pr_<level> format strings
Add a space after an exclamation point No other change in output
Quoted 6 lines
Signed-off-by Joe Perches <[email protected]>--- arch/x86/kernel/microcode_amd.c | 40 +++++++++++++++---------------- arch/x86/kernel/microcode_core.c | 26 +++++++++++--------- arch/x86/kernel/microcode_intel.c | 47 +++++++++++++++--------------------- 3 files changed, 53 insertions(+), 60 deletions(-)
very nice. I've applied it, thanks Joe!
Ingo
Joe Perches
maintainercover arch/x86: Add #define pr_fmt(fmt) and use pr_<level>
For the files that primarily use embedded prefixes:
Standardize a bit on use of pr_<level>, removed embedded prefixes and use #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt as appropriate. Coalesced long format strings.
Joe Perches (5):
es7000_32.c: use pr_<level> and add pr_fmt(fmt) arch/x86/kernel/setup_percpu.c: use pr_<level> and add pr_fmt(fmt) i8254.c: Add pr_fmt(fmt)
kmmio.c: Add and use pr_fmt(fmt) arch/x86/mm/mmio-mod.c: use pr_fmt
arch/x86/kernel/apic/es7000_32.c | 12 ++++--- arch/x86/kernel/setup_percpu.c | 13 ++++--- arch/x86/kvm/i8254.c | 12 ++++--- arch/x86/mm/kmmio.c | 40 +++++++++++----------- arch/x86/mm/mmio-mod.c | 71 ++++++++++++++++++------------------- 5 files changed, 76 insertions(+), 72 deletions(-)
Joe Perches
maintainerPATCH 1/5 es7000_32.c: use pr_<level> and add pr_fmt(fmt)
Added #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Converted a few printk(KERN_INFO to pr_info(
Stripped "es7000_mipcfg" from pr_debug
--- arch/x86/kernel/apic/es7000_32.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
arch/x86/kernel/apic/es7000_32.c +7 -5
@@ -27,6 +27,9 @@* * http://www.unisys.com */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/notifier.h> #include <linux/spinlock.h> #include <linux/cpumask.h>
@@ -223,9 +226,9 @@ static int parse_unisys_oem(char *oemptr) mip_addr = val; mip = (struct mip_reg *)val; mip_reg =__va (mip); -pr_debug ("es7000_mipcfg: host_reg = 0x%lx \n" , +pr_debug ("host_reg = 0x%lx\n" , (unsigned long )host_reg); -pr_debug ("es7000_mipcfg: mip_reg = 0x%lx \n" , +pr_debug ("mip_reg = 0x%lx\n" , (unsigned long )mip_reg); success++;break ;
@@ -401,7 +404,7 @@ static void es7000_enable_apic_mode(void)if (!es7000_plat)return ; -printk (KERN_INFO "ES7000: Enabling APIC mode.\n" ); +pr_info ("Enabling APIC mode.\n" );memset (&es7000_mip_reg,0 ,sizeof (struct mip_reg )); es7000_mip_reg.off_0x00 =MIP_SW_APIC ; es7000_mip_reg.off_0x38 =MIP_VALID ;
@@ -514,8 +517,7 @@ static void es7000_setup_apic_routing(void) {int apic =per_cpu (x86_bios_cpu_apicid,smp_processor_id ()); -printk (KERN_INFO -"Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n" , +pr_info ("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n" , (apic_version[apic] ==0x14 ) ?"Physical Cluster" :"Logical Cluster" , nr_ioapics,cpumask_bits (es7000_target_cpus ())[0 ]);
Signature · 1 line
1.6.6.rc0.57.gad7a
tip-bot for Joe Perches
maintainer[tip:x86/urgent] x86: es7000_32.c: Use pr_<level> and add pr_fmt(fmt)
Commit-ID: 5cd476effe9570d2e520cf904d51f5c992972647 Gitweb: http://git.kernel.org/tip/5cd476effe9570d2e520cf904d51f5c992972647 Author: Joe Perches <[email protected]> AuthorDate: Wed, 9 Dec 2009 10:45:33 -0800 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 10 Dec 2009 08:57:49 +0100
x86: es7000_32.c: Use pr_<level> and add pr_fmt(fmt)
- Added #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
- Converted a few printk(KERN_INFO to pr_info(
- Stripped "es7000_mipcfg" from pr_debug
LKML-Reference: <3b4375af246dec5941168858910210937c110af9.1260383912.git.joe@perches.com>
--- arch/x86/kernel/apic/es7000_32.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
arch/x86/kernel/apic/es7000_32.c +7 -5
@@ -27,6 +27,9 @@* * http://www.unisys.com */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/notifier.h> #include <linux/spinlock.h> #include <linux/cpumask.h>
@@ -223,9 +226,9 @@ static int parse_unisys_oem(char *oemptr) mip_addr = val; mip = (struct mip_reg *)val; mip_reg =__va (mip); -pr_debug ("es7000_mipcfg: host_reg = 0x%lx \n" , +pr_debug ("host_reg = 0x%lx\n" , (unsigned long )host_reg); -pr_debug ("es7000_mipcfg: mip_reg = 0x%lx \n" , +pr_debug ("mip_reg = 0x%lx\n" , (unsigned long )mip_reg); success++;break ;
@@ -401,7 +404,7 @@ static void es7000_enable_apic_mode(void)if (!es7000_plat)return ; -printk (KERN_INFO "ES7000: Enabling APIC mode.\n" ); +pr_info ("Enabling APIC mode.\n" );memset (&es7000_mip_reg,0 ,sizeof (struct mip_reg )); es7000_mip_reg.off_0x00 =MIP_SW_APIC ; es7000_mip_reg.off_0x38 =MIP_VALID ;
@@ -514,8 +517,7 @@ static void es7000_setup_apic_routing(void) {int apic =per_cpu (x86_bios_cpu_apicid,smp_processor_id ()); -printk (KERN_INFO -"Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n" , +pr_info ("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n" , (apic_version[apic] ==0x14 ) ?"Physical Cluster" :"Logical Cluster" , nr_ioapics,cpumask_bits (es7000_target_cpus ())[0 ]);
Joe Perches
maintainerPATCH 2/5 arch/x86/kernel/setup_percpu.c: use pr_<level> and add pr_fmt(fmt)
In reply to Joe PerchesAdded #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Stripped PERCPU: from a pr_warning
--- arch/x86/kernel/setup_percpu.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
arch/x86/kernel/setup_percpu.c +7 -6
@@ -1,3 +1,5 @@ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h>
@@ -20,9 +22,9 @@#include <asm/stackprotector.h> #ifdef CONFIG_DEBUG_PER_CPU_MAPS -# define DBG(x...) printk(KERN_DEBUG x) +# define DBG (fmt, ...) pr_dbg(fmt, ##__VA_ARGS__)#else -# define DBG(x...) +# define DBG (fmt, ...) do { if (0) pr_dbg(fmt, ##__VA_ARGS__); } while (0)#endif DEFINE_PER_CPU (int, cpu_number);
@@ -116,8 +118,8 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size, } else { ptr =__alloc_bootmem_node_nopanic (NODE_DATA (node), size, align, goal); -pr_debug ("per cpu data for cpu%d %lu bytes on node%d at " -"%016lx\n" , cpu, size, node,__pa (ptr)); +pr_debug ("per cpu data for cpu%d %lu bytes on node%d at %016lx\n" , + cpu, size, node,__pa (ptr)); }return ptr;#else
@@ -198,8 +200,7 @@ void __init setup_per_cpu_areas(void) pcpu_cpu_distance, pcpu_fc_alloc, pcpu_fc_free);if (rc <0 ) -pr_warning ("PERCPU: %s allocator failed (%d), " -"falling back to page size\n" , +pr_warning ("%s allocator failed (%d), falling back to page size\n" , pcpu_fc_names[pcpu_chosen_fc], rc); }if (rc <0 )
Signature · 1 line
1.6.6.rc0.57.gad7a
tip-bot for Joe Perches
maintainer[tip:x86/urgent] x86: setup_percpu.c: Use pr_<level> and add pr_fmt(fmt)
Commit-ID: 40685236b3161b80030a4df34bcbc5941ea59876 Gitweb: http://git.kernel.org/tip/40685236b3161b80030a4df34bcbc5941ea59876 Author: Joe Perches <[email protected]> AuthorDate: Wed, 9 Dec 2009 10:45:34 -0800 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 10 Dec 2009 08:57:50 +0100
x86: setup_percpu.c: Use pr_<level> and add pr_fmt(fmt)
- Added #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
- Stripped PERCPU: from a pr_warning
LKML-Reference: <7ead24eccbea8f2b11795abad3e2893a98e1e111.1260383912.git.joe@perches.com>
--- arch/x86/kernel/setup_percpu.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
arch/x86/kernel/setup_percpu.c +7 -6
@@ -1,3 +1,5 @@ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h>
@@ -20,9 +22,9 @@#include <asm/stackprotector.h> #ifdef CONFIG_DEBUG_PER_CPU_MAPS -# define DBG(x...) printk(KERN_DEBUG x) +# define DBG (fmt, ...) pr_dbg(fmt, ##__VA_ARGS__)#else -# define DBG(x...) +# define DBG (fmt, ...) do { if (0) pr_dbg(fmt, ##__VA_ARGS__); } while (0)#endif DEFINE_PER_CPU (int, cpu_number);
@@ -116,8 +118,8 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size, } else { ptr =__alloc_bootmem_node_nopanic (NODE_DATA (node), size, align, goal); -pr_debug ("per cpu data for cpu%d %lu bytes on node%d at " -"%016lx\n" , cpu, size, node,__pa (ptr)); +pr_debug ("per cpu data for cpu%d %lu bytes on node%d at %016lx\n" , + cpu, size, node,__pa (ptr)); }return ptr;#else
@@ -198,8 +200,7 @@ void __init setup_per_cpu_areas(void) pcpu_cpu_distance, pcpu_fc_alloc, pcpu_fc_free);if (rc <0 ) -pr_warning ("PERCPU: %s allocator failed (%d), " -"falling back to page size\n" , +pr_warning ("%s allocator failed (%d), falling back to page size\n" , pcpu_fc_names[pcpu_chosen_fc], rc); }if (rc <0 )
Joe Perches
maintainerPATCH 3/5 i8254.c: Add pr_fmt(fmt)
In reply to Joe PerchesAdd pr_fmt(fmt) "pit: " fmt
Strip pit: prefixes from pr_debug
--- arch/x86/kvm/i8254.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
arch/x86/kvm/i8254.c +7 -5
@@ -29,6 +29,8 @@* Based on QEMU and Xen. */ +#define pr_fmt (fmt) "pit: " fmt +#include <linux/kvm_host.h> #include "irq.h"
@@ -262,7 +264,7 @@ void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu)static void destroy_pit_timer (struct kvm_timer *pt) { -pr_debug ("pit: execute del timer!\n" ); +pr_debug ("execute del timer!\n" );hrtimer_cancel (&pt->timer); }
@@ -284,7 +286,7 @@ static void create_pit_timer(struct kvm_kpit_state *ps, u32 val, int is_period) interval =muldiv64 (val,NSEC_PER_SEC ,KVM_PIT_FREQ ); -pr_debug ("pit: create pit timer, interval is %llu nsec\n" , interval); +pr_debug ("create pit timer, interval is %llu nsec\n" , interval);/* TODO The new value only affected after the retriggered */ hrtimer_cancel (&pt->timer);
@@ -309,7 +311,7 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)WARN_ON (!mutex_is_locked (&ps->lock)); -pr_debug ("pit: load_count val is %d, channel is %d\n" , val, channel); +pr_debug ("load_count val is %d, channel is %d\n" , val, channel);/* * The largest possible initial count is 0; this is equivalent
@@ -395,8 +397,8 @@ static int pit_ioport_write(struct kvm_io_device *this,mutex_lock (&pit_state->lock);if (val !=0 ) -pr_debug ("pit: write addr is 0x%x, len is %d, val is 0x%x\n" , - (unsigned int )addr, len, val); +pr_debug ("write addr is 0x%x, len is %d, val is 0x%x\n" , + (unsigned int )addr, len, val);if (addr ==3 ) { channel = val >>6 ;
Signature · 1 line
1.6.6.rc0.57.gad7a
tip-bot for Joe Perches
maintainer[tip:x86/urgent] x86: i8254.c: Add pr_fmt(fmt)
Commit-ID: a78d9626f4f6fa7904bfdb071205080743125983 Gitweb: http://git.kernel.org/tip/a78d9626f4f6fa7904bfdb071205080743125983 Author: Joe Perches <[email protected]> AuthorDate: Wed, 9 Dec 2009 10:45:35 -0800 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 10 Dec 2009 08:57:50 +0100
x86: i8254.c: Add pr_fmt(fmt)
- Add pr_fmt(fmt) "pit: " fmt
- Strip pit: prefixes from pr_debug
LKML-Reference: <bbd4de532f18bb7c11f64ba20d224c08291cb126.1260383912.git.joe@perches.com>
--- arch/x86/kvm/i8254.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
arch/x86/kvm/i8254.c +7 -5
@@ -29,6 +29,8 @@* Based on QEMU and Xen. */ +#define pr_fmt (fmt) "pit: " fmt +#include <linux/kvm_host.h> #include "irq.h"
@@ -262,7 +264,7 @@ void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu)static void destroy_pit_timer (struct kvm_timer *pt) { -pr_debug ("pit: execute del timer!\n" ); +pr_debug ("execute del timer!\n" );hrtimer_cancel (&pt->timer); }
@@ -284,7 +286,7 @@ static void create_pit_timer(struct kvm_kpit_state *ps, u32 val, int is_period) interval =muldiv64 (val,NSEC_PER_SEC ,KVM_PIT_FREQ ); -pr_debug ("pit: create pit timer, interval is %llu nsec\n" , interval); +pr_debug ("create pit timer, interval is %llu nsec\n" , interval);/* TODO The new value only affected after the retriggered */ hrtimer_cancel (&pt->timer);
@@ -309,7 +311,7 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)WARN_ON (!mutex_is_locked (&ps->lock)); -pr_debug ("pit: load_count val is %d, channel is %d\n" , val, channel); +pr_debug ("load_count val is %d, channel is %d\n" , val, channel);/* * The largest possible initial count is 0; this is equivalent
@@ -395,8 +397,8 @@ static int pit_ioport_write(struct kvm_io_device *this,mutex_lock (&pit_state->lock);if (val !=0 ) -pr_debug ("pit: write addr is 0x%x, len is %d, val is 0x%x\n" , - (unsigned int )addr, len, val); +pr_debug ("write addr is 0x%x, len is %d, val is 0x%x\n" , + (unsigned int )addr, len, val);if (addr ==3 ) { channel = val >>6 ;
Joe Perches
maintainerPATCH 4/5 kmmio.c: Add and use pr_fmt(fmt)
In reply to Joe PerchesAdd #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Strip "kmmio: " from pr_<level>s
--- arch/x86/mm/kmmio.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-)
arch/x86/mm/kmmio.c +20 -20
@@ -5,6 +5,8 @@* 2008 Pekka Paalanen <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/list.h> #include <linux/rculist.h> #include <linux/spinlock.h>
@@ -136,7 +138,7 @@ static int clear_page_presence(struct kmmio_fault_page *f, bool clear)pte_t *pte =lookup_address (f->page, &level);if (!pte) { -pr_err ("kmmio: no pte for page 0x%08lx\n" , f->page); +pr_err ("no pte for page 0x%08lx\n" , f->page);return -1 ; }
@@ -148,7 +150,7 @@ static int clear_page_presence(struct kmmio_fault_page *f, bool clear)clear_pte_presence (pte, clear, &f->old_presence);break ;default : -pr_err ("kmmio: unexpected page level 0x%x.\n" , level); +pr_err ("unexpected page level 0x%x.\n" , level);return -1 ; }
@@ -170,13 +172,14 @@ static int clear_page_presence(struct kmmio_fault_page *f, bool clear)static int arm_kmmio_fault_page (struct kmmio_fault_page *f) {int ret; -WARN_ONCE (f->armed,KERN_ERR "kmmio page already armed.\n" ); + WARN_ONCE(f->armed, KERN_ERR pr_fmt("kmmio page already armed.\n"));if (f->armed) { -pr_warning ("kmmio double-arm: page 0x%08lx, ref %d, old %d\n" , - f->page, f->count, !!f->old_presence); +pr_warning ("double-arm: page 0x%08lx, ref %d, old %d\n" , + f->page, f->count, !!f->old_presence); } ret =clear_page_presence (f, true); -WARN_ONCE (ret <0 ,KERN_ERR "kmmio arming 0x%08lx failed.\n" , f->page); + WARN_ONCE(ret < 0, KERN_ERR pr_fmt("arming 0x%08lx failed.\n"), + f->page); f->armed = true;return ret; }
@@ -240,24 +243,21 @@ int kmmio_handler(struct pt_regs *regs, unsigned long addr)* condition needs handling by do_page_fault(), the * page really not being present is the most common. */ -pr_debug ("kmmio: secondary hit for 0x%08lx CPU %d.\n" , - addr,smp_processor_id ()); +pr_debug ("secondary hit for 0x%08lx CPU %d.\n" , + addr,smp_processor_id ());if (!faultpage->old_presence) -pr_info ("kmmio: unexpected secondary hit for " -"address 0x%08lx on CPU %d.\n" , addr, -smp_processor_id ()); +pr_info ("unexpected secondary hit for address 0x%08lx on CPU %d.\n" , + addr,smp_processor_id ()); }else {/* * Prevent overwriting already in-flight context. * This should not happen, let's hope disarming at * least prevents a panic. */ -pr_emerg ("kmmio: recursive probe hit on CPU %d, " -"for address 0x%08lx. Ignoring.\n" , -smp_processor_id (), addr); -pr_emerg ("kmmio: previous hit was at 0x%08lx.\n" , - ctx->addr); +pr_emerg ("recursive probe hit on CPU %d, for address 0x%08lx. Ignoring.\n" , +smp_processor_id (), addr); +pr_emerg ("previous hit was at 0x%08lx.\n" , ctx->addr);disarm_kmmio_fault_page (faultpage); } goto no_kmmio_ctx;
@@ -316,8 +316,8 @@ static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs)* something external causing them (f.e. using a debugger while * mmio tracing enabled), or erroneous behaviour */ -pr_warning ("kmmio: unexpected debug trap on CPU %d.\n" , -smp_processor_id ()); +pr_warning ("unexpected debug trap on CPU %d.\n" , +smp_processor_id ()); goto out; }
@@ -425,7 +425,7 @@ int register_kmmio_probe(struct kmmio_probe *p)list_add_rcu (&p->list, &kmmio_probes);while (size < size_lim) {if (add_kmmio_fault_page (p->addr + size)) -pr_err ("kmmio: Unable to set page fault.\n" ); +pr_err ("Unable to set page fault.\n" ); size +=PAGE_SIZE ; } out:
@@ -511,7 +511,7 @@ void unregister_kmmio_probe(struct kmmio_probe *p) drelease =kmalloc (sizeof (*drelease),GFP_ATOMIC );if (!drelease) { -pr_crit ("kmmio: leaking kmmio_fault_page objects.\n" ); +pr_crit ("leaking kmmio_fault_page objects.\n" );return ; } drelease->release_list = release_list;
Signature · 1 line
1.6.6.rc0.57.gad7a
tip-bot for Joe Perches
maintainer[tip:x86/urgent] x86: kmmio.c: Add and use pr_fmt(fmt)
Commit-ID: 1bd591a5f17f546121fcf0015d72cc3e9c49cc29 Gitweb: http://git.kernel.org/tip/1bd591a5f17f546121fcf0015d72cc3e9c49cc29 Author: Joe Perches <[email protected]> AuthorDate: Wed, 9 Dec 2009 10:45:36 -0800 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 10 Dec 2009 08:57:51 +0100
x86: kmmio.c: Add and use pr_fmt(fmt)
- Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
- Strip "kmmio: " from pr_<level>s
LKML-Reference: <7aa509f8a23933036d39f54bd51e9acc52068049.1260383912.git.joe@perches.com>
--- arch/x86/mm/kmmio.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-)
arch/x86/mm/kmmio.c +20 -20
@@ -5,6 +5,8 @@* 2008 Pekka Paalanen <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/list.h> #include <linux/rculist.h> #include <linux/spinlock.h>
@@ -136,7 +138,7 @@ static int clear_page_presence(struct kmmio_fault_page *f, bool clear)pte_t *pte =lookup_address (f->page, &level);if (!pte) { -pr_err ("kmmio: no pte for page 0x%08lx\n" , f->page); +pr_err ("no pte for page 0x%08lx\n" , f->page);return -1 ; }
@@ -148,7 +150,7 @@ static int clear_page_presence(struct kmmio_fault_page *f, bool clear)clear_pte_presence (pte, clear, &f->old_presence);break ;default : -pr_err ("kmmio: unexpected page level 0x%x.\n" , level); +pr_err ("unexpected page level 0x%x.\n" , level);return -1 ; }
@@ -170,13 +172,14 @@ static int clear_page_presence(struct kmmio_fault_page *f, bool clear)static int arm_kmmio_fault_page (struct kmmio_fault_page *f) {int ret; -WARN_ONCE (f->armed,KERN_ERR "kmmio page already armed.\n" ); + WARN_ONCE(f->armed, KERN_ERR pr_fmt("kmmio page already armed.\n"));if (f->armed) { -pr_warning ("kmmio double-arm: page 0x%08lx, ref %d, old %d\n" , - f->page, f->count, !!f->old_presence); +pr_warning ("double-arm: page 0x%08lx, ref %d, old %d\n" , + f->page, f->count, !!f->old_presence); } ret =clear_page_presence (f, true); -WARN_ONCE (ret <0 ,KERN_ERR "kmmio arming 0x%08lx failed.\n" , f->page); + WARN_ONCE(ret < 0, KERN_ERR pr_fmt("arming 0x%08lx failed.\n"), + f->page); f->armed = true;return ret; }
@@ -240,24 +243,21 @@ int kmmio_handler(struct pt_regs *regs, unsigned long addr)* condition needs handling by do_page_fault(), the * page really not being present is the most common. */ -pr_debug ("kmmio: secondary hit for 0x%08lx CPU %d.\n" , - addr,smp_processor_id ()); +pr_debug ("secondary hit for 0x%08lx CPU %d.\n" , + addr,smp_processor_id ());if (!faultpage->old_presence) -pr_info ("kmmio: unexpected secondary hit for " -"address 0x%08lx on CPU %d.\n" , addr, -smp_processor_id ()); +pr_info ("unexpected secondary hit for address 0x%08lx on CPU %d.\n" , + addr,smp_processor_id ()); }else {/* * Prevent overwriting already in-flight context. * This should not happen, let's hope disarming at * least prevents a panic. */ -pr_emerg ("kmmio: recursive probe hit on CPU %d, " -"for address 0x%08lx. Ignoring.\n" , -smp_processor_id (), addr); -pr_emerg ("kmmio: previous hit was at 0x%08lx.\n" , - ctx->addr); +pr_emerg ("recursive probe hit on CPU %d, for address 0x%08lx. Ignoring.\n" , +smp_processor_id (), addr); +pr_emerg ("previous hit was at 0x%08lx.\n" , ctx->addr);disarm_kmmio_fault_page (faultpage); } goto no_kmmio_ctx;
@@ -316,8 +316,8 @@ static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs)* something external causing them (f.e. using a debugger while * mmio tracing enabled), or erroneous behaviour */ -pr_warning ("kmmio: unexpected debug trap on CPU %d.\n" , -smp_processor_id ()); +pr_warning ("unexpected debug trap on CPU %d.\n" , +smp_processor_id ()); goto out; }
@@ -425,7 +425,7 @@ int register_kmmio_probe(struct kmmio_probe *p)list_add_rcu (&p->list, &kmmio_probes);while (size < size_lim) {if (add_kmmio_fault_page (p->addr + size)) -pr_err ("kmmio: Unable to set page fault.\n" ); +pr_err ("Unable to set page fault.\n" ); size +=PAGE_SIZE ; } out:
@@ -511,7 +511,7 @@ void unregister_kmmio_probe(struct kmmio_probe *p) drelease =kmalloc (sizeof (*drelease),GFP_ATOMIC );if (!drelease) { -pr_crit ("kmmio: leaking kmmio_fault_page objects.\n" ); +pr_crit ("leaking kmmio_fault_page objects.\n" );return ; } drelease->release_list = release_list;
Joe Perches
maintainerPATCH 5/5 arch/x86/mm/mmio-mod.c: use pr_fmt
In reply to Joe PerchesAdd #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Remove #define NAME
Remove NAME from pr_<level>
--- arch/x86/mm/mmio-mod.c | 71 +++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 36 deletions(-)
arch/x86/mm/mmio-mod.c +35 -36
@@ -19,6 +19,9 @@* * Derived from the read-mod example from relay-examples by Tom Zanussi. */ + +#define pr_fmt (fmt) "mmiotrace: " +#define DEBUG 1#include <linux/module.h>
@@ -36,8 +39,6 @@#include "pf_in.h" -#define NAME "mmiotrace: " -struct trap_reason {unsigned long addr;unsigned long ip;
@@ -96,17 +97,18 @@ static void print_pte(unsigned long address)pte_t *pte =lookup_address (address, &level);if (!pte) { -pr_err (NAME "Error in %s: no pte for page 0x%08lx\n" , - __func__, address); +pr_err ("Error in %s: no pte for page 0x%08lx\n" , + __func__, address);return ; }if (level ==PG_LEVEL_2M ) { -pr_emerg (NAME "4MB pages are not currently supported: " -"0x%08lx\n" , address); +pr_emerg ("4MB pages are not currently supported: 0x%08lx\n" , + address);BUG (); } -pr_info (NAME "pte for 0x%lx: 0x%llx 0x%llx\n" , address, +pr_info ("pte for 0x%lx: 0x%llx 0x%llx\n" , + address, (unsigned long long )pte_val (*pte), (unsigned long long )pte_val (*pte) & _PAGE_PRESENT); }
@@ -118,22 +120,21 @@ static void print_pte(unsigned long address)static void die_kmmio_nesting_error (struct pt_regs *regs,unsigned long addr) {const struct trap_reason *my_reason = &get_cpu_var (pf_reason); -pr_emerg (NAME "unexpected fault for address: 0x%08lx, " -"last fault for address: 0x%08lx\n" , - addr, my_reason->addr); +pr_emerg ("unexpected fault for address: 0x%08lx, last fault for address: 0x%08lx\n" , + addr, my_reason->addr);print_pte (addr);print_symbol (KERN_EMERG "faulting IP is at %s\n" , regs->ip);print_symbol (KERN_EMERG "last faulting IP was at %s\n" , my_reason->ip);#ifdef __i386__pr_emerg ("eax: %08lx ebx: %08lx ecx: %08lx edx: %08lx\n" , - regs->ax, regs->bx, regs->cx, regs->dx); + regs->ax, regs->bx, regs->cx, regs->dx);pr_emerg ("esi: %08lx edi: %08lx ebp: %08lx esp: %08lx\n" , - regs->si, regs->di, regs->bp, regs->sp); + regs->si, regs->di, regs->bp, regs->sp);#else pr_emerg ("rax: %016lx rcx: %016lx rdx: %016lx\n" , - regs->ax, regs->cx, regs->dx); + regs->ax, regs->cx, regs->dx);pr_emerg ("rsi: %016lx rdi: %016lx rbp: %016lx rsp: %016lx\n" , - regs->si, regs->di, regs->bp, regs->sp); + regs->si, regs->di, regs->bp, regs->sp);#endif put_cpu_var (pf_reason);BUG ();
@@ -213,7 +214,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,/* this should always return the active_trace count to 0 */ my_reason->active_traces--;if (my_reason->active_traces) { -pr_emerg (NAME "unexpected post handler" ); +pr_emerg ("unexpected post handler" );BUG (); }
@@ -244,7 +245,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size, };if (!trace) { -pr_err (NAME "kmalloc failed in ioremap\n" ); +pr_err ("kmalloc failed in ioremap\n" );return ; }
@@ -282,8 +283,8 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,if (!is_enabled ())/* recheck and proper locking in *_core() */ return ; -pr_debug (NAME "ioremap_*(0x%llx, 0x%lx) = %p\n" , - (unsigned long long )offset, size, addr); +pr_debug ("ioremap_*(0x%llx, 0x%lx) = %p\n" , + (unsigned long long )offset, size, addr);if ((filter_offset) && (offset != filter_offset))return ;ioremap_trace_core (offset, size, addr);
@@ -301,7 +302,7 @@ static void iounmap_trace_core(volatile void __iomem *addr)struct remap_trace *tmp;struct remap_trace *found_trace =NULL ; -pr_debug (NAME "Unmapping %p.\n" , addr); +pr_debug ("Unmapping %p.\n" , addr);spin_lock_irq (&trace_lock);if (!is_enabled ())
@@ -363,9 +364,8 @@ static void clear_trace_list(void)* Caller also ensures is_enabled() cannot change. */ list_for_each_entry (trace, &trace_list, list) { -pr_notice (NAME "purging non-iounmapped " -"trace @0x%08lx, size 0x%lx.\n" , - trace->probe.addr, trace->probe.len); +pr_notice ("purging non-iounmapped trace @0x%08lx, size 0x%lx.\n" , + trace->probe.addr, trace->probe.len);if (!nommiotrace)unregister_kmmio_probe (&trace->probe); }
@@ -387,7 +387,7 @@ static void enter_uniprocessor(void)if (downed_cpus ==NULL && !alloc_cpumask_var (&downed_cpus,GFP_KERNEL )) { -pr_notice (NAME "Failed to allocate mask\n" ); +pr_notice ("Failed to allocate mask\n" ); goto out; }
@@ -395,20 +395,19 @@ static void enter_uniprocessor(void)cpumask_copy (downed_cpus, cpu_online_mask);cpumask_clear_cpu (cpumask_first (cpu_online_mask), downed_cpus);if (num_online_cpus () >1 ) -pr_notice (NAME "Disabling non-boot CPUs...\n" ); +pr_notice ("Disabling non-boot CPUs...\n" );put_online_cpus ();for_each_cpu (cpu, downed_cpus) { err =cpu_down (cpu);if (!err) -pr_info (NAME "CPU%d is down.\n" , cpu); +pr_info ("CPU%d is down.\n" , cpu);else -pr_err (NAME "Error taking CPU%d down: %d\n" , cpu, err); +pr_err ("Error taking CPU%d down: %d\n" , cpu, err); } out:if (num_online_cpus () >1 ) -pr_warning (NAME "multiple CPUs still online, " -"may miss events.\n" ); +pr_warning ("multiple CPUs still online, may miss events.\n" ); }/* __ref because leave_uniprocessor calls cpu_up which is __cpuinit,
@@ -420,13 +419,13 @@ static void __ref leave_uniprocessor(void)if (downed_cpus ==NULL ||cpumask_weight (downed_cpus) ==0 )return ; -pr_notice (NAME "Re-enabling CPUs...\n" ); +pr_notice ("Re-enabling CPUs...\n" );for_each_cpu (cpu, downed_cpus) { err =cpu_up (cpu);if (!err) -pr_info (NAME "enabled CPU%d.\n" , cpu); +pr_info ("enabled CPU%d.\n" , cpu);else -pr_err (NAME "cannot re-enable CPU%d: %d\n" , cpu, err); +pr_err ("cannot re-enable CPU%d: %d\n" , cpu, err); } }
@@ -434,8 +433,8 @@ static void __ref leave_uniprocessor(void)static void enter_uniprocessor (void ) {if (num_online_cpus () >1 ) -pr_warning (NAME "multiple CPUs are online, may miss events. " -"Suggest booting with maxcpus=1 kernel argument.\n" ); +pr_warning ("multiple CPUs are online, may miss events. " +"Suggest booting with maxcpus=1 kernel argument.\n" ); }static void leave_uniprocessor (void )
@@ -450,13 +449,13 @@ void enable_mmiotrace(void) goto out;if (nommiotrace) -pr_info (NAME "MMIO tracing disabled.\n" ); +pr_info ("MMIO tracing disabled.\n" );kmmio_init ();enter_uniprocessor ();spin_lock_irq (&trace_lock);atomic_inc (&mmiotrace_enabled);spin_unlock_irq (&trace_lock); -pr_info (NAME "enabled.\n" ); +pr_info ("enabled.\n" ); out:mutex_unlock (&mmiotrace_mutex); }
@@ -475,7 +474,7 @@ void disable_mmiotrace(void)clear_trace_list ();/* guarantees: no more kmmio callbacks */ leave_uniprocessor ();kmmio_cleanup (); -pr_info (NAME "disabled.\n" ); +pr_info ("disabled.\n" ); out:mutex_unlock (&mmiotrace_mutex); }
Signature · 1 line
1.6.6.rc0.57.gad7a
tip-bot for Joe Perches
maintainer[tip:x86/urgent] x86: mmio-mod.c: Use pr_fmt
Commit-ID: 3a0340be06a9356eb61f6804107480acbe62c069 Gitweb: http://git.kernel.org/tip/3a0340be06a9356eb61f6804107480acbe62c069 Author: Joe Perches <[email protected]> AuthorDate: Wed, 9 Dec 2009 10:45:37 -0800 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 10 Dec 2009 08:57:51 +0100
x86: mmio-mod.c: Use pr_fmt
- Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
- Remove #define NAME
- Remove NAME from pr_<level>
LKML-Reference: <009cb214c45ef932df0242856228f4739cc91408.1260383912.git.joe@perches.com>
--- arch/x86/mm/mmio-mod.c | 71 +++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 36 deletions(-)
arch/x86/mm/mmio-mod.c +35 -36
@@ -19,6 +19,9 @@* * Derived from the read-mod example from relay-examples by Tom Zanussi. */ + +#define pr_fmt (fmt) "mmiotrace: " +#define DEBUG 1#include <linux/module.h>
@@ -36,8 +39,6 @@#include "pf_in.h" -#define NAME "mmiotrace: " -struct trap_reason {unsigned long addr;unsigned long ip;
@@ -96,17 +97,18 @@ static void print_pte(unsigned long address)pte_t *pte =lookup_address (address, &level);if (!pte) { -pr_err (NAME "Error in %s: no pte for page 0x%08lx\n" , - __func__, address); +pr_err ("Error in %s: no pte for page 0x%08lx\n" , + __func__, address);return ; }if (level ==PG_LEVEL_2M ) { -pr_emerg (NAME "4MB pages are not currently supported: " -"0x%08lx\n" , address); +pr_emerg ("4MB pages are not currently supported: 0x%08lx\n" , + address);BUG (); } -pr_info (NAME "pte for 0x%lx: 0x%llx 0x%llx\n" , address, +pr_info ("pte for 0x%lx: 0x%llx 0x%llx\n" , + address, (unsigned long long )pte_val (*pte), (unsigned long long )pte_val (*pte) & _PAGE_PRESENT); }
@@ -118,22 +120,21 @@ static void print_pte(unsigned long address)static void die_kmmio_nesting_error (struct pt_regs *regs,unsigned long addr) {const struct trap_reason *my_reason = &get_cpu_var (pf_reason); -pr_emerg (NAME "unexpected fault for address: 0x%08lx, " -"last fault for address: 0x%08lx\n" , - addr, my_reason->addr); +pr_emerg ("unexpected fault for address: 0x%08lx, last fault for address: 0x%08lx\n" , + addr, my_reason->addr);print_pte (addr);print_symbol (KERN_EMERG "faulting IP is at %s\n" , regs->ip);print_symbol (KERN_EMERG "last faulting IP was at %s\n" , my_reason->ip);#ifdef __i386__pr_emerg ("eax: %08lx ebx: %08lx ecx: %08lx edx: %08lx\n" , - regs->ax, regs->bx, regs->cx, regs->dx); + regs->ax, regs->bx, regs->cx, regs->dx);pr_emerg ("esi: %08lx edi: %08lx ebp: %08lx esp: %08lx\n" , - regs->si, regs->di, regs->bp, regs->sp); + regs->si, regs->di, regs->bp, regs->sp);#else pr_emerg ("rax: %016lx rcx: %016lx rdx: %016lx\n" , - regs->ax, regs->cx, regs->dx); + regs->ax, regs->cx, regs->dx);pr_emerg ("rsi: %016lx rdi: %016lx rbp: %016lx rsp: %016lx\n" , - regs->si, regs->di, regs->bp, regs->sp); + regs->si, regs->di, regs->bp, regs->sp);#endif put_cpu_var (pf_reason);BUG ();
@@ -213,7 +214,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,/* this should always return the active_trace count to 0 */ my_reason->active_traces--;if (my_reason->active_traces) { -pr_emerg (NAME "unexpected post handler" ); +pr_emerg ("unexpected post handler" );BUG (); }
@@ -244,7 +245,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size, };if (!trace) { -pr_err (NAME "kmalloc failed in ioremap\n" ); +pr_err ("kmalloc failed in ioremap\n" );return ; }
@@ -282,8 +283,8 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,if (!is_enabled ())/* recheck and proper locking in *_core() */ return ; -pr_debug (NAME "ioremap_*(0x%llx, 0x%lx) = %p\n" , - (unsigned long long )offset, size, addr); +pr_debug ("ioremap_*(0x%llx, 0x%lx) = %p\n" , + (unsigned long long )offset, size, addr);if ((filter_offset) && (offset != filter_offset))return ;ioremap_trace_core (offset, size, addr);
@@ -301,7 +302,7 @@ static void iounmap_trace_core(volatile void __iomem *addr)struct remap_trace *tmp;struct remap_trace *found_trace =NULL ; -pr_debug (NAME "Unmapping %p.\n" , addr); +pr_debug ("Unmapping %p.\n" , addr);spin_lock_irq (&trace_lock);if (!is_enabled ())
@@ -363,9 +364,8 @@ static void clear_trace_list(void)* Caller also ensures is_enabled() cannot change. */ list_for_each_entry (trace, &trace_list, list) { -pr_notice (NAME "purging non-iounmapped " -"trace @0x%08lx, size 0x%lx.\n" , - trace->probe.addr, trace->probe.len); +pr_notice ("purging non-iounmapped trace @0x%08lx, size 0x%lx.\n" , + trace->probe.addr, trace->probe.len);if (!nommiotrace)unregister_kmmio_probe (&trace->probe); }
@@ -387,7 +387,7 @@ static void enter_uniprocessor(void)if (downed_cpus ==NULL && !alloc_cpumask_var (&downed_cpus,GFP_KERNEL )) { -pr_notice (NAME "Failed to allocate mask\n" ); +pr_notice ("Failed to allocate mask\n" ); goto out; }
@@ -395,20 +395,19 @@ static void enter_uniprocessor(void)cpumask_copy (downed_cpus, cpu_online_mask);cpumask_clear_cpu (cpumask_first (cpu_online_mask), downed_cpus);if (num_online_cpus () >1 ) -pr_notice (NAME "Disabling non-boot CPUs...\n" ); +pr_notice ("Disabling non-boot CPUs...\n" );put_online_cpus ();for_each_cpu (cpu, downed_cpus) { err =cpu_down (cpu);if (!err) -pr_info (NAME "CPU%d is down.\n" , cpu); +pr_info ("CPU%d is down.\n" , cpu);else -pr_err (NAME "Error taking CPU%d down: %d\n" , cpu, err); +pr_err ("Error taking CPU%d down: %d\n" , cpu, err); } out:if (num_online_cpus () >1 ) -pr_warning (NAME "multiple CPUs still online, " -"may miss events.\n" ); +pr_warning ("multiple CPUs still online, may miss events.\n" ); }/* __ref because leave_uniprocessor calls cpu_up which is __cpuinit,
@@ -420,13 +419,13 @@ static void __ref leave_uniprocessor(void)if (downed_cpus ==NULL ||cpumask_weight (downed_cpus) ==0 )return ; -pr_notice (NAME "Re-enabling CPUs...\n" ); +pr_notice ("Re-enabling CPUs...\n" );for_each_cpu (cpu, downed_cpus) { err =cpu_up (cpu);if (!err) -pr_info (NAME "enabled CPU%d.\n" , cpu); +pr_info ("enabled CPU%d.\n" , cpu);else -pr_err (NAME "cannot re-enable CPU%d: %d\n" , cpu, err); +pr_err ("cannot re-enable CPU%d: %d\n" , cpu, err); } }
@@ -434,8 +433,8 @@ static void __ref leave_uniprocessor(void)static void enter_uniprocessor (void ) {if (num_online_cpus () >1 ) -pr_warning (NAME "multiple CPUs are online, may miss events. " -"Suggest booting with maxcpus=1 kernel argument.\n" ); +pr_warning ("multiple CPUs are online, may miss events. " +"Suggest booting with maxcpus=1 kernel argument.\n" ); }static void leave_uniprocessor (void )
@@ -450,13 +449,13 @@ void enable_mmiotrace(void) goto out;if (nommiotrace) -pr_info (NAME "MMIO tracing disabled.\n" ); +pr_info ("MMIO tracing disabled.\n" );kmmio_init ();enter_uniprocessor ();spin_lock_irq (&trace_lock);atomic_inc (&mmiotrace_enabled);spin_unlock_irq (&trace_lock); -pr_info (NAME "enabled.\n" ); +pr_info ("enabled.\n" ); out:mutex_unlock (&mmiotrace_mutex); }
@@ -475,7 +474,7 @@ void disable_mmiotrace(void)clear_trace_list ();/* guarantees: no more kmmio callbacks */ leave_uniprocessor ();kmmio_cleanup (); -pr_info (NAME "disabled.\n" ); +pr_info ("disabled.\n" ); out:mutex_unlock (&mmiotrace_mutex); }
tip-bot for Joe Perches
maintainer[tip:x86/urgent] arch/x86/kernel/microcode*: Use pr_fmt() and remove duplicated KERN_ERR prefix
In reply to Joe PerchesCommit-ID: f58e1f53de52a70391b6478617311207c7203363 Gitweb: http://git.kernel.org/tip/f58e1f53de52a70391b6478617311207c7203363 Author: Joe Perches <[email protected]> AuthorDate: Tue, 8 Dec 2009 22:30:50 -0800 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 9 Dec 2009 08:25:57 +0100
arch/x86/kernel/microcode*: Use pr_fmt() and remove duplicated KERN_ERR prefix
- Use #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
- Remove "microcode: " prefix from each pr_<level>
- Fix duplicated KERN_ERR prefix
- Coalesce pr_<level> format strings
- Add a space after an exclamation point
No other change in output.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/microcode_amd.c | 40 +++++++++++++++---------------- arch/x86/kernel/microcode_core.c | 26 +++++++++++--------- arch/x86/kernel/microcode_intel.c | 47 +++++++++++++++--------------------- 3 files changed, 53 insertions(+), 60 deletions(-)
arch/x86/kernel/microcode_amd.c +19 -21
@@ -13,6 +13,9 @@* Licensed under the terms of the GNU General Public * License version 2. See file COPYING for details. */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/firmware.h> #include <linux/pci_ids.h> #include <linux/uaccess.h>
@@ -81,7 +84,7 @@ static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)memset (csig,0 ,sizeof (*csig));rdmsr (MSR_AMD64_PATCH_LEVEL , csig->rev, dummy); -pr_info ("microcode: CPU%d: patch_level=0x%x\n" , cpu, csig->rev); +pr_info ("CPU%d: patch_level=0x%x\n" , cpu, csig->rev);return 0 ; }
@@ -111,8 +114,8 @@ static int get_matching_microcode(int cpu, void *mc, int rev)/* ucode might be chipset specific -- currently we don't support this */ if (mc_header->nb_dev_id || mc_header->sb_dev_id) { -pr_err (KERN_ERR "microcode: CPU%d: loading of chipset " -"specific code not yet supported\n" , cpu); +pr_err ("CPU%d: loading of chipset specific code not yet supported\n" , + cpu);return 0 ; }
@@ -141,12 +144,12 @@ static int apply_microcode_amd(int cpu)/* check current patch id and patch's id for match */ if (rev != mc_amd->hdr.patch_id) { -pr_err ("microcode: CPU%d: update failed " -"(for patch_level=0x%x)\n" , cpu, mc_amd->hdr.patch_id); +pr_err ("CPU%d: update failed (for patch_level=0x%x)\n" , + cpu, mc_amd->hdr.patch_id);return -1 ; } -pr_info ("microcode: CPU%d: updated (new patch_level=0x%x)\n" , cpu, rev); +pr_info ("CPU%d: updated (new patch_level=0x%x)\n" , cpu, rev); uci->cpu_sig.rev = rev;return 0 ;
@@ -169,15 +172,14 @@ get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)return NULL ;if (section_hdr[0 ] !=UCODE_UCODE_TYPE ) { -pr_err ("microcode: error: invalid type field in " -"container file section header\n" ); +pr_err ("error: invalid type field in container file section header\n" );return NULL ; } total_size = (unsigned long ) (section_hdr[4 ] + (section_hdr[5 ] <<8 ));if (total_size > size || total_size >UCODE_MAX_SIZE ) { -pr_err ("microcode: error: size mismatch\n" ); +pr_err ("error: size mismatch\n" );return NULL ; }
@@ -206,14 +208,13 @@ static int install_equiv_cpu_table(const u8 *buf) size = buf_pos[2 ];if (buf_pos[1 ] !=UCODE_EQUIV_CPU_TABLE_TYPE || !size) { -pr_err ("microcode: error: invalid type field in " -"container file section header\n" ); +pr_err ("error: invalid type field in container file section header\n" );return 0 ; } equiv_cpu_table = (struct equiv_cpu_entry *)vmalloc (size);if (!equiv_cpu_table) { -pr_err ("microcode: failed to allocate equivalent CPU table\n" ); +pr_err ("failed to allocate equivalent CPU table\n" );return 0 ; }
@@ -246,7 +247,7 @@ generic_load_microcode(int cpu, const u8 *data, size_t size) offset =install_equiv_cpu_table (ucode_ptr);if (!offset) { -pr_err ("microcode: failed to create equivalent cpu table\n" ); +pr_err ("failed to create equivalent cpu table\n" );return UCODE_ERROR ; }
@@ -277,8 +278,7 @@ generic_load_microcode(int cpu, const u8 *data, size_t size)if (!leftover) {vfree (uci->mc); uci->mc = new_mc; -pr_debug ("microcode: CPU%d found a matching microcode " -"update with version 0x%x (current=0x%x)\n" , +pr_debug ("CPU%d found a matching microcode update with version 0x%x (current=0x%x)\n" , cpu, new_rev, uci->cpu_sig.rev); }else {vfree (new_mc);
@@ -300,7 +300,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)return UCODE_NFOUND ;if (*(u32 *)firmware->data !=UCODE_MAGIC ) { -pr_err ("microcode: invalid UCODE_MAGIC (0x%08x)\n" , +pr_err ("invalid UCODE_MAGIC (0x%08x)\n" , *(u32 *)firmware->data);return UCODE_ERROR ; }
@@ -313,8 +313,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)static enum ucode_state request_microcode_user (int cpu,const void __user *buf,size_t size) { -pr_info ("microcode: AMD microcode update via " -"/dev/cpu/microcode not supported\n" ); +pr_info ("AMD microcode update via /dev/cpu/microcode not supported\n" );return UCODE_ERROR ; }
@@ -334,14 +333,13 @@ void init_microcode_amd(struct device *device)WARN_ON (c->x86_vendor !=X86_VENDOR_AMD );if (c->x86 <0x10 ) { -pr_warning ("microcode: AMD CPU family 0x%x not supported\n" , - c->x86); +pr_warning ("AMD CPU family 0x%x not supported\n" , c->x86);return ; } supported_cpu =1 ;if (request_firmware (&firmware, fw_name, device)) -pr_err ("microcode: failed to load file %s\n" , fw_name); +pr_err ("failed to load file %s\n" , fw_name); }void fini_microcode_amd (void )
arch/x86/kernel/microcode_core.c +14 -12
@@ -70,6 +70,9 @@* Fix sigmatch() macro to handle old CPUs with pf == 0. * Thanks to Stuart Swales for pointing out this bug. */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/platform_device.h> #include <linux/miscdevice.h> #include <linux/capability.h>
@@ -209,7 +212,7 @@ static ssize_t microcode_write(struct file *file, const char __user *buf,ssize_t ret = -EINVAL ;if ((len >>PAGE_SHIFT ) > totalram_pages) { -pr_err ("microcode: too much data (max %ld pages)\n" , totalram_pages); +pr_err ("too much data (max %ld pages)\n" , totalram_pages);return ret; }
@@ -244,7 +247,7 @@ static int __init microcode_dev_init(void) error =misc_register (µcode_dev);if (error) { -pr_err ("microcode: can't misc_register on minor=%d\n" ,MICROCODE_MINOR ); +pr_err ("can't misc_register on minor=%d\n" ,MICROCODE_MINOR );return error; }
@@ -359,7 +362,7 @@ static enum ucode_state microcode_resume_cpu(int cpu)if (!uci->mc)return UCODE_NFOUND ; -pr_debug ("microcode: CPU%d updated upon resume\n" , cpu); +pr_debug ("CPU%d updated upon resume\n" , cpu);apply_microcode_on_target (cpu);return UCODE_OK ;
@@ -379,7 +382,7 @@ static enum ucode_state microcode_init_cpu(int cpu) ustate = microcode_ops->request_microcode_fw (cpu, µcode_pdev->dev);if (ustate ==UCODE_OK ) { -pr_debug ("microcode: CPU%d updated upon init\n" , cpu); +pr_debug ("CPU%d updated upon init\n" , cpu);apply_microcode_on_target (cpu); }
@@ -406,7 +409,7 @@ static int mc_sysdev_add(struct sys_device *sys_dev)if (!cpu_online (cpu))return 0 ; -pr_debug ("microcode: CPU%d added\n" , cpu); +pr_debug ("CPU%d added\n" , cpu); err =sysfs_create_group (&sys_dev->kobj, &mc_attr_group);if (err)
@@ -425,7 +428,7 @@ static int mc_sysdev_remove(struct sys_device *sys_dev)if (!cpu_online (cpu))return 0 ; -pr_debug ("microcode: CPU%d removed\n" , cpu); +pr_debug ("CPU%d removed\n" , cpu);microcode_fini_cpu (cpu);sysfs_remove_group (&sys_dev->kobj, &mc_attr_group);return 0 ;
@@ -473,15 +476,15 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)microcode_update_cpu (cpu);case CPU_DOWN_FAILED :case CPU_DOWN_FAILED_FROZEN : -pr_debug ("microcode: CPU%d added\n" , cpu); +pr_debug ("CPU%d added\n" , cpu);if (sysfs_create_group (&sys_dev->kobj, &mc_attr_group)) -pr_err ("microcode: Failed to create group for CPU%d\n" , cpu); +pr_err ("Failed to create group for CPU%d\n" , cpu);break ;case CPU_DOWN_PREPARE :case CPU_DOWN_PREPARE_FROZEN :/* Suspend is in progress, only remove the interface */ sysfs_remove_group (&sys_dev->kobj, &mc_attr_group); -pr_debug ("microcode: CPU%d removed\n" , cpu); +pr_debug ("CPU%d removed\n" , cpu);break ;case CPU_DEAD :case CPU_UP_CANCELED_FROZEN :
@@ -507,7 +510,7 @@ static int __init microcode_init(void) microcode_ops =init_amd_microcode ();if (!microcode_ops) { -pr_err ("microcode: no support for this CPU vendor\n" ); +pr_err ("no support for this CPU vendor\n" );return -ENODEV ; }
@@ -541,8 +544,7 @@ static int __init microcode_init(void)register_hotcpu_notifier (&mc_cpu_notifier);pr_info ("Microcode Update Driver: v" MICROCODE_VERSION -" <[email protected]>," -" Peter Oruba\n" ); +" <[email protected]>, Peter Oruba\n" );return 0 ; }
arch/x86/kernel/microcode_intel.c +20 -27
129 lines not on this page · raw message
Joe Perches
maintainerPATCH 1/1 checkpatch.pl: Warn on pr_<level> or dev_<level> with KERN_<level>
In reply to Ingo MolnarQuoted 3 lines · Ingo Molnar
( Andy: i suspect checkpatch could also grow a new warning perhaps, the
'\<pr_.*(KERN_.*' pattern will i suspect pinpoint something fishy in most cases. )
---
scripts/checkpatch.pl +6 -0
@@ -1832,6 +1832,12 @@ sub process { } } +# pr_<level> and dev_<level> should not use KERN_* levels + + if ($line =~ /\b(pr_|dev_)[a-z]+.*KERN_/) { + WARN("pr_<level>() and dev_<level> should not include KERN_ facility level\n" . $herecurr); + } + # function brace can't be on same line, except for #defines of do while, # or if closed on same line if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and
Re: [PATCH] checkpatch.pl: Warn on pr_<level> or dev_<level> with KERN_<level>
Quoted 12 lines · Joe Perches
Quoted 3 lines · Ingo Molnar
( Andy: i suspect checkpatch could also grow a new warning perhaps, the
'\<pr_.*(KERN_.*' pattern will i suspect pinpoint something fishy in most cases. )Signed-off-by Joe Perches <[email protected]>---
scripts/checkpatch.pl +0
-0
scripts/checkpatch.pl sub process { · line 1837
Quoted 6 lines
scripts/checkpatch.pl +3
-0@@ -1832,6 +1832,12 @@ sub process { } } +# pr_<level> and dev_<level> should not use KERN_* levels + + if ($line =~ /\b(pr_|dev_)[a-z]+.*KERN_/) {
putting \( into the pattern would further reduce the chance of false positives.
Ingo