 32aaeffbd4
			
		
	
	
	32aaeffbd4
	
	
	
		
			
			* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...
Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
		
	
			
		
			
				
	
	
		
			309 lines
		
	
	
	
		
			8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			309 lines
		
	
	
	
		
			8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  *  drivers/s390/cio/qdio_debug.c
 | |
|  *
 | |
|  *  Copyright IBM Corp. 2008,2009
 | |
|  *
 | |
|  *  Author: Jan Glauber (jang@linux.vnet.ibm.com)
 | |
|  */
 | |
| #include <linux/seq_file.h>
 | |
| #include <linux/debugfs.h>
 | |
| #include <linux/uaccess.h>
 | |
| #include <linux/export.h>
 | |
| #include <asm/debug.h>
 | |
| #include "qdio_debug.h"
 | |
| #include "qdio.h"
 | |
| 
 | |
| debug_info_t *qdio_dbf_setup;
 | |
| debug_info_t *qdio_dbf_error;
 | |
| 
 | |
| static struct dentry *debugfs_root;
 | |
| #define QDIO_DEBUGFS_NAME_LEN	10
 | |
| 
 | |
| void qdio_allocate_dbf(struct qdio_initialize *init_data,
 | |
| 		       struct qdio_irq *irq_ptr)
 | |
| {
 | |
| 	char text[20];
 | |
| 
 | |
| 	DBF_EVENT("qfmt:%1d", init_data->q_format);
 | |
| 	DBF_HEX(init_data->adapter_name, 8);
 | |
| 	DBF_EVENT("qpff%4x", init_data->qib_param_field_format);
 | |
| 	DBF_HEX(&init_data->qib_param_field, sizeof(void *));
 | |
| 	DBF_HEX(&init_data->input_slib_elements, sizeof(void *));
 | |
| 	DBF_HEX(&init_data->output_slib_elements, sizeof(void *));
 | |
| 	DBF_EVENT("niq:%1d noq:%1d", init_data->no_input_qs,
 | |
| 		  init_data->no_output_qs);
 | |
| 	DBF_HEX(&init_data->input_handler, sizeof(void *));
 | |
| 	DBF_HEX(&init_data->output_handler, sizeof(void *));
 | |
| 	DBF_HEX(&init_data->int_parm, sizeof(long));
 | |
| 	DBF_HEX(&init_data->input_sbal_addr_array, sizeof(void *));
 | |
| 	DBF_HEX(&init_data->output_sbal_addr_array, sizeof(void *));
 | |
| 	DBF_EVENT("irq:%8lx", (unsigned long)irq_ptr);
 | |
| 
 | |
| 	/* allocate trace view for the interface */
 | |
| 	snprintf(text, 20, "qdio_%s", dev_name(&init_data->cdev->dev));
 | |
| 	irq_ptr->debug_area = debug_register(text, 2, 1, 16);
 | |
| 	debug_register_view(irq_ptr->debug_area, &debug_hex_ascii_view);
 | |
| 	debug_set_level(irq_ptr->debug_area, DBF_WARN);
 | |
| 	DBF_DEV_EVENT(DBF_ERR, irq_ptr, "dbf created");
 | |
| }
 | |
| 
 | |
| static int qstat_show(struct seq_file *m, void *v)
 | |
| {
 | |
| 	unsigned char state;
 | |
| 	struct qdio_q *q = m->private;
 | |
| 	int i;
 | |
| 
 | |
| 	if (!q)
 | |
| 		return 0;
 | |
| 
 | |
| 	seq_printf(m, "Timestamp: %Lx  Last AI: %Lx\n",
 | |
| 		   q->timestamp, last_ai_time);
 | |
| 	seq_printf(m, "nr_used: %d  ftc: %d  last_move: %d\n",
 | |
| 		   atomic_read(&q->nr_buf_used),
 | |
| 		   q->first_to_check, q->last_move);
 | |
| 	if (q->is_input_q) {
 | |
| 		seq_printf(m, "polling: %d  ack start: %d  ack count: %d\n",
 | |
| 			   q->u.in.polling, q->u.in.ack_start,
 | |
| 			   q->u.in.ack_count);
 | |
| 		seq_printf(m, "DSCI: %d   IRQs disabled: %u\n",
 | |
| 			   *(u32 *)q->irq_ptr->dsci,
 | |
| 			   test_bit(QDIO_QUEUE_IRQS_DISABLED,
 | |
| 			   &q->u.in.queue_irq_state));
 | |
| 	}
 | |
| 	seq_printf(m, "SBAL states:\n");
 | |
| 	seq_printf(m, "|0      |8      |16     |24     |32     |40     |48     |56  63|\n");
 | |
| 
 | |
| 	for (i = 0; i < QDIO_MAX_BUFFERS_PER_Q; i++) {
 | |
| 		debug_get_buf_state(q, i, &state);
 | |
| 		switch (state) {
 | |
| 		case SLSB_P_INPUT_NOT_INIT:
 | |
| 		case SLSB_P_OUTPUT_NOT_INIT:
 | |
| 			seq_printf(m, "N");
 | |
| 			break;
 | |
| 		case SLSB_P_OUTPUT_PENDING:
 | |
| 			seq_printf(m, "P");
 | |
| 			break;
 | |
| 		case SLSB_P_INPUT_PRIMED:
 | |
| 		case SLSB_CU_OUTPUT_PRIMED:
 | |
| 			seq_printf(m, "+");
 | |
| 			break;
 | |
| 		case SLSB_P_INPUT_ACK:
 | |
| 			seq_printf(m, "A");
 | |
| 			break;
 | |
| 		case SLSB_P_INPUT_ERROR:
 | |
| 		case SLSB_P_OUTPUT_ERROR:
 | |
| 			seq_printf(m, "x");
 | |
| 			break;
 | |
| 		case SLSB_CU_INPUT_EMPTY:
 | |
| 		case SLSB_P_OUTPUT_EMPTY:
 | |
| 			seq_printf(m, "-");
 | |
| 			break;
 | |
| 		case SLSB_P_INPUT_HALTED:
 | |
| 		case SLSB_P_OUTPUT_HALTED:
 | |
| 			seq_printf(m, ".");
 | |
| 			break;
 | |
| 		default:
 | |
| 			seq_printf(m, "?");
 | |
| 		}
 | |
| 		if (i == 63)
 | |
| 			seq_printf(m, "\n");
 | |
| 	}
 | |
| 	seq_printf(m, "\n");
 | |
| 	seq_printf(m, "|64     |72     |80     |88     |96     |104    |112    |   127|\n");
 | |
| 
 | |
| 	seq_printf(m, "\nSBAL statistics:");
 | |
| 	if (!q->irq_ptr->perf_stat_enabled) {
 | |
| 		seq_printf(m, " disabled\n");
 | |
| 		return 0;
 | |
| 	}
 | |
| 
 | |
| 	seq_printf(m, "\n1          2..        4..        8..        "
 | |
| 		   "16..       32..       64..       127\n");
 | |
| 	for (i = 0; i < ARRAY_SIZE(q->q_stats.nr_sbals); i++)
 | |
| 		seq_printf(m, "%-10u ", q->q_stats.nr_sbals[i]);
 | |
| 	seq_printf(m, "\nError      NOP        Total\n%-10u %-10u %-10u\n\n",
 | |
| 		   q->q_stats.nr_sbal_error, q->q_stats.nr_sbal_nop,
 | |
| 		   q->q_stats.nr_sbal_total);
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| static int qstat_seq_open(struct inode *inode, struct file *filp)
 | |
| {
 | |
| 	return single_open(filp, qstat_show,
 | |
| 			   filp->f_path.dentry->d_inode->i_private);
 | |
| }
 | |
| 
 | |
| static const struct file_operations debugfs_fops = {
 | |
| 	.owner	 = THIS_MODULE,
 | |
| 	.open	 = qstat_seq_open,
 | |
| 	.read	 = seq_read,
 | |
| 	.llseek  = seq_lseek,
 | |
| 	.release = single_release,
 | |
| };
 | |
| 
 | |
| static char *qperf_names[] = {
 | |
| 	"Assumed adapter interrupts",
 | |
| 	"QDIO interrupts",
 | |
| 	"Requested PCIs",
 | |
| 	"Inbound tasklet runs",
 | |
| 	"Inbound tasklet resched",
 | |
| 	"Inbound tasklet resched2",
 | |
| 	"Outbound tasklet runs",
 | |
| 	"SIGA read",
 | |
| 	"SIGA write",
 | |
| 	"SIGA sync",
 | |
| 	"Inbound calls",
 | |
| 	"Inbound handler",
 | |
| 	"Inbound stop_polling",
 | |
| 	"Inbound queue full",
 | |
| 	"Outbound calls",
 | |
| 	"Outbound handler",
 | |
| 	"Outbound queue full",
 | |
| 	"Outbound fast_requeue",
 | |
| 	"Outbound target_full",
 | |
| 	"QEBSM eqbs",
 | |
| 	"QEBSM eqbs partial",
 | |
| 	"QEBSM sqbs",
 | |
| 	"QEBSM sqbs partial",
 | |
| 	"Discarded interrupts"
 | |
| };
 | |
| 
 | |
| static int qperf_show(struct seq_file *m, void *v)
 | |
| {
 | |
| 	struct qdio_irq *irq_ptr = m->private;
 | |
| 	unsigned int *stat;
 | |
| 	int i;
 | |
| 
 | |
| 	if (!irq_ptr)
 | |
| 		return 0;
 | |
| 	if (!irq_ptr->perf_stat_enabled) {
 | |
| 		seq_printf(m, "disabled\n");
 | |
| 		return 0;
 | |
| 	}
 | |
| 	stat = (unsigned int *)&irq_ptr->perf_stat;
 | |
| 
 | |
| 	for (i = 0; i < ARRAY_SIZE(qperf_names); i++)
 | |
| 		seq_printf(m, "%26s:\t%u\n",
 | |
| 			   qperf_names[i], *(stat + i));
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| static ssize_t qperf_seq_write(struct file *file, const char __user *ubuf,
 | |
| 			       size_t count, loff_t *off)
 | |
| {
 | |
| 	struct seq_file *seq = file->private_data;
 | |
| 	struct qdio_irq *irq_ptr = seq->private;
 | |
| 	struct qdio_q *q;
 | |
| 	unsigned long val;
 | |
| 	int ret, i;
 | |
| 
 | |
| 	if (!irq_ptr)
 | |
| 		return 0;
 | |
| 
 | |
| 	ret = kstrtoul_from_user(ubuf, count, 10, &val);
 | |
| 	if (ret)
 | |
| 		return ret;
 | |
| 
 | |
| 	switch (val) {
 | |
| 	case 0:
 | |
| 		irq_ptr->perf_stat_enabled = 0;
 | |
| 		memset(&irq_ptr->perf_stat, 0, sizeof(irq_ptr->perf_stat));
 | |
| 		for_each_input_queue(irq_ptr, q, i)
 | |
| 			memset(&q->q_stats, 0, sizeof(q->q_stats));
 | |
| 		for_each_output_queue(irq_ptr, q, i)
 | |
| 			memset(&q->q_stats, 0, sizeof(q->q_stats));
 | |
| 		break;
 | |
| 	case 1:
 | |
| 		irq_ptr->perf_stat_enabled = 1;
 | |
| 		break;
 | |
| 	}
 | |
| 	return count;
 | |
| }
 | |
| 
 | |
| static int qperf_seq_open(struct inode *inode, struct file *filp)
 | |
| {
 | |
| 	return single_open(filp, qperf_show,
 | |
| 			   filp->f_path.dentry->d_inode->i_private);
 | |
| }
 | |
| 
 | |
| static struct file_operations debugfs_perf_fops = {
 | |
| 	.owner	 = THIS_MODULE,
 | |
| 	.open	 = qperf_seq_open,
 | |
| 	.read	 = seq_read,
 | |
| 	.write	 = qperf_seq_write,
 | |
| 	.llseek  = seq_lseek,
 | |
| 	.release = single_release,
 | |
| };
 | |
| static void setup_debugfs_entry(struct qdio_q *q, struct ccw_device *cdev)
 | |
| {
 | |
| 	char name[QDIO_DEBUGFS_NAME_LEN];
 | |
| 
 | |
| 	snprintf(name, QDIO_DEBUGFS_NAME_LEN, "%s_%d",
 | |
| 		 q->is_input_q ? "input" : "output",
 | |
| 		 q->nr);
 | |
| 	q->debugfs_q = debugfs_create_file(name, S_IFREG | S_IRUGO | S_IWUSR,
 | |
| 				q->irq_ptr->debugfs_dev, q, &debugfs_fops);
 | |
| 	if (IS_ERR(q->debugfs_q))
 | |
| 		q->debugfs_q = NULL;
 | |
| }
 | |
| 
 | |
| void qdio_setup_debug_entries(struct qdio_irq *irq_ptr, struct ccw_device *cdev)
 | |
| {
 | |
| 	struct qdio_q *q;
 | |
| 	int i;
 | |
| 
 | |
| 	irq_ptr->debugfs_dev = debugfs_create_dir(dev_name(&cdev->dev),
 | |
| 						  debugfs_root);
 | |
| 	if (IS_ERR(irq_ptr->debugfs_dev))
 | |
| 		irq_ptr->debugfs_dev = NULL;
 | |
| 
 | |
| 	irq_ptr->debugfs_perf = debugfs_create_file("statistics",
 | |
| 				S_IFREG | S_IRUGO | S_IWUSR,
 | |
| 				irq_ptr->debugfs_dev, irq_ptr,
 | |
| 				&debugfs_perf_fops);
 | |
| 	if (IS_ERR(irq_ptr->debugfs_perf))
 | |
| 		irq_ptr->debugfs_perf = NULL;
 | |
| 
 | |
| 	for_each_input_queue(irq_ptr, q, i)
 | |
| 		setup_debugfs_entry(q, cdev);
 | |
| 	for_each_output_queue(irq_ptr, q, i)
 | |
| 		setup_debugfs_entry(q, cdev);
 | |
| }
 | |
| 
 | |
| void qdio_shutdown_debug_entries(struct qdio_irq *irq_ptr, struct ccw_device *cdev)
 | |
| {
 | |
| 	struct qdio_q *q;
 | |
| 	int i;
 | |
| 
 | |
| 	for_each_input_queue(irq_ptr, q, i)
 | |
| 		debugfs_remove(q->debugfs_q);
 | |
| 	for_each_output_queue(irq_ptr, q, i)
 | |
| 		debugfs_remove(q->debugfs_q);
 | |
| 	debugfs_remove(irq_ptr->debugfs_perf);
 | |
| 	debugfs_remove(irq_ptr->debugfs_dev);
 | |
| }
 | |
| 
 | |
| int __init qdio_debug_init(void)
 | |
| {
 | |
| 	debugfs_root = debugfs_create_dir("qdio", NULL);
 | |
| 
 | |
| 	qdio_dbf_setup = debug_register("qdio_setup", 16, 1, 16);
 | |
| 	debug_register_view(qdio_dbf_setup, &debug_hex_ascii_view);
 | |
| 	debug_set_level(qdio_dbf_setup, DBF_INFO);
 | |
| 	DBF_EVENT("dbf created\n");
 | |
| 
 | |
| 	qdio_dbf_error = debug_register("qdio_error", 4, 1, 16);
 | |
| 	debug_register_view(qdio_dbf_error, &debug_hex_ascii_view);
 | |
| 	debug_set_level(qdio_dbf_error, DBF_INFO);
 | |
| 	DBF_ERROR("dbf created\n");
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| void qdio_debug_exit(void)
 | |
| {
 | |
| 	debugfs_remove(debugfs_root);
 | |
| 	if (qdio_dbf_setup)
 | |
| 		debug_unregister(qdio_dbf_setup);
 | |
| 	if (qdio_dbf_error)
 | |
| 		debug_unregister(qdio_dbf_error);
 | |
| }
 |