Commit 740eaf7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Vasily Gorbik:

 - Add clang 10 build support.

 - Fix BUG() implementation to contain precise bug address, which is
   relevant for kprobes.

 - Make ftraced function appear in a stacktrace.

 - Minor perf improvements and refactoring.

 - Possible deadlock and recovery fixes in pci code.

* tag 's390-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: fix __EMIT_BUG() macro
  s390/ftrace: generate traced function stack frame
  s390: adjust -mpacked-stack support check for clang 10
  s390/jump_label: use "i" constraint for clang
  s390/cpum_sf: Use DIV_ROUND_UP
  s390/cpum_sf: Use kzalloc and minor changes
  s390/cpum_sf: Convert debug trace to common layout
  s390/pci: Fix possible deadlock in recover_store()
  s390/pci: Recover handle in clp_set_pci_fn()
parents fad7bdc9 17248ea0

arch/s390/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ cflags-y += -Wa,-I$(srctree)/arch/$(ARCH)/include 
#

cflags-$(CONFIG_FRAME_POINTER) += -fno-optimize-sibling-calls



ifeq ($(call cc-option-yn,-mpacked-stack),y)

ifeq ($(call cc-option-yn,-mpacked-stack -mbackchain -msoft-float),y)

cflags-$(CONFIG_PACK_STACK)  += -mpacked-stack -D__PACK_STACK

aflags-$(CONFIG_PACK_STACK)  += -D__PACK_STACK

endif

arch/s390/boot/head.S

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ ENTRY(startup_kdump) 
	.quad	.Lduct			# cr5: primary-aste origin

	.quad	0			# cr6:	I/O interrupts

	.quad	0			# cr7:	secondary space segment table

	.quad	0			# cr8:	access registers translation

	.quad	0x0000000000008000	# cr8:	access registers translation

	.quad	0			# cr9:	tracing off

	.quad	0			# cr10: tracing off

	.quad	0			# cr11: tracing off

arch/s390/include/asm/bug.h

+7 −9
Original line number Diff line number Diff line
@@ -10,15 +10,14 @@ 


#define __EMIT_BUG(x) do {					\

	asm_inline volatile(					\

		"0:	j	0b+2\n"				\

		"1:\n"						\

		"0:	mc	0,0\n"				\

		".section .rodata.str,\"aMS\",@progbits,1\n"	\

		"2:	.asciz	\""__FILE__"\"\n"		\

		"1:	.asciz	\""__FILE__"\"\n"		\

		".previous\n"					\

		".section __bug_table,\"awM\",@progbits,%2\n"	\

		"3:	.long	1b-3b,2b-3b\n"			\

		"2:	.long	0b-2b,1b-2b\n"			\

		"	.short	%0,%1\n"			\

		"	.org	3b+%2\n"			\

		"	.org	2b+%2\n"			\

		".previous\n"					\

		: : "i" (__LINE__),				\

		    "i" (x),					\
@@ -29,12 +28,11 @@ 


#define __EMIT_BUG(x) do {					\

	asm_inline volatile(					\

		"0:	j	0b+2\n"				\

		"1:\n"						\

		"0:	mc	0,0\n"				\

		".section __bug_table,\"awM\",@progbits,%1\n"	\

		"2:	.long	1b-2b\n"			\

		"1:	.long	0b-1b\n"			\

		"	.short	%0\n"				\

		"	.org	2b+%1\n"			\

		"	.org	1b+%1\n"			\

		".previous\n"					\

		: : "i" (x),					\

		    "i" (sizeof(struct bug_entry)));		\

arch/s390/include/asm/jump_label.h

+3 −1
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ 
#define JUMP_LABEL_NOP_SIZE 6

#define JUMP_LABEL_NOP_OFFSET 2



#if __GNUC__ < 9

#ifdef CONFIG_CC_IS_CLANG

#define JUMP_LABEL_STATIC_KEY_CONSTRAINT "i"

#elif __GNUC__ < 9

#define JUMP_LABEL_STATIC_KEY_CONSTRAINT "X"

#else

#define JUMP_LABEL_STATIC_KEY_CONSTRAINT "jdd"

arch/s390/include/asm/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ void zpci_remove_reserved_devices(void); 
/* CLP */

int clp_scan_pci_devices(void);

int clp_rescan_pci_devices(void);

int clp_rescan_pci_devices_simple(void);

int clp_rescan_pci_devices_simple(u32 *fid);

int clp_add_pci_device(u32, u32, int);

int clp_enable_fh(struct zpci_dev *, u8);

int clp_disable_fh(struct zpci_dev *);