Please pull git390 'for-linus' branch
Subsystems (4)
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/Kconfig | 4 +- arch/s390/Makefile | 12 ++-- arch/s390/defconfig | 21 +++-- arch/s390/kernel/early.c | 5 +- arch/s390/kernel/head31.S | 15 +--- arch/s390/kernel/head64.S | 16 +--- arch/s390/kernel/ipl.c | 33 ++----- arch/s390/kernel/setup.c | 10 ++- arch/s390/kernel/smp.c | 182 ++++++++++++++++---------------------- arch/s390/kernel/time.c | 10 ++- arch/s390/lib/delay.c | 7 ++ arch/s390/mm/init.c | 2 + drivers/s390/char/sclp_quiesce.c | 1 + drivers/s390/cio/cio.c | 3 +- include/asm-s390/atomic.h | 2 + include/asm-s390/ipl.h | 113 +++++++++++++++++++++++ include/asm-s390/local.h | 59 +------------ include/asm-s390/processor.h | 5 + include/asm-s390/sections.h | 2 +- include/asm-s390/setup.h | 74 --------------- 20 files changed, 269 insertions(+), 307 deletions(-) create mode 100644 include/asm-s390/ipl.h
Heiko Carstens (4):
[S390] Optional ZONE_DMA for s390.
[S390] etr: Add barrier() to etr_sync_cpu_start(). [S390] bss section clearing.
[S390] nss: Free unused memory in kernel image.
Jan Glauber (2):
[S390] fix non-smp compile.
[S390] smp_call_function cleanup
Martin Schwidefsky (2):
[S390] update default configuration
[S390] prevent softirqs if delay is called disabled
Mathieu Desnoyers (2):
[S390] local_t cleanup : use asm-generic/local.h. [S390] add atomic64_xchg to s390
Michael Holzheu (4):
[S390] New get_cpu_id() inline assembly
[S390] New header file ipl.h
[S390] Remove BUG() statement
[S390] Replace $(ARCH) macros in Makefile
arch/s390/Kconfig +2 -2
@@ -8,8 +8,8 @@ config MMU default y config ZONE_DMA - bool - default y + def_bool y + depends on 64BIT config LOCKDEP_SUPPORT bool
arch/s390/Makefile +6 -6
@@ -82,18 +82,18 @@ AFLAGS += $(aflags-y) OBJCOPYFLAGS := -O binary LDFLAGS_vmlinux := -e start -head-y := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o +head-y := arch/s390/kernel/head.o arch/s390/kernel/init_task.o -core-y += arch/$(ARCH)/mm/ arch/$(ARCH)/kernel/ arch/$(ARCH)/crypto/ \ - arch/$(ARCH)/appldata/ arch/$(ARCH)/hypfs/ -libs-y += arch/$(ARCH)/lib/ +core-y += arch/s390/mm/ arch/s390/kernel/ arch/s390/crypto/ \ + arch/s390/appldata/ arch/s390/hypfs/ +libs-y += arch/s390/lib/ drivers-y += drivers/s390/ -drivers-$(CONFIG_MATHEMU) += arch/$(ARCH)/math-emu/ +drivers-$(CONFIG_MATHEMU) += arch/s390/math-emu/ # must be linked after kernel drivers-$(CONFIG_OPROFILE) += arch/s390/oprofile/ -boot := arch/$(ARCH)/boot +boot := arch/s390/boot all: image
arch/s390/defconfig +15 -6
@@ -1,9 +1,10 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20-rc1 -# Fri Dec 15 16:52:28 2006 +# Linux kernel version: 2.6.21-rc1 +# Wed Feb 21 10:44:30 2007 # CONFIG_MMU=y +CONFIG_ZONE_DMA=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -11,6 +12,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_TIME=y +CONFIG_NO_IOMEM=y CONFIG_S390=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -29,6 +31,7 @@ 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
@@ -133,6 +136,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_RESOURCES_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 CONFIG_HOLES_IN_ZONE=y #
@@ -178,7 +182,9 @@ CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set # CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set CONFIG_IUCV=m CONFIG_AFIUCV=m CONFIG_INET=y
@@ -195,7 +201,7 @@ CONFIG_IP_FIB_HASH=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -# CONFIG_INET_TUNNEL is not set +CONFIG_INET_TUNNEL=y CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y
@@ -313,6 +319,7 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_FW_LOADER is not set # CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set CONFIG_SYS_HYPERVISOR=y #
@@ -686,13 +693,13 @@ CONFIG_HEADERS_CHECK=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=17 # CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_SLAB is not set CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_MUTEXES=y -# CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set CONFIG_DEBUG_SPINLOCK_SLEEP=y
@@ -702,10 +709,10 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_LIST is not set # CONFIG_FRAME_POINTER is not set -# CONFIG_UNWIND_INFO is not set CONFIG_FORCED_INLINING=y # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_LKDTM is not set +# CONFIG_FAULT_INJECTION is not set # # Security options
@@ -733,8 +740,10 @@ CONFIG_CRYPTO_MANAGER=y # CONFIG_CRYPTO_GF128MUL is not set CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_PCBC=m # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_DES is not set +CONFIG_CRYPTO_FCRYPT=m # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_SERPENT is not set
@@ -748,6 +757,7 @@ CONFIG_CRYPTO_CBC=y # CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CAMELLIA=m # CONFIG_CRYPTO_TEST is not set #
@@ -768,4 +778,3 @@ CONFIG_BITREVERSE=m CONFIG_CRC32=m # CONFIG_LIBCRC32C is not set CONFIG_PLIST=y -CONFIG_IOMAP_COPY=y
arch/s390/kernel/early.c +3 -2
@@ -14,6 +14,7 @@#include <linux/module.h> #include <linux/pfn.h> #include <linux/uaccess.h> +#include <asm/ipl.h> #include <asm/lowcore.h> #include <asm/processor.h> #include <asm/sections.h>
@@ -109,7 +110,7 @@ static inline void create_kernel_nss(void) { }*/ static noinline __init void clear_bss_section(void) { -memset (__bss_start,0 , _end - __bss_start); +memset (__bss_start,0 , __bss_stop - __bss_start); }/*
@@ -129,7 +130,7 @@ static noinline __init void detect_machine_type(void) {struct cpuinfo_S390 *cpuinfo = &S390_lowcore.cpu_data; - asmvolatile ("stidp %0" :"=m" (S390_lowcore.cpu_data.cpu_id)); +get_cpu_id (&S390_lowcore.cpu_data.cpu_id);/* Running under z/VM ? */ if (cpuinfo->cpu_id.version ==0xff )
arch/s390/kernel/head31.S +2 -13
@@ -148,20 +148,9 @@ startup_continue: .Lstartup_init: .long startup_init - .globl ipl_schib -ipl_schib: - .rept 13 - .long 0 - .endr - - .globl ipl_flags -ipl_flags: - .long 0 - .globl ipl_devno -ipl_devno: - .word 0 - .org 0x12000 + .globl _ehead +_ehead: #ifdef CONFIG_SHARED_KERNEL .org 0x100000 #endif
arch/s390/kernel/head64.S +2 -14
@@ -154,21 +154,9 @@ startup_continue: .Lparmaddr: .quad PARMAREA - .globl ipl_schib -ipl_schib: - .rept 13 - .long 0 - .endr - - .globl ipl_flags -ipl_flags: - .long 0 - .globl ipl_devno -ipl_devno: - .word 0 - .org 0x12000 - + .globl _ehead +_ehead: #ifdef CONFIG_SHARED_KERNEL .org 0x100000 #endif
arch/s390/kernel/ipl.c +10 -23
@@ -14,6 +14,7 @@#include <linux/delay.h> #include <linux/reboot.h> #include <linux/ctype.h> +#include <asm/ipl.h> #include <asm/smp.h> #include <asm/setup.h> #include <asm/cpcmd.h>
@@ -42,6 +43,13 @@ enum ipl_type {#define IPL_FCP_STR "fcp"#define IPL_NSS_STR "nss" +/* +* Must be in data section since the bss section +* is not cleared when these are accessed. +*/ +u16 ipl_devno __attribute__((__section__(".data"))) = 0; +u32 ipl_flags __attribute__((__section__(".data"))) = 0; +static char *ipl_type_str (enum ipl_type type) {switch (type) {
@@ -90,31 +98,10 @@ static char *shutdown_action_str(enum shutdown_action action)case SHUTDOWN_STOP :return SHUTDOWN_STOP_STR ;default : -BUG (); +return NULL ; } } -enum diag308_subcode { -DIAG308_IPL =3 , -DIAG308_DUMP =4 , -DIAG308_SET =5 , -DIAG308_STORE =6 , -}; - -enum diag308_ipl_type { -DIAG308_IPL_TYPE_FCP =0 , -DIAG308_IPL_TYPE_CCW =2 , -}; - -enum diag308_opt { -DIAG308_IPL_OPT_IPL =0x10 , -DIAG308_IPL_OPT_DUMP =0x20 , -}; - -enum diag308_rc { -DIAG308_RC_OK =1 , -}; -static int diag308_set_works =0 ;static int reipl_capabilities =IPL_TYPE_UNKNOWN ;
@@ -134,7 +121,7 @@ static struct ipl_parameter_block *dump_block_ccw;static enum shutdown_action on_panic_action =SHUTDOWN_STOP ; -static int diag308 (unsigned long subcode,void *addr) +int diag308 (unsigned long subcode,void *addr) { register unsigned long _addr asm("0") = (unsigned long) addr; register unsigned long _rc asm("1") = 0;
arch/s390/kernel/setup.c +8 -2
@@ -41,6 +41,7 @@#include <linux/ctype.h> #include <linux/reboot.h> +#include <asm/ipl.h> #include <asm/uaccess.h> #include <asm/system.h> #include <asm/smp.h>
@@ -106,7 +107,7 @@ void __devinit cpu_init (void)/* * Store processor id in lowcore (used e.g. in timer_interrupt) */ - asmvolatile ("stidp %0" :"=m" (S390_lowcore.cpu_data.cpu_id)); +get_cpu_id (&S390_lowcore.cpu_data.cpu_id); S390_lowcore.cpu_data.cpu_addr = addr;/*
@@ -689,9 +690,14 @@ setup_memory(void)psw_set_key (PAGE_DEFAULT_KEY );free_bootmem_with_active_regions (0 , max_pfn); -reserve_bootmem (0 ,PFN_PHYS (start_pfn));/* +* Reserve memory used for lowcore/command line/kernel image. +*/ +reserve_bootmem (0 , (unsigned long )_ehead); +reserve_bootmem ((unsigned long )_stext, +PFN_PHYS (start_pfn) - (unsigned long )_stext); +/* * Reserve the bootmem bitmap itself as well. We do this in two * steps (first step was init_bootmem()) because this catches * the (very unlikely) case of us accidentally initializing the
arch/s390/kernel/smp.c +78 -104
253 lines not on this page · raw message
arch/s390/kernel/time.c +9 -1
@@ -747,6 +747,7 @@ static void etr_adjust_time(unsigned long long clock, unsigned long long delay) } } +#ifdef CONFIG_SMP static void etr_sync_cpu_start (void *dummy) {int *in_sync = dummy;
@@ -758,8 +759,14 @@ static void etr_sync_cpu_start(void *dummy)* __udelay will stop the cpu on an enabled wait psw until the * TOD is running again. */ -while (*in_sync ==0 ) +while (*in_sync ==0 ) {__udelay (1 ); +/* +* A different cpu changes *in_sync. Therefore use +* barrier() to force memory access. +*/ +barrier (); + }if (*in_sync !=1 )/* Didn't work. Clear per-cpu in sync bit again. */ etr_disable_sync_clock (NULL );
@@ -773,6 +780,7 @@ static void etr_sync_cpu_start(void *dummy)static void etr_sync_cpu_end (void *dummy) { } +#endif /* CONFIG_SMP */ /* * Sync the TOD clock using the port refered to by aibp. This port
arch/s390/lib/delay.c +7 -0
@@ -15,6 +15,7 @@#include <linux/delay.h> #include <linux/timex.h> #include <linux/irqflags.h> +#include <linux/interrupt.h> void __delay (unsigned long loops) {
@@ -35,7 +36,11 @@ void __udelay(unsigned long usecs) {u64 end, time, jiffy_timer =0 ;unsigned long flags, cr0, mask, dummy; +int irq_context; + irq_context =in_interrupt (); +if (!irq_context) +local_bh_disable ();local_irq_save (flags);if (raw_irqs_disabled_flags (flags)) { jiffy_timer = S390_lowcore.jiffy_timer;
@@ -62,6 +67,8 @@ void __udelay(unsigned long usecs)__ctl_load (cr0,0 ,0 ); S390_lowcore.jiffy_timer = jiffy_timer; } +if (!irq_context) +_local_bh_enable ();set_clock_comparator (S390_lowcore.jiffy_timer);local_irq_restore (flags); }
arch/s390/mm/init.c +2 -0
@@ -141,7 +141,9 @@ void __init paging_init(void)__raw_local_irq_ssm (ssm_mask);memset (max_zone_pfns,0 ,sizeof (max_zone_pfns)); +#ifdef CONFIG_ZONE_DMA max_zone_pfns[ZONE_DMA ] =PFN_DOWN (MAX_DMA_ADDRESS ); +#endif max_zone_pfns[ZONE_NORMAL ] = max_low_pfn;free_area_init_nodes (max_zone_pfns); }
drivers/s390/char/sclp_quiesce.c +1 -0
@@ -16,6 +16,7 @@#include <asm/atomic.h> #include <asm/ptrace.h> #include <asm/sigp.h> +#include <asm/smp.h> #include "sclp.h"
drivers/s390/cio/cio.c +2 -1
@@ -21,6 +21,7 @@#include <asm/irq_regs.h> #include <asm/setup.h> #include <asm/reset.h> +#include <asm/ipl.h> #include "airq.h" #include "cio.h" #include "css.h"
@@ -1047,7 +1048,7 @@ void reipl_ccw_dev(struct ccw_dev_id *devid)do_reipl_asm (*((__u32 *)&schid)); } -extern struct schib ipl_schib; +static struct schib __initdata ipl_schib;/* * ipl_save_parameters gets called very early. It is not allowed to access
include/asm-s390/atomic.h +2 -0
@@ -215,6 +215,8 @@ static __inline__ void atomic64_set_mask(unsigned long mask, atomic64_t * v)__CSG_LOOP (v, mask,"ogr" ); } +#define atomic64_xchg (v, new) (xchg(&((v)->counter), new)) +static __inline__long long atomic64_cmpxchg (atomic64_t *v,long long old,long long new) {
include/asm-s390/ipl.h new file +113 -0
113 lines not on this page · raw message
include/asm-s390/local.h +1 -58
59 lines not on this page · raw message
include/asm-s390/processor.h +5 -0
@@ -36,6 +36,11 @@ typedef struct unsigned int unused : 16; } __attribute__ ((packed)) cpuid_t; +static inline void get_cpu_id (cpuid_t *ptr) +{ + asmvolatile ("stidp 0(%1)" :"=m" (*ptr) :"a" (ptr)); +} +struct cpuinfo_S390 {cpuid_t cpu_id;
include/asm-s390/sections.h +1 -1
@@ -3,6 +3,6 @@#include <asm-generic/sections.h> -extern char _eshared[]; +extern char _eshared[], _ehead[];#endif
include/asm-s390/setup.h +0 -74
89 lines not on this page · raw message
Signature · 8 lines
blue skies, IBM Deutschland Entwicklung GmbH
Martin Vorsitzender des Aufsichtsrats: Johann Weihen
Geschäftsführung: Herbert Kircher
Martin Schwidefsky Sitz der Gesellschaft: Böblingen
Linux on zSeries Registergericht: Amtsgericht Stuttgart,
Development HRB 243294
"Reality continues to ruin my life." - Calvin.