stmmac: intel: Fix kernel panic on pci probe
Subsystems (4)
PATCH 1/1 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 b4c5f83ae3f3 ("stmmac: intel: Adding ref clock 1us tic for LPI cntr")
Cc Voon Weifeng <[email protected]>
Signed-off-by Wong Vee Khee <[email protected]>
--- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +7 -7
@@ -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);
Signature · 1 line
2.17.0
Quoted 9 lines · On Thu, 29 Oct 2020 17:32:28 +0800 Wong Vee Khee wrote:
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_intelmodule.Move the code block after pci resources is obtained.
Fixes b4c5f83ae3f3 ("stmmac: intel: Adding ref clock 1us tic for LPI cntr")Cc Voon Weifeng <[email protected]>Signed-off-by Wong Vee Khee <[email protected]>
Applied, thanks!