s390 patches for 4.3-rc5
Hi Linus,
please pull from the 'for-linus' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus
to receive the following updates:
Three bug fixes and an update to the default configuration.
Christian Borntraeger (1):
s390/boot/decompression: disable floating point in decompressor
Martin Schwidefsky (2):
s390/numa: use correct type for node_to_cpumask_map s390/vtime: correct scaled cputime of partially idle CPUs
Sebastian Ott (1):
s390/defconfig: set SCSI_DH=y
arch/s390/boot/compressed/Makefile | 2 +- arch/s390/configs/default_defconfig | 2 +- arch/s390/configs/gcov_defconfig | 2 +- arch/s390/configs/performance_defconfig | 2 +- arch/s390/include/asm/numa.h | 2 +- arch/s390/include/asm/topology.h | 2 +- arch/s390/kernel/asm-offsets.c | 1 + arch/s390/kernel/entry.S | 30 ++++++++++++++- arch/s390/kernel/vtime.c | 66 ++++++++++++++++++--------------- arch/s390/numa/mode_emu.c | 4 +- arch/s390/numa/numa.c | 4 +- 11 files changed, 77 insertions(+), 40 deletions(-)
arch/s390/boot/compressed/Makefile +1 -1
@@ -10,7 +10,7 @@ targets += misc.o piggy.o sizes.h head.o KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUX_INCLUDE) -O2 KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING -KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks +KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -msoft-float KBUILD_CFLAGS += $(call cc-option,-mpacked-stack) KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
arch/s390/configs/default_defconfig +1 -1
@@ -381,7 +381,7 @@ CONFIG_ISCSI_TCP=m CONFIG_SCSI_DEBUG=m CONFIG_ZFCP=y CONFIG_SCSI_VIRTIO=m -CONFIG_SCSI_DH=m +CONFIG_SCSI_DH=y CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_HP_SW=m CONFIG_SCSI_DH_EMC=m
arch/s390/configs/gcov_defconfig +1 -1
@@ -377,7 +377,7 @@ CONFIG_ISCSI_TCP=m CONFIG_SCSI_DEBUG=m CONFIG_ZFCP=y CONFIG_SCSI_VIRTIO=m -CONFIG_SCSI_DH=m +CONFIG_SCSI_DH=y CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_HP_SW=m CONFIG_SCSI_DH_EMC=m
arch/s390/configs/performance_defconfig +1 -1
@@ -377,7 +377,7 @@ CONFIG_ISCSI_TCP=m CONFIG_SCSI_DEBUG=m CONFIG_ZFCP=y CONFIG_SCSI_VIRTIO=m -CONFIG_SCSI_DH=m +CONFIG_SCSI_DH=y CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_HP_SW=m CONFIG_SCSI_DH_EMC=m
arch/s390/include/asm/numa.h +1 -1
@@ -19,7 +19,7 @@ int numa_pfn_to_nid(unsigned long pfn);int __node_distance (int a,int b);void numa_update_cpu_topology (void ); -extern cpumask_var_t node_to_cpumask_map[MAX_NUMNODES ]; +extern cpumask_t node_to_cpumask_map[MAX_NUMNODES ];extern int numa_debug_enabled;#else
arch/s390/include/asm/topology.h +1 -1
@@ -68,7 +68,7 @@ static inline int cpu_to_node(int cpu)#define cpumask_of_node cpumask_of_nodestatic inline const struct cpumask *cpumask_of_node (int node) { -return node_to_cpumask_map[node]; +return &node_to_cpumask_map[node]; }/*
arch/s390/kernel/asm-offsets.c +1 -0
@@ -176,6 +176,7 @@ int main(void)DEFINE (__LC_PASTE, offsetof(struct _lowcore , paste));DEFINE (__LC_FP_CREG_SAVE_AREA, offsetof(struct _lowcore , fpt_creg_save_area));DEFINE (__LC_LAST_BREAK, offsetof(struct _lowcore , breaking_event_addr)); +DEFINE (__LC_PERCPU_OFFSET, offsetof(struct _lowcore , percpu_offset));DEFINE (__LC_VDSO_PER_CPU, offsetof(struct _lowcore , vdso_per_cpu_data));DEFINE (__LC_GMAP, offsetof(struct _lowcore , gmap));DEFINE (__LC_PGM_TDB, offsetof(struct _lowcore , pgm_tdb));
arch/s390/kernel/entry.S +29 -1
@@ -733,6 +733,14 @@ ENTRY(psw_idle) stg %r3,__SF_EMPTY(%r15) larl %r1,.Lpsw_idle_lpsw+4 stg %r1,__SF_EMPTY+8(%r15) +#ifdef CONFIG_SMP + larl %r1,smp_cpu_mtid + llgf %r1,0(%r1) + ltgr %r1,%r1 + jz .Lpsw_idle_stcctm + .insn rsy,0xeb0000000017,%r1,5,__SF_EMPTY+16(%r15) +.Lpsw_idle_stcctm: +#endif STCK __CLOCK_IDLE_ENTER(%r2) stpt __TIMER_IDLE_ENTER(%r2) .Lpsw_idle_lpsw:
@@ -1159,7 +1167,27 @@ cleanup_critical: jhe 1f mvc __CLOCK_IDLE_ENTER(8,%r2),__CLOCK_IDLE_EXIT(%r2) mvc __TIMER_IDLE_ENTER(8,%r2),__TIMER_IDLE_EXIT(%r2) -1: # account system time going idle +1: # calculate idle cycles +#ifdef CONFIG_SMP + clg %r9,BASED(.Lcleanup_idle_insn) + jl 3f + larl %r1,smp_cpu_mtid + llgf %r1,0(%r1) + ltgr %r1,%r1 + jz 3f + .insn rsy,0xeb0000000017,%r1,5,__SF_EMPTY+80(%r15) + larl %r3,mt_cycles + ag %r3,__LC_PERCPU_OFFSET + la %r4,__SF_EMPTY+16(%r15) +2: lg %r0,0(%r3) + slg %r0,0(%r4) + alg %r0,64(%r4) + stg %r0,0(%r3) + la %r3,8(%r3) + la %r4,8(%r4) + brct %r1,2b +#endif +3: # account system time going idle lg %r9,__LC_STEAL_TIMER alg %r9,__CLOCK_IDLE_ENTER(%r2) slg %r9,__LC_LAST_UPDATE_CLOCK
arch/s390/kernel/vtime.c +37 -29
97 lines not on this page · raw message
arch/s390/numa/mode_emu.c +2 -2
@@ -368,7 +368,7 @@ static void topology_add_core(struct toptree *core)cpumask_copy (&top->thread_mask, &core->mask);cpumask_copy (&top->core_mask, &core_mc (core)->mask);cpumask_copy (&top->book_mask, &core_book (core)->mask); -cpumask_set_cpu (cpu, node_to_cpumask_map[core_node (core)->id]); +cpumask_set_cpu (cpu, &node_to_cpumask_map[core_node (core)->id]); top->node_id =core_node (core)->id; } }
@@ -383,7 +383,7 @@ static void toptree_to_topology(struct toptree *numa)/* Clear all node masks */ for (i =0 ; i <MAX_NUMNODES ; i++) -cpumask_clear (node_to_cpumask_map[i]); +cpumask_clear (&node_to_cpumask_map[i]);/* Rebuild all masks */ toptree_for_each (core, numa,CORE )
arch/s390/numa/numa.c +2 -2
@@ -23,7 +23,7 @@pg_data_t *node_data[MAX_NUMNODES ];EXPORT_SYMBOL (node_data); -cpumask_var_t node_to_cpumask_map[MAX_NUMNODES ]; +cpumask_t node_to_cpumask_map[MAX_NUMNODES ];EXPORT_SYMBOL (node_to_cpumask_map);const struct numa_mode numa_mode_plain = {
@@ -144,7 +144,7 @@ void __init numa_setup(void)static int __init numa_init_early (void ) {/* Attach all possible CPUs to node 0 for now. */ -cpumask_copy (node_to_cpumask_map[0 ], cpu_possible_mask); +cpumask_copy (&node_to_cpumask_map[0 ], cpu_possible_mask);return 0 ; }early_initcall (numa_init_early);