Skip to content

Commit 7f7d6c2

Browse files
Fabio Estevamdavem330
authored andcommitted
net: fec: Ensure that initialization is done prior to request_irq()
Currently request_irq() is called prior to fec_enet_init() and fec_ptp_init(), which causes the following crash on a mx53qsb: Unable to handle kernel NULL pointer dereference at virtual address 00000002 pgd = 80004000 [00000002] *pgd=00000000 Internal error: Oops: 5 [#1] SMP ARM Modules linked in: CPU: 0 Not tainted (3.8.0-rc7-next-20130215+ #346) PC is at fec_enet_interrupt+0xd0/0x348 LR is at fec_enet_interrupt+0xb8/0x348 pc : [<80372b7c>] lr : [<80372b64>] psr: 60000193 sp : df855c20 ip : df855c20 fp : df855c74 r10: 00000516 r9 : 1c000000 r8 : 00000000 r7 : 00000000 r6 : 00000000 r5 : 00000000 r4 : df9b7800 r3 : df9b7df4 r2 : 00000000 r1 : 00000000 r0 : df9b7d34 Ensure that such initialization functions are called prior to requesting the interrupts, so that all necessary the data structures are in place when the irqs occur. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent b531ed6 commit 7f7d6c2

1 file changed

Lines changed: 15 additions & 15 deletions

File tree

  • drivers/net/ethernet/freescale

drivers/net/ethernet/freescale/fec.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1782,6 +1782,15 @@ fec_probe(struct platform_device *pdev)
17821782
fep->phy_interface = ret;
17831783
}
17841784

1785+
fep->bufdesc_ex =
1786+
pdev->id_entry->driver_data & FEC_QUIRK_HAS_BUFDESC_EX;
1787+
if (fep->bufdesc_ex)
1788+
fec_ptp_init(ndev, pdev);
1789+
1790+
ret = fec_enet_init(ndev);
1791+
if (ret)
1792+
goto failed_init;
1793+
17851794
for (i = 0; i < FEC_IRQ_NUM; i++) {
17861795
irq = platform_get_irq(pdev, i);
17871796
if (irq < 0) {
@@ -1819,8 +1828,6 @@ fec_probe(struct platform_device *pdev)
18191828
}
18201829

18211830
fep->clk_ptp = devm_clk_get(&pdev->dev, "ptp");
1822-
fep->bufdesc_ex =
1823-
pdev->id_entry->driver_data & FEC_QUIRK_HAS_BUFDESC_EX;
18241831
if (IS_ERR(fep->clk_ptp)) {
18251832
ret = PTR_ERR(fep->clk_ptp);
18261833
fep->bufdesc_ex = 0;
@@ -1843,13 +1850,6 @@ fec_probe(struct platform_device *pdev)
18431850

18441851
fec_reset_phy(pdev);
18451852

1846-
if (fep->bufdesc_ex)
1847-
fec_ptp_init(ndev, pdev);
1848-
1849-
ret = fec_enet_init(ndev);
1850-
if (ret)
1851-
goto failed_init;
1852-
18531853
ret = fec_enet_mii_init(pdev);
18541854
if (ret)
18551855
goto failed_mii_init;
@@ -1866,7 +1866,6 @@ fec_probe(struct platform_device *pdev)
18661866
failed_register:
18671867
fec_enet_mii_remove(fep);
18681868
failed_mii_init:
1869-
failed_init:
18701869
failed_regulator:
18711870
clk_disable_unprepare(fep->clk_ahb);
18721871
clk_disable_unprepare(fep->clk_ipg);
@@ -1881,6 +1880,7 @@ fec_probe(struct platform_device *pdev)
18811880
}
18821881
failed_irq:
18831882
iounmap(fep->hwp);
1883+
failed_init:
18841884
failed_ioremap:
18851885
free_netdev(ndev);
18861886
failed_alloc_etherdev:
@@ -1899,17 +1899,17 @@ fec_drv_remove(struct platform_device *pdev)
18991899

19001900
unregister_netdev(ndev);
19011901
fec_enet_mii_remove(fep);
1902-
for (i = 0; i < FEC_IRQ_NUM; i++) {
1903-
int irq = platform_get_irq(pdev, i);
1904-
if (irq > 0)
1905-
free_irq(irq, ndev);
1906-
}
19071902
del_timer_sync(&fep->time_keep);
19081903
clk_disable_unprepare(fep->clk_ptp);
19091904
if (fep->ptp_clock)
19101905
ptp_clock_unregister(fep->ptp_clock);
19111906
clk_disable_unprepare(fep->clk_ahb);
19121907
clk_disable_unprepare(fep->clk_ipg);
1908+
for (i = 0; i < FEC_IRQ_NUM; i++) {
1909+
int irq = platform_get_irq(pdev, i);
1910+
if (irq > 0)
1911+
free_irq(irq, ndev);
1912+
}
19131913
iounmap(fep->hwp);
19141914
free_netdev(ndev);
19151915

0 commit comments

Comments
 (0)