Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 741f21e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] Update default configuration.
  [S390] Have param.h simply include <asm-generic/param.h>.
  [S390] qdio: convert global statistics to per-device stats
parents d4d3b192 cc4707b3

arch/s390/defconfig

+75 −11
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.31

# Tue Sep 22 17:43:13 2009

# Linux kernel version: 2.6.33-rc2

# Mon Jan  4 09:03:07 2010

#

CONFIG_SCHED_MC=y

CONFIG_MMU=y
@@ -51,6 +51,7 @@ CONFIG_AUDIT=y 
#

CONFIG_TREE_RCU=y

# CONFIG_TREE_PREEMPT_RCU is not set

# CONFIG_TINY_RCU is not set

# CONFIG_RCU_TRACE is not set

CONFIG_RCU_FANOUT=64

# CONFIG_RCU_FANOUT_EXACT is not set
@@ -113,7 +114,6 @@ CONFIG_HAVE_PERF_EVENTS=y 
# CONFIG_PERF_EVENTS is not set

# CONFIG_PERF_COUNTERS is not set

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_STRIP_ASM_SYMS is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

# CONFIG_SLUB is not set
@@ -149,21 +149,78 @@ CONFIG_STOP_MACHINE=y 
CONFIG_BLOCK=y

CONFIG_BLK_DEV_BSG=y

# CONFIG_BLK_DEV_INTEGRITY is not set

# CONFIG_BLK_CGROUP is not set

CONFIG_BLOCK_COMPAT=y



#

# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

# CONFIG_DEFAULT_AS is not set

# CONFIG_CFQ_GROUP_IOSCHED is not set

CONFIG_DEFAULT_DEADLINE=y

# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="deadline"

CONFIG_PREEMPT_NOTIFIERS=y

CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y

CONFIG_ARCH_INLINE_SPIN_TRYLOCK_BH=y

CONFIG_ARCH_INLINE_SPIN_LOCK=y

CONFIG_ARCH_INLINE_SPIN_LOCK_BH=y

CONFIG_ARCH_INLINE_SPIN_LOCK_IRQ=y

CONFIG_ARCH_INLINE_SPIN_LOCK_IRQSAVE=y

CONFIG_ARCH_INLINE_SPIN_UNLOCK=y

CONFIG_ARCH_INLINE_SPIN_UNLOCK_BH=y

CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQ=y

CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE=y

CONFIG_ARCH_INLINE_READ_TRYLOCK=y

CONFIG_ARCH_INLINE_READ_LOCK=y

CONFIG_ARCH_INLINE_READ_LOCK_BH=y

CONFIG_ARCH_INLINE_READ_LOCK_IRQ=y

CONFIG_ARCH_INLINE_READ_LOCK_IRQSAVE=y

CONFIG_ARCH_INLINE_READ_UNLOCK=y

CONFIG_ARCH_INLINE_READ_UNLOCK_BH=y

CONFIG_ARCH_INLINE_READ_UNLOCK_IRQ=y

CONFIG_ARCH_INLINE_READ_UNLOCK_IRQRESTORE=y

CONFIG_ARCH_INLINE_WRITE_TRYLOCK=y

CONFIG_ARCH_INLINE_WRITE_LOCK=y

CONFIG_ARCH_INLINE_WRITE_LOCK_BH=y

CONFIG_ARCH_INLINE_WRITE_LOCK_IRQ=y

CONFIG_ARCH_INLINE_WRITE_LOCK_IRQSAVE=y

CONFIG_ARCH_INLINE_WRITE_UNLOCK=y

CONFIG_ARCH_INLINE_WRITE_UNLOCK_BH=y

CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQ=y

CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE=y

# CONFIG_INLINE_SPIN_TRYLOCK is not set

# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set

# CONFIG_INLINE_SPIN_LOCK is not set

# CONFIG_INLINE_SPIN_LOCK_BH is not set

# CONFIG_INLINE_SPIN_LOCK_IRQ is not set

# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set

# CONFIG_INLINE_SPIN_UNLOCK is not set

# CONFIG_INLINE_SPIN_UNLOCK_BH is not set

# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set

# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set

# CONFIG_INLINE_READ_TRYLOCK is not set

# CONFIG_INLINE_READ_LOCK is not set

# CONFIG_INLINE_READ_LOCK_BH is not set

# CONFIG_INLINE_READ_LOCK_IRQ is not set

# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set

# CONFIG_INLINE_READ_UNLOCK is not set

# CONFIG_INLINE_READ_UNLOCK_BH is not set

# CONFIG_INLINE_READ_UNLOCK_IRQ is not set

# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set

# CONFIG_INLINE_WRITE_TRYLOCK is not set

# CONFIG_INLINE_WRITE_LOCK is not set

# CONFIG_INLINE_WRITE_LOCK_BH is not set

# CONFIG_INLINE_WRITE_LOCK_IRQ is not set

# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set

# CONFIG_INLINE_WRITE_UNLOCK is not set

# CONFIG_INLINE_WRITE_UNLOCK_BH is not set

# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set

# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set

# CONFIG_MUTEX_SPIN_ON_OWNER is not set

CONFIG_FREEZER=y



#
@@ -227,14 +284,13 @@ CONFIG_MEMORY_HOTPLUG=y 
CONFIG_MEMORY_HOTPLUG_SPARSE=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_SPLIT_PTLOCK_CPUS=999999

CONFIG_MIGRATION=y

CONFIG_PHYS_ADDR_T_64BIT=y

CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

# CONFIG_KSM is not set

CONFIG_DEFAULT_MMAP_MIN_ADDR=4096



#
@@ -339,6 +395,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y 
CONFIG_INET6_XFRM_MODE_BEET=y

# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set

CONFIG_IPV6_SIT=y

# CONFIG_IPV6_SIT_6RD is not set

CONFIG_IPV6_NDISC_NODETYPE=y

# CONFIG_IPV6_TUNNEL is not set

# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -504,6 +561,10 @@ CONFIG_BLK_DEV=y 
# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=m

# CONFIG_BLK_DEV_CRYPTOLOOP is not set



#

# DRBD disabled because PROC_FS, INET or CONNECTOR not selected

#

CONFIG_BLK_DEV_NBD=m

# CONFIG_BLK_DEV_OSD is not set

CONFIG_BLK_DEV_RAM=y
@@ -710,7 +771,6 @@ CONFIG_S390_VMUR=m 
# CONFIG_PPS is not set

# CONFIG_POWER_SUPPLY is not set

# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set

# CONFIG_WATCHDOG is not set

# CONFIG_REGULATOR is not set

# CONFIG_MEMSTICK is not set
@@ -864,6 +924,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y 
CONFIG_ENABLE_MUST_CHECK=y

CONFIG_FRAME_WARN=2048

CONFIG_MAGIC_SYSRQ=y

# CONFIG_STRIP_ASM_SYMS is not set

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_FS=y

# CONFIG_HEADERS_CHECK is not set
@@ -931,7 +992,6 @@ CONFIG_BRANCH_PROFILE_NONE=y 
CONFIG_SAMPLES=y

# CONFIG_SAMPLE_KOBJECT is not set

# CONFIG_SAMPLE_KPROBES is not set

# CONFIG_KMEMCHECK is not set



#

# Security options
@@ -939,7 +999,11 @@ CONFIG_SAMPLES=y 
# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITYFS is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_DEFAULT_SECURITY_SELINUX is not set

# CONFIG_DEFAULT_SECURITY_SMACK is not set

# CONFIG_DEFAULT_SECURITY_TOMOYO is not set

CONFIG_DEFAULT_SECURITY_DAC=y

CONFIG_DEFAULT_SECURITY=""

CONFIG_CRYPTO=y



#

arch/s390/include/asm/param.h

+2 −26
Original line number Diff line number Diff line 
/*

 *  include/asm-s390/param.h

 *

 *  S390 version

 *

 *  Derived from "include/asm-i386/param.h"

 */



#ifndef _ASMS390_PARAM_H

#define _ASMS390_PARAM_H



#ifdef __KERNEL__

# define HZ		CONFIG_HZ	/* Internal kernel timer frequency */

# define USER_HZ	100		/* .. some user interfaces are in "ticks" */

# define CLOCKS_PER_SEC	(USER_HZ)	/* like times() */

#endif



#ifndef HZ

#define HZ 100

#endif



#define EXEC_PAGESIZE	4096



#ifndef NOGROUP

#define NOGROUP		(-1)

#endif



#define MAXHOSTNAMELEN	64	/* max length of hostname */

#include <asm-generic/param.h>



#endif
 
#endif /* _ASMS390_PARAM_H */

drivers/s390/cio/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,5 +10,5 @@ obj-y += ccw_device.o cmf.o 
obj-$(CONFIG_CHSC_SCH) += chsc_sch.o

obj-$(CONFIG_CCWGROUP) += ccwgroup.o



qdio-objs := qdio_main.o qdio_thinint.o qdio_debug.o qdio_perf.o qdio_setup.o

qdio-objs := qdio_main.o qdio_thinint.o qdio_debug.o qdio_setup.o

obj-$(CONFIG_QDIO) += qdio.o

drivers/s390/cio/qdio.h

+35 −1
Original line number Diff line number Diff line
@@ -182,6 +182,34 @@ struct scssc_area { 
	u32:32;

} __attribute__ ((packed));



struct qdio_dev_perf_stat {

	unsigned int adapter_int;

	unsigned int qdio_int;

	unsigned int pci_request_int;



	unsigned int tasklet_inbound;

	unsigned int tasklet_inbound_resched;

	unsigned int tasklet_inbound_resched2;

	unsigned int tasklet_outbound;



	unsigned int siga_read;

	unsigned int siga_write;

	unsigned int siga_sync;



	unsigned int inbound_call;

	unsigned int inbound_handler;

	unsigned int stop_polling;

	unsigned int inbound_queue_full;

	unsigned int outbound_call;

	unsigned int outbound_handler;

	unsigned int fast_requeue;

	unsigned int target_full;

	unsigned int eqbs;

	unsigned int eqbs_partial;

	unsigned int sqbs;

	unsigned int sqbs_partial;

};



struct qdio_input_q {

	/* input buffer acknowledgement flag */

	int polling;
@@ -269,6 +297,7 @@ struct qdio_irq { 
	u32 *dsci;		/* address of device state change indicator */

	struct ccw_device *cdev;

	struct dentry *debugfs_dev;

	struct dentry *debugfs_perf;



	unsigned long int_parm;

	struct subchannel_id schid;
@@ -286,9 +315,10 @@ struct qdio_irq { 
	struct ciw aqueue;



	struct qdio_ssqd_desc ssqd_desc;



	void (*orig_handler) (struct ccw_device *, unsigned long, struct irb *);



	struct qdio_dev_perf_stat perf_stat;

	int perf_stat_enabled;

	/*

	 * Warning: Leave these members together at the end so they won't be

	 * cleared in qdio_setup_irq.
@@ -311,6 +341,10 @@ struct qdio_irq { 
	(irq->qib.qfmt == QDIO_IQDIO_QFMT || \

	 css_general_characteristics.aif_osa)



#define qperf(qdev,attr)	qdev->perf_stat.attr

#define qperf_inc(q,attr)	if (q->irq_ptr->perf_stat_enabled) \

					q->irq_ptr->perf_stat.attr++



/* the highest iqdio queue is used for multicast */

static inline int multicast_outbound(struct qdio_q *q)

{

drivers/s390/cio/qdio_debug.c

+106 −8
Original line number Diff line number Diff line
@@ -55,13 +55,11 @@ static int qstat_show(struct seq_file *m, void *v) 
	if (!q)

		return 0;



	seq_printf(m, "device state indicator: %d\n", *(u32 *)q->irq_ptr->dsci);

	seq_printf(m, "nr_used: %d\n", atomic_read(&q->nr_buf_used));

	seq_printf(m, "ftc: %d\n", q->first_to_check);

	seq_printf(m, "last_move: %d\n", q->last_move);

	seq_printf(m, "polling: %d\n", q->u.in.polling);

	seq_printf(m, "ack start: %d\n", q->u.in.ack_start);

	seq_printf(m, "ack count: %d\n", q->u.in.ack_count);

	seq_printf(m, "DSCI: %d   nr_used: %d\n",

		   *(u32 *)q->irq_ptr->dsci, atomic_read(&q->nr_buf_used));

	seq_printf(m, "ftc: %d  last_move: %d\n", q->first_to_check, q->last_move);

	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, "slsb buffer states:\n");

	seq_printf(m, "|0      |8      |16     |24     |32     |40     |48     |56  63|\n");
@@ -110,7 +108,6 @@ static ssize_t qstat_seq_write(struct file *file, const char __user *buf, 


	if (!q)

		return 0;



	if (q->is_input_q)

		xchg(q->irq_ptr->dsci, 1);

	local_bh_disable();
@@ -134,6 +131,98 @@ static const struct file_operations debugfs_fops = { 
	.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 fast_requeue",

	"Outbound target_full",

	"QEBSM eqbs",

	"QEBSM eqbs partial",

	"QEBSM sqbs",

	"QEBSM sqbs partial"

};



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;

	unsigned long val;

	char buf[8];

	int ret;



	if (!irq_ptr)

		return 0;

	if (count >= sizeof(buf))

		return -EINVAL;

	if (copy_from_user(&buf, ubuf, count))

		return -EFAULT;

	buf[count] = 0;



	ret = strict_strtoul(buf, 10, &val);

	if (ret < 0)

		return ret;



	switch (val) {

	case 0:

		irq_ptr->perf_stat_enabled = 0;

		memset(&irq_ptr->perf_stat, 0, sizeof(irq_ptr->perf_stat));

		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];
@@ -156,6 +245,14 @@ void qdio_setup_debug_entries(struct qdio_irq *irq_ptr, struct ccw_device *cdev) 
						  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)
@@ -171,6 +268,7 @@ void qdio_shutdown_debug_entries(struct qdio_irq *irq_ptr, struct ccw_device *cd 
		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);

}