Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae2104be authored by Yijing Wang's avatar Yijing Wang Committed by David S. Miller
Browse files

bnx2x: clean up unnecessary MSI/MSI-X capability find 



PCI core will initialize device MSI/MSI-X capability in
pci_msi_init_pci_dev(). So device driver should use
pci_dev->msi_cap/msix_cap to determine whether the device
support MSI/MSI-X instead of using
pci_find_capability(pci_dev, PCI_CAP_ID_MSI/MSIX).
Access to PCIe device config space again will consume more time.

Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Cc: Eilon Greenstein <eilong@broadcom.com>
Cc: netdev@vger.kernel.org
Acked-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 555a8428

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+3 −5
Original line number Diff line number Diff line
@@ -12544,16 +12544,14 @@ static int bnx2x_set_qm_cid_count(struct bnx2x *bp) 
static int bnx2x_get_num_non_def_sbs(struct pci_dev *pdev,

				     int cnic_cnt, bool is_vf)

{

	int pos, index;

	int index;

	u16 control = 0;



	pos = pci_find_capability(pdev, PCI_CAP_ID_MSIX);



	/*

	 * If MSI-X is not supported - return number of SBs needed to support

	 * one fast path queue: one FP queue + SB for CNIC

	 */

	if (!pos) {

	if (!pdev->msix_cap) {

		dev_info(&pdev->dev, "no msix capability found\n");

		return 1 + cnic_cnt;

	}
@@ -12566,7 +12564,7 @@ static int bnx2x_get_num_non_def_sbs(struct pci_dev *pdev, 
	 * without the default SB.

	 * For VFs there is no default SB, then we return (index+1).

	 */

	pci_read_config_word(pdev, pos  + PCI_MSI_FLAGS, &control);

	pci_read_config_word(pdev, pdev->msix_cap + PCI_MSI_FLAGS, &control);



	index = control & PCI_MSIX_FLAGS_QSIZE;