From: Philipp Stanner <pstanner@redhat•com>
To: Damien Le Moal <dlemoal@kernel•org>,
Niklas Cassel <cassel@kernel•org>,
Basavaraj Natikar <basavaraj.natikar@amd•com>,
Jiri Kosina <jikos@kernel•org>,
Benjamin Tissoires <bentiss@kernel•org>,
Arnd Bergmann <arnd@arndb•de>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Alex Dubov <oakad@yahoo•com>,
Sudarsana Kalluru <skalluru@marvell•com>,
Manish Chopra <manishc@marvell•com>,
Andrew Lunn <andrew+netdev@lunn•ch>,
"David S. Miller" <davem@davemloft•net>,
Eric Dumazet <edumazet@google•com>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
Rasesh Mody <rmody@marvell•com>,
GR-Linux-NIC-Dev@marvell•com,
Igor Mitsyanko <imitsyanko@quantenna•com>,
Sergey Matyukevich <geomatsi@gmail•com>,
Kalle Valo <kvalo@kernel•org>,
Sanjay R Mehta <sanju.mehta@amd•com>,
Shyam Sundar S K <Shyam-sundar.S-k@amd•com>,
Jon Mason <jdmason@kudzu•us>, Dave Jiang <dave.jiang@intel•com>,
Allen Hubbe <allenbh@gmail•com>,
Bjorn Helgaas <bhelgaas@google•com>,
Alex Williamson <alex.williamson@redhat•com>,
Juergen Gross <jgross@suse•com>,
Stefano Stabellini <sstabellini@kernel•org>,
Oleksandr Tyshchenko <oleksandr_tyshchenko@epam•com>,
Philipp Stanner <pstanner@redhat•com>,
Mario Limonciello <mario.limonciello@amd•com>,
Chen Ni <nichen@iscas•ac.cn>, Ricky Wu <ricky_wu@realtek•com>,
Al Viro <viro@zeniv•linux.org.uk>,
Breno Leitao <leitao@debian•org>,
Kevin Tian <kevin.tian@intel•com>,
Thomas Gleixner <tglx@linutronix•de>,
Mostafa Saleh <smostafa@google•com>,
Andy Shevchenko <andriy.shevchenko@linux•intel.com>,
Jason Gunthorpe <jgg@ziepe•ca>, Yi Liu <yi.l.liu@intel•com>,
Kunwu Chan <chentao@kylinos•cn>,
Ankit Agrawal <ankita@nvidia•com>,
Christian Brauner <brauner@kernel•org>,
Reinette Chatre <reinette.chatre@intel•com>,
Eric Auger <eric.auger@redhat•com>, Ye Bin <yebin10@huawei•com>
Cc: linux-ide@vger•kernel.org, linux-kernel@vger•kernel.org,
linux-input@vger•kernel.org, netdev@vger•kernel.org,
linux-wireless@vger•kernel.org, ntb@lists•linux.dev,
linux-pci@vger•kernel.org, kvm@vger•kernel.org,
xen-devel@lists•xenproject.org
Subject: [PATCH v2 06/11] vfio/pci: Use never-managed version of pci_intx()
Date: Wed, 13 Nov 2024 13:41:54 +0100 [thread overview]
Message-ID: <20241113124158.22863-8-pstanner@redhat.com> (raw)
In-Reply-To: <20241113124158.22863-2-pstanner@redhat.com>
pci_intx() is a hybrid function which can sometimes be managed through
devres. To remove this hybrid nature from pci_intx(), it is necessary to
port users to either an always-managed or a never-managed version.
vfio enables its PCI-Device with pci_enable_device(). Thus, it
needs the never-managed version.
Replace pci_intx() with pci_intx_unmanaged().
Signed-off-by: Philipp Stanner <pstanner@redhat•com>
---
drivers/vfio/pci/vfio_pci_core.c | 2 +-
drivers/vfio/pci/vfio_pci_intrs.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c
index 1ab58da9f38a..90240c8d51aa 100644
--- a/drivers/vfio/pci/vfio_pci_core.c
+++ b/drivers/vfio/pci/vfio_pci_core.c
@@ -498,7 +498,7 @@ int vfio_pci_core_enable(struct vfio_pci_core_device *vdev)
if (vfio_pci_nointx(pdev)) {
pci_info(pdev, "Masking broken INTx support\n");
vdev->nointx = true;
- pci_intx(pdev, 0);
+ pci_intx_unmanaged(pdev, 0);
} else
vdev->pci_2_3 = pci_intx_mask_supported(pdev);
}
diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c
index 8382c5834335..40abb0b937a2 100644
--- a/drivers/vfio/pci/vfio_pci_intrs.c
+++ b/drivers/vfio/pci/vfio_pci_intrs.c
@@ -118,7 +118,7 @@ static bool __vfio_pci_intx_mask(struct vfio_pci_core_device *vdev)
*/
if (unlikely(!is_intx(vdev))) {
if (vdev->pci_2_3)
- pci_intx(pdev, 0);
+ pci_intx_unmanaged(pdev, 0);
goto out_unlock;
}
@@ -132,7 +132,7 @@ static bool __vfio_pci_intx_mask(struct vfio_pci_core_device *vdev)
* mask, not just when something is pending.
*/
if (vdev->pci_2_3)
- pci_intx(pdev, 0);
+ pci_intx_unmanaged(pdev, 0);
else
disable_irq_nosync(pdev->irq);
@@ -178,7 +178,7 @@ static int vfio_pci_intx_unmask_handler(void *opaque, void *data)
*/
if (unlikely(!is_intx(vdev))) {
if (vdev->pci_2_3)
- pci_intx(pdev, 1);
+ pci_intx_unmanaged(pdev, 1);
goto out_unlock;
}
@@ -296,7 +296,7 @@ static int vfio_intx_enable(struct vfio_pci_core_device *vdev,
*/
ctx->masked = vdev->virq_disabled;
if (vdev->pci_2_3) {
- pci_intx(pdev, !ctx->masked);
+ pci_intx_unmanaged(pdev, !ctx->masked);
irqflags = IRQF_SHARED;
} else {
irqflags = ctx->masked ? IRQF_NO_AUTOEN : 0;
@@ -569,7 +569,7 @@ static void vfio_msi_disable(struct vfio_pci_core_device *vdev, bool msix)
* via their shutdown paths. Restore for NoINTx devices.
*/
if (vdev->nointx)
- pci_intx(pdev, 0);
+ pci_intx_unmanaged(pdev, 0);
vdev->irq_type = VFIO_PCI_NUM_IRQS;
}
--
2.47.0
next prev parent reply other threads:[~2024-11-13 12:42 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-13 12:41 [PATCH v2 00/11] Remove implicit devres from pci_intx() Philipp Stanner
2024-11-13 12:41 ` [PATCH v2 01/11] PCI: Prepare removing " Philipp Stanner
2024-11-13 16:04 ` Thomas Gleixner
2024-11-13 16:11 ` Philipp Stanner
2024-11-13 12:41 ` [PATCH v2 02/11] drivers/xen: Use never-managed version of pci_intx() Philipp Stanner
2024-11-13 12:41 ` [PATCH v2 03/11] net/ethernet: " Philipp Stanner
2024-11-13 12:41 ` [PATCH v2 04/11] net/ntb: " Philipp Stanner
2024-11-13 15:24 ` Dave Jiang
2024-11-13 12:41 ` [PATCH v2 05/11] misc: " Philipp Stanner
2024-11-13 12:41 ` Philipp Stanner [this message]
2024-11-13 12:41 ` [PATCH v2 07/11] PCI: MSI: " Philipp Stanner
2024-11-15 15:35 ` Thomas Gleixner
2024-11-13 12:41 ` [PATCH v2 08/11] ata: Use always-managed " Philipp Stanner
2024-11-13 12:41 ` [PATCH v2 09/11] wifi: qtnfmac: use always-managed version of pcim_intx() Philipp Stanner
2024-11-13 12:41 ` [PATCH v2 10/11] HID: amd_sfh: Use " Philipp Stanner
2024-11-13 12:41 ` [PATCH v2 11/11] Remove devres from pci_intx() Philipp Stanner
2024-11-13 16:22 ` Thomas Gleixner
2024-11-14 9:05 ` Philipp Stanner
2024-11-15 0:46 ` Thomas Gleixner
2024-11-15 8:32 ` Philipp Stanner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241113124158.22863-8-pstanner@redhat.com \
--to=pstanner@redhat$(echo .)com \
--cc=GR-Linux-NIC-Dev@marvell$(echo .)com \
--cc=Shyam-sundar.S-k@amd$(echo .)com \
--cc=alex.williamson@redhat$(echo .)com \
--cc=allenbh@gmail$(echo .)com \
--cc=andrew+netdev@lunn$(echo .)ch \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=ankita@nvidia$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=basavaraj.natikar@amd$(echo .)com \
--cc=bentiss@kernel$(echo .)org \
--cc=bhelgaas@google$(echo .)com \
--cc=brauner@kernel$(echo .)org \
--cc=cassel@kernel$(echo .)org \
--cc=chentao@kylinos$(echo .)cn \
--cc=dave.jiang@intel$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dlemoal@kernel$(echo .)org \
--cc=edumazet@google$(echo .)com \
--cc=eric.auger@redhat$(echo .)com \
--cc=geomatsi@gmail$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=imitsyanko@quantenna$(echo .)com \
--cc=jdmason@kudzu$(echo .)us \
--cc=jgg@ziepe$(echo .)ca \
--cc=jgross@suse$(echo .)com \
--cc=jikos@kernel$(echo .)org \
--cc=kevin.tian@intel$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=kvalo@kernel$(echo .)org \
--cc=kvm@vger$(echo .)kernel.org \
--cc=leitao@debian$(echo .)org \
--cc=linux-ide@vger$(echo .)kernel.org \
--cc=linux-input@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-pci@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=manishc@marvell$(echo .)com \
--cc=mario.limonciello@amd$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nichen@iscas$(echo .)ac.cn \
--cc=ntb@lists$(echo .)linux.dev \
--cc=oakad@yahoo$(echo .)com \
--cc=oleksandr_tyshchenko@epam$(echo .)com \
--cc=pabeni@redhat$(echo .)com \
--cc=reinette.chatre@intel$(echo .)com \
--cc=ricky_wu@realtek$(echo .)com \
--cc=rmody@marvell$(echo .)com \
--cc=sanju.mehta@amd$(echo .)com \
--cc=skalluru@marvell$(echo .)com \
--cc=smostafa@google$(echo .)com \
--cc=sstabellini@kernel$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=viro@zeniv$(echo .)linux.org.uk \
--cc=xen-devel@lists$(echo .)xenproject.org \
--cc=yebin10@huawei$(echo .)com \
--cc=yi.l.liu@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox