averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-22 09:34:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

ntb: Use never-managed version of pci_intx()

Browse Source 
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.

hw/amd and how/intel enable their PCI devices with pci_enable_device().
Thus, they need the never-managed version.

Replace pci_intx() with pci_intx_unmanaged().

Link: https://lore.kernel.org/r/20241209130632.132074-6-pstanner@redhat.com
Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> # ntb_hw_amd.c
Acked-by: Dave Jiang <dave.jiang@intel.com>           # ntb_hw_gen1.c
This commit is contained in:
Philipp Stanner
2025-01-18 14:38:48 -06:00
committed by Bjorn Helgaas
parent 57ca6af53e
commit f72acbeb2c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/ntb/hw/amd/ntb_hw_amd.c
+2 -2
View File
@@ -791,7 +791,7 @@ err_msi_request:
err_msi_enable:
/* Try to set up intx irq */
pci_intx(pdev, 1);
pci_intx_unmanaged(pdev, 1);
rc = request_irq(pdev->irq, ndev_irq_isr, IRQF_SHARED,
"ndev_irq_isr", ndev);
@@ -831,7 +831,7 @@ static void ndev_deinit_isr(struct amd_ntb_dev *ndev)
if (pci_dev_msi_enabled(pdev))
pci_disable_msi(pdev);
else
pci_intx(pdev, 0);
pci_intx_unmanaged(pdev, 0);
}
}
drivers/ntb/hw/intel/ntb_hw_gen1.c
+1 -1
View File
@@ -445,7 +445,7 @@ err_msi_enable:
/* Try to set up intx irq */
pci_intx(pdev, 1);
pci_intx_unmanaged(pdev, 1);
rc = request_irq(pdev->irq, ndev_irq_isr, IRQF_SHARED,
"ndev_irq_isr", ndev);