Commit 785ff20b authored by Wong Vee Khee's avatar Wong Vee Khee Committed by Jakub Kicinski
Browse files

stmmac: intel: Fix kernel panic on pci probe 



The commit "stmmac: intel: Adding ref clock 1us tic for LPI cntr"
introduced a regression which leads to the kernel panic duing loading
of the dwmac_intel module.

Move the code block after pci resources is obtained.

Fixes: b4c5f83a ("stmmac: intel: Adding ref clock 1us tic for LPI cntr")
Cc: Voon Weifeng <weifeng.voon@intel.com>
Signed-off-by: default avatarWong Vee Khee <vee.khee.wong@intel.com>
Link: https://lore.kernel.org/r/20201029093228.1741-1-vee.khee.wong@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d6a076d6

drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c

+7 −7
Original line number Diff line number Diff line
@@ -625,13 +625,6 @@ static int intel_eth_pci_probe(struct pci_dev *pdev, 
	if (ret)

		return ret;



	if (plat->eee_usecs_rate > 0) {

		u32 tx_lpi_usec;



		tx_lpi_usec = (plat->eee_usecs_rate / 1000000) - 1;

		writel(tx_lpi_usec, res.addr + GMAC_1US_TIC_COUNTER);

	}



	ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);

	if (ret < 0)

		return ret;
@@ -641,6 +634,13 @@ static int intel_eth_pci_probe(struct pci_dev *pdev, 
	res.wol_irq = pci_irq_vector(pdev, 0);

	res.irq = pci_irq_vector(pdev, 0);



	if (plat->eee_usecs_rate > 0) {

		u32 tx_lpi_usec;



		tx_lpi_usec = (plat->eee_usecs_rate / 1000000) - 1;

		writel(tx_lpi_usec, res.addr + GMAC_1US_TIC_COUNTER);

	}



	ret = stmmac_dvr_probe(&pdev->dev, plat, &res);

	if (ret) {

		pci_free_irq_vectors(pdev);