Commit 6b292a8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Martin Schwidefsky:
 "An optimization for irq-restore, the SSM instruction is quite a bit
  slower than an if-statement and a STOSM.

  The copy_file_range system all is added.

  Cleanup for PCI and CIO.

  And a couple of bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/cio: update measurement characteristics
  s390/cio: ensure consistent measurement state
  s390/cio: fix measurement characteristics memleak
  s390/zcrypt: Fix cryptographic device id in kernel messages
  s390/pci: remove iomap sanity checks
  s390/pci: set error state for unusable functions
  s390/pci: fix bar check
  s390/pci: resize iomap
  s390/pci: improve ZPCI_* macros
  s390/pci: provide ZPCI_ADDR macro
  s390/pci: adjust IOMAP_MAX_ENTRIES
  s390/numa: move numa_init_late() from device to arch_initcall
  s390: remove all usages of PSW_ADDR_INSN
  s390: remove all usages of PSW_ADDR_AMODE
  s390: wire up copy_file_range syscall
  s390: remove superfluous memblock_alloc() return value checks
  s390/numa: allocate memory with correct alignment
  s390/irqflags: optimize irq restore
  s390/mm: use TASK_MAX_SIZE where applicable
parents d3f71ae7 9f3d6d7a

arch/s390/include/asm/irqflags.h

+7 −2
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 


#include <linux/types.h>



#define ARCH_IRQ_ENABLED	(3UL << (BITS_PER_LONG - 8))



/* store then OR system mask. */

#define __arch_local_irq_stosm(__or)					\

({									\
@@ -54,14 +56,17 @@ static inline notrace void arch_local_irq_enable(void) 
	__arch_local_irq_stosm(0x03);

}



/* This only restores external and I/O interrupt state */

static inline notrace void arch_local_irq_restore(unsigned long flags)

{

	__arch_local_irq_ssm(flags);

	/* only disabled->disabled and disabled->enabled is valid */

	if (flags & ARCH_IRQ_ENABLED)

		arch_local_irq_enable();

}



static inline notrace bool arch_irqs_disabled_flags(unsigned long flags)

{

	return !(flags & (3UL << (BITS_PER_LONG - 8)));

	return !(flags & ARCH_IRQ_ENABLED);

}



static inline notrace bool arch_irqs_disabled(void)

arch/s390/include/asm/pci_io.h

+9 −5
Original line number Diff line number Diff line
@@ -8,10 +8,13 @@ 
#include <asm/pci_insn.h>



/* I/O Map */

#define ZPCI_IOMAP_MAX_ENTRIES		0x7fff

#define ZPCI_IOMAP_ADDR_BASE		0x8000000000000000ULL

#define ZPCI_IOMAP_ADDR_IDX_MASK	0x7fff000000000000ULL

#define ZPCI_IOMAP_ADDR_OFF_MASK	0x0000ffffffffffffULL

#define ZPCI_IOMAP_SHIFT		48

#define ZPCI_IOMAP_ADDR_BASE		0x8000000000000000UL

#define ZPCI_IOMAP_ADDR_OFF_MASK	((1UL << ZPCI_IOMAP_SHIFT) - 1)

#define ZPCI_IOMAP_MAX_ENTRIES							\

	((ULONG_MAX - ZPCI_IOMAP_ADDR_BASE + 1) / (1UL << ZPCI_IOMAP_SHIFT))

#define ZPCI_IOMAP_ADDR_IDX_MASK						\

	(~ZPCI_IOMAP_ADDR_OFF_MASK - ZPCI_IOMAP_ADDR_BASE)



struct zpci_iomap_entry {

	u32 fh;
@@ -21,8 +24,9 @@ struct zpci_iomap_entry { 


extern struct zpci_iomap_entry *zpci_iomap_start;



#define ZPCI_ADDR(idx) (ZPCI_IOMAP_ADDR_BASE | ((u64) idx << ZPCI_IOMAP_SHIFT))

#define ZPCI_IDX(addr)								\

	(((__force u64) addr & ZPCI_IOMAP_ADDR_IDX_MASK) >> 48)

	(((__force u64) addr & ZPCI_IOMAP_ADDR_IDX_MASK) >> ZPCI_IOMAP_SHIFT)

#define ZPCI_OFFSET(addr)							\

	((__force u64) addr & ZPCI_IOMAP_ADDR_OFF_MASK)

arch/s390/include/asm/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -166,14 +166,14 @@ extern __vector128 init_task_fpu_regs[__NUM_VXRS]; 
 */

#define start_thread(regs, new_psw, new_stackp) do {			\

	regs->psw.mask	= PSW_USER_BITS | PSW_MASK_EA | PSW_MASK_BA;	\

	regs->psw.addr	= new_psw | PSW_ADDR_AMODE;			\

	regs->psw.addr	= new_psw;					\

	regs->gprs[15]	= new_stackp;					\

	execve_tail();							\

} while (0)



#define start_thread31(regs, new_psw, new_stackp) do {			\

	regs->psw.mask	= PSW_USER_BITS | PSW_MASK_BA;			\

	regs->psw.addr	= new_psw | PSW_ADDR_AMODE;			\

	regs->psw.addr	= new_psw;					\

	regs->gprs[15]	= new_stackp;					\

	crst_table_downgrade(current->mm, 1UL << 31);			\

	execve_tail();							\

arch/s390/include/asm/ptrace.h

+3 −3
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static inline int test_pt_regs_flag(struct pt_regs *regs, int flag) 
#define arch_has_block_step()	(1)



#define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)

#define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN)

#define instruction_pointer(regs) ((regs)->psw.addr)

#define user_stack_pointer(regs)((regs)->gprs[15])

#define profile_pc(regs) instruction_pointer(regs)
@@ -161,7 +161,7 @@ static inline long regs_return_value(struct pt_regs *regs) 
static inline void instruction_pointer_set(struct pt_regs *regs,

					   unsigned long val)

{

	regs->psw.addr = val | PSW_ADDR_AMODE;

	regs->psw.addr = val;

}



int regs_query_register_offset(const char *name);
@@ -171,7 +171,7 @@ unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n); 


static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)

{

	return regs->gprs[15] & PSW_ADDR_INSN;

	return regs->gprs[15];

}



#endif /* __ASSEMBLY__ */

arch/s390/include/uapi/asm/unistd.h

+2 −1
Original line number Diff line number Diff line
@@ -310,7 +310,8 @@ 
#define __NR_recvmsg		372

#define __NR_shutdown		373

#define __NR_mlock2		374

#define NR_syscalls 375

#define __NR_copy_file_range	375

#define NR_syscalls 376



/* 

 * There are some system calls that are not present on 64 bit, some

CRA Git | Maintained and supported by SUSTech CRA and CCSE