Commit fd2f2610 authored by Linus Torvalds's avatar Linus Torvalds

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

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] Fix broken logic, SIGA flags must be bitwise ORed
  [S390] cio: Dont print trailing \0 in modalias_show().
  [S390] Simplify stack trace.
  [S390] z/VM unit record device driver
  [S390] vmcp cleanup
  [S390] qdio: output queue stall on FCP and network devices
  [S390] Fix disassembly of RX_URRD, SI_URD & PC-relative instructions.
  [S390] Update default configuration.
parents 99e1221d a07a5b33
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.21 # Linux kernel version: 2.6.22
# Thu May 10 15:18:19 2007 # Tue Jul 17 12:50:23 2007
# #
CONFIG_MMU=y CONFIG_MMU=y
CONFIG_ZONE_DMA=y CONFIG_ZONE_DMA=y
...@@ -32,12 +32,11 @@ CONFIG_LOCALVERSION="" ...@@ -32,12 +32,11 @@ CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y CONFIG_SWAP=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set
CONFIG_SYSVIPC_SYSCTL=y CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE=y
# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set # CONFIG_TASKSTATS is not set
# CONFIG_UTS_NS is not set # CONFIG_USER_NS is not set
CONFIG_AUDIT=y CONFIG_AUDIT=y
# CONFIG_AUDITSYSCALL is not set # CONFIG_AUDITSYSCALL is not set
CONFIG_IKCONFIG=y CONFIG_IKCONFIG=y
...@@ -61,20 +60,19 @@ CONFIG_BUG=y ...@@ -61,20 +60,19 @@ CONFIG_BUG=y
CONFIG_ELF_CORE=y CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y CONFIG_BASE_FULL=y
CONFIG_FUTEX=y CONFIG_FUTEX=y
CONFIG_ANON_INODES=y
CONFIG_EPOLL=y CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y CONFIG_SHMEM=y
CONFIG_VM_EVENT_COUNTERS=y CONFIG_VM_EVENT_COUNTERS=y
CONFIG_SLUB_DEBUG=y
CONFIG_SLAB=y CONFIG_SLAB=y
# CONFIG_SLUB is not set # CONFIG_SLUB is not set
# CONFIG_SLOB is not set # CONFIG_SLOB is not set
CONFIG_RT_MUTEXES=y CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set # CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0 CONFIG_BASE_SMALL=0
#
# Loadable module support
#
CONFIG_MODULES=y CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODULE_FORCE_UNLOAD is not set
...@@ -82,12 +80,9 @@ CONFIG_MODVERSIONS=y ...@@ -82,12 +80,9 @@ CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y CONFIG_STOP_MACHINE=y
#
# Block layer
#
CONFIG_BLOCK=y CONFIG_BLOCK=y
# CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_BLK_DEV_IO_TRACE is not set
CONFIG_BLK_DEV_BSG=y
# #
# IO Schedulers # IO Schedulers
...@@ -151,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y ...@@ -151,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_RESOURCES_64BIT=y CONFIG_RESOURCES_64BIT=y
CONFIG_ZONE_DMA_FLAG=1 CONFIG_ZONE_DMA_FLAG=1
CONFIG_VIRT_TO_BUS=y
CONFIG_HOLES_IN_ZONE=y CONFIG_HOLES_IN_ZONE=y
# #
...@@ -248,25 +244,13 @@ CONFIG_IPV6_SIT=y ...@@ -248,25 +244,13 @@ CONFIG_IPV6_SIT=y
# CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_IPV6_MULTIPLE_TABLES is not set
# CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_SECMARK is not set
# CONFIG_NETFILTER is not set # CONFIG_NETFILTER is not set
#
# DCCP Configuration (EXPERIMENTAL)
#
# CONFIG_IP_DCCP is not set # CONFIG_IP_DCCP is not set
#
# SCTP Configuration (EXPERIMENTAL)
#
CONFIG_IP_SCTP=m CONFIG_IP_SCTP=m
# CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_DBG_OBJCNT is not set
# CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_NONE is not set
# CONFIG_SCTP_HMAC_SHA1 is not set # CONFIG_SCTP_HMAC_SHA1 is not set
CONFIG_SCTP_HMAC_MD5=y CONFIG_SCTP_HMAC_MD5=y
#
# TIPC Configuration (EXPERIMENTAL)
#
# CONFIG_TIPC is not set # CONFIG_TIPC is not set
# CONFIG_ATM is not set # CONFIG_ATM is not set
# CONFIG_BRIDGE is not set # CONFIG_BRIDGE is not set
...@@ -293,6 +277,7 @@ CONFIG_NET_SCH_CBQ=m ...@@ -293,6 +277,7 @@ CONFIG_NET_SCH_CBQ=m
# CONFIG_NET_SCH_HTB is not set # CONFIG_NET_SCH_HTB is not set
# CONFIG_NET_SCH_HFSC is not set # CONFIG_NET_SCH_HFSC is not set
CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_PRIO=m
CONFIG_NET_SCH_RR=m
CONFIG_NET_SCH_RED=m CONFIG_NET_SCH_RED=m
CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_SFQ=m
CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCH_TEQL=m
...@@ -317,10 +302,14 @@ CONFIG_CLS_U32_MARK=y ...@@ -317,10 +302,14 @@ CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_RSVP6=m
# CONFIG_NET_EMATCH is not set # 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_POLICE=y
# CONFIG_NET_CLS_IND is not set # CONFIG_NET_CLS_IND is not set
CONFIG_NET_ESTIMATOR=y
# #
# Network testing # Network testing
...@@ -329,6 +318,7 @@ CONFIG_NET_ESTIMATOR=y ...@@ -329,6 +318,7 @@ CONFIG_NET_ESTIMATOR=y
# CONFIG_NET_TCPPROBE is not set # CONFIG_NET_TCPPROBE is not set
# CONFIG_AF_RXRPC is not set # CONFIG_AF_RXRPC is not set
# CONFIG_RFKILL is not set # CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
# CONFIG_PCMCIA is not set # CONFIG_PCMCIA is not set
CONFIG_CCW=y CONFIG_CCW=y
...@@ -345,15 +335,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y ...@@ -345,15 +335,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set # CONFIG_DEBUG_DEVRES is not set
CONFIG_SYS_HYPERVISOR=y CONFIG_SYS_HYPERVISOR=y
#
# Connector - unified userspace <-> kernelspace linker
#
# CONFIG_CONNECTOR is not set # CONFIG_CONNECTOR is not set
CONFIG_BLK_DEV=y
#
# Block devices
#
# CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_LOOP=m
# CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_CRYPTOLOOP is not set
...@@ -376,17 +359,15 @@ CONFIG_DASD_ECKD=y ...@@ -376,17 +359,15 @@ CONFIG_DASD_ECKD=y
CONFIG_DASD_FBA=y CONFIG_DASD_FBA=y
CONFIG_DASD_DIAG=y CONFIG_DASD_DIAG=y
CONFIG_DASD_EER=y CONFIG_DASD_EER=y
CONFIG_MISC_DEVICES=y
# # CONFIG_EEPROM_93CX6 is not set
# Misc devices
#
# CONFIG_BLINK is not set
# #
# SCSI device support # SCSI device support
# #
# CONFIG_RAID_ATTRS is not set # CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=y CONFIG_SCSI=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SCSI_TGT is not set # CONFIG_SCSI_TGT is not set
CONFIG_SCSI_NETLINK=y CONFIG_SCSI_NETLINK=y
CONFIG_SCSI_PROC_FS=y CONFIG_SCSI_PROC_FS=y
...@@ -447,40 +428,21 @@ CONFIG_DM_MIRROR=y ...@@ -447,40 +428,21 @@ CONFIG_DM_MIRROR=y
CONFIG_DM_ZERO=y CONFIG_DM_ZERO=y
CONFIG_DM_MULTIPATH=y CONFIG_DM_MULTIPATH=y
# CONFIG_DM_MULTIPATH_EMC is not set # CONFIG_DM_MULTIPATH_EMC is not set
# CONFIG_DM_MULTIPATH_RDAC is not set
# CONFIG_DM_DELAY is not set # CONFIG_DM_DELAY is not set
#
# Network device support
#
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
# CONFIG_NETDEVICES_MULTIQUEUE is not set
# CONFIG_IFB is not set
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_BONDING=m CONFIG_BONDING=m
# CONFIG_MACVLAN is not set
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_TUN=m CONFIG_TUN=m
#
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y CONFIG_NET_ETHERNET=y
# CONFIG_MII is not set # CONFIG_MII is not set
CONFIG_NETDEV_1000=y
# CONFIG_NETDEV_10000=y
# Ethernet (1000 Mbit)
#
#
# Ethernet (10000 Mbit)
#
CONFIG_MLX4_DEBUG=y
#
# Token Ring devices
#
# CONFIG_TR is not set # CONFIG_TR is not set
#
# Wan interfaces
#
# CONFIG_WAN is not set # CONFIG_WAN is not set
# #
...@@ -511,10 +473,6 @@ CONFIG_CCWGROUP=y ...@@ -511,10 +473,6 @@ CONFIG_CCWGROUP=y
CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256 CONFIG_LEGACY_PTY_COUNT=256
#
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set # CONFIG_WATCHDOG is not set
CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM=m
# CONFIG_R3964 is not set # CONFIG_R3964 is not set
...@@ -554,6 +512,8 @@ CONFIG_S390_TAPE_34XX=m ...@@ -554,6 +512,8 @@ CONFIG_S390_TAPE_34XX=m
# CONFIG_VMCP is not set # CONFIG_VMCP is not set
# CONFIG_MONREADER is not set # CONFIG_MONREADER is not set
CONFIG_MONWRITER=m CONFIG_MONWRITER=m
CONFIG_S390_VMUR=m
# CONFIG_POWER_SUPPLY is not set
# #
# File systems # File systems
...@@ -655,7 +615,6 @@ CONFIG_SUNRPC=y ...@@ -655,7 +615,6 @@ CONFIG_SUNRPC=y
# CONFIG_NCP_FS is not set # CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set # CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set # CONFIG_AFS_FS is not set
# CONFIG_9P_FS is not set
# #
# Partition Types # Partition Types
...@@ -712,6 +671,7 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -712,6 +671,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
CONFIG_HEADERS_CHECK=y CONFIG_HEADERS_CHECK=y
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
# CONFIG_SCHED_DEBUG is not set
# CONFIG_SCHEDSTATS is not set # CONFIG_SCHEDSTATS is not set
# CONFIG_TIMER_STATS is not set # CONFIG_TIMER_STATS is not set
# CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SLAB is not set
...@@ -740,10 +700,6 @@ CONFIG_FORCED_INLINING=y ...@@ -740,10 +700,6 @@ CONFIG_FORCED_INLINING=y
# #
# CONFIG_KEYS is not set # CONFIG_KEYS is not set
# CONFIG_SECURITY is not set # CONFIG_SECURITY is not set
#
# Cryptographic options
#
CONFIG_CRYPTO=y CONFIG_CRYPTO=y
CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_BLKCIPHER=y
...@@ -782,10 +738,7 @@ CONFIG_CRYPTO_FCRYPT=m ...@@ -782,10 +738,7 @@ CONFIG_CRYPTO_FCRYPT=m
# CONFIG_CRYPTO_CRC32C is not set # CONFIG_CRYPTO_CRC32C is not set
CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA=m
# CONFIG_CRYPTO_TEST is not set # CONFIG_CRYPTO_TEST is not set
CONFIG_CRYPTO_HW=y
#
# Hardware crypto devices
#
# CONFIG_CRYPTO_SHA1_S390 is not set # CONFIG_CRYPTO_SHA1_S390 is not set
# CONFIG_CRYPTO_SHA256_S390 is not set # CONFIG_CRYPTO_SHA256_S390 is not set
# CONFIG_CRYPTO_DES_S390 is not set # CONFIG_CRYPTO_DES_S390 is not set
...@@ -800,6 +753,7 @@ CONFIG_ZCRYPT=m ...@@ -800,6 +753,7 @@ CONFIG_ZCRYPT=m
CONFIG_BITREVERSE=m CONFIG_BITREVERSE=m
# CONFIG_CRC_CCITT is not set # CONFIG_CRC_CCITT is not set
# CONFIG_CRC16 is not set # CONFIG_CRC16 is not set
# CONFIG_CRC_ITU_T is not set
CONFIG_CRC32=m CONFIG_CRC32=m
# CONFIG_LIBCRC32C is not set # CONFIG_LIBCRC32C is not set
CONFIG_PLIST=y CONFIG_PLIST=y
...@@ -240,8 +240,8 @@ static const unsigned char formats[][7] = { ...@@ -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_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_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_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_RX_URRD] = { 0xff, 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_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_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_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 }, [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) ...@@ -1190,7 +1190,8 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr)
else if (operand->flags & OPERAND_CR) else if (operand->flags & OPERAND_CR)
ptr += sprintf(ptr, "%%c%i", value); ptr += sprintf(ptr, "%%c%i", value);
else if (operand->flags & OPERAND_PCREL) 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) else if (operand->flags & OPERAND_SIGNED)
ptr += sprintf(ptr, "%i", value); ptr += sprintf(ptr, "%i", value);
else else
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
static unsigned long save_context_stack(struct stack_trace *trace, static unsigned long save_context_stack(struct stack_trace *trace,
unsigned int *skip,
unsigned long sp, unsigned long sp,
unsigned long low, unsigned long low,
unsigned long high) unsigned long high)
...@@ -28,10 +27,10 @@ static unsigned long save_context_stack(struct stack_trace *trace, ...@@ -28,10 +27,10 @@ static unsigned long save_context_stack(struct stack_trace *trace,
sf = (struct stack_frame *)sp; sf = (struct stack_frame *)sp;
while(1) { while(1) {
addr = sf->gprs[8] & PSW_ADDR_INSN; addr = sf->gprs[8] & PSW_ADDR_INSN;
if (!(*skip)) if (!trace->skip)
trace->entries[trace->nr_entries++] = addr; trace->entries[trace->nr_entries++] = addr;
else else
(*skip)--; trace->skip--;
if (trace->nr_entries >= trace->max_entries) if (trace->nr_entries >= trace->max_entries)
return sp; return sp;
low = sp; low = sp;
...@@ -48,10 +47,10 @@ static unsigned long save_context_stack(struct stack_trace *trace, ...@@ -48,10 +47,10 @@ static unsigned long save_context_stack(struct stack_trace *trace,
return sp; return sp;
regs = (struct pt_regs *)sp; regs = (struct pt_regs *)sp;
addr = regs->psw.addr & PSW_ADDR_INSN; addr = regs->psw.addr & PSW_ADDR_INSN;
if (!(*skip)) if (!trace->skip)
trace->entries[trace->nr_entries++] = addr; trace->entries[trace->nr_entries++] = addr;
else else
(*skip)--; trace->skip--;
if (trace->nr_entries >= trace->max_entries) if (trace->nr_entries >= trace->max_entries)
return sp; return sp;
low = sp; low = sp;
...@@ -65,20 +64,17 @@ void save_stack_trace(struct stack_trace *trace) ...@@ -65,20 +64,17 @@ void save_stack_trace(struct stack_trace *trace)
unsigned long orig_sp, new_sp; unsigned long orig_sp, new_sp;
orig_sp = sp & PSW_ADDR_INSN; orig_sp = sp & PSW_ADDR_INSN;
new_sp = save_context_stack(trace, orig_sp,
new_sp = save_context_stack(trace, &trace->skip, orig_sp,
S390_lowcore.panic_stack - PAGE_SIZE, S390_lowcore.panic_stack - PAGE_SIZE,
S390_lowcore.panic_stack); S390_lowcore.panic_stack);
if (new_sp != orig_sp) if (new_sp != orig_sp)
return; return;
new_sp = save_context_stack(trace, &trace->skip, new_sp, new_sp = save_context_stack(trace, new_sp,
S390_lowcore.async_stack - ASYNC_SIZE, S390_lowcore.async_stack - ASYNC_SIZE,
S390_lowcore.async_stack); S390_lowcore.async_stack);
if (new_sp != orig_sp) if (new_sp != orig_sp)
return; return;
save_context_stack(trace, new_sp,
save_context_stack(trace, &trace->skip, new_sp,
S390_lowcore.thread_info, S390_lowcore.thread_info,
S390_lowcore.thread_info + THREAD_SIZE); S390_lowcore.thread_info + THREAD_SIZE);
return;
} }
...@@ -164,3 +164,9 @@ config MONWRITER ...@@ -164,3 +164,9 @@ config MONWRITER
help help
Character device driver for writing z/VM monitor service records 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.
...@@ -29,6 +29,7 @@ obj-$(CONFIG_S390_TAPE_34XX) += tape_34xx.o ...@@ -29,6 +29,7 @@ obj-$(CONFIG_S390_TAPE_34XX) += tape_34xx.o
obj-$(CONFIG_S390_TAPE_3590) += tape_3590.o obj-$(CONFIG_S390_TAPE_3590) += tape_3590.o
obj-$(CONFIG_MONREADER) += monreader.o obj-$(CONFIG_MONREADER) += monreader.o
obj-$(CONFIG_MONWRITER) += monwriter.o obj-$(CONFIG_MONWRITER) += monwriter.o
obj-$(CONFIG_S390_VMUR) += vmur.o
zcore_mod-objs := sclp_sdias.o zcore.o zcore_mod-objs := sclp_sdias.o zcore.o
obj-$(CONFIG_ZFCPDUMP) += zcore_mod.o obj-$(CONFIG_ZFCPDUMP) += zcore_mod.o
/* /*
* Copyright (C) 2004,2005 IBM Corporation * Copyright IBM Corp. 2004,2007
* Interface implementation for communication with the z/VM control program * Interface implementation for communication with the z/VM control program
* Author(s): Christian Borntraeger <cborntra@de.ibm.com> * Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
* *
* *
* z/VMs CP offers the possibility to issue commands via the diagnose code 8 * z/VMs CP offers the possibility to issue commands via the diagnose code 8
...@@ -22,9 +22,11 @@ ...@@ -22,9 +22,11 @@
#include "vmcp.h" #include "vmcp.h"
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Christian Borntraeger <cborntra@de.ibm.com>"); MODULE_AUTHOR("Christian Borntraeger <borntraeger@de.ibm.com>");
MODULE_DESCRIPTION("z/VM CP interface"); MODULE_DESCRIPTION("z/VM CP interface");
#define PRINTK_HEADER "vmcp: "
static debug_info_t *vmcp_debug; static debug_info_t *vmcp_debug;
static int vmcp_open(struct inode *inode, struct file *file) static int vmcp_open(struct inode *inode, struct file *file)
...@@ -40,7 +42,7 @@ static int vmcp_open(struct inode *inode, struct file *file) ...@@ -40,7 +42,7 @@ static int vmcp_open(struct inode *inode, struct file *file)
session->bufsize = PAGE_SIZE; session->bufsize = PAGE_SIZE;
session->response = NULL; session->response = NULL;
session->resp_size = 0; session->resp_size = 0;
init_MUTEX(&session->mutex); mutex_init(&session->mutex);
file->private_data = session; file->private_data = session;
return nonseekable_open(inode, file); return nonseekable_open(inode, file);
} }
...@@ -57,37 +59,37 @@ static int vmcp_release(struct inode *inode, struct file *file) ...@@ -57,37 +59,37 @@ static int vmcp_release(struct inode *inode, struct file *file)
} }
static ssize_t static ssize_t
vmcp_read(struct file *file, char __user * buff, size_t count, loff_t * ppos) vmcp_read(struct file *file, char __user *buff, size_t count, loff_t *ppos)
{ {
size_t tocopy; size_t tocopy;
struct vmcp_session *session; struct vmcp_session *session;
session = (struct vmcp_session *)file->private_data; session = (struct vmcp_session *)file->private_data;
if (down_interruptible(&session->mutex)) if (mutex_lock_interruptible(&session->mutex))
return -ERESTARTSYS; return -ERESTARTSYS;
if (!session->response) { if (!session->response) {
up(&session->mutex); mutex_unlock(&session->mutex);
return 0; return 0;
} }
if (*ppos > session->resp_size) { if (*ppos > session->resp_size) {
up(&session->mutex); mutex_unlock(&session->mutex);
return 0; return 0;
} }
tocopy = min(session->resp_size - (size_t) (*ppos), count); tocopy = min(session->resp_size - (size_t) (*ppos), count);
tocopy = min(tocopy,session->bufsize - (size_t) (*ppos)); tocopy = min(tocopy, session->bufsize - (size_t) (*ppos));
if (copy_to_user(buff, session->response + (*ppos), tocopy)) { if (copy_to_user(buff, session->response + (*ppos), tocopy)) {
up(&session->mutex); mutex_unlock(&session->mutex);
return -EFAULT; return -EFAULT;
} }
up(&session->mutex); mutex_unlock(&session->mutex);
*ppos += tocopy; *ppos += tocopy;
return tocopy; return tocopy;
} }
static ssize_t static ssize_t
vmcp_write(struct file *file, const char __user * buff, size_t count, vmcp_write(struct file *file, const char __user *buff, size_t count,
loff_t * ppos) loff_t *ppos)
{ {
char *cmd; char *cmd;
struct vmcp_session *session; struct vmcp_session *session;
...@@ -103,7 +105,7 @@ vmcp_write(struct file *file, const char __user * buff, size_t count, ...@@ -103,7 +105,7 @@ vmcp_write(struct file *file, const char __user * buff, size_t count,
} }
cmd[count] = '\0'; cmd[count] = '\0';
session = (struct vmcp_session *)file->private_data; session = (struct vmcp_session *)file->private_data;
if (down_interruptible(&session->mutex)) { if (mutex_lock_interruptible(&session->mutex)) {
kfree(cmd); kfree(cmd);
return -ERESTARTSYS; return -ERESTARTSYS;
} }
...@@ -112,15 +114,14 @@ vmcp_write(struct file *file, const char __user * buff, size_t count, ...@@ -112,15 +114,14 @@ vmcp_write(struct file *file, const char __user * buff, size_t count,
| __GFP_REPEAT | GFP_DMA, | __GFP_REPEAT | GFP_DMA,
get_order(session->bufsize)); get_order(session->bufsize));
if (!session->response) { if (!session->response) {
up(&session->mutex); mutex_unlock(&session->mutex);
kfree(cmd); kfree(cmd);
return -ENOMEM; return -ENOMEM;
} }
debug_text_event(vmcp_debug, 1, cmd); debug_text_event(vmcp_debug, 1, cmd);
session->resp_size = cpcmd(cmd, session->response, session->resp_size = cpcmd(cmd, session->response, session->bufsize,
session->bufsize,
&session->resp_code); &session->resp_code);
up(&session->mutex); mutex_unlock(&session->mutex);
kfree(cmd); kfree(cmd);
*ppos = 0; /* reset the file pointer after a command */ *ppos = 0; /* reset the file pointer after a command */
return count; return count;
...@@ -145,12 +146,12 @@ static long vmcp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -145,12 +146,12 @@ static long vmcp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
int temp; int temp;
session = (struct vmcp_session *)file->private_data; session = (struct vmcp_session *)file->private_data;
if (down_interruptible(&session->mutex)) if (mutex_lock_interruptible(&session->mutex))
return -ERESTARTSYS; return -ERESTARTSYS;
switch (cmd) { switch (cmd) {
case VMCP_GETCODE: case VMCP_GETCODE:
temp = session->resp_code; temp = session->resp_code;
up(&session->mutex); mutex_unlock(&session->mutex);
return put_user(temp, (int __user *)arg); return put_user(temp, (int __user *)arg);
case VMCP_SETBUF: case VMCP_SETBUF:
free_pages((unsigned long)session->response, free_pages((unsigned long)session->response,
...@@ -161,14 +162,14 @@ static long vmcp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -161,14 +162,14 @@ static long vmcp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
session->bufsize = PAGE_SIZE; session->bufsize = PAGE_SIZE;
temp = -EINVAL; temp = -EINVAL;
} }
up(&session->mutex); mutex_unlock(&session->mutex);
return temp; return temp;
case VMCP_GETSIZE: case VMCP_GETSIZE:
temp = session->resp_size; temp = session->resp_size;
up(&session->mutex); mutex_unlock(&session->mutex);
return put_user(temp, (int __user *)arg); return put_user(temp, (int __user *)arg);
default: default:
up(&session->mutex); mutex_unlock(&session->mutex);
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
} }
...@@ -180,7 +181,7 @@ static const struct file_operations vmcp_fops = { ...@@ -180,7 +181,7 @@ static const struct file_operations vmcp_fops = {
.read = vmcp_read, .read = vmcp_read,
.write = vmcp_write, .write = vmcp_write,
.unlocked_ioctl = vmcp_ioctl, .unlocked_ioctl = vmcp_ioctl,
.compat_ioctl = vmcp_ioctl .compat_ioctl = vmcp_ioctl,
}; };
static struct miscdevice vmcp_dev = { static struct miscdevice vmcp_dev = {
...@@ -194,26 +195,38 @@ static int __init vmcp_init(void) ...@@ -194,26 +195,38 @@ static int __init vmcp_init(void)
int ret; int ret;
if (!MACHINE_IS_VM) { if (!MACHINE_IS_VM) {
printk(KERN_WARNING PRINT_WARN("z/VM CP interface is only available under z/VM\n");
"z/VM CP interface is only available under z/VM\n");
return -ENODEV; return -ENODEV;
} }
ret = misc_register(&vmcp_dev);
if (!ret)
printk(KERN_INFO "z/VM CP interface loaded\n");
else
printk(KERN_WARNING
"z/VM CP interface not loaded. Could not register misc device.\n");
vmcp_debug = debug_register("vmcp", 1, 1, 240); vmcp_debug = debug_register("vmcp", 1, 1, 240);
debug_register_view(vmcp_debug, &debug_hex_ascii_view); if (!vmcp_debug) {
PRINT_ERR("z/VM CP interface not loaded. Could not register "
"debug feature\n");
return -ENOMEM;
}
ret = debug_register_view(vmcp_debug, &debug_hex_ascii_view);
if (ret) {
PRINT_ERR("z/VM CP interface not loaded. Could not register "
"debug feature view. Error code: %d\n", ret);
debug_unregister(vmcp_debug);
return ret; return ret;
}
ret = misc_register(&vmcp_dev);
if (ret) {
PRINT_ERR("z/VM CP interface not loaded. Could not register "
"misc device. Error code: %d\n", ret);
debug_unregister(vmcp_debug);
return ret;
}
PRINT_INFO("z/VM CP interface loaded\n");
return 0;
} }
static void __exit vmcp_exit(void) static void __exit vmcp_exit(void)
{ {
WARN_ON(misc_deregister(&vmcp_dev) != 0); misc_deregister(&vmcp_dev);
debug_unregister(vmcp_debug); debug_unregister(vmcp_debug);
printk(KERN_INFO "z/VM CP interface unloaded.\n"); PRINT_INFO("z/VM CP interface unloaded.\n");
} }
module_init(vmcp_init); module_init(vmcp_init);
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
* The idea of this driver is based on cpint from Neale Ferguson * The idea of this driver is based on cpint from Neale Ferguson
*/ */
#include <asm/semaphore.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/mutex.h>
#define VMCP_GETCODE _IOR(0x10, 1, int) #define VMCP_GETCODE _IOR(0x10, 1, int)
#define VMCP_SETBUF _IOW(0x10, 2, int) #define VMCP_SETBUF _IOW(0x10, 2, int)
...@@ -26,5 +26,5 @@ struct vmcp_session { ...@@ -26,5 +26,5 @@ struct vmcp_session {
int resp_code; int resp_code;
/* As we use copy_from/to_user, which might * /* As we use copy_from/to_user, which might *
* sleep and cannot use a spinlock */ * sleep and cannot use a spinlock */
struct semaphore mutex; struct mutex mutex;
}; };
This diff is collapsed.
/*
* Linux driver for System z and s390 unit record devices
* (z/VM virtual punch, reader, printer)
*
* Copyright IBM Corp. 2001, 2007
* Authors: Malcolm Beattie <beattiem@uk.ibm.com>
* Michael Holzheu <holzheu@de.ibm.com>
* Frank Munzert <munzert@de.ibm.com>
*/
#ifndef _VMUR_H_
#define _VMUR_H_
#define DEV_CLASS_UR_I 0x20 /* diag210 unit record input device class */
#define DEV_CLASS_UR_O 0x10 /* diag210 unit record output device class */
/*
* we only support z/VM's default unit record devices:
* both in SPOOL directory control statement and in CP DEFINE statement
* RDR defaults to 2540 reader
* PUN defaults to 2540 punch
* PRT defaults to 1403 printer
*/
#define READER_PUNCH_DEVTYPE 0x2540
#define PRINTER_DEVTYPE 0x1403
/* z/VM spool file control block SFBLOK */
struct file_control_block {
char reserved_1[8];
char user_owner[8];
char user_orig[8];
__s32 data_recs;
__s16 rec_len;
__s16 file_num;
__u8 file_stat;
__u8 dev_type;
char reserved_2[6];
char file_name[12];
char file_type[12];
char create_date[8];
char create_time[8];
char reserved_3[6];
__u8 file_class;
__u8 sfb_lok;
__u64 distr_code;
__u32 reserved_4;
__u8 current_starting_copy_number;
__u8 sfblock_cntrl_flags;
__u8 reserved_5;
__u8 more_status_flags;
char rest[200];
} __attribute__ ((packed));
#define FLG_CP_DUMP 0x10
/*
* A struct urdev is created for each ur device that is made available
* via the ccw_device driver model.
*/
struct urdev {
struct ccw_device *cdev; /* Backpointer to ccw device */
struct mutex io_mutex; /* Serialises device IO */
struct mutex open_mutex; /* Serialises access to device */
struct completion *io_done; /* do_ur_io waits; irq completes */
struct device *device;
struct cdev *char_device;
struct ccw_dev_id dev_id; /* device id */
size_t reclen; /* Record length for *write* CCWs */
int class; /* VM device class */
int io_request_rc; /* return code from I/O request */
};
/*
* A struct urfile is allocated at open() time for each device and
* freed on release().
*/
struct urfile {
struct urdev *urd;
unsigned int flags;
size_t dev_reclen;
__u16 file_reclen;
};
/*
* Device major/minor definitions.
*/
#define UR_MAJOR 0 /* get dynamic major */
/*
* We map minor numbers directly to device numbers (0-FFFF) for simplicity.
* This avoids having to allocate (and manage) slot numbers.
*/
#define NUM_MINORS 65536
/* Limiting each I/O to 511 records limits chan prog to 4KB (511 r/w + 1 NOP) */
#define MAX_RECS_PER_IO 511
#define WRITE_CCW_CMD 0x01
#define TRACE(x...) debug_sprintf_event(vmur_dbf, 1, x)
#define CCWDEV_CU_DI(cutype, di) \
CCW_DEVICE(cutype, 0x00), .driver_info = (di)
#define FILE_RECLEN_OFFSET 4064 /* reclen offset in spool data block */
#endif /* _VMUR_H_ */
...@@ -272,7 +272,7 @@ modalias_show (struct device *dev, struct device_attribute *attr, char *buf) ...@@ -272,7 +272,7 @@ modalias_show (struct device *dev, struct device_attribute *attr, char *buf)
struct ccw_device_id *id = &(cdev->id); struct ccw_device_id *id = &(cdev->id);
int len; 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; return len > PAGE_SIZE ? PAGE_SIZE : len;
} }
......
...@@ -166,9 +166,9 @@ qdio_check_ccq(struct qdio_q *q, unsigned int ccq) ...@@ -166,9 +166,9 @@ qdio_check_ccq(struct qdio_q *q, unsigned int ccq)
{ {
char dbf_text[15]; char dbf_text[15];
if (ccq == 0 || ccq == 32 || ccq == 96) if (ccq == 0 || ccq == 32)
return 0; return 0;
if (ccq == 97) if (ccq == 96 || ccq == 97)
return 1; return 1;
/*notify devices immediately*/ /*notify devices immediately*/
sprintf(dbf_text,"%d", ccq); sprintf(dbf_text,"%d", ccq);
...@@ -2306,8 +2306,8 @@ qdio_get_ssqd_information(struct qdio_irq *irq_ptr) ...@@ -2306,8 +2306,8 @@ qdio_get_ssqd_information(struct qdio_irq *irq_ptr)
if (!ssqd_area) { if (!ssqd_area) {
QDIO_PRINT_WARN("Could not get memory for chsc. Using all " \ QDIO_PRINT_WARN("Could not get memory for chsc. Using all " \
"SIGAs for sch x%x.\n", irq_ptr->schid.sch_no); "SIGAs for sch x%x.\n", irq_ptr->schid.sch_no);
irq_ptr->qdioac = CHSC_FLAG_SIGA_INPUT_NECESSARY || irq_ptr->qdioac = CHSC_FLAG_SIGA_INPUT_NECESSARY |
CHSC_FLAG_SIGA_OUTPUT_NECESSARY || CHSC_FLAG_SIGA_OUTPUT_NECESSARY |
CHSC_FLAG_SIGA_SYNC_NECESSARY; /* all flags set */ CHSC_FLAG_SIGA_SYNC_NECESSARY; /* all flags set */
irq_ptr->is_qebsm = 0; irq_ptr->is_qebsm = 0;
irq_ptr->sch_token = 0; irq_ptr->sch_token = 0;
...@@ -2328,8 +2328,8 @@ qdio_get_ssqd_information(struct qdio_irq *irq_ptr) ...@@ -2328,8 +2328,8 @@ qdio_get_ssqd_information(struct qdio_irq *irq_ptr)
QDIO_PRINT_WARN("CHSC returned cc %i. Using all " \ QDIO_PRINT_WARN("CHSC returned cc %i. Using all " \
"SIGAs for sch 0.%x.%x.\n", result, "SIGAs for sch 0.%x.%x.\n", result,
irq_ptr->schid.ssid, irq_ptr->schid.sch_no); irq_ptr->schid.ssid, irq_ptr->schid.sch_no);
qdioac = CHSC_FLAG_SIGA_INPUT_NECESSARY || qdioac = CHSC_FLAG_SIGA_INPUT_NECESSARY |
CHSC_FLAG_SIGA_OUTPUT_NECESSARY || CHSC_FLAG_SIGA_OUTPUT_NECESSARY |
CHSC_FLAG_SIGA_SYNC_NECESSARY; /* all flags set */ CHSC_FLAG_SIGA_SYNC_NECESSARY; /* all flags set */
irq_ptr->is_qebsm = 0; irq_ptr->is_qebsm = 0;
goto out; goto out;
...@@ -2340,8 +2340,8 @@ qdio_get_ssqd_information(struct qdio_irq *irq_ptr) ...@@ -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", "is 0x%x. Using all SIGAs for sch 0.%x.%x.\n",
ssqd_area->response.code, ssqd_area->response.code,
irq_ptr->schid.ssid, irq_ptr->schid.sch_no); irq_ptr->schid.ssid, irq_ptr->schid.sch_no);
qdioac = CHSC_FLAG_SIGA_INPUT_NECESSARY || qdioac = CHSC_FLAG_SIGA_INPUT_NECESSARY |
CHSC_FLAG_SIGA_OUTPUT_NECESSARY || CHSC_FLAG_SIGA_OUTPUT_NECESSARY |
CHSC_FLAG_SIGA_SYNC_NECESSARY; /* all flags set */ CHSC_FLAG_SIGA_SYNC_NECESSARY; /* all flags set */
irq_ptr->is_qebsm = 0; irq_ptr->is_qebsm = 0;
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment