From nobody Mon Jun 15 01:41:28 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33B6E3A7F59; Tue, 7 Apr 2026 10:13:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775556787; cv=none; b=DtV4hxw6VWVmE5403KdgHVh2gSmtt5iVAsNV1G0YVV9QWpb/JjU4nikBbrY1MIyk0i21e/13AWG/9hZS2TQaWd6l0brWSJ5n+NqjBXKzer4AxzLpV5aUzEkwtimbphJV87crrIZeyO1cqDoq6nxAaVEcpLsv6w+vgqiZC9IyGUo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775556787; c=relaxed/simple; bh=kh9IxItZrBEfaxvMrocqYzgGEA97zbpJLUmSbQyz25w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EFbfLTZ5od0Wjn5tKY7R/Z10X9gSICD8eENBVGvZfhRrP01rvfDTDtQvhbGVoyGp8BNOg78HWTZjjccNmeG9X4HjkY3i3l2ChiTU6KMo1HJl/sBtwCw7VVsjDjFycOoQUTknKISO1b9v/tfQVU7+V7kdaof2hxt5aXwccH4njz4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=PDlo51WR; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="PDlo51WR" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 636LmHLM2302379; Tue, 7 Apr 2026 10:12:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=2IpPVj REkuBsK+TET1GouWcBspy/bdWhIXHS4LB8pCU=; b=PDlo51WRXlOWa79uoRUnnj BRZ7A93w3HiT9Suqor7Oymv/uBpI7kInuXMc1W+QsH9YP0onEuyju6EfCLt6HkLd KzTzxCDCNuD8i+1HzGMT6ba52AEIBAS2JiB6yJaXHMtVBn8evHrrtluJDOBTts72 awheDHs+9PvaTDjTKvsnuswhO7c3x4VgIH0fLGNLsyquxo4iqbFRkbuM1EAkpr5L vwsZjjoRN5KKkSvWiwB1uTRU/s2TbaigXFc0wU2cboBcFlMxJTXHGORjH5tYPQYp mzZUhY7Fz63WHMdYrXtkWJmMNz/coWPHcmvczF1Lmwva/g3xB/LOh1lKWVk4eGqA == Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dcn2fac1v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 07 Apr 2026 10:12:58 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 63794luj030068; Tue, 7 Apr 2026 10:12:57 GMT Received: from smtprelay02.dal12v.mail.ibm.com ([172.16.1.4]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4dcme7a2xj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 07 Apr 2026 10:12:57 +0000 Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay02.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 637ACu4G12124694 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 Apr 2026 10:12:56 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 271CF58059; Tue, 7 Apr 2026 10:12:56 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 47A8658043; Tue, 7 Apr 2026 10:12:53 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 7 Apr 2026 10:12:53 +0000 (GMT) From: Niklas Schnelle Date: Tue, 07 Apr 2026 12:12:33 +0200 Subject: [PATCH v7 1/2] docs: s390/pci: Improve and update PCI documentation Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260407-uid_slot-v7-1-e50f7976124e@linux.ibm.com> References: <20260407-uid_slot-v7-0-e50f7976124e@linux.ibm.com> In-Reply-To: <20260407-uid_slot-v7-0-e50f7976124e@linux.ibm.com> To: Bjorn Helgaas , Jonathan Corbet , Lukas Wunner , Shuah Khan Cc: Farhan Ali , Alexander Gordeev , Christian Borntraeger , Gerald Schaefer , Gerd Bayer , Heiko Carstens , Julian Ruess , Matthew Rosato , Peter Oberparleiter , Ramesh Errabolu , Sven Schnelle , Vasily Gorbik , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-s390@vger.kernel.org, Niklas Schnelle , Randy Dunlap X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=10294; i=schnelle@linux.ibm.com; h=from:subject:message-id; bh=kh9IxItZrBEfaxvMrocqYzgGEA97zbpJLUmSbQyz25w=; b=owGbwMvMwCX2Wz534YHOJ2GMp9WSGDKv3Jgtp+vYsbPnwKt7wa0X5/K/4n9g3DNxh+92r4npD 3IUeWbv7yhlYRDjYpAVU2RZ1OXst65giumeoP4OmDmsTCBDGLg4BWAigqcZGaa8mBn1K/igw/F+ IZNVC+P/aBzW0u3bFvHu0/9NDExG884yMjx79Vbd9UN/5asg1sLX97dVbfWpXNefd3Wvke/uwtX 5q/gA X-Developer-Key: i=schnelle@linux.ibm.com; a=openpgp; fpr=9DB000B2D2752030A5F72DDCAFE43F15E8C26090 X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDA3MDA5MCBTYWx0ZWRfXyCFxKpBhfZmk PgUI+6lSk58osoIPDpBfIPoGqxlyHv4NIpT3SvcArNtodh6ylUZc6wM8fNh7mjnY0GtLzD7RosN ffyMu2WpV8ArFe1WEkVR3sqITMOEtYa8OBdQnplyr3NKcmpJY6oDD3WhDL8zcTp+ctBVRVoXGBU JXy8Z3xru53+QU1KI0W6nn4sxR1+ot0H+qcC7qLcuy3a5NM3ClW+xHOMLn54AO+nDT//rYtxHz6 JN75motWzMoKLapn2d5/t/dnpie32vXVPpM9/C39B9r8GujSPdEjNVehlMhLnD8/KFWoddMlljH RoSav66AMmD5rI24M5udazf+FiOvmVRcocfD7RvAR1/vADk7HOiS2xWFZ1fiTFORWrwRRBVaYGo DRT9Ao/+YLaJlEzbXBt/OYsSAzc3A6c++cK5yxzC+f2PBAjtJoWvh6orvYLmmFHv0E/IjnqbtQV juaxvwNAS/3ngc0ZHQA== X-Authority-Analysis: v=2.4 cv=FsY1OWrq c=1 sm=1 tr=0 ts=69d4d8ab cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=JfrnYn6hAAAA:8 a=TOD45aG0oo66aBzYHRIA:9 a=QEXdDO2ut3YA:10 a=O8hF6Hzn-FEA:10 a=1CNFftbPRP8L7MoqJWF3:22 X-Proofpoint-ORIG-GUID: y3KCDtxm_YONqs7VRIJr3MIQ5TmIJD8K X-Proofpoint-GUID: q_cTSB3Sm6SIGr2y3upTi18T-NvSw_QS X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-07_02,2026-04-07_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 impostorscore=0 spamscore=0 phishscore=0 lowpriorityscore=0 clxscore=1011 adultscore=0 malwarescore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604010000 definitions=main-2604070090 Update the s390 specific PCI documentation to better reflect current behavior and terms such as the handling of Isolated VFs via commit 25f39d3dcb48 ("s390/pci: Ignore RID for isolated VFs"). Add a descriptions for /sys/firmware/clp/uid_is_unique which was added in commit b043a81ce3ee ("s390/pci: Expose firmware provided UID Checking state in sysfs") but missed documentation. Similarly add documentation for the fidparm attribute added by commit 99ad39306a62 ("s390/pci: Expose FIDPARM attribute in sysfs") and add a list of pft values and their names. Finally improve formatting of the different attribute descriptions by adding a separating colon. Reviewed-by: Farhan Ali Acked-by: Randy Dunlap Tested-by: Randy Dunlap Reviewed-by: Matthew Rosato Signed-off-by: Niklas Schnelle --- Documentation/arch/s390/pci.rst | 144 +++++++++++++++++++++++++++---------= ---- 1 file changed, 97 insertions(+), 47 deletions(-) diff --git a/Documentation/arch/s390/pci.rst b/Documentation/arch/s390/pci.= rst index d5755484d8e75c7bf67a350e61bbe04f0452a2fa..8cb0a1e784a7cfc5df1e04a4154= ba02c9ecf46cc 100644 --- a/Documentation/arch/s390/pci.rst +++ b/Documentation/arch/s390/pci.rst @@ -6,6 +6,7 @@ S/390 PCI =20 Authors: - Pierre Morel + - Niklas Schnelle =20 Copyright, IBM Corp. 2020 =20 @@ -27,14 +28,16 @@ Command line parameters debugfs entries --------------- =20 -The S/390 debug feature (s390dbf) generates views to hold various debug re= sults in sysfs directories of the form: +The S/390 debug feature (s390dbf) generates views to hold various debug re= sults +in sysfs directories of the form: =20 * /sys/kernel/debug/s390dbf/pci_*/ =20 For example: =20 - /sys/kernel/debug/s390dbf/pci_msg/sprintf - Holds messages from the processing of PCI events, like machine check h= andling + + holds messages from the processing of PCI events, like machine check h= andling and setting of global functionality, like UID checking. =20 Change the level of logging to be more or less verbose by piping @@ -47,87 +50,134 @@ Sysfs entries =20 Entries specific to zPCI functions and entries that hold zPCI information. =20 -* /sys/bus/pci/slots/XXXXXXXX +* /sys/bus/pci/slots/XXXXXXXX: =20 - The slot entries are set up using the function identifier (FID) of the - PCI function. The format depicted as XXXXXXXX above is 8 hexadecimal dig= its - with 0 padding and lower case hexadecimal digits. + The slot entries are set up using the function identifier (FID) of the P= CI + function as slot name. The format depicted as XXXXXXXX above is 8 hexade= cimal + digits with 0 padding and lower case hexadecimal digits. =20 - /sys/bus/pci/slots/XXXXXXXX/power =20 A physical function that currently supports a virtual function cannot be powered off until all virtual functions are removed with: - echo 0 > /sys/bus/pci/devices/XXXX:XX:XX.X/sriov_numvf + echo 0 > /sys/bus/pci/devices/DDDD:BB:dd.f/sriov_numvf =20 -* /sys/bus/pci/devices/XXXX:XX:XX.X/ +* /sys/bus/pci/devices/DDDD:BB:dd.f/: =20 - - function_id - A zPCI function identifier that uniquely identifies the function in th= e Z server. + - function_id: + The zPCI function identifier (FID) is a 32-bit hexadecimal value that + uniquely identifies the PCI function. Unless the hypervisor provides + a virtual FID e.g. on KVM this identifier is unique across the machine= even + between different partitions. =20 - - function_handle - Low-level identifier used for a configured PCI function. - It might be useful for debugging. + - function_handle: + This 32-bit hexadecimal value is a low-level identifier used for a PCI + function. Note that the function handle may be changed and become inva= lid + on PCI events and when enabling/disabling the PCI function. =20 - - pchid - Model-dependent location of the I/O adapter. + - pchid: + This 16-bit hexadecimal value encodes a model-dependent location for + the PCI function. =20 - - pfgid - PCI function group ID, functions that share identical functionality + - pfgid: + PCI function group ID; functions that share identical functionality use a common identifier. A PCI group defines interrupts, IOMMU, IOTLB, and DMA specifics. =20 - - vfn + - vfn: The virtual function number, from 1 to N for virtual functions, 0 for physical functions. =20 - - pft - The PCI function type + - pft: + The PCI function type is an s390-specific type attribute. It indicates + a more general, usage oriented, type than PCI Specification + class/vendor/device identifiers. That is PCI functions with the same p= ft + value may be backed by different hardware implementations. At the same= time + apart from unclassified functions (pft is 0x00) the same pft value + generally implies a similar usage model. At the same time the same + PCI hardware device may appear with different pft values when in a + different usage model. For example NETD and NETH VFs may be implemented + by the same PCI hardware device but in NETD the parent Physical Functi= on + is user managed while with NETH it is platform managed. =20 - - port - The port corresponds to the physical port the function is attached to. - It also gives an indication of the physical function a virtual function - is attached to. + Currently the following PFT values are defined: =20 - - uid - The user identifier (UID) may be defined as part of the machine - configuration or the z/VM or KVM guest configuration. If the accompany= ing - uid_is_unique attribute is 1 the platform guarantees that the UID is u= nique - within that instance and no devices with the same UID can be attached - during the lifetime of the system. + - 0x00 (UNC): Unclassified + - 0x02 (ROCE): RoCE Express + - 0x05 (ISM): Internal Shared Memory + - 0x0a (ROC2): RoCE Express 2 + - 0x0b (NVMe): NVMe + - 0x0c (NETH): Network Express hybrid + - 0x0d (CNW): Cloud Network Adapter + - 0x0f (NETD): Network Express direct =20 - - uid_is_unique - Indicates whether the user identifier (UID) is guaranteed to be and re= main - unique within this Linux instance. + - port: + The port is a decimal value corresponding to the physical port the fun= ction + is attached to. Virtual Functions (VFs) share the port with their pare= nt + Physical Function (PF). A value of 0 indicates that the port attribute= is + not applicable for that PCI function type. =20 - - pfip/segmentX + - uid: + The user-defined identifier (UID) for a PCI function is a 32-bit + hexadecimal value. It is defined on a per instance basis as part of the + partition, KVM guest, or z/VM guest configuration. If UID Checking is + enabled the platform ensures that the UID is unique within that instan= ce + and no two PCI functions with the same UID will be visible to the inst= ance. + + Independent of this guarantee and unlike the function ID (FID) the UID= may + be the same in different partitions within the same machine. This allo= ws to + create PCI configurations in multiple partitions to be identical in the + UID-namespace. + + - uid_is_unique: + A 0 or 1 flag indicating whether the user-defined identifier (UID) is + guaranteed to be and remain unique within this Linux instance. This + platform feature is called UID Checking. + + - pfip/segmentX: The segments determine the isolation of a function. They correspond to the physical path to the function. The more the segments are different, the more the functions are isolat= ed. =20 + - fidparm: + Contains an 8-bit-per-PCI function parameter field in hexadecimal prov= ided + by the platform. The meaning of this field is PCI function type specif= ic. + For NETH VFs a value of 0x01 indicates that the function supports + promiscuous mode. + +* /sys/firmware/clp/uid_is_unique: + + In addition to the per-device uid_is_unique attribute this presents a + global indication of whether UID Checking is enabled. This allows users + to check for UID Checking even when no PCI functions are configured. + Enumeration and hotplug =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The PCI address consists of four parts: domain, bus, device and function, -and is of this form: DDDD:BB:dd.f +and is of this form: DDDD:BB:dd.f. =20 -* When not using multi-functions (norid is set, or the firmware does not - support multi-functions): +* For a PCI function for which the platform does not expose the RID, the + pci=3Dnorid kernel parameter is used, or a so-called isolated Virtual Fu= nction + which does have RID information but is used without its parent Physical + Function being part of the same PCI configuration: =20 - There is only one function per domain. =20 - - The domain is set from the zPCI function's UID as defined during the - LPAR creation. + - The domain is set from the zPCI function's UID if UID Checking is on; + otherwise the domain ID is generated dynamically and is not stable + across reboots or hot plug. =20 -* When using multi-functions (norid parameter is not set), - zPCI functions are addressed differently: +* For a PCI function for which the platform exposes the RID and which + is not an Isolated Virtual Function: =20 - There is still only one bus per domain. =20 - - There can be up to 256 functions per bus. + - There can be up to 256 PCI functions per bus. =20 - - The domain part of the address of all functions for - a multi-Function device is set from the zPCI function's UID as defined - in the LPAR creation for the function zero. + - The domain part of the address of all functions within the same topolo= gy is + that of the configured PCI function with the lowest devfn within that + topology. =20 - - New functions will only be ready for use after the function zero - (the function with devfn 0) has been enumerated. + - Virtual Functions generated by an SR-IOV capable Physical Function only + become visible once SR-IOV is enabled. --=20 2.51.0 From nobody Mon Jun 15 01:41:28 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 023083A7F70; Tue, 7 Apr 2026 10:13:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775556786; cv=none; b=gNq0+4cwgTGxOUlczsbSJSs/GnvU53v5E7ONOqHngY2d6Lq2M1L80G4IKUz4hOfQ05X/rGivH8uh+5LSS850adFg3aP5ZIjBOUUGv+K7+iLN0cryidm/RQpKiDNlxxUPPjtkfTKbmMGczf9cnGj8cRZxVuK8eXL8G5gB57tzHdU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775556786; c=relaxed/simple; bh=0yuT2PoffZdjEVj1tBN1P+Mh4nvHudhGqJL377+tL3U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mwprgElzp9RTb7nhUDCZACJR3vL5gmhKYCSiDSiss26UrgZli0IpWk1wzM5xd7ioULhKWpTiGOwmGZRjLZbV22cDVLuUPEZYrdFAP8NSBvnpALNAjtD4AhM+TbSxxqlPhgk9seW8nj0k5um+RfmfLaKpQfqK75hlwfWnZ/9Kexo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=FspZ9CHz; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="FspZ9CHz" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 636LnXDr2318763; Tue, 7 Apr 2026 10:13:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=pdvkY4 dACeoVC7oRMfy5m9NQZqSPkdfdV71ylaqPRj8=; b=FspZ9CHzBBB5eeYtqL/eU0 6wxaWnCkJ7YDcgHVxykZEXujrCvTRmamQBft+zYVqf5zcv8/OGLsW1KquskYNk4U 5Un4JRXQ/xZQU5zLZmicFsoxitndMEA8rZo7OIgN+fs/QuBxiYCp/MjsaA/qZ7F9 lPcqKowsQHPfvCnZ/5ol+6ajJZ7sNzBP7zDp62EyiddfZeZ0wZoDYTZYBgfLg47B d8cyNpcY9cMZYw/9ZkCFJ3kij3RBVF2b5ee78dz7YWfnQExlkKILkeg43TOteHXP 5auF5MKzYJ6tXlBVjN9jIKrhSzS9Y+k7WsaDRrSHE3kqQE8Eay+QnaXV6DGqR2Dg == Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dcn2ftby6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 07 Apr 2026 10:13:02 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 63790uHw018961; Tue, 7 Apr 2026 10:13:01 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4dcme9a30t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 07 Apr 2026 10:13:01 +0000 Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 637ACxZf36962896 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 Apr 2026 10:12:59 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1A1C758043; Tue, 7 Apr 2026 10:12:59 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 619D25805E; Tue, 7 Apr 2026 10:12:56 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 7 Apr 2026 10:12:56 +0000 (GMT) From: Niklas Schnelle Date: Tue, 07 Apr 2026 12:12:34 +0200 Subject: [PATCH v7 2/2] PCI: s390: Expose the UID as an arch specific PCI slot attribute Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260407-uid_slot-v7-2-e50f7976124e@linux.ibm.com> References: <20260407-uid_slot-v7-0-e50f7976124e@linux.ibm.com> In-Reply-To: <20260407-uid_slot-v7-0-e50f7976124e@linux.ibm.com> To: Bjorn Helgaas , Jonathan Corbet , Lukas Wunner , Shuah Khan Cc: Farhan Ali , Alexander Gordeev , Christian Borntraeger , Gerald Schaefer , Gerd Bayer , Heiko Carstens , Julian Ruess , Matthew Rosato , Peter Oberparleiter , Ramesh Errabolu , Sven Schnelle , Vasily Gorbik , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-s390@vger.kernel.org, Niklas Schnelle X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5423; i=schnelle@linux.ibm.com; h=from:subject:message-id; bh=0yuT2PoffZdjEVj1tBN1P+Mh4nvHudhGqJL377+tL3U=; b=owGbwMvMwCX2Wz534YHOJ2GMp9WSGDKv3JgtkqReJ3TMYEaMfqXHGVVzsT2LFK/kn979oDXVU YPxv49HRykLgxgXg6yYIsuiLme/dQVTTPcE9XfAzGFlAhnCwMUpABNR02FkeNuZxL29meOg6Dzl 9RVxfjt1kqfLHikw+OMw466WfLToToY/vIyWbrmno6VEJzHL79BQvqSZUDlr42qWX4vnWcuIsRS wAQA= X-Developer-Key: i=schnelle@linux.ibm.com; a=openpgp; fpr=9DB000B2D2752030A5F72DDCAFE43F15E8C26090 X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=FKArAeos c=1 sm=1 tr=0 ts=69d4d8ae cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=WU3I-MCEZjdC1qMpAq0A:9 a=QEXdDO2ut3YA:10 X-Proofpoint-ORIG-GUID: 1xXOhKbJbU_OXJGKiKN4YORWDfI-ORGF X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDA3MDA5MCBTYWx0ZWRfXw/+LXR2t4dOH HlLWWXnK1zn42CSU3P4VkJEgdQq8AMO6j36/4Ji63ht2/5G+5s9AUTW3vqWNqchmOIM6dz2i6JJ nVNhJFRSN7xMyLkVuZdD8Of4GYPANhebGKFvUKVJfDhvfXSxHN/qxCMR4JgMqRil760NmMn2G0G qbrsiNg/F5YlcQHfBRnx3CKV/yBOrwDggpQeqxminM3MeH8Q+4fdbscJFzJmxpnztSnC7B7j4fU L04DCEer55mvaL1h1/flL10XrQcqpHf+9JGHtmY5xMuIRxIiB9A5epHjuGuotrGMVzUalmGFYan m1lnFQgH3HKnLC2UUdu50F95pxWsAG0WfRK9ZYJK41b4jZCmm5Al24mvLB7bTDqCTD6uOVnKKu2 oeEh+IT2EDHkV9IGaYAHdCt870oNosN6y+ZfsdsuTBHlzEaHe8pFhAl7rgGBdHQDMXPLvz2UXgs EJg8B5qYmtRsgbOxIbA== X-Proofpoint-GUID: rcMw0VczlAcIRkwukXl9KuvAf6E6hyZG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-07_02,2026-04-07_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 bulkscore=0 suspectscore=0 priorityscore=1501 impostorscore=0 spamscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604010000 definitions=main-2604070090 On s390, an individual PCI function can generally be identified by two identifiers, the FID and the UID. Which identifier is used depends on the scope and the platform configuration. The first identifier, the FID, is always available and identifies a PCI device uniquely within a machine. The FID may be virtualized by hypervisors, but on the LPAR level, the machine scope makes it impossible to create the same configuration based on FIDs on two different LPARs of the same machine, and difficult to reuse across machines. Such matching LPAR configurations are useful, though, allowing standardized setups and booting a Linux installation on different LPARs. To this end the UID, or user-defined identifier, was introduced. While it is only guaranteed to be unique within an LPAR and only if indicated by firmware, it allows users to replicate PCI device setups. On s390, which uses a machine hypervisor, a per PCI function hotplug model is used. The shortcoming with the UID then is, that it is not visible to the user without first attaching the PCI function and accessing the "uid" device attribute. The FID, on the other hand, is used as the slot name and is thus known even with the PCI function in standby. Remedy this shortcoming by providing the UID as an attribute on the slot allowing the user to identify a PCI function based on the UID without having to first attach it. Do this via a macro mechanism analogous to what was introduced by commit 265baca69a07 ("s390/pci: Stop usurping pdev->dev.groups") for the PCI device attributes. Reviewed-by: Gerd Bayer Reviewed-by: Julian Ruess Signed-off-by: Niklas Schnelle --- Documentation/arch/s390/pci.rst | 7 +++++++ arch/s390/include/asm/pci.h | 4 ++++ arch/s390/pci/pci_sysfs.c | 20 ++++++++++++++++++++ drivers/pci/slot.c | 13 ++++++++++++- 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/Documentation/arch/s390/pci.rst b/Documentation/arch/s390/pci.= rst index 8cb0a1e784a7cfc5df1e04a4154ba02c9ecf46cc..a620cf694c6f6c0bbd4f77ea476= 8cce7cc42c963 100644 --- a/Documentation/arch/s390/pci.rst +++ b/Documentation/arch/s390/pci.rst @@ -58,6 +58,13 @@ Entries specific to zPCI functions and entries that hold= zPCI information. =20 - /sys/bus/pci/slots/XXXXXXXX/power =20 + In addition to using the FID as the name of the slot, the slot directory + also contains the following s390-specific slot attributes. + + - uid: + The User-defined identifier (UID) of the function which may be configu= red + by this slot. See also the corresponding attribute of the device. + A physical function that currently supports a virtual function cannot be powered off until all virtual functions are removed with: echo 0 > /sys/bus/pci/devices/DDDD:BB:dd.f/sriov_numvf diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index c0ff19dab5807c7e1aabb48a0e9436aac45ec97d..5dcf35f0f325f5f44b28109a1c8= d9aef18401035 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -208,6 +208,10 @@ extern const struct attribute_group zpci_ident_attr_gr= oup; &pfip_attr_group, \ &zpci_ident_attr_group, =20 +extern const struct attribute_group zpci_slot_attr_group; + +#define ARCH_PCI_SLOT_GROUPS (&zpci_slot_attr_group) + extern unsigned int s390_pci_force_floating __initdata; extern unsigned int s390_pci_no_rid; =20 diff --git a/arch/s390/pci/pci_sysfs.c b/arch/s390/pci/pci_sysfs.c index c2444a23e26c4218832bb91930b5f0ffd498d28f..d98d97df792adb3c7e415a8d374= cc2f3a65fbb52 100644 --- a/arch/s390/pci/pci_sysfs.c +++ b/arch/s390/pci/pci_sysfs.c @@ -187,6 +187,17 @@ static ssize_t index_show(struct device *dev, } static DEVICE_ATTR_RO(index); =20 +static ssize_t zpci_uid_slot_show(struct pci_slot *slot, char *buf) +{ + struct zpci_dev *zdev =3D container_of(slot->hotplug, struct zpci_dev, + hotplug_slot); + + return sysfs_emit(buf, "0x%x\n", zdev->uid); +} + +static struct pci_slot_attribute zpci_slot_attr_uid =3D + __ATTR(uid, 0444, zpci_uid_slot_show, NULL); + static umode_t zpci_index_is_visible(struct kobject *kobj, struct attribute *attr, int n) { @@ -243,6 +254,15 @@ const struct attribute_group pfip_attr_group =3D { .attrs =3D pfip_attrs, }; =20 +static struct attribute *zpci_slot_attrs[] =3D { + &zpci_slot_attr_uid.attr, + NULL, +}; + +const struct attribute_group zpci_slot_attr_group =3D { + .attrs =3D zpci_slot_attrs, +}; + static struct attribute *clp_fw_attrs[] =3D { &uid_checking_attr.attr, NULL, diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c index 787311614e5b6ebb39e7284f9b9f205a0a684d6d..2f8fcfbbec24e73d0bb6e40fd04= c05a94f518045 100644 --- a/drivers/pci/slot.c +++ b/drivers/pci/slot.c @@ -96,7 +96,18 @@ static struct attribute *pci_slot_default_attrs[] =3D { &pci_slot_attr_cur_speed.attr, NULL, }; -ATTRIBUTE_GROUPS(pci_slot_default); + +static const struct attribute_group pci_slot_default_group =3D { + .attrs =3D pci_slot_default_attrs, +}; + +static const struct attribute_group *pci_slot_default_groups[] =3D { + &pci_slot_default_group, +#ifdef ARCH_PCI_SLOT_GROUPS + ARCH_PCI_SLOT_GROUPS, +#endif + NULL, +}; =20 static const struct kobj_type pci_slot_ktype =3D { .sysfs_ops =3D &pci_slot_sysfs_ops, --=20 2.51.0