From nobody Sat Feb 7 17:48:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ED3AC7EE29 for ; Fri, 9 Jun 2023 12:44:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240699AbjFIMo3 (ORCPT ); Fri, 9 Jun 2023 08:44:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238873AbjFIMo1 (ORCPT ); Fri, 9 Jun 2023 08:44:27 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB0F01BC6; Fri, 9 Jun 2023 05:44:25 -0700 (PDT) Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 359Cga8M008426; Fri, 9 Jun 2023 12:44:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : message-id : content-type : mime-version; s=pp1; bh=xvQu0AiyIjgiXGGDfx0WYJkuDdk/m9Wc+TbG/u0vKbI=; b=apqmGBDYutGFPb/x+jkOmWnBlCXPZ5e2rV8j3cq5xvEpWCHfaUd707EHx04ZZ6MzkQ2q Y2WbT3F0faiV8R0/RRUiQMvLTn7K7NpKrN8/zQ/usrxnBL7h9bgGfMfv6qUZF093gOxZ k3RGuZBXQw7m5aDFAULvf80NhRv7FaMf/ZVso4/4UbyIVpvqZ7h6KuGSBZ8ClCa9Cd8k Kc19vdpqSL7rGz1WGBrSRgzDBPsgIn2B1V/U575+oLmyGfr1NMZTdUq8b7OkwbrSZ3px vrV4C2V0R1/CPPUMGZ/6yVGjoCFtmot514TqFs0u+nhfr3r653soZE86sME52mchJsNk FA== Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3r44aq818b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 09 Jun 2023 12:44:24 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3593h4gL009532; Fri, 9 Jun 2023 12:44:22 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma03ams.nl.ibm.com (PPS) with ESMTPS id 3r2a769xv6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 09 Jun 2023 12:44:22 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 359CiIRB21234198 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 9 Jun 2023 12:44:18 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id ADA182004D; Fri, 9 Jun 2023 12:44:18 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 77F7220043; Fri, 9 Jun 2023 12:44:18 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTPS; Fri, 9 Jun 2023 12:44:18 +0000 (GMT) Date: Fri, 9 Jun 2023 14:44:17 +0200 From: Alexander Gordeev To: Linus Torvalds Cc: Heiko Carstens , Vasily Gorbik , linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Subject: [GIT PULL] s390 updates for 6.4-rc6 Message-ID: Content-Disposition: inline X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 6NjOKPqenhPLWWu5n9F6FeWPJsvrCpkF X-Proofpoint-GUID: 6NjOKPqenhPLWWu5n9F6FeWPJsvrCpkF X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-09_08,2023-06-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 malwarescore=0 adultscore=0 suspectscore=0 spamscore=0 phishscore=0 priorityscore=1501 clxscore=1015 mlxlogscore=809 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306090106 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Hello Linus, please pull s390 changes for 6.4-rc6. Thank you, Alexander The following changes since commit 0f1cbf941d5949110adf70725a9614e622de8d99: s390/iommu: get rid of S390_CCW_IOMMU and S390_AP_IOMMU (2023-05-01 14:11= :28 -0300) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-6.= 4-3 for you to fetch changes up to 03c5c83b70dca3729a3eb488e668e5044bd9a5ea: s390/purgatory: disable branch profiling (2023-05-25 19:41:45 +0200) ---------------------------------------------------------------- s390 updates for 6.4-rc6 - Avoid linker error for randomly generated config file that = =20 has CONFIG_BRANCH_PROFILE_NONE enabled and make it similar = =20 to riscv, x86 and also to commit 4bf3ec384edf ("s390: disable = =20 branch profiling for vdso"). = =20 - Currently, if the device is offline and all the channel paths are = =20 either configured or varied offline, the associated subchannel gets = =20 unregistered. Don't unregister the subchannel, instead unregister = =20 offline device. = =20 ---------------------------------------------------------------- Alexander Gordeev (1): s390/purgatory: disable branch profiling Vineeth Vijayan (1): s390/cio: unregister device when the only path is gone arch/s390/purgatory/Makefile | 1 + drivers/s390/cio/device.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile index 32573b4f9bd2..cc8cf5abea15 100644 --- a/arch/s390/purgatory/Makefile +++ b/arch/s390/purgatory/Makefile @@ -26,6 +26,7 @@ KBUILD_CFLAGS +=3D -Wno-pointer-sign -Wno-sign-compare KBUILD_CFLAGS +=3D -fno-zero-initialized-in-bss -fno-builtin -ffreestanding KBUILD_CFLAGS +=3D -Os -m64 -msoft-float -fno-common KBUILD_CFLAGS +=3D -fno-stack-protector +KBUILD_CFLAGS +=3D -DDISABLE_BRANCH_PROFILING KBUILD_CFLAGS +=3D $(CLANG_FLAGS) KBUILD_CFLAGS +=3D $(call cc-option,-fno-PIE) KBUILD_AFLAGS :=3D $(filter-out -DCC_USING_EXPOLINE,$(KBUILD_AFLAGS)) diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index d5c43e9b5128..c0d620ffea61 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -1376,6 +1376,7 @@ void ccw_device_set_notoper(struct ccw_device *cdev) enum io_sch_action { IO_SCH_UNREG, IO_SCH_ORPH_UNREG, + IO_SCH_UNREG_CDEV, IO_SCH_ATTACH, IO_SCH_UNREG_ATTACH, IO_SCH_ORPH_ATTACH, @@ -1408,7 +1409,7 @@ static enum io_sch_action sch_get_action(struct subch= annel *sch) } if ((sch->schib.pmcw.pam & sch->opm) =3D=3D 0) { if (ccw_device_notify(cdev, CIO_NO_PATH) !=3D NOTIFY_OK) - return IO_SCH_UNREG; + return IO_SCH_UNREG_CDEV; return IO_SCH_DISC; } if (device_is_disconnected(cdev)) @@ -1470,6 +1471,7 @@ static int io_subchannel_sch_event(struct subchannel = *sch, int process) case IO_SCH_ORPH_ATTACH: ccw_device_set_disconnected(cdev); break; + case IO_SCH_UNREG_CDEV: case IO_SCH_UNREG_ATTACH: case IO_SCH_UNREG: if (!cdev) @@ -1503,6 +1505,7 @@ static int io_subchannel_sch_event(struct subchannel = *sch, int process) if (rc) goto out; break; + case IO_SCH_UNREG_CDEV: case IO_SCH_UNREG_ATTACH: spin_lock_irqsave(sch->lock, flags); sch_set_cdev(sch, NULL);