Commit c130d3be authored by Max Filippov's avatar Max Filippov
Browse files

xtensa: clean up custom-controlled debug output 



Replace #ifdef'fed/commented out debug printk statements with pr_debug.
Replace printk statements with pr_* equivalents.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 40d1a07b

arch/xtensa/kernel/module.c

+8 −11
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <linux/kernel.h>

#include <linux/cache.h>



#undef DEBUG_RELOCATE



static int

decode_calln_opcode (unsigned char *location)

{
@@ -58,10 +56,9 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, 
	unsigned char *location;

	uint32_t value;



#ifdef DEBUG_RELOCATE

	printk("Applying relocate section %u to %u\n", relsec,

	pr_debug("Applying relocate section %u to %u\n", relsec,

		 sechdrs[relsec].sh_info);

#endif



	for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rela); i++) {

		location = (char *)sechdrs[sechdrs[relsec].sh_info].sh_addr

			+ rela[i].r_offset;
@@ -87,7 +84,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, 
				value -= ((unsigned long)location & -4) + 4;

				if ((value & 3) != 0 ||

				    ((value + (1 << 19)) >> 20) != 0) {

					printk("%s: relocation out of range, "

					pr_err("%s: relocation out of range, "

					       "section %d reloc %d "

					       "sym '%s'\n",

					       mod->name, relsec, i,
@@ -111,7 +108,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, 
				value -= (((unsigned long)location + 3) & -4);

				if ((value & 3) != 0 ||

				    (signed int)value >> 18 != -1) {

					printk("%s: relocation out of range, "

					pr_err("%s: relocation out of range, "

					       "section %d reloc %d "

					       "sym '%s'\n",

					       mod->name, relsec, i,
@@ -156,7 +153,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, 
		case R_XTENSA_SLOT12_OP:

		case R_XTENSA_SLOT13_OP:

		case R_XTENSA_SLOT14_OP:

			printk("%s: unexpected FLIX relocation: %u\n",

			pr_err("%s: unexpected FLIX relocation: %u\n",

			       mod->name,

			       ELF32_R_TYPE(rela[i].r_info));

			return -ENOEXEC;
@@ -176,13 +173,13 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, 
		case R_XTENSA_SLOT12_ALT:

		case R_XTENSA_SLOT13_ALT:

		case R_XTENSA_SLOT14_ALT:

			printk("%s: unexpected ALT relocation: %u\n",

			pr_err("%s: unexpected ALT relocation: %u\n",

			       mod->name,

			       ELF32_R_TYPE(rela[i].r_info));

			return -ENOEXEC;



		default:

			printk("%s: unexpected relocation: %u\n",

			pr_err("%s: unexpected relocation: %u\n",

			       mod->name,

			       ELF32_R_TYPE(rela[i].r_info));

			return -ENOEXEC;

arch/xtensa/kernel/pci.c

+11 −19
Original line number Diff line number Diff line
@@ -29,14 +29,6 @@ 
#include <asm/pci-bridge.h>

#include <asm/platform.h>



#undef DEBUG



#ifdef DEBUG

#define DBG(x...) printk(x)

#else

#define DBG(x...)

#endif



/* PCI Controller */
@@ -101,7 +93,7 @@ pcibios_enable_resources(struct pci_dev *dev, int mask) 
	for(idx=0; idx<6; idx++) {

		r = &dev->resource[idx];

		if (!r->start && r->end) {

			printk (KERN_ERR "PCI: Device %s not available because "

			pr_err("PCI: Device %s not available because "

			       "of resource collisions\n", pci_name(dev));

			return -EINVAL;

		}
@@ -113,7 +105,7 @@ pcibios_enable_resources(struct pci_dev *dev, int mask) 
	if (dev->resource[PCI_ROM_RESOURCE].start)

		cmd |= PCI_COMMAND_MEMORY;

	if (cmd != old_cmd) {

		printk("PCI: Enabling device %s (%04x -> %04x)\n",

		pr_info("PCI: Enabling device %s (%04x -> %04x)\n",

			pci_name(dev), old_cmd, cmd);

		pci_write_config_word(dev, PCI_COMMAND, cmd);

	}
@@ -144,8 +136,8 @@ static void __init pci_controller_apertures(struct pci_controller *pci_ctrl, 
	res = &pci_ctrl->io_resource;

	if (!res->flags) {

		if (io_offset)

			printk (KERN_ERR "I/O resource not set for host"

				" bridge %d\n", pci_ctrl->index);

			pr_err("I/O resource not set for host bridge %d\n",

			       pci_ctrl->index);

		res->start = 0;

		res->end = IO_SPACE_LIMIT;

		res->flags = IORESOURCE_IO;
@@ -159,8 +151,8 @@ static void __init pci_controller_apertures(struct pci_controller *pci_ctrl, 
		if (!res->flags) {

			if (i > 0)

				continue;

			printk(KERN_ERR "Memory resource not set for "

			       "host bridge %d\n", pci_ctrl->index);

			pr_err("Memory resource not set for host bridge %d\n",

			       pci_ctrl->index);

			res->start = 0;

			res->end = ~0U;

			res->flags = IORESOURCE_MEM;
@@ -176,7 +168,7 @@ static int __init pcibios_init(void) 
	struct pci_bus *bus;

	int next_busno = 0, ret;



	printk("PCI: Probing PCI hardware\n");

	pr_info("PCI: Probing PCI hardware\n");



	/* Scan all of the recorded PCI controllers.  */

	for (pci_ctrl = pci_ctrl_head; pci_ctrl; pci_ctrl = pci_ctrl->next) {
@@ -232,7 +224,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
	for (idx=0; idx<6; idx++) {

		r = &dev->resource[idx];

		if (!r->start && r->end) {

			printk(KERN_ERR "PCI: Device %s not available because "

			pr_err("PCI: Device %s not available because "

			       "of resource collisions\n", pci_name(dev));

			return -EINVAL;

		}
@@ -242,7 +234,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
			cmd |= PCI_COMMAND_MEMORY;

	}

	if (cmd != old_cmd) {

		printk("PCI: Enabling device %s (%04x -> %04x)\n",

		pr_info("PCI: Enabling device %s (%04x -> %04x)\n",

			pci_name(dev), old_cmd, cmd);

		pci_write_config_word(dev, PCI_COMMAND, cmd);

	}

arch/xtensa/kernel/setup.c

+3 −4
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static int __init parse_bootparam(const bp_tag_t* tag) 
	/* Boot parameters must start with a BP_TAG_FIRST tag. */



	if (tag->id != BP_TAG_FIRST) {

		printk(KERN_WARNING "Invalid boot parameters!\n");

		pr_warn("Invalid boot parameters!\n");

		return 0;

	}
@@ -172,8 +172,7 @@ static int __init parse_bootparam(const bp_tag_t* tag) 
			}

		}

		if (t == &__tagtable_end)

			printk(KERN_WARNING "Ignoring tag "

			       "0x%08x\n", tag->id);

			pr_warn("Ignoring tag 0x%08x\n", tag->id);

		tag = (bp_tag_t*)((unsigned long)(tag + 1) + tag->size);

	}

arch/xtensa/kernel/signal.c

+2 −6
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
#include <asm/coprocessor.h>

#include <asm/unistd.h>



#define DEBUG_SIG  0



extern struct task_struct *coproc_owners[];



struct rt_sigframe
@@ -399,10 +397,8 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set, 
	regs->areg[8] = (unsigned long) &frame->uc;

	regs->threadptr = tp;



#if DEBUG_SIG

	printk("SIG rt deliver (%s:%d): signal=%d sp=%p pc=%08x\n",

	pr_debug("SIG rt deliver (%s:%d): signal=%d sp=%p pc=%08lx\n",

		 current->comm, current->pid, sig, frame, regs->pc);

#endif



	return 0;

}

arch/xtensa/kernel/traps.c

+14 −11
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/kallsyms.h>

#include <linux/delay.h>

#include <linux/hardirq.h>

#include <linux/ratelimit.h>



#include <asm/stacktrace.h>

#include <asm/ptrace.h>
@@ -181,10 +182,11 @@ void do_unhandled(struct pt_regs *regs, unsigned long exccause) 
			regs, SIGKILL);



	/* If in user mode, send SIGILL signal to current process */

	printk("Caught unhandled exception in '%s' "

	pr_info_ratelimited("Caught unhandled exception in '%s' "

			    "(pid = %d, pc = %#010lx) - should not happen\n"

			    "\tEXCCAUSE is %ld\n",

	       current->comm, task_pid_nr(current), regs->pc, exccause);

			    current->comm, task_pid_nr(current), regs->pc,

			    exccause);

	force_sig(SIGILL, current);

}
@@ -305,7 +307,7 @@ do_illegal_instruction(struct pt_regs *regs) 


	/* If in user mode, send SIGILL signal to current process. */



	printk("Illegal Instruction in '%s' (pid = %d, pc = %#010lx)\n",

	pr_info_ratelimited("Illegal Instruction in '%s' (pid = %d, pc = %#010lx)\n",

			    current->comm, task_pid_nr(current), regs->pc);

	force_sig(SIGILL, current);

}
@@ -329,9 +331,10 @@ do_unaligned_user (struct pt_regs *regs) 


	current->thread.bad_vaddr = regs->excvaddr;

	current->thread.error_code = -3;

	printk("Unaligned memory access to %08lx in '%s' "

	pr_info_ratelimited("Unaligned memory access to %08lx in '%s' "

			    "(pid = %d, pc = %#010lx)\n",

	       regs->excvaddr, current->comm, task_pid_nr(current), regs->pc);

			    regs->excvaddr, current->comm,

			    task_pid_nr(current), regs->pc);

	info.si_signo = SIGBUS;

	info.si_errno = 0;

	info.si_code = BUS_ADRALN;