Please pull git390 'for-linus' branch
Subsystems (2)
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus
to receive the following updates:
arch/s390/defconfig | 110 ++---- arch/s390/kernel/dis.c | 7 +- arch/s390/kernel/stacktrace.c | 26 +- drivers/s390/char/Kconfig | 6 + drivers/s390/char/Makefile | 1 + drivers/s390/char/vmcp.c | 89 +++-- drivers/s390/char/vmcp.h | 4 +- drivers/s390/char/vmur.c | 906 +++++++++++++++++++++++++++++++++++++++++ drivers/s390/char/vmur.h | 104 +++++ drivers/s390/cio/device.c | 2 +- drivers/s390/cio/qdio.c | 16 +- 11 files changed, 1126 insertions(+), 145 deletions(-) create mode 100644 drivers/s390/char/vmur.c create mode 100644 drivers/s390/char/vmur.h
Christian Borntraeger (2):
[S390] Fix disassembly of RX_URRD, SI_URD & PC-relative instructions. [S390] vmcp cleanup
Cornelia Huck (1):
[S390] cio: Dont print trailing \0 in modalias_show().
Frank Munzert (1):
[S390] z/VM unit record device driver
Frank Pavlic (1):
[S390] qdio: output queue stall on FCP and network devices
Heiko Carstens (1):
[S390] Simplify stack trace.
Jan Glauber (1):
[S390] Fix broken logic, SIGA flags must be bitwise ORed
Martin Schwidefsky (1):
[S390] Update default configuration.
arch/s390/defconfig +32 -78
@@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21 -# Thu May 10 15:18:19 2007 +# Linux kernel version: 2.6.22 +# Tue Jul 17 12:50:23 2007 # CONFIG_MMU=y CONFIG_ZONE_DMA=y
@@ -32,12 +32,11 @@ CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_IPC_NS is not set CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set -# CONFIG_UTS_NS is not set +# CONFIG_USER_NS is not set CONFIG_AUDIT=y # CONFIG_AUDITSYSCALL is not set CONFIG_IKCONFIG=y
@@ -61,20 +60,19 @@ CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y +CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 - -# -# Loadable module support -# CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -82,12 +80,9 @@ CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y CONFIG_STOP_MACHINE=y - -# -# Block layer -# CONFIG_BLOCK=y # CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_BLK_DEV_BSG=y # # IO Schedulers
@@ -151,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_RESOURCES_64BIT=y CONFIG_ZONE_DMA_FLAG=1 +CONFIG_VIRT_TO_BUS=y CONFIG_HOLES_IN_ZONE=y #
@@ -248,25 +244,13 @@ CONFIG_IPV6_SIT=y # CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# # CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y - -# -# TIPC Configuration (EXPERIMENTAL) -# # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set
@@ -293,6 +277,7 @@ CONFIG_NET_SCH_CBQ=m # CONFIG_NET_SCH_HTB is not set # CONFIG_NET_SCH_HFSC is not set CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RR=m CONFIG_NET_SCH_RED=m CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TEQL=m
@@ -317,10 +302,14 @@ CONFIG_CLS_U32_MARK=y CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m # CONFIG_NET_EMATCH is not set -# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=y +# CONFIG_NET_ACT_GACT is not set +# CONFIG_NET_ACT_MIRRED is not set +# CONFIG_NET_ACT_PEDIT is not set +# CONFIG_NET_ACT_SIMP is not set CONFIG_NET_CLS_POLICE=y # CONFIG_NET_CLS_IND is not set -CONFIG_NET_ESTIMATOR=y # # Network testing
@@ -329,6 +318,7 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_TCPPROBE is not set # CONFIG_AF_RXRPC is not set # CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set # CONFIG_PCMCIA is not set CONFIG_CCW=y
@@ -345,15 +335,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set CONFIG_SYS_HYPERVISOR=y - -# -# Connector - unified userspace <-> kernelspace linker -# # CONFIG_CONNECTOR is not set - -# -# Block devices -# +CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=m # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -376,17 +359,15 @@ CONFIG_DASD_ECKD=y CONFIG_DASD_FBA=y CONFIG_DASD_DIAG=y CONFIG_DASD_EER=y - -# -# Misc devices -# -# CONFIG_BLINK is not set +CONFIG_MISC_DEVICES=y +# CONFIG_EEPROM_93CX6 is not set # # SCSI device support # # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=y +# CONFIG_SCSI_DMA is not set # CONFIG_SCSI_TGT is not set CONFIG_SCSI_NETLINK=y CONFIG_SCSI_PROC_FS=y
@@ -447,40 +428,21 @@ CONFIG_DM_MIRROR=y CONFIG_DM_ZERO=y CONFIG_DM_MULTIPATH=y # CONFIG_DM_MULTIPATH_EMC is not set +# CONFIG_DM_MULTIPATH_RDAC is not set # CONFIG_DM_DELAY is not set - -# -# Network device support -# CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES_MULTIQUEUE is not set +# CONFIG_IFB is not set CONFIG_DUMMY=m CONFIG_BONDING=m +# CONFIG_MACVLAN is not set CONFIG_EQUALIZER=m CONFIG_TUN=m - -# -# Ethernet (10 or 100Mbit) -# CONFIG_NET_ETHERNET=y # CONFIG_MII is not set - -# -# Ethernet (1000 Mbit) -# - -# -# Ethernet (10000 Mbit) -# -CONFIG_MLX4_DEBUG=y - -# -# Token Ring devices -# +CONFIG_NETDEV_1000=y +CONFIG_NETDEV_10000=y # CONFIG_TR is not set - -# -# Wan interfaces -# # CONFIG_WAN is not set #
@@ -511,10 +473,6 @@ CONFIG_CCWGROUP=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 - -# -# Watchdog Cards -# # CONFIG_WATCHDOG is not set CONFIG_HW_RANDOM=m # CONFIG_R3964 is not set
@@ -554,6 +512,8 @@ CONFIG_S390_TAPE_34XX=m # CONFIG_VMCP is not set # CONFIG_MONREADER is not set CONFIG_MONWRITER=m +CONFIG_S390_VMUR=m +# CONFIG_POWER_SUPPLY is not set # # File systems
@@ -655,7 +615,6 @@ CONFIG_SUNRPC=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -# CONFIG_9P_FS is not set # # Partition Types
@@ -712,6 +671,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y CONFIG_HEADERS_CHECK=y CONFIG_DEBUG_KERNEL=y +# CONFIG_SCHED_DEBUG is not set # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_SLAB is not set
@@ -740,10 +700,6 @@ CONFIG_FORCED_INLINING=y # # CONFIG_KEYS is not set # CONFIG_SECURITY is not set - -# -# Cryptographic options -# CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_BLKCIPHER=y
@@ -782,10 +738,7 @@ CONFIG_CRYPTO_FCRYPT=m # CONFIG_CRYPTO_CRC32C is not set CONFIG_CRYPTO_CAMELLIA=m # CONFIG_CRYPTO_TEST is not set - -# -# Hardware crypto devices -# +CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_SHA1_S390 is not set # CONFIG_CRYPTO_SHA256_S390 is not set # CONFIG_CRYPTO_DES_S390 is not set
@@ -800,6 +753,7 @@ CONFIG_ZCRYPT=m CONFIG_BITREVERSE=m # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set +# CONFIG_CRC_ITU_T is not set CONFIG_CRC32=m # CONFIG_LIBCRC32C is not set CONFIG_PLIST=y
arch/s390/kernel/dis.c +4 -3
@@ -240,8 +240,8 @@ static const unsigned char formats[][7] = { [INSTR_RXY_FRRD] = { 0xff, F_8,D20_20,X_12,B_16,0,0 },/* e.g. ley */ [INSTR_RX_FRRD] = { 0xff, F_8,D_20,X_12,B_16,0,0 }, /* e.g. ae */ [INSTR_RX_RRRD] = { 0xff, R_8,D_20,X_12,B_16,0,0 }, /* e.g. l */ - [INSTR_RX_URRD] = { 0x00, U4_8,D_20,X_12,B_16,0,0 }, /* e.g. bc */ - [INSTR_SI_URD] = { 0x00, D_20,B_16,U8_8,0,0,0 }, /* e.g. cli */ + [INSTR_RX_URRD] = { 0xff, U4_8,D_20,X_12,B_16,0,0 }, /* e.g. bc */ + [INSTR_SI_URD] = { 0xff, D_20,B_16,U8_8,0,0,0 }, /* e.g. cli */ [INSTR_SIY_URD] = { 0xff, D20_20,B_16,U8_8,0,0,0 }, /* e.g. tmy */ [INSTR_SSE_RDRD] = { 0xff, D_20,B_16,D_36,B_32,0,0 }, /* e.g. mvsdk */ [INSTR_SS_L0RDRD] = { 0xff, D_20,L8_8,B_16,D_36,B_32,0 },
@@ -1190,7 +1190,8 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr)else if (operand->flags &OPERAND_CR ) ptr +=sprintf (ptr,"%%c%i" , value);else if (operand->flags &OPERAND_PCREL ) - ptr +=sprintf (ptr,"%lx" , value + addr); + ptr +=sprintf (ptr,"%lx" , (signed int ) value + + addr);else if (operand->flags &OPERAND_SIGNED ) ptr +=sprintf (ptr,"%i" , value);else
arch/s390/kernel/stacktrace.c +11 -15
@@ -12,7 +12,6 @@#include <linux/kallsyms.h> static unsigned long save_context_stack (struct stack_trace *trace, -unsigned int *skip,unsigned long sp,unsigned long low,unsigned long high)
@@ -28,10 +27,10 @@ static unsigned long save_context_stack(struct stack_trace *trace, sf = (struct stack_frame *)sp;while (1 ) { addr = sf->gprs[8 ] &PSW_ADDR_INSN ; -if (!(*skip)) +if (!trace->skip) trace->entries[trace->nr_entries++] = addr;else - (*skip)--; + trace->skip--;if (trace->nr_entries >= trace->max_entries)return sp; low = sp;
@@ -48,10 +47,10 @@ static unsigned long save_context_stack(struct stack_trace *trace,return sp; regs = (struct pt_regs *)sp; addr = regs->psw.addr &PSW_ADDR_INSN ; -if (!(*skip)) +if (!trace->skip) trace->entries[trace->nr_entries++] = addr;else - (*skip)--; + trace->skip--;if (trace->nr_entries >= trace->max_entries)return sp; low = sp;
@@ -65,20 +64,17 @@ void save_stack_trace(struct stack_trace *trace)unsigned long orig_sp, new_sp; orig_sp = sp &PSW_ADDR_INSN ; - - new_sp =save_context_stack (trace, &trace->skip, orig_sp, - S390_lowcore.panic_stack -PAGE_SIZE , - S390_lowcore.panic_stack); + new_sp =save_context_stack (trace, orig_sp, + S390_lowcore.panic_stack -PAGE_SIZE , + S390_lowcore.panic_stack);if (new_sp != orig_sp)return ; - new_sp =save_context_stack (trace, &trace->skip, new_sp, - S390_lowcore.async_stack -ASYNC_SIZE , - S390_lowcore.async_stack); + new_sp =save_context_stack (trace, new_sp, + S390_lowcore.async_stack -ASYNC_SIZE , + S390_lowcore.async_stack);if (new_sp != orig_sp)return ; - -save_context_stack (trace, &trace->skip, new_sp, +save_context_stack (trace, new_sp, S390_lowcore.thread_info, S390_lowcore.thread_info +THREAD_SIZE ); -return ; }
drivers/s390/char/Kconfig +6 -0
@@ -164,3 +164,9 @@ config MONWRITER help Character device driver for writing z/VM monitor service records +config S390_VMUR + tristate "z/VM unit record device driver" + default "m" + help + Character device driver for z/VM reader, puncher and printer. +
drivers/s390/char/Makefile +1 -0
@@ -29,6 +29,7 @@ obj-$(CONFIG_S390_TAPE_34XX) += tape_34xx.o obj-$(CONFIG_S390_TAPE_3590) += tape_3590.o obj-$(CONFIG_MONREADER) += monreader.o obj-$(CONFIG_MONWRITER) += monwriter.o +obj-$(CONFIG_S390_VMUR) += vmur.o zcore_mod-objs := sclp_sdias.o zcore.o obj-$(CONFIG_ZFCPDUMP) += zcore_mod.o
drivers/s390/char/vmcp.c +51 -38
194 lines not on this page · raw message
drivers/s390/char/vmcp.h +2 -2
@@ -12,8 +12,8 @@* The idea of this driver is based on cpint from Neale Ferguson */ -#include <asm/semaphore.h> #include <linux/ioctl.h> +#include <linux/mutex.h> #define VMCP_GETCODE _IOR(0x10, 1, int)#define VMCP_SETBUF _IOW(0x10, 2, int)
@@ -26,5 +26,5 @@ struct vmcp_session {int resp_code;/* As we use copy_from/to_user, which might * * sleep and cannot use a spinlock */ -struct semaphore mutex; +struct mutex mutex; };
drivers/s390/char/vmur.c new file +906 -0
906 lines not on this page · raw message
drivers/s390/char/vmur.h new file +104 -0
104 lines not on this page · raw message
drivers/s390/cio/device.c +1 -1
@@ -272,7 +272,7 @@ modalias_show (struct device *dev, struct device_attribute *attr, char *buf)struct ccw_device_id *id = &(cdev->id);int len; - len =snprint_alias (buf,PAGE_SIZE , id,"\n" ) +1 ; + len =snprint_alias (buf,PAGE_SIZE , id,"\n" );return len >PAGE_SIZE ?PAGE_SIZE : len; }
drivers/s390/cio/qdio.c +8 -8
@@ -166,9 +166,9 @@ qdio_check_ccq(struct qdio_q *q, unsigned int ccq) {char dbf_text[15 ]; -if (ccq ==0 || ccq ==32 || ccq ==96 ) +if (ccq ==0 || ccq ==32 )return 0 ; -if (ccq ==97 ) +if (ccq ==96 || ccq ==97 )return 1 ;/*notify devices immediately*/ sprintf (dbf_text,"%d" , ccq);
@@ -2306,8 +2306,8 @@ qdio_get_ssqd_information(struct qdio_irq *irq_ptr)if (!ssqd_area) {QDIO_PRINT_WARN ("Could not get memory for chsc. Using all " \"SIGAs for sch x%x.\n" , irq_ptr->schid.sch_no); - irq_ptr->qdioac =CHSC_FLAG_SIGA_INPUT_NECESSARY || -CHSC_FLAG_SIGA_OUTPUT_NECESSARY || + irq_ptr->qdioac =CHSC_FLAG_SIGA_INPUT_NECESSARY | +CHSC_FLAG_SIGA_OUTPUT_NECESSARY |CHSC_FLAG_SIGA_SYNC_NECESSARY ;/* all flags set */ irq_ptr->is_qebsm =0 ; irq_ptr->sch_token =0 ;
@@ -2328,8 +2328,8 @@ qdio_get_ssqd_information(struct qdio_irq *irq_ptr)QDIO_PRINT_WARN ("CHSC returned cc %i. Using all " \"SIGAs for sch 0.%x.%x.\n" , result, irq_ptr->schid.ssid, irq_ptr->schid.sch_no); - qdioac =CHSC_FLAG_SIGA_INPUT_NECESSARY || -CHSC_FLAG_SIGA_OUTPUT_NECESSARY || + qdioac =CHSC_FLAG_SIGA_INPUT_NECESSARY | +CHSC_FLAG_SIGA_OUTPUT_NECESSARY |CHSC_FLAG_SIGA_SYNC_NECESSARY ;/* all flags set */ irq_ptr->is_qebsm =0 ; goto out;
@@ -2340,8 +2340,8 @@ qdio_get_ssqd_information(struct qdio_irq *irq_ptr)"is 0x%x. Using all SIGAs for sch 0.%x.%x.\n" , ssqd_area->response.code, irq_ptr->schid.ssid, irq_ptr->schid.sch_no); - qdioac =CHSC_FLAG_SIGA_INPUT_NECESSARY || -CHSC_FLAG_SIGA_OUTPUT_NECESSARY || + qdioac =CHSC_FLAG_SIGA_INPUT_NECESSARY | +CHSC_FLAG_SIGA_OUTPUT_NECESSARY |CHSC_FLAG_SIGA_SYNC_NECESSARY ;/* all flags set */ irq_ptr->is_qebsm =0 ; goto out;