|
@@ -117,8 +117,9 @@ static struct platform_device_id fec_devtype[] = {
|
|
|
.name = "imx6ul-fec",
|
|
|
.driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |
|
|
|
FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM |
|
|
|
- FEC_QUIRK_HAS_VLAN | FEC_QUIRK_BUG_CAPTURE |
|
|
|
- FEC_QUIRK_HAS_RACC | FEC_QUIRK_HAS_COALESCE,
|
|
|
+ FEC_QUIRK_HAS_VLAN | FEC_QUIRK_ERR007885 |
|
|
|
+ FEC_QUIRK_BUG_CAPTURE | FEC_QUIRK_HAS_RACC |
|
|
|
+ FEC_QUIRK_HAS_COALESCE,
|
|
|
}, {
|
|
|
/* sentinel */
|
|
|
}
|
|
@@ -235,14 +236,14 @@ static struct bufdesc *fec_enet_get_nextdesc(struct bufdesc *bdp,
|
|
|
struct bufdesc_prop *bd)
|
|
|
{
|
|
|
return (bdp >= bd->last) ? bd->base
|
|
|
- : (struct bufdesc *)(((unsigned)bdp) + bd->dsize);
|
|
|
+ : (struct bufdesc *)(((void *)bdp) + bd->dsize);
|
|
|
}
|
|
|
|
|
|
static struct bufdesc *fec_enet_get_prevdesc(struct bufdesc *bdp,
|
|
|
struct bufdesc_prop *bd)
|
|
|
{
|
|
|
return (bdp <= bd->base) ? bd->last
|
|
|
- : (struct bufdesc *)(((unsigned)bdp) - bd->dsize);
|
|
|
+ : (struct bufdesc *)(((void *)bdp) - bd->dsize);
|
|
|
}
|
|
|
|
|
|
static int fec_enet_get_bd_index(struct bufdesc *bdp,
|
|
@@ -1266,7 +1267,7 @@ skb_done:
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /* ERR006538: Keep the transmitter going */
|
|
|
+ /* ERR006358: Keep the transmitter going */
|
|
|
if (bdp != txq->bd.cur &&
|
|
|
readl(txq->bd.reg_desc_active) == 0)
|
|
|
writel(0, txq->bd.reg_desc_active);
|
|
@@ -2651,7 +2652,7 @@ static void fec_enet_free_queue(struct net_device *ndev)
|
|
|
for (i = 0; i < fep->num_tx_queues; i++)
|
|
|
if (fep->tx_queue[i] && fep->tx_queue[i]->tso_hdrs) {
|
|
|
txq = fep->tx_queue[i];
|
|
|
- dma_free_coherent(NULL,
|
|
|
+ dma_free_coherent(&fep->pdev->dev,
|
|
|
txq->bd.ring_size * TSO_HEADER_SIZE,
|
|
|
txq->tso_hdrs,
|
|
|
txq->tso_hdrs_dma);
|
|
@@ -2685,7 +2686,7 @@ static int fec_enet_alloc_queue(struct net_device *ndev)
|
|
|
txq->tx_wake_threshold =
|
|
|
(txq->bd.ring_size - txq->tx_stop_threshold) / 2;
|
|
|
|
|
|
- txq->tso_hdrs = dma_alloc_coherent(NULL,
|
|
|
+ txq->tso_hdrs = dma_alloc_coherent(&fep->pdev->dev,
|
|
|
txq->bd.ring_size * TSO_HEADER_SIZE,
|
|
|
&txq->tso_hdrs_dma,
|
|
|
GFP_KERNEL);
|
|
@@ -3187,7 +3188,7 @@ static int fec_enet_init(struct net_device *ndev)
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_OF
|
|
|
-static void fec_reset_phy(struct platform_device *pdev)
|
|
|
+static int fec_reset_phy(struct platform_device *pdev)
|
|
|
{
|
|
|
int err, phy_reset;
|
|
|
bool active_high = false;
|
|
@@ -3195,16 +3196,18 @@ static void fec_reset_phy(struct platform_device *pdev)
|
|
|
struct device_node *np = pdev->dev.of_node;
|
|
|
|
|
|
if (!np)
|
|
|
- return;
|
|
|
+ return 0;
|
|
|
|
|
|
- of_property_read_u32(np, "phy-reset-duration", &msec);
|
|
|
+ err = of_property_read_u32(np, "phy-reset-duration", &msec);
|
|
|
/* A sane reset duration should not be longer than 1s */
|
|
|
- if (msec > 1000)
|
|
|
+ if (!err && msec > 1000)
|
|
|
msec = 1;
|
|
|
|
|
|
phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0);
|
|
|
- if (!gpio_is_valid(phy_reset))
|
|
|
- return;
|
|
|
+ if (phy_reset == -EPROBE_DEFER)
|
|
|
+ return phy_reset;
|
|
|
+ else if (!gpio_is_valid(phy_reset))
|
|
|
+ return 0;
|
|
|
|
|
|
active_high = of_property_read_bool(np, "phy-reset-active-high");
|
|
|
|
|
@@ -3213,7 +3216,7 @@ static void fec_reset_phy(struct platform_device *pdev)
|
|
|
"phy-reset");
|
|
|
if (err) {
|
|
|
dev_err(&pdev->dev, "failed to get phy-reset-gpios: %d\n", err);
|
|
|
- return;
|
|
|
+ return err;
|
|
|
}
|
|
|
|
|
|
if (msec > 20)
|
|
@@ -3222,14 +3225,17 @@ static void fec_reset_phy(struct platform_device *pdev)
|
|
|
usleep_range(msec * 1000, msec * 1000 + 1000);
|
|
|
|
|
|
gpio_set_value_cansleep(phy_reset, !active_high);
|
|
|
+
|
|
|
+ return 0;
|
|
|
}
|
|
|
#else /* CONFIG_OF */
|
|
|
-static void fec_reset_phy(struct platform_device *pdev)
|
|
|
+static int fec_reset_phy(struct platform_device *pdev)
|
|
|
{
|
|
|
/*
|
|
|
* In case of platform probe, the reset has been done
|
|
|
* by machine code.
|
|
|
*/
|
|
|
+ return 0;
|
|
|
}
|
|
|
#endif /* CONFIG_OF */
|
|
|
|
|
@@ -3400,6 +3406,7 @@ fec_probe(struct platform_device *pdev)
|
|
|
if (ret) {
|
|
|
dev_err(&pdev->dev,
|
|
|
"Failed to enable phy regulator: %d\n", ret);
|
|
|
+ clk_disable_unprepare(fep->clk_ipg);
|
|
|
goto failed_regulator;
|
|
|
}
|
|
|
} else {
|
|
@@ -3412,7 +3419,9 @@ fec_probe(struct platform_device *pdev)
|
|
|
pm_runtime_set_active(&pdev->dev);
|
|
|
pm_runtime_enable(&pdev->dev);
|
|
|
|
|
|
- fec_reset_phy(pdev);
|
|
|
+ ret = fec_reset_phy(pdev);
|
|
|
+ if (ret)
|
|
|
+ goto failed_reset;
|
|
|
|
|
|
if (fep->bufdesc_ex)
|
|
|
fec_ptp_init(pdev);
|
|
@@ -3473,8 +3482,10 @@ failed_init:
|
|
|
fec_ptp_stop(pdev);
|
|
|
if (fep->reg_phy)
|
|
|
regulator_disable(fep->reg_phy);
|
|
|
+failed_reset:
|
|
|
+ pm_runtime_put(&pdev->dev);
|
|
|
+ pm_runtime_disable(&pdev->dev);
|
|
|
failed_regulator:
|
|
|
- clk_disable_unprepare(fep->clk_ipg);
|
|
|
failed_clk_ipg:
|
|
|
fec_enet_clk_enable(ndev, false);
|
|
|
failed_clk:
|