Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp1526232ybb; Sat, 4 Apr 2020 06:21:47 -0700 (PDT) X-Google-Smtp-Source: APiQypIyBgRYOMHKWG7NdTWlKRLGzDsIeet7em1NnV/1XXffIyBBO6eWDZ8QKFdKLxU2JbZNea4X X-Received: by 2002:a05:6830:2428:: with SMTP id k8mr10698683ots.345.1586006506973; Sat, 04 Apr 2020 06:21:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586006506; cv=none; d=google.com; s=arc-20160816; b=Rs8RjgQ23eFgalnoESaDokCv1Kh37xbvpjmTJDj+hTu/d5hcKL6HPO9+aXUdMhcLlX a0HfmLFexkZDxQfo3hrNI/S8mFJvB/FhWkDfTHaShynG8pWQdHPoo4cCqRGgWdPV++KN jXL1syaZDLZjKZJ552PkAlX52IhVbrZTV858gV6DGAVWMaHjK+N0RKSRU1sU4EejE+yO cHpFUDyjix7aPvK5Tc8MAWeEd+A3isSkb2ZPeQi7ZqiSKkt+SK1fA2WfrvjQ1R3XTAM8 nM96/OJ30KMDVBdo7blym/5zSrT0B3o0jo7Ck3EVX+SFzmP8SiJ2KwL6H2cjJOH8Fx/C 4M2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-disposition :mime-version:subject:cc:to:from:date; bh=h1oiZCHuIzPuRe2mgwq9xc+srCzDccnYh41IrCrx0Bo=; b=TO80SLqlmWjIUhv8xQzIhE7urDq0BG7rHVPi1YC5fm/P5wixqEVKRHR96WVapLevO0 IXTPNSfYAknl/y7hF0Og7ZK6KymELjzvwJTB96dUSqVym0r4IKpzvAdcJz2fUGL/cLUQ BG7Yyqojp56EuEweG9UgAIJ8nWxhGQF6HjUcIH5VI9CZocMuktqb5nNPWsUIjJNBOSj0 cNJ6UTy7+IIi/0hGXQ3+WCTRvErKf8P7revPJl5tFQN/rzIXij56AApi6HXkeFTHmGqX OS1PwFZWXNw7Ws7ngg3LIR7NYT6GoVX7l4Xi+KodfYkDIzx5qMyGe89tRaqW6fFtoreb 5MeQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k21si4804382oik.231.2020.04.04.06.21.31; Sat, 04 Apr 2020 06:21:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726258AbgDDNTM (ORCPT + 99 others); Sat, 4 Apr 2020 09:19:12 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:6494 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725870AbgDDNTM (ORCPT ); Sat, 4 Apr 2020 09:19:12 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 034D4MXI098434 for ; Sat, 4 Apr 2020 09:19:10 -0400 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0a-001b2d01.pphosted.com with ESMTP id 306p40cytg-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 04 Apr 2020 09:19:10 -0400 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 4 Apr 2020 14:18:49 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Sat, 4 Apr 2020 14:18:48 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 034DJ6A158523796 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 4 Apr 2020 13:19:06 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5048E4C040; Sat, 4 Apr 2020 13:19:06 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CF3734C044; Sat, 4 Apr 2020 13:19:05 +0000 (GMT) Received: from localhost (unknown [9.145.25.218]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Sat, 4 Apr 2020 13:19:05 +0000 (GMT) Date: Sat, 4 Apr 2020 15:19:04 +0200 From: Vasily Gorbik To: Linus Torvalds Cc: Heiko Carstens , Christian Borntraeger , linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Subject: [GIT PULL] s390 patches for the 5.7 merge window MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-TM-AS-GCONF: 00 x-cbid: 20040413-0016-0000-0000-000002FE369E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20040413-0017-0000-0000-000033620863 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.676 definitions=2020-04-04_09:2020-04-03,2020-04-04 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 lowpriorityscore=0 priorityscore=1501 mlxscore=0 suspectscore=2 bulkscore=0 phishscore=0 spamscore=0 impostorscore=0 malwarescore=0 clxscore=1015 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004040117 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello Linus, please pull s390 changes for 5.7. There are some common code changes to remove s390 specific power management callbacks. Agreed by Rafael: http://lkml.kernel.org/r/CAJZ5v0jiz-YmULR+T3k38=WYkx83F=JAmNpc3r7=+N398FQOkQ@mail.gmail.com Thank you, Vasily The following changes since commit 11a48a5a18c63fd7621bb050228cebf13566e4d8: Linux 5.6-rc2 (2020-02-16 13:16:59 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.7-1 for you to fetch changes up to 1058c163dc31b3335c9cf7c4fa42ccf87be73017: s390/mm: cleanup init_new_context() callback (2020-03-28 12:46:12 +0100) ---------------------------------------------------------------- s390 updates for the 5.7 merge window - Update maintainers. Niklas Schnelle takes over zpci and Vineeth Vijayan common io code. - Extend cpuinfo to include topology information. - Add new extended counters for IBM z15 and sampling buffer allocation rework in perf code. - Add control over zeroing out memory during system restart. - CCA protected key block version 2 support and other fixes/improvements in crypto code. - Convert to new fallthrough; annotations. - Replace zero-length arrays with flexible-arrays. - QDIO debugfs and other small improvements. - Drop 2-level paging support optimization for compat tasks. Varios mm cleanups. - Remove broken and unused hibernate / power management support. - Remove fake numa support which does not bring any benefits. - Exclude offline CPUs from CPU topology masks to be more consistent with other architectures. - Prevent last branching instruction address leaking to userspace. - Other small various fixes and improvements all over the code. ---------------------------------------------------------------- Alexander Gordeev (14): s390/mm: cleanup phys_to_pfn() and friends s390/cpuinfo: add system topology information s390/mm: optimize page table upgrade routine s390/cpuinfo: show processor physical address s390/numa: remove redundant cpus_with_topology variable s390/topology: remove offline CPUs from CPU topology masks s390/cpuinfo: show number of online cores s390/cpuinfo: show number of online CPUs within a package s390/cpuinfo: fix wrong output when CPU0 is offline s390/cpuinfo: do not skip info for CPUs without MHz feature s390/mm: cleanup arch_get_unmapped_area() and friends s390/mm: remove page table downgrade support s390/mm: cleanup virtual memory constants usage s390/mm: cleanup init_new_context() callback Christian Borntraeger (2): s390/mm: mark private defines for vm_fault_t as such s390/config: do not select VIRTIO_CONSOLE via Kconfig Gerald Schaefer (1): s390/ipl: add support to control memory clearing for FCP and CCW re-IPL Gustavo A. R. Silva (1): s390: Replace zero-length array with flexible-array member Harald Freudenberger (5): s390/zcrypt: Support for CCA protected key block version 2 s390/zcrypt: replace snprintf/sprintf with scnprintf s390/ap: Remove ap device suspend and resume callbacks s390/zcrypt: use kvmalloc instead of kmalloc for 256k alloc s390/ap: remove power management code from ap bus and drivers Heiko Carstens (6): s390/mm: remove fake numa support s390: enable bpf jit by default when not built as always-on s390/irq: make init_ext_interrupts static s390/traps: mark test_monitor_call __init s390: remove broken hibernate / power management support PM: remove s390 specific callbacks Joe Perches (4): s390: use fallthrough; s390/zcrypt: use fallthrough; s390/vfio: use fallthrough; s390/cio: use fallthrough; Julian Wiedmann (9): s390/qdio: clean up cdev access in qdio_setup_irq() s390/qdio: reduce access to cdev->private->qdio_data s390/qdio: use QDIO_IRQ_STATE_INACTIVE instead of 0 s390/qdio: simplify debugfs code s390/qdio: export SSQD via debugfs s390/qdio: pass ISC as parameter to chsc_sadc() s390/ccwgroup: remove pm support s390/qdio: remove unused function declarations s390/qdio: set qdio_irq->cdev at allocation time Michael Mueller (1): s390/diag: fix display of diagnose call statistics Niklas Schnelle (2): s390/pci: Fix zpci_alloc_domain() over allocation s390/pci: Improve handling of unset UID Peter Oberparleiter (2): MAINTAINERS: Update s390/cio maintainer MAINTAINERS: Update s390/pci maintainer Pierre Morel (1): s390/pci: embedding hotplug_slot in zdev Stefan Raspl (1): s390/arch: install kernels with their proper version ID Sven Schnelle (1): s390: prevent leaking kernel address in BEAR Takashi Iwai (1): s390/zcrypt: Use scnprintf() for avoiding potential buffer overflow Thomas Richter (3): s390/cpum_sf: Rework sampling buffer allocation s390/cpum_cf: Add new extended counters for IBM z15 s390/cpum_sf: Fix wrong page count in error message Torsten Duwe (1): s390/crypto: explicitly memzero stack key material in aes_s390.c Ursula Braun (1): s390/ism: remove pm support afzal mohammed (1): s390/irq: replace setup_irq() by request_irq() MAINTAINERS | 4 +- arch/s390/Kconfig | 73 +---- arch/s390/appldata/appldata_os.c | 2 +- arch/s390/boot/install.sh | 17 +- arch/s390/configs/debug_defconfig | 1 + arch/s390/configs/defconfig | 1 + arch/s390/crypto/aes_s390.c | 3 + arch/s390/include/asm/hw_irq.h | 1 - arch/s390/include/asm/ipl.h | 1 + arch/s390/include/asm/lowcore.h | 4 +- arch/s390/include/asm/mmu.h | 2 - arch/s390/include/asm/mmu_context.h | 44 +-- arch/s390/include/asm/numa.h | 13 +- arch/s390/include/asm/page.h | 18 +- arch/s390/include/asm/pci.h | 6 + arch/s390/include/asm/pgalloc.h | 39 +-- arch/s390/include/asm/processor.h | 10 +- arch/s390/include/asm/setup.h | 7 + arch/s390/include/asm/smp.h | 1 + arch/s390/include/asm/topology.h | 15 +- arch/s390/kernel/Makefile | 1 - arch/s390/kernel/asm-offsets.c | 2 + arch/s390/kernel/diag.c | 2 +- arch/s390/kernel/entry.S | 65 ++-- arch/s390/kernel/ipl.c | 73 ++++- arch/s390/kernel/irq.c | 26 +- arch/s390/kernel/machine_kexec.c | 31 -- arch/s390/kernel/perf_cpum_cf_events.c | 123 ++++++- arch/s390/kernel/perf_cpum_sf.c | 44 +-- arch/s390/kernel/process.c | 1 + arch/s390/kernel/processor.c | 34 +- arch/s390/kernel/setup.c | 4 + arch/s390/kernel/signal.c | 4 +- arch/s390/kernel/smp.c | 13 +- arch/s390/kernel/suspend.c | 240 -------------- arch/s390/kernel/swsusp.S | 276 ---------------- arch/s390/kernel/topology.c | 34 +- arch/s390/kernel/traps.c | 2 +- arch/s390/mm/cmm.c | 46 +-- arch/s390/mm/fault.c | 21 +- arch/s390/mm/hugetlbpage.c | 11 +- arch/s390/mm/mmap.c | 40 +-- arch/s390/mm/pageattr.c | 16 - arch/s390/mm/pgalloc.c | 108 +++--- arch/s390/mm/vmem.c | 4 + arch/s390/numa/Makefile | 2 - arch/s390/numa/mode_emu.c | 577 --------------------------------- arch/s390/numa/numa.c | 147 +-------- arch/s390/numa/numa_mode.h | 25 -- arch/s390/numa/toptree.c | 351 -------------------- arch/s390/numa/toptree.h | 61 ---- arch/s390/pci/pci.c | 83 ++--- arch/s390/pci/pci_clp.c | 2 +- drivers/pci/hotplug/s390_pci_hpc.c | 99 ++---- drivers/s390/block/dasd_diag.c | 2 +- drivers/s390/block/dasd_eckd.h | 2 +- drivers/s390/char/con3215.c | 2 +- drivers/s390/char/hmcdrv_ftp.c | 2 +- drivers/s390/char/raw3270.h | 2 +- drivers/s390/char/sclp_cmd.c | 2 +- drivers/s390/char/sclp_pci.c | 2 +- drivers/s390/char/sclp_sdias.c | 2 +- drivers/s390/char/tape_core.c | 6 +- drivers/s390/cio/airq.c | 8 +- drivers/s390/cio/ccwgroup.c | 69 ---- drivers/s390/cio/chsc.c | 5 +- drivers/s390/cio/chsc.h | 3 +- drivers/s390/cio/cio.c | 8 +- drivers/s390/cio/device.c | 4 +- drivers/s390/cio/idset.c | 2 +- drivers/s390/cio/qdio.h | 9 +- drivers/s390/cio/qdio_debug.c | 59 ++-- drivers/s390/cio/qdio_debug.h | 3 +- drivers/s390/cio/qdio_main.c | 23 +- drivers/s390/cio/qdio_setup.c | 29 +- drivers/s390/cio/qdio_thinint.c | 2 +- drivers/s390/crypto/ap_bus.c | 212 +++--------- drivers/s390/crypto/ap_bus.h | 5 - drivers/s390/crypto/ap_card.c | 17 +- drivers/s390/crypto/ap_queue.c | 75 +---- drivers/s390/crypto/pkey_api.c | 2 +- drivers/s390/crypto/vfio_ap_ops.c | 2 +- drivers/s390/crypto/zcrypt_card.c | 6 +- drivers/s390/crypto/zcrypt_ccamisc.c | 33 +- drivers/s390/crypto/zcrypt_ccamisc.h | 2 +- drivers/s390/crypto/zcrypt_cex2a.c | 2 - drivers/s390/crypto/zcrypt_cex2c.c | 2 - drivers/s390/crypto/zcrypt_cex4.c | 76 ++--- drivers/s390/crypto/zcrypt_ep11misc.c | 10 +- drivers/s390/crypto/zcrypt_msgtype6.c | 10 +- drivers/s390/crypto/zcrypt_queue.c | 4 +- drivers/s390/net/ism_drv.c | 20 -- include/linux/suspend.h | 34 -- kernel/power/Kconfig | 3 - kernel/power/snapshot.c | 18 - 95 files changed, 800 insertions(+), 2809 deletions(-) delete mode 100644 arch/s390/kernel/suspend.c delete mode 100644 arch/s390/kernel/swsusp.S delete mode 100644 arch/s390/numa/mode_emu.c delete mode 100644 arch/s390/numa/numa_mode.h delete mode 100644 arch/s390/numa/toptree.c delete mode 100644 arch/s390/numa/toptree.h