Commit 03785a69 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull s390 updates from Vasily Gorbik:

 - Make use of the IBM z16 processor activity instrumentation facility
   extension to count neural network processor assist operations: add a
   new PMU device driver so that perf can make use of this.

 - Rework memcpy_real() to avoid DAT-off mode.

 - Rework absolute lowcore access code.

 - Various small fixes and improvements all over the code.

* tag 's390-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/pci: remove unused bus_next field from struct zpci_dev
  s390/cio: remove unused ccw_device_force_console() declaration
  s390/pai: Add support for PAI Extension 1 NNPA counters
  s390/mm: fix no previous prototype warnings in maccess.c
  s390/mm: uninline copy_oldmem_kernel() function
  s390/mm,ptdump: add real memory copy page markers
  s390/mm: rework memcpy_real() to avoid DAT-off mode
  s390/dump: save IPL CPU registers once DAT is available
  s390/pci: convert high_memory to physical address
  s390/smp,ptdump: add absolute lowcore markers
  s390/smp: rework absolute lowcore access
  s390/smp: call smp_reinit_ipl_cpu() before scheduler is available
  s390/ptdump: add missing amode31 markers
  s390/mm: split lowcore pages with set_memory_4k()
  s390/mm: remove unused access parameter from do_fault_error()
  s390/delay: sync comment within __delay() with reality
  s390: move from strlcpy with unused retval to strscpy
parents 2e64066d 8fb65e05

arch/s390/boot/startup.c

+7 −1
Original line number Diff line number Diff line
@@ -10,11 +10,14 @@ 
#include <asm/sclp.h>

#include <asm/diag.h>

#include <asm/uv.h>

#include <asm/abs_lowcore.h>

#include "decompressor.h"

#include "boot.h"

#include "uv.h"



unsigned long __bootdata_preserved(__kaslr_offset);

unsigned long __bootdata_preserved(__abs_lowcore);

unsigned long __bootdata_preserved(__memcpy_real_area);

unsigned long __bootdata(__amode31_base);

unsigned long __bootdata_preserved(VMALLOC_START);

unsigned long __bootdata_preserved(VMALLOC_END);
@@ -180,7 +183,10 @@ static void setup_kernel_memory_layout(void) 
	/* force vmalloc and modules below kasan shadow */

	vmax = min(vmax, KASAN_SHADOW_START);

#endif

	MODULES_END = vmax;

	__memcpy_real_area = round_down(vmax - PAGE_SIZE, PAGE_SIZE);

	__abs_lowcore = round_down(__memcpy_real_area - ABS_LOWCORE_MAP_SIZE,

				   sizeof(struct lowcore));

	MODULES_END = round_down(__abs_lowcore, _SEGMENT_SIZE);

	MODULES_VADDR = MODULES_END - MODULES_LEN;

	VMALLOC_END = MODULES_VADDR;

arch/s390/include/asm/abs_lowcore.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_S390_ABS_LOWCORE_H

#define _ASM_S390_ABS_LOWCORE_H



#include <asm/lowcore.h>



#define ABS_LOWCORE_MAP_SIZE	(NR_CPUS * sizeof(struct lowcore))



extern unsigned long __abs_lowcore;

extern bool abs_lowcore_mapped;



struct lowcore *get_abs_lowcore(unsigned long *flags);

void put_abs_lowcore(struct lowcore *lc, unsigned long flags);

int abs_lowcore_map(int cpu, struct lowcore *lc, bool alloc);

void abs_lowcore_unmap(int cpu);



#endif /* _ASM_S390_ABS_LOWCORE_H */

arch/s390/include/asm/ccwdev.h

+0 −1
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ extern struct ccw_device *ccw_device_create_console(struct ccw_driver *); 
extern void ccw_device_destroy_console(struct ccw_device *);

extern int ccw_device_enable_console(struct ccw_device *);

extern void ccw_device_wait_idle(struct ccw_device *);

extern int ccw_device_force_console(struct ccw_device *);



extern void *ccw_device_dma_zalloc(struct ccw_device *cdev, size_t size);

extern void ccw_device_dma_free(struct ccw_device *cdev,

arch/s390/include/asm/ctl_reg.h

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ union ctlreg0 { 
					   Interruption-Filtering Override */

		unsigned long	   : 3;

		unsigned long ccc  : 1; /* Cryptography counter control */

		unsigned long	   : 18;

		unsigned long pec  : 1; /* PAI extension control */

		unsigned long	   : 17;

		unsigned long	   : 3;

		unsigned long lap  : 1; /* Low-address-protection control */

		unsigned long	   : 4;

arch/s390/include/asm/lowcore.h

+3 −1
Original line number Diff line number Diff line
@@ -203,7 +203,9 @@ struct lowcore { 
	__u8	pad_0x1400[0x1500-0x1400];	/* 0x1400 */

	/* Cryptography-counter designation */

	__u64	ccd;				/* 0x1500 */

	__u8	pad_0x1508[0x1800-0x1508];	/* 0x1508 */

	/* AI-extension counter designation */

	__u64	aicd;				/* 0x1508 */

	__u8	pad_0x1510[0x1800-0x1510];	/* 0x1510 */



	/* Transaction abort diagnostic block */

	struct pgm_tdb pgm_tdb;			/* 0x1800 */