From nobody Tue Dec 2 02:16:26 2025 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 797CF311C2A; Thu, 20 Nov 2025 10:27:47 +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=1763634470; cv=none; b=Qq8nbH56dlcv/r30v2NKNt/cfUUP5ED6m6XQ1jk23l53/gvCnF8ERMaeIrIuNgCHORJc2jAjuAFjYo53M37e7LkGuyaPOdkalbUrNZ4J/rp0NwaF90B4yb4PJuN1wUJRpM8U+YsGJvktjOLw8Mf0JStlkw/1koy85cu3LjoW/jI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763634470; c=relaxed/simple; bh=oAgeMxQ+c0k5R8Zm6rJJS8z3j6np1W6NcBM2vBaJ7pk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uAikuwhgaufpfGPemr918ljqldyFeLzAh4rGTskkSDChhXokjJLUkXmU7DBjGS5Zhb7l4XycsDJMjoMCmeFfWcAwJFdVePwbI5UpzWuHphf9V4ZOP3K8V01xSGsiOAbSE1khPibrSz1jagOM4geBW7jGHiDgYxiNIBUpVXy7Yt0= 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=Kn4/coC1; 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="Kn4/coC1" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5AJLl0J3021706; Thu, 20 Nov 2025 10:27:32 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=6T7wC7 9xoMCQ2U7t7iJ+GPmWhQ4lqDODQNt2r7sPG3Q=; b=Kn4/coC18hWw1M5ffIFPha 6K+7GJ2zFFf0BCceyL+ID+7NzGbfR9Jp1n4b99s3qAHQuL1XvQy5zlJkeWQFvxrr FvCdQjm1YPLkPnD6lSWtI0C7q0PEOmeaOhn3B8Czii3lD97mpa3DmL3YjYSXF4+Z gE3+4PoK9IJWenHiAwVHCl8QeBxGDoYBSBtVn8iJEVs5IKCHBnak4LR6K1dfXitf lCMd/ya1g94VjhnpXYMraGrYG+5gVUuQEBPBrOZfE7QVLZN0g/sOrLlEBGfC8Oju SgkaRmR9atlOCuDsS0aRR4XGjQiqS6GGGfks/h5v/8+X2OJR48as7+eLa5udUBWw == Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4aejjwdthu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Nov 2025 10:27:32 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5AK6nUhQ017319; Thu, 20 Nov 2025 10:27:31 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4af6j1wjxh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Nov 2025 10:27:31 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5AKARR5K42795316 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Nov 2025 10:27:27 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5ADE02005A; Thu, 20 Nov 2025 10:27:27 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2387320065; Thu, 20 Nov 2025 10:27:27 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 20 Nov 2025 10:27:27 +0000 (GMT) From: Tobias Schumacher Date: Thu, 20 Nov 2025 11:27:26 +0100 Subject: [PATCH v4 1/2] genirq: Change hwirq parameter to irq_hw_number_t 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: <20251120-implement-msi-domain-v4-1-a01be58e158a@linux.ibm.com> References: <20251120-implement-msi-domain-v4-0-a01be58e158a@linux.ibm.com> In-Reply-To: <20251120-implement-msi-domain-v4-0-a01be58e158a@linux.ibm.com> To: Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Niklas Schnelle , Gerald Schaefer , Gerd Bayer , Halil Pasic , Matthew Rosato , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, Tobias Schumacher X-Mailer: b4 0.14.2 X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=BanVE7t2 c=1 sm=1 tr=0 ts=691eed14 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VnNF1IyMAAAA:8 a=apPMBW2BC5_Ovgk0KuUA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTE1MDAzMiBTYWx0ZWRfX6he43EldgFij WBvOmsy9yuKnRsi81G/Dk7KhK8wIj6zMwRTZwVE/LGOksuX2/ZGMFrGRvJaGsO8PQzmKgjjPiWF zFqmMFZW/Ze5T3PSxDE1GLF84TJPUI22o6j/DDyGeoXXkphEQHGOLfYwXQCVzlDJ7rjXFNnOSjD DPPswNL9gxdD/uP1qQsRFBd34KuSzGMp2haK5acc0KJkpSQLJLdLMQDHBbgNRlpcIeFeLCiSP5I 0Fz4lQjmjQA/grlyzilCnwEES1WDZ8K3uWGNVoEdSKll7Qce7cdHNqq8Qi6AnN23ls0iEpTjrM/ XCHO02iVgakgVqEqOFGiT3wjlY4ro/ZUL4/sqLVBHuXXaCLCfW+/z7EdcU88KrXXkkrGHFVRH92 /ked8vfClbHUuT8+2I0C8hyjJEeeFA== X-Proofpoint-GUID: 4N-PY9RRItMUbDs4-Gk8OqtNIPpj_qoA X-Proofpoint-ORIG-GUID: 4N-PY9RRItMUbDs4-Gk8OqtNIPpj_qoA X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-20_03,2025-11-20_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 impostorscore=0 priorityscore=1501 clxscore=1015 phishscore=0 bulkscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511150032 The irqdomain implementation internally represents hardware IRQs as irq_hw_number_t, which is defined as unsigned long int. When providing an irq_hw_number_t to the generic_handle_domain() functions that expect and unsigned int hwirq, this can lead to a loss of information. Change the hwirq parameter to irq_hw_number_t to support the full range of hwirqs. Reviewed-by: Thomas Gleixner Reviewed-by: Niklas Schnelle Signed-off-by: Tobias Schumacher Reviewed-by: Farhan Ali --- include/linux/irqdesc.h | 6 +++--- kernel/irq/irqdesc.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h index fd091c35d5721eee37a2fd3d5526559671d5048d..03b63aea73bb21ae1456910afa5= 34d60f9cfa94d 100644 --- a/include/linux/irqdesc.h +++ b/include/linux/irqdesc.h @@ -183,9 +183,9 @@ int generic_handle_irq_safe(unsigned int irq); * and handle the result interrupt number. Return -EINVAL if * conversion failed. */ -int generic_handle_domain_irq(struct irq_domain *domain, unsigned int hwir= q); -int generic_handle_domain_irq_safe(struct irq_domain *domain, unsigned int= hwirq); -int generic_handle_domain_nmi(struct irq_domain *domain, unsigned int hwir= q); +int generic_handle_domain_irq(struct irq_domain *domain, irq_hw_number_t h= wirq); +int generic_handle_domain_irq_safe(struct irq_domain *domain, irq_hw_numbe= r_t hwirq); +int generic_handle_domain_nmi(struct irq_domain *domain, irq_hw_number_t h= wirq); #endif =20 /* Test to see if a driver has successfully requested an irq */ diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index db714d3014b5f7b62403ea04b80331ec6b1dc642..0cd3198496bc0766c81c353c3ff= 80ea184793d6a 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -720,7 +720,7 @@ EXPORT_SYMBOL_GPL(generic_handle_irq_safe); * This function must be called from an IRQ context with irq regs * initialized. */ -int generic_handle_domain_irq(struct irq_domain *domain, unsigned int hwir= q) +int generic_handle_domain_irq(struct irq_domain *domain, irq_hw_number_t h= wirq) { return handle_irq_desc(irq_resolve_mapping(domain, hwirq)); } @@ -738,7 +738,7 @@ EXPORT_SYMBOL_GPL(generic_handle_domain_irq); * context). If the interrupt is marked as 'enforce IRQ-context only' then * the function must be invoked from hard interrupt context. */ -int generic_handle_domain_irq_safe(struct irq_domain *domain, unsigned int= hwirq) +int generic_handle_domain_irq_safe(struct irq_domain *domain, irq_hw_numbe= r_t hwirq) { unsigned long flags; int ret; @@ -761,7 +761,7 @@ EXPORT_SYMBOL_GPL(generic_handle_domain_irq_safe); * This function must be called from an NMI context with irq regs * initialized. **/ -int generic_handle_domain_nmi(struct irq_domain *domain, unsigned int hwir= q) +int generic_handle_domain_nmi(struct irq_domain *domain, irq_hw_number_t h= wirq) { WARN_ON_ONCE(!in_nmi()); return handle_irq_desc(irq_resolve_mapping(domain, hwirq)); --=20 2.48.1 From nobody Tue Dec 2 02:16:26 2025 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 E25DB2BFC73; Thu, 20 Nov 2025 10:27:47 +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=1763634470; cv=none; b=Rt2CbFOf040RXu2N9AfQdU3sWzjMLqWwg6yHIGNZyCVFfBAZwPxpstGap3A+LfLNZH7zKjg5Ee+Y1uHjwl+fgUydF3x6meUidvrTBoLzbvljRJjcLX/AjArVQ2hgHETiVopR1SCI64y22vAL2Iz9XzQyRskuNsatqPy6tlmCSjI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763634470; c=relaxed/simple; bh=MKsSWLnHefyVltxWY9agCN6lwZaDlWsrhTILg/Gvrsg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Tpwfw9v43+FeS9MgFgsHecbxKGxrKS4cKGKjEw6tE/WBrezBzyZJBvT9GhQONoSAc1gCU82kwGEKJZnx2R24L6QHvPNtkM5xuTn/5aN2+A55Eg8xD+DE5jZF01UoIBh9DfNe5CV9v5d9SbsJFCfggWRzE4AhSOPN4rkyxnXq2uI= 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=a8pUVhRk; 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="a8pUVhRk" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5AJLksUe029077; Thu, 20 Nov 2025 10:27:33 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=jcQuUY iEXxxiaWw1w+xjnW11GXL9EXMCow13VL1G2sg=; b=a8pUVhRk6wrXOS2meK1zgc niJLRsW9Dc9LJxUcltL5qQ1gebBsntSxRGWomSRxSAWXD3lmuEiS/YtGHx92B6Eo 6s+wMVqK72BLJYDFgj6z8R8oWDiSF6uLw1SvZo7iSvjjD7wb7g3LTRXbaTzWdK3l VWBKY1MH8wi+GXoAiYnDuC717dLNS+RXIaC6OOqPo+IDf7yz0ChLDlb62ftoZkmy nnc4ajuhyg1HTxW1Nbze3lmvR3ZSxH/EMLeSl668PHAlaty/qprD/8ERdZNjR0xC trTEGRfxEGrpZmVyRnmOfH0ilQxY8qCbbxEvDH0HwQXsUveuG23VtaNu11eU8VhQ == Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4aejk1nuwp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Nov 2025 10:27:33 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5AK9iQTg005122; Thu, 20 Nov 2025 10:27:32 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4af5bkdugm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Nov 2025 10:27:31 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5AKARRox42795318 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Nov 2025 10:27:27 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AC2152005A; Thu, 20 Nov 2025 10:27:27 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 609AA20063; Thu, 20 Nov 2025 10:27:27 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 20 Nov 2025 10:27:27 +0000 (GMT) From: Tobias Schumacher Date: Thu, 20 Nov 2025 11:27:27 +0100 Subject: [PATCH v4 2/2] s390/pci: Migrate s390 IRQ logic to IRQ domain API 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: <20251120-implement-msi-domain-v4-2-a01be58e158a@linux.ibm.com> References: <20251120-implement-msi-domain-v4-0-a01be58e158a@linux.ibm.com> In-Reply-To: <20251120-implement-msi-domain-v4-0-a01be58e158a@linux.ibm.com> To: Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Niklas Schnelle , Gerald Schaefer , Gerd Bayer , Halil Pasic , Matthew Rosato , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, Tobias Schumacher X-Mailer: b4 0.14.2 X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=C/nkCAP+ c=1 sm=1 tr=0 ts=691eed15 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=pn-msHsI0j841b3IYMsA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-GUID: 3GGUXmyzlR_Yh4BdPomqxSrKJS_iiw9T X-Proofpoint-ORIG-GUID: 3GGUXmyzlR_Yh4BdPomqxSrKJS_iiw9T X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTE1MDAzMiBTYWx0ZWRfX6F3NEjekxSNk O7AMqEbIaJbIA2GnXxOxe/YFrnITFSshFU9osu7oLDNNB25jwxcX+gvHpH6FZmAmt866xs8ADIA Z0oN/TjnaVOIHD8RpGYhFSEnV1ujDTOer6RmVoTA3uIZaA3ZxmWpRODZD73Ah5SaCFhUAfc5j8t CGX+QcbUAWXwr/yHJhX6NEVp2QsR5HEAeAU7gD6XRunvX0p5qMI7xP48rQL39gyCmgXgttaoeY+ POKtIVJPipQy53JJh1YSVKQsPveySlI6o5eaWk29EoycL22+jVgwBogB9JJfMJAqIsIcWxpJSo8 PszFp06+MSoLYoSQmYGnJhWoJbNb154zkquL5yp8NICnz005BFdCuPVMRkI3+zJnoCKRqD4siIX 0bo+2Gs7fQ6rAnIYS8GbhL5hLZUMTA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-20_03,2025-11-20_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 spamscore=0 impostorscore=0 bulkscore=0 malwarescore=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511150032 s390 is one of the last architectures using the legacy API for setup and teardown of PCI MSI IRQs. Migrate the s390 IRQ allocation and teardown to the MSI parent domain API. For details, see: https://lore.kernel.org/lkml/20221111120501.026511281@linutronix.de In detail, create an MSI parent domain for each PCI domain. When a PCI device sets up MSI or MSI-X IRQs, the library creates a per-device IRQ domain for this device, which is used by the device for allocating and freeing IRQs. The per-device domain delegates this allocation and freeing to the parent-domain. In the end, the corresponding callbacks of the parent domain are responsible for allocating and freeing the IRQs. The allocation is split into two parts: - zpci_msi_prepare() is called once for each device and allocates the required resources. On s390, each PCI function has its own airq vector and a summary bit, which must be configured once per function. This is done in prepare(). - zpci_msi_alloc() can be called multiple times for allocating one or more MSI/MSI-X IRQs. This creates a mapping between the virtual IRQ number in the kernel and the hardware IRQ number. Freeing is split into two counterparts: - zpci_msi_free() reverts the effects of zpci_msi_alloc() and - zpci_msi_teardown() reverts the effects of zpci_msi_prepare(). This is called once when all IRQs are freed before a device is removed. Since the parent domain in the end allocates the IRQs, the hwirq encoding must be unambiguous for all IRQs of all devices. This is achieved by encoding the hwirq using the PCI function id and the MSI index. Signed-off-by: Tobias Schumacher Reviewed-by: Farhan Ali Reviewed-by: Niklas Schnelle --- arch/s390/Kconfig | 1 + arch/s390/include/asm/pci.h | 4 + arch/s390/pci/pci_bus.c | 21 ++- arch/s390/pci/pci_irq.c | 335 +++++++++++++++++++++++++++-------------= ---- 4 files changed, 229 insertions(+), 132 deletions(-) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index df22b10d91415e1ed183cc8add9ad0ac4293c50e..48cd6a12bd04dfe4dd61ecc79d3= 401ba685c51bb 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -251,6 +251,7 @@ config S390 select HOTPLUG_SMT select IOMMU_HELPER if PCI select IOMMU_SUPPORT if PCI + select IRQ_MSI_LIB if PCI select KASAN_VMALLOC if KASAN select LOCK_MM_AND_FIND_VMA select MMU_GATHER_MERGE_VMAS diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index a32f465ecf73a5cc3408a312d94ec888d62848cc..60abc84cf14fe6fb1ee149df688= eea94f0983ed0 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -109,6 +110,7 @@ struct zpci_bus { struct list_head resources; struct list_head bus_next; struct resource bus_resource; + struct irq_domain *msi_parent_domain; int topo; /* TID if topo_is_tid, PCHID otherwise */ int domain_nr; u8 multifunction : 1; @@ -310,6 +312,8 @@ int zpci_dma_exit_device(struct zpci_dev *zdev); /* IRQ */ int __init zpci_irq_init(void); void __init zpci_irq_exit(void); +int zpci_create_parent_msi_domain(struct zpci_bus *zbus); +void zpci_remove_parent_msi_domain(struct zpci_bus *zbus); =20 /* FMB */ int zpci_fmb_enable_device(struct zpci_dev *); diff --git a/arch/s390/pci/pci_bus.c b/arch/s390/pci/pci_bus.c index be8c697fea0cc755cfdb4fb0a9e3b95183bec0dc..9da261b600df805ef76f3331975= ac8fce6178908 100644 --- a/arch/s390/pci/pci_bus.c +++ b/arch/s390/pci/pci_bus.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -189,7 +190,7 @@ static bool zpci_bus_is_multifunction_root(struct zpci_= dev *zdev) static int zpci_bus_create_pci_bus(struct zpci_bus *zbus, struct zpci_dev = *fr, struct pci_ops *ops) { struct pci_bus *bus; - int domain; + int domain, rc; =20 domain =3D zpci_alloc_domain((u16)fr->uid); if (domain < 0) @@ -199,19 +200,28 @@ static int zpci_bus_create_pci_bus(struct zpci_bus *z= bus, struct zpci_dev *fr, s zbus->multifunction =3D zpci_bus_is_multifunction_root(fr); zbus->max_bus_speed =3D fr->max_bus_speed; =20 + rc =3D zpci_create_parent_msi_domain(zbus); + if (rc) + goto out_free_domain; + /* * Note that the zbus->resources are taken over and zbus->resources * is empty after a successful call */ bus =3D pci_create_root_bus(NULL, ZPCI_BUS_NR, ops, zbus, &zbus->resource= s); - if (!bus) { - zpci_free_domain(zbus->domain_nr); - return -EFAULT; - } + if (!bus) + goto out_remove_msi_domain; =20 zbus->bus =3D bus; + dev_set_msi_domain(&zbus->bus->dev, zbus->msi_parent_domain); =20 return 0; + +out_remove_msi_domain: + zpci_remove_parent_msi_domain(zbus); +out_free_domain: + zpci_free_domain(zbus->domain_nr); + return -EFAULT; } =20 static void zpci_bus_release(struct kref *kref) @@ -232,6 +242,7 @@ static void zpci_bus_release(struct kref *kref) mutex_lock(&zbus_list_lock); list_del(&zbus->bus_next); mutex_unlock(&zbus_list_lock); + zpci_remove_parent_msi_domain(zbus); kfree(zbus); } =20 diff --git a/arch/s390/pci/pci_irq.c b/arch/s390/pci/pci_irq.c index e73be96ce5fe6473fc193d65b8f0ff635d6a98ba..f67c50632a796b0aa438ac9464d= a53acc0296218 100644 --- a/arch/s390/pci/pci_irq.c +++ b/arch/s390/pci/pci_irq.c @@ -7,6 +7,7 @@ #include #include #include +#include #include =20 #include @@ -110,43 +111,41 @@ static int zpci_set_irq(struct zpci_dev *zdev) return rc; } =20 -/* Clear adapter interruptions */ -static int zpci_clear_irq(struct zpci_dev *zdev) +static int zpci_set_irq_affinity(struct irq_data *data, const struct cpuma= sk *dest, + bool force) { - int rc; - - if (irq_delivery =3D=3D DIRECTED) - rc =3D zpci_clear_directed_irq(zdev); - else - rc =3D zpci_clear_airq(zdev); - - return rc; + irq_data_update_affinity(data, dest); + return IRQ_SET_MASK_OK; } =20 -static int zpci_set_irq_affinity(struct irq_data *data, const struct cpuma= sk *dest, - bool force) +static void zpci_compose_msi_msg(struct irq_data *data, struct msi_msg *ms= g) { - struct msi_desc *entry =3D irq_data_get_msi_desc(data); - struct msi_msg msg =3D entry->msg; - int cpu_addr =3D smp_cpu_get_cpu_address(cpumask_first(dest)); + struct msi_desc *desc =3D irq_data_get_msi_desc(data); + struct zpci_dev *zdev =3D to_zpci_dev(desc->dev); =20 - msg.address_lo &=3D 0xff0000ff; - msg.address_lo |=3D (cpu_addr << 8); - pci_write_msi_msg(data->irq, &msg); + if (irq_delivery =3D=3D DIRECTED) { + int cpu =3D cpumask_first(irq_data_get_affinity_mask(data)); =20 - return IRQ_SET_MASK_OK; + msg->address_lo =3D zdev->msi_addr & 0xff0000ff; + msg->address_lo |=3D (smp_cpu_get_cpu_address(cpu) << 8); + } else { + msg->address_lo =3D zdev->msi_addr & 0xffffffff; + } + msg->address_hi =3D zdev->msi_addr >> 32; + msg->data =3D data->hwirq & 0xffffffff; } =20 static struct irq_chip zpci_irq_chip =3D { .name =3D "PCI-MSI", - .irq_unmask =3D pci_msi_unmask_irq, - .irq_mask =3D pci_msi_mask_irq, + .irq_compose_msi_msg =3D zpci_compose_msi_msg }; =20 static void zpci_handle_cpu_local_irq(bool rescan) { struct airq_iv *dibv =3D zpci_ibv[smp_processor_id()]; union zpci_sic_iib iib =3D {{0}}; + struct irq_domain *msi_domain; + irq_hw_number_t hwirq; unsigned long bit; int irqs_on =3D 0; =20 @@ -164,7 +163,9 @@ static void zpci_handle_cpu_local_irq(bool rescan) continue; } inc_irq_stat(IRQIO_MSI); - generic_handle_irq(airq_iv_get_data(dibv, bit)); + hwirq =3D airq_iv_get_data(dibv, bit); + msi_domain =3D (struct irq_domain *)airq_iv_get_ptr(dibv, bit); + generic_handle_domain_irq(msi_domain, hwirq); } } =20 @@ -229,6 +230,8 @@ static void zpci_floating_irq_handler(struct airq_struc= t *airq, struct tpi_info *tpi_info) { union zpci_sic_iib iib =3D {{0}}; + struct irq_domain *msi_domain; + irq_hw_number_t hwirq; unsigned long si, ai; struct airq_iv *aibv; int irqs_on =3D 0; @@ -256,7 +259,9 @@ static void zpci_floating_irq_handler(struct airq_struc= t *airq, break; inc_irq_stat(IRQIO_MSI); airq_iv_lock(aibv, ai); - generic_handle_irq(airq_iv_get_data(aibv, ai)); + hwirq =3D airq_iv_get_data(aibv, ai); + msi_domain =3D (struct irq_domain *)airq_iv_get_ptr(aibv, ai); + generic_handle_domain_irq(msi_domain, hwirq); airq_iv_unlock(aibv, ai); } } @@ -278,7 +283,9 @@ static int __alloc_airq(struct zpci_dev *zdev, int msi_= vecs, zdev->aisb =3D *bit; =20 /* Create adapter interrupt vector */ - zdev->aibv =3D airq_iv_create(msi_vecs, AIRQ_IV_DATA | AIRQ_IV_BITLOCK, = NULL); + zdev->aibv =3D airq_iv_create(msi_vecs, + AIRQ_IV_PTR | AIRQ_IV_DATA | AIRQ_IV_BITLOCK, + NULL); if (!zdev->aibv) return -ENOMEM; =20 @@ -290,146 +297,219 @@ static int __alloc_airq(struct zpci_dev *zdev, int = msi_vecs, return 0; } =20 -int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) +bool arch_restore_msi_irqs(struct pci_dev *pdev) { - unsigned int hwirq, msi_vecs, irqs_per_msi, i, cpu; struct zpci_dev *zdev =3D to_zpci(pdev); - struct msi_desc *msi; - struct msi_msg msg; - unsigned long bit; - int cpu_addr; - int rc, irq; =20 - zdev->aisb =3D -1UL; - zdev->msi_first_bit =3D -1U; + zpci_set_irq(zdev); + return true; +} + +static struct airq_struct zpci_airq =3D { + .handler =3D zpci_floating_irq_handler, + .isc =3D PCI_ISC, +}; + +/* + * Encode the hwirq number for the parent domain. The encoding must be uni= que + * for each IRQ of each device in the parent domain, so it uses the devfn = to + * identify the device and the msi_index to identify the IRQ within that d= evice. + */ +static inline u32 zpci_encode_hwirq(u8 devfn, u16 msi_index) +{ + return (devfn << 16) | msi_index; +} + +static inline u16 zpci_decode_hwirq_msi_index(irq_hw_number_t irq) +{ + return irq & GENMASK_U16(15, 0); +} + +static int zpci_msi_prepare(struct irq_domain *domain, + struct device *dev, int nvec, + msi_alloc_info_t *info) +{ + struct zpci_dev *zdev =3D to_zpci_dev(dev); + struct pci_dev *pdev =3D to_pci_dev(dev); + unsigned long bit; + int msi_vecs, rc; =20 msi_vecs =3D min_t(unsigned int, nvec, zdev->max_msi); - if (msi_vecs < nvec) { - pr_info("%s requested %d irqs, allocate system limit of %d", + if (msi_vecs < nvec) + pr_info("%s requested %d IRQs, allocate system limit of %d\n", pci_name(pdev), nvec, zdev->max_msi); - } =20 rc =3D __alloc_airq(zdev, msi_vecs, &bit); - if (rc < 0) + if (rc) { + pr_err("Allocating adapter IRQs for %s failed\n", pci_name(pdev)); return rc; + } =20 - /* - * Request MSI interrupts: - * When using MSI, nvec_used interrupt sources and their irq - * descriptors are controlled through one msi descriptor. - * Thus the outer loop over msi descriptors shall run only once, - * while two inner loops iterate over the interrupt vectors. - * When using MSI-X, each interrupt vector/irq descriptor - * is bound to exactly one msi descriptor (nvec_used is one). - * So the inner loops are executed once, while the outer iterates - * over the MSI-X descriptors. - */ - hwirq =3D bit; - msi_for_each_desc(msi, &pdev->dev, MSI_DESC_NOTASSOCIATED) { - if (hwirq - bit >=3D msi_vecs) - break; - irqs_per_msi =3D min_t(unsigned int, msi_vecs, msi->nvec_used); - irq =3D __irq_alloc_descs(-1, 0, irqs_per_msi, 0, THIS_MODULE, - (irq_delivery =3D=3D DIRECTED) ? - msi->affinity : NULL); - if (irq < 0) - return -ENOMEM; - - for (i =3D 0; i < irqs_per_msi; i++) { - rc =3D irq_set_msi_desc_off(irq, i, msi); - if (rc) - return rc; - irq_set_chip_and_handler(irq + i, &zpci_irq_chip, - handle_percpu_irq); + zdev->msi_first_bit =3D bit; + zdev->msi_nr_irqs =3D msi_vecs; + rc =3D zpci_set_irq(zdev); + if (rc) { + pr_err("Registering adapter IRQs for %s failed\n", + pci_name(pdev)); + if (irq_delivery =3D=3D DIRECTED) { + airq_iv_free(zpci_ibv[0], zdev->msi_first_bit, msi_vecs); + } else { + zpci_clear_airq(zdev); + airq_iv_release(zdev->aibv); + zdev->aibv =3D NULL; + airq_iv_free_bit(zpci_sbv, zdev->aisb); + zdev->aisb =3D -1UL; } + zdev->msi_first_bit =3D -1U; + return rc; + } =20 - msg.data =3D hwirq - bit; - if (irq_delivery =3D=3D DIRECTED) { - if (msi->affinity) - cpu =3D cpumask_first(&msi->affinity->mask); - else - cpu =3D 0; - cpu_addr =3D smp_cpu_get_cpu_address(cpu); + return 0; +} + +static void zpci_msi_teardown_directed(struct zpci_dev *zdev) +{ + zpci_clear_directed_irq(zdev); + airq_iv_free(zpci_ibv[0], zdev->msi_first_bit, zdev->max_msi); + zdev->msi_first_bit =3D -1U; +} + +static void zpci_msi_teardown_floating(struct zpci_dev *zdev) +{ + zpci_clear_airq(zdev); + airq_iv_release(zdev->aibv); + zdev->aibv =3D NULL; + airq_iv_free_bit(zpci_sbv, zdev->aisb); + zdev->aisb =3D -1UL; + zdev->msi_first_bit =3D -1U; +} =20 - msg.address_lo =3D zdev->msi_addr & 0xff0000ff; - msg.address_lo |=3D (cpu_addr << 8); +static void zpci_msi_teardown(struct irq_domain *domain, msi_alloc_info_t = *arg) +{ + struct zpci_dev *zdev =3D to_zpci_dev(domain->dev); =20 + if (irq_delivery =3D=3D DIRECTED) + zpci_msi_teardown_directed(zdev); + else + zpci_msi_teardown_floating(zdev); +} + +static int zpci_msi_domain_alloc(struct irq_domain *domain, unsigned int v= irq, + unsigned int nr_irqs, void *args) +{ + struct msi_desc *desc =3D ((msi_alloc_info_t *)args)->desc; + struct zpci_dev *zdev =3D to_zpci_dev(desc->dev); + struct zpci_bus *zbus =3D zdev->zbus; + unsigned int cpu, hwirq; + unsigned long bit; + int i; + + bit =3D zdev->msi_first_bit + desc->msi_index; + hwirq =3D zpci_encode_hwirq(zdev->devfn, desc->msi_index); + + if (desc->msi_index + nr_irqs > zdev->max_msi) + return -EINVAL; + + for (i =3D 0; i < nr_irqs; i++) { + irq_domain_set_info(domain, virq + i, hwirq + i, + &zpci_irq_chip, zdev, + handle_percpu_irq, NULL, NULL); + + if (irq_delivery =3D=3D DIRECTED) { for_each_possible_cpu(cpu) { - for (i =3D 0; i < irqs_per_msi; i++) - airq_iv_set_data(zpci_ibv[cpu], - hwirq + i, irq + i); + airq_iv_set_ptr(zpci_ibv[cpu], bit + i, + (unsigned long)zbus->msi_parent_domain); + airq_iv_set_data(zpci_ibv[cpu], bit + i, hwirq + i); } } else { - msg.address_lo =3D zdev->msi_addr & 0xffffffff; - for (i =3D 0; i < irqs_per_msi; i++) - airq_iv_set_data(zdev->aibv, hwirq + i, irq + i); + airq_iv_set_ptr(zdev->aibv, bit + i, + (unsigned long)zbus->msi_parent_domain); + airq_iv_set_data(zdev->aibv, bit + i, hwirq + i); } - msg.address_hi =3D zdev->msi_addr >> 32; - pci_write_msi_msg(irq, &msg); - hwirq +=3D irqs_per_msi; } =20 - zdev->msi_first_bit =3D bit; - zdev->msi_nr_irqs =3D hwirq - bit; + return 0; +} =20 - rc =3D zpci_set_irq(zdev); - if (rc) - return rc; +static void zpci_msi_domain_free(struct irq_domain *domain, unsigned int v= irq, + unsigned int nr_irqs) +{ + irq_hw_number_t hwirq; + struct irq_data *d; + u16 msi_index; + int i; + + for (i =3D 0; i < nr_irqs; i++) { + d =3D irq_domain_get_irq_data(domain, virq + i); + hwirq =3D d->hwirq; + msi_index =3D zpci_decode_hwirq_msi_index(hwirq); + irq_domain_reset_irq_data(d); + } +} + +static const struct irq_domain_ops zpci_msi_domain_ops =3D { + .alloc =3D zpci_msi_domain_alloc, + .free =3D zpci_msi_domain_free +}; + +static bool zpci_init_dev_msi_info(struct device *dev, struct irq_domain *= domain, + struct irq_domain *real_parent, + struct msi_domain_info *info) +{ + if (!msi_lib_init_dev_msi_info(dev, domain, real_parent, info)) + return false; + + info->ops->msi_prepare =3D zpci_msi_prepare; + info->ops->msi_teardown =3D zpci_msi_teardown; =20 - return (zdev->msi_nr_irqs =3D=3D nvec) ? 0 : zdev->msi_nr_irqs; + return true; } =20 -void arch_teardown_msi_irqs(struct pci_dev *pdev) +static struct msi_parent_ops zpci_msi_parent_ops =3D { + .supported_flags =3D MSI_GENERIC_FLAGS_MASK | + MSI_FLAG_PCI_MSIX | + MSI_FLAG_MULTI_PCI_MSI, + .required_flags =3D MSI_FLAG_USE_DEF_DOM_OPS | + MSI_FLAG_USE_DEF_CHIP_OPS, + .init_dev_msi_info =3D zpci_init_dev_msi_info +}; + +int zpci_create_parent_msi_domain(struct zpci_bus *zbus) { - struct zpci_dev *zdev =3D to_zpci(pdev); - struct msi_desc *msi; - unsigned int i; - int rc; + char fwnode_name[18]; =20 - /* Disable interrupts */ - rc =3D zpci_clear_irq(zdev); - if (rc) - return; + sprintf(fwnode_name, "ZPCI_MSI_DOM_%04x", zbus->domain_nr); + struct irq_domain_info info =3D { + .fwnode =3D irq_domain_alloc_named_fwnode(fwnode_name), + .ops =3D &zpci_msi_domain_ops + }; =20 - /* Release MSI interrupts */ - msi_for_each_desc(msi, &pdev->dev, MSI_DESC_ASSOCIATED) { - for (i =3D 0; i < msi->nvec_used; i++) { - irq_set_msi_desc(msi->irq + i, NULL); - irq_free_desc(msi->irq + i); - } - msi->msg.address_lo =3D 0; - msi->msg.address_hi =3D 0; - msi->msg.data =3D 0; - msi->irq =3D 0; + if (!info.fwnode) { + pr_err("Failed to allocate fwnode for MSI IRQ domain\n"); + return -ENOMEM; } =20 - if (zdev->aisb !=3D -1UL) { - zpci_ibv[zdev->aisb] =3D NULL; - airq_iv_free_bit(zpci_sbv, zdev->aisb); - zdev->aisb =3D -1UL; - } - if (zdev->aibv) { - airq_iv_release(zdev->aibv); - zdev->aibv =3D NULL; + if (irq_delivery =3D=3D FLOATING) + zpci_msi_parent_ops.required_flags |=3D MSI_FLAG_NO_AFFINITY; + zbus->msi_parent_domain =3D msi_create_parent_irq_domain(&info, &zpci_msi= _parent_ops); + if (!zbus->msi_parent_domain) { + irq_domain_free_fwnode(info.fwnode); + pr_err("Failed to create MSI IRQ domain\n"); + return -ENOMEM; } =20 - if ((irq_delivery =3D=3D DIRECTED) && zdev->msi_first_bit !=3D -1U) - airq_iv_free(zpci_ibv[0], zdev->msi_first_bit, zdev->msi_nr_irqs); + return 0; } =20 -bool arch_restore_msi_irqs(struct pci_dev *pdev) +void zpci_remove_parent_msi_domain(struct zpci_bus *zbus) { - struct zpci_dev *zdev =3D to_zpci(pdev); + struct fwnode_handle *fn; =20 - zpci_set_irq(zdev); - return true; + fn =3D zbus->msi_parent_domain->fwnode; + irq_domain_remove(zbus->msi_parent_domain); + irq_domain_free_fwnode(fn); } =20 -static struct airq_struct zpci_airq =3D { - .handler =3D zpci_floating_irq_handler, - .isc =3D PCI_ISC, -}; - static void __init cpu_enable_directed_irq(void *unused) { union zpci_sic_iib iib =3D {{0}}; @@ -466,6 +546,7 @@ static int __init zpci_directed_irq_init(void) * is only done on the first vector. */ zpci_ibv[cpu] =3D airq_iv_create(cache_line_size() * BITS_PER_BYTE, + AIRQ_IV_PTR | AIRQ_IV_DATA | AIRQ_IV_CACHELINE | (!cpu ? AIRQ_IV_ALLOC : 0), NULL); --=20 2.48.1