linux-kernel - [PATCH 04/13] net/ethernet: Use never-managed version of pci

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20241015185124.64726-5-pstanner@redhat.com>
Date: Tue, 15 Oct 2024 20:51:14 +0200
From: Philipp Stanner <pstanner@...hat.com>
To: Damien Le Moal <dlemoal@...nel.org>,
	Niklas Cassel <cassel@...nel.org>,
	Sergey Shtylyov <s.shtylyov@....ru>,
	Basavaraj Natikar <basavaraj.natikar@....com>,
	Jiri Kosina <jikos@...nel.org>,
	Benjamin Tissoires <bentiss@...nel.org>,
	Arnd Bergmann <arnd@...db.de>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Alex Dubov <oakad@...oo.com>,
	Sudarsana Kalluru <skalluru@...vell.com>,
	Manish Chopra <manishc@...vell.com>,
	"David S. Miller" <davem@...emloft.net>,
	Eric Dumazet <edumazet@...gle.com>,
	Jakub Kicinski <kuba@...nel.org>,
	Paolo Abeni <pabeni@...hat.com>,
	Rasesh Mody <rmody@...vell.com>,
	GR-Linux-NIC-Dev@...vell.com,
	Igor Mitsyanko <imitsyanko@...ntenna.com>,
	Sergey Matyukevich <geomatsi@...il.com>,
	Kalle Valo <kvalo@...nel.org>,
	Sanjay R Mehta <sanju.mehta@....com>,
	Shyam Sundar S K <Shyam-sundar.S-k@....com>,
	Jon Mason <jdmason@...zu.us>,
	Dave Jiang <dave.jiang@...el.com>,
	Allen Hubbe <allenbh@...il.com>,
	Bjorn Helgaas <bhelgaas@...gle.com>,
	Alex Williamson <alex.williamson@...hat.com>,
	Juergen Gross <jgross@...e.com>,
	Stefano Stabellini <sstabellini@...nel.org>,
	Oleksandr Tyshchenko <oleksandr_tyshchenko@...m.com>,
	Jaroslav Kysela <perex@...ex.cz>,
	Takashi Iwai <tiwai@...e.com>,
	Chen Ni <nichen@...as.ac.cn>,
	Mario Limonciello <mario.limonciello@....com>,
	Philipp Stanner <pstanner@...hat.com>,
	Ricky Wu <ricky_wu@...ltek.com>,
	Al Viro <viro@...iv.linux.org.uk>,
	Breno Leitao <leitao@...ian.org>,
	Kevin Tian <kevin.tian@...el.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
	Mostafa Saleh <smostafa@...gle.com>,
	Jason Gunthorpe <jgg@...pe.ca>,
	Yi Liu <yi.l.liu@...el.com>,
	Christian Brauner <brauner@...nel.org>,
	Ankit Agrawal <ankita@...dia.com>,
	Eric Auger <eric.auger@...hat.com>,
	Reinette Chatre <reinette.chatre@...el.com>,
	Ye Bin <yebin10@...wei.com>,
	Marek Marczykowski-Górecki <marmarek@...isiblethingslab.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@...ux.dev>,
	Peter Ujfalusi <peter.ujfalusi@...ux.intel.com>,
	Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
	Kai Vehmanen <kai.vehmanen@...ux.intel.com>,
	Rui Salvaterra <rsalvaterra@...il.com>
Cc: linux-ide@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	linux-input@...r.kernel.org,
	netdev@...r.kernel.org,
	linux-wireless@...r.kernel.org,
	ntb@...ts.linux.dev,
	linux-pci@...r.kernel.org,
	kvm@...r.kernel.org,
	xen-devel@...ts.xenproject.org,
	linux-sound@...r.kernel.org
Subject: [PATCH 04/13] net/ethernet: Use never-managed version of pci_intx()

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.

broadcom/bnx2x and brocade/bna enable their PCI-Device with
pci_enable_device(). Thus, they need the never-managed version.

Replace pci_intx() with pci_intx_unmanaged().

Signed-off-by: Philipp Stanner <pstanner@...hat.com>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +-
 drivers/net/ethernet/brocade/bna/bnad.c          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 678829646cec..2ae63d6e6792 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -1669,7 +1669,7 @@ static void bnx2x_igu_int_enable(struct bnx2x *bp)
 	REG_WR(bp, IGU_REG_PF_CONFIGURATION, val);
 
 	if (val & IGU_PF_CONF_INT_LINE_EN)
-		pci_intx(bp->pdev, true);
+		pci_intx_unmanaged(bp->pdev, true);
 
 	barrier();
 
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index ece6f3b48327..2b37462d406e 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -2669,7 +2669,7 @@ bnad_enable_msix(struct bnad *bnad)
 		}
 	}
 
-	pci_intx(bnad->pcidev, 0);
+	pci_intx_unmanaged(bnad->pcidev, 0);
 
 	return;
 
-- 
2.47.0