Unverified Commit 35af3033 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11080 ixgbe: fix pci device refcount leak 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SOY6SVOK4QUIBOEAAHKNMIY2APW4PRXM/ 
 
https://gitee.com/src-openeuler/kernel/issues/IALLC8 
 
Link:https://gitee.com/openeuler/kernel/pulls/11080

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents e458ee0a 701f3148

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+9 −5
Original line number Diff line number Diff line
@@ -851,9 +851,11 @@ static struct pci_dev *ixgbe_get_first_secondary_devfn(unsigned int devfn) 
	rp_pdev = pci_get_domain_bus_and_slot(0, 0, devfn);

	if (rp_pdev && rp_pdev->subordinate) {

		bus = rp_pdev->subordinate->number;

		pci_dev_put(rp_pdev);

		return pci_get_domain_bus_and_slot(0, bus, 0);

	}



	pci_dev_put(rp_pdev);

	return NULL;

}
@@ -870,6 +872,7 @@ static bool ixgbe_x550em_a_has_mii(struct ixgbe_hw *hw) 
	struct ixgbe_adapter *adapter = hw->back;

	struct pci_dev *pdev = adapter->pdev;

	struct pci_dev *func0_pdev;

	bool has_mii = false;



	/* For the C3000 family of SoCs (x550em_a) the internal ixgbe devices

	 * are always downstream of root ports @ 0000:00:16.0 & 0000:00:17.0
@@ -880,15 +883,16 @@ static bool ixgbe_x550em_a_has_mii(struct ixgbe_hw *hw) 
	func0_pdev = ixgbe_get_first_secondary_devfn(PCI_DEVFN(0x16, 0));

	if (func0_pdev) {

		if (func0_pdev == pdev)

			return true;

		else

			return false;

			has_mii = true;

		goto out;

	}

	func0_pdev = ixgbe_get_first_secondary_devfn(PCI_DEVFN(0x17, 0));

	if (func0_pdev == pdev)

		return true;

		has_mii = true;



	return false;

out:

	pci_dev_put(func0_pdev);

	return has_mii;

}



/**