From nobody Fri Apr 17 10:29:25 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 3BED0C4332F for ; Thu, 17 Nov 2022 15:08:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240113AbiKQPI2 (ORCPT ); Thu, 17 Nov 2022 10:08:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240037AbiKQPH6 (ORCPT ); Thu, 17 Nov 2022 10:07:58 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C814E74AA4; Thu, 17 Nov 2022 07:07:57 -0800 (PST) Date: Thu, 17 Nov 2022 15:07:55 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1668697676; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PqSrWor0W3gt7s1Oft9gM5a9a3arhJ6cJus3p2ui2qI=; b=SkpTF0wJhT3WzN7CQiW/AndPqPQxGMStYzurk/jwu44MtE0Ak986n9lGmfkNx7zuy9motk eWGIkhmYmuWZ6DiM6+eGn2KxBCelaZy9GUJ38sbaLQ4LRJJKjdyc6ge1XJvm6ewFVZfF2/ VFI9mCPasrQ0hJoH4xoQ6LzRvIKL5pOpc3t+5Zf8ZcjTEqg8K3T8W/AvFFR1Z8ENTq+TA0 lQ8DxoXTEpN5XPr6ushEer9clkQhL7wYJRWgWm6yWD/x2s6HP+Sdp49ToBaEpXyEImKzcO 5Rmj1Xe7JtutC1BBYaOyipwa/FY4lQWtj9er7j0bCcnQpYZX3iYozulPliBu2w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1668697676; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PqSrWor0W3gt7s1Oft9gM5a9a3arhJ6cJus3p2ui2qI=; b=v2tP2c+yKFFBoZHxB4tTlOU76e4i6RnbArV8LRKeR8na/IyWBstTo2ERiexFijTdGdqvWt PAV7YJYNm8G7pIAg== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] PCI/MSI: Reject MSI-X early Cc: Thomas Gleixner , Jason Gunthorpe , Bjorn Helgaas , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org In-Reply-To: <20221111122015.631728309@linutronix.de> References: <20221111122015.631728309@linutronix.de> MIME-Version: 1.0 Message-ID: <166869767519.4906.15352965310185673367.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the irq/core branch of tip: Commit-ID: 99f3d279765725920aa5924fa445537a20129a6f Gitweb: https://git.kernel.org/tip/99f3d279765725920aa5924fa445537a2= 0129a6f Author: Thomas Gleixner AuthorDate: Fri, 11 Nov 2022 14:55:11 +01:00 Committer: Thomas Gleixner CommitterDate: Thu, 17 Nov 2022 15:15:22 +01:00 PCI/MSI: Reject MSI-X early Similar to PCI multi-MSI reject MSI-X enablement when a irq domain is attached to the device which does not support MSI-X. Signed-off-by: Thomas Gleixner Reviewed-by: Jason Gunthorpe Acked-by: Bjorn Helgaas Link: https://lore.kernel.org/r/20221111122015.631728309@linutronix.de --- drivers/pci/msi/msi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c index bc84647..0740acd 100644 --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -762,6 +762,10 @@ int __pci_enable_msix_range(struct pci_dev *dev, struc= t msix_entry *entries, int if (WARN_ON_ONCE(dev->msix_enabled)) return -EINVAL; =20 + /* Check MSI-X early on irq domain enabled architectures */ + if (!pci_msi_domain_supports(dev, MSI_FLAG_PCI_MSIX, ALLOW_LEGACY)) + return -ENOTSUPP; + if (!pci_msi_supported(dev, nvec) || dev->current_state !=3D PCI_D0) return -EINVAL;