Hello Linus,
Please pull s390 changes for 6.5 merge window part 2.
Thank you,
Alexander
The following changes since commit 6a46676994607a1bde51cba71c1b0d373a555f45:
Merge tag 's390-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (2023-06-27 15:49:10 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-6.5-2
for you to fetch changes up to 54372cf043276735e29045abf998895b2ac277cf:
Revert "s390/mm: get rid of VMEM_MAX_PHYS macro" (2023-07-04 07:46:26 +0200)
----------------------------------------------------------------
s390 updates for 6.5 merge window part 2
- Fix virtual vs physical address confusion in vmem_add_range()
and vmem_remove_range() functions.
- Include <linux/io.h> instead of <asm/io.h> and <asm-generic/io.h>
throughout s390 code.
- Make all PSW related defines also available for assembler files.
Remove PSW_DEFAULT_KEY define from uapi for that.
- When adding an undefined symbol the build still succeeds, but
userspace crashes trying to execute VDSO, because the symbol
is not resolved. Add undefined symbols check to prevent that.
- Use kvmalloc_array() instead of kzalloc() for allocaton of 256k
memory when executing s390 crypto adapter IOCTL.
- Add -fPIE flag to prevent decompressor misaligned symbol build
error with clang.
- Use .balign instead of .align everywhere. This is a no-op for s390,
but with this there no mix in using .align and .balign anymore.
- Filter out -mno-pic-data-is-text-relative flag when compiling
kernel to prevent VDSO build error.
- Rework entering of DAT-on mode on CPU restart to use PSW_KERNEL_BITS
mask directly.
- Do not retry administrative requests to some s390 crypto cards,
since the firmware assumes replay attacks.
- Remove most of the debug code, which is build in when kernel config
option CONFIG_ZCRYPT_DEBUG is enabled.
- Remove CONFIG_ZCRYPT_MULTIDEVNODES kernel config option and switch
off the multiple devices support for the s390 zcrypt device driver.
- With the conversion to generic entry machine checks are accounted
to the current context instead of irq time. As result, the STCKF
instruction at the beginning of the machine check handler and the
lowcore member are no longer required, therefore remove it.
- Fix various typos found with codespell.
- Minor cleanups to CPU-measurement Counter and Sampling Facilities code.
- Revert patch that removes VMEM_MAX_PHYS macro, since it causes
a regression.
----------------------------------------------------------------
Alexander Gordeev (5):
s390/mm: get rid of VMEM_MAX_PHYS macro
s390/vmem: fix virtual vs physical address confusion
s390/mm: fence off VM macros from asm and linker
s390/entry: rework entering DAT-on mode on CPU restart
Revert "s390/mm: get rid of VMEM_MAX_PHYS macro"
Baoquan He (1):
s390/mm: do not include <asm-generic/io.h> directly
Harald Freudenberger (3):
s390/zcrypt: cleanup some debug code
s390/zcrypt: do not retry administrative requests
s390/zcrypt: remove ZCRYPT_MULTIDEVNODES kernel config option
Heiko Carstens (7):
s390/zcrypt: use kvmalloc_array() instead of kzalloc()
s390/decompressor: fix misaligned symbol build error
s390: consistently use .balign instead of .align
s390/ptrace: remove PSW_DEFAULT_KEY from uapi
s390/ptrace: make all psw related defines also available for asm
s390: include linux/io.h instead of asm/io.h
s390: fix various typos
Sumanth Korikkar (1):
s390/vdso: filter out mno-pic-data-is-text-relative cflag
Sven Schnelle (2):
s390/vdso: check for undefined symbols after build
s390/entry: remove mcck clock
Thomas Richter (6):
s390/cpum_cf: remove unneeded debug statements
s390/cpum_sf: simplify function setup_pmu_cpu
s390/cpum_sf: remove parameter in call to pr_err
s390/cpum_sf: remove unnecessary debug statement
s390/cpum_sf: handle casts consistently
s390/cpum_sf: remove check on CPU being online
arch/s390/Makefile | 1 +
arch/s390/appldata/appldata_base.c | 4 +-
arch/s390/appldata/appldata_mem.c | 2 +-
arch/s390/boot/head.S | 16 ++---
arch/s390/boot/head_kdump.S | 6 +-
arch/s390/crypto/crc32be-vx.S | 2 +-
arch/s390/include/asm/ap.h | 2 +-
arch/s390/include/asm/appldata.h | 2 +-
arch/s390/include/asm/asm-extable.h | 4 +-
arch/s390/include/asm/dma.h | 2 +-
arch/s390/include/asm/lowcore.h | 4 +-
arch/s390/include/asm/page.h | 6 +-
arch/s390/include/asm/ptrace.h | 52 +++++++-------
arch/s390/include/uapi/asm/cmb.h | 2 +-
arch/s390/include/uapi/asm/dasd.h | 2 +-
arch/s390/include/uapi/asm/pkey.h | 6 +-
arch/s390/include/uapi/asm/ptrace.h | 121 ++++++++++++++++-----------------
arch/s390/kernel/asm-offsets.c | 1 -
arch/s390/kernel/cpcmd.c | 2 +-
arch/s390/kernel/dis.c | 4 +-
arch/s390/kernel/entry.S | 14 ++--
arch/s390/kernel/head64.S | 2 +-
arch/s390/kernel/kprobes_insn_page.S | 2 +-
arch/s390/kernel/nospec-branch.c | 2 +-
arch/s390/kernel/perf_cpum_cf.c | 32 +--------
arch/s390/kernel/perf_cpum_sf.c | 58 ++++++----------
arch/s390/kernel/perf_pai_ext.c | 4 +-
arch/s390/kernel/process.c | 2 +-
arch/s390/kernel/setup.c | 2 +-
arch/s390/kernel/smp.c | 2 +-
arch/s390/kernel/time.c | 2 +-
arch/s390/kernel/vdso32/Makefile | 6 +-
arch/s390/kernel/vdso64/Makefile | 6 +-
arch/s390/kvm/gaccess.c | 4 +-
arch/s390/kvm/intercept.c | 2 +-
arch/s390/kvm/kvm-s390.c | 2 +-
arch/s390/kvm/pci.c | 2 +-
arch/s390/kvm/priv.c | 3 +-
arch/s390/kvm/pv.c | 2 +-
arch/s390/kvm/sigp.c | 2 +-
arch/s390/kvm/vsie.c | 4 +-
arch/s390/lib/spinlock.c | 2 +-
arch/s390/mm/gmap.c | 2 +-
arch/s390/mm/maccess.c | 2 +-
arch/s390/mm/vmem.c | 4 +-
arch/s390/net/bpf_jit_comp.c | 4 +-
arch/s390/pci/pci_irq.c | 6 +-
arch/s390/purgatory/head.S | 2 +-
drivers/crypto/Kconfig | 11 ---
drivers/s390/block/dasd_diag.c | 2 +-
drivers/s390/block/dasd_eckd.c | 4 +-
drivers/s390/block/dasd_fba.c | 2 +-
drivers/s390/block/dcssblk.c | 2 +-
drivers/s390/char/con3215.c | 2 +-
drivers/s390/char/monwriter.c | 2 +-
drivers/s390/cio/ccwgroup.c | 2 +-
drivers/s390/cio/device.c | 2 +-
drivers/s390/cio/device_fsm.c | 4 +-
drivers/s390/cio/vfio_ccw_cp.c | 4 +-
drivers/s390/crypto/ap_bus.c | 4 +-
drivers/s390/crypto/ap_bus.h | 27 +-------
drivers/s390/crypto/ap_queue.c | 7 --
drivers/s390/crypto/vfio_ap_ops.c | 4 +-
drivers/s390/crypto/zcrypt_api.c | 113 ++----------------------------
drivers/s390/crypto/zcrypt_api.h | 3 -
drivers/s390/crypto/zcrypt_ccamisc.c | 2 +-
drivers/s390/crypto/zcrypt_ccamisc.h | 4 +-
drivers/s390/crypto/zcrypt_ep11misc.c | 2 +-
drivers/s390/crypto/zcrypt_ep11misc.h | 4 +-
drivers/s390/crypto/zcrypt_msgtype50.c | 10 ---
drivers/s390/crypto/zcrypt_msgtype6.c | 16 ++---
drivers/s390/net/ctcm_mpc.c | 10 +--
drivers/s390/net/netiucv.c | 2 +-
73 files changed, 235 insertions(+), 428 deletions(-)
The pull request you sent on Thu, 6 Jul 2023 14:28:04 +0200:
> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-6.5-2
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a452483508d7b70b0f6c69e249ec0b3ea2330b5c
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html