Merge branch 'sh_eth' (d5c065e3) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/ethernet/renesas/sh_eth.c

+29 −38

Original line number	Original line	Diff line number	Diff line
	@@ -400,7 +400,8 @@ static void sh_eth_select_mii(struct net_device *ndev)
	value = 0x0;		value = 0x0;
	break;		break;
	default:		default:
	pr_warn("PHY interface mode was not setup. Set to MII.\n");		netdev_warn(ndev,
			"PHY interface mode was not setup. Set to MII.\n");
	value = 0x1;		value = 0x1;
	break;		break;
	}		}
	@@ -854,7 +855,7 @@ static int sh_eth_check_reset(struct net_device *ndev)
	cnt--;		cnt--;
	}		}
	if (cnt <= 0) {		if (cnt <= 0) {
	pr_err("Device reset failed\n");		netdev_err(ndev, "Device reset failed\n");
	ret = -ETIMEDOUT;		ret = -ETIMEDOUT;
	}		}
	return ret;		return ret;
	@@ -1556,8 +1557,7 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
	/* Unused write back interrupt */		/* Unused write back interrupt */
	if (intr_status & EESR_TABT) { /* Transmit Abort int */		if (intr_status & EESR_TABT) { /* Transmit Abort int */
	ndev->stats.tx_aborted_errors++;		ndev->stats.tx_aborted_errors++;
	if (netif_msg_tx_err(mdp))		netif_err(mdp, tx_err, ndev, "Transmit Abort\n");
	dev_err(&ndev->dev, "Transmit Abort\n");
	}		}
	}		}

	@@ -1566,45 +1566,38 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
	if (intr_status & EESR_RFRMER) {		if (intr_status & EESR_RFRMER) {
	/* Receive Frame Overflow int */		/* Receive Frame Overflow int */
	ndev->stats.rx_frame_errors++;		ndev->stats.rx_frame_errors++;
	if (netif_msg_rx_err(mdp))		netif_err(mdp, rx_err, ndev, "Receive Abort\n");
	dev_err(&ndev->dev, "Receive Abort\n");
	}		}
	}		}

	if (intr_status & EESR_TDE) {		if (intr_status & EESR_TDE) {
	/* Transmit Descriptor Empty int */		/* Transmit Descriptor Empty int */
	ndev->stats.tx_fifo_errors++;		ndev->stats.tx_fifo_errors++;
	if (netif_msg_tx_err(mdp))		netif_err(mdp, tx_err, ndev, "Transmit Descriptor Empty\n");
	dev_err(&ndev->dev, "Transmit Descriptor Empty\n");
	}		}

	if (intr_status & EESR_TFE) {		if (intr_status & EESR_TFE) {
	/* FIFO under flow */		/* FIFO under flow */
	ndev->stats.tx_fifo_errors++;		ndev->stats.tx_fifo_errors++;
	if (netif_msg_tx_err(mdp))		netif_err(mdp, tx_err, ndev, "Transmit FIFO Under flow\n");
	dev_err(&ndev->dev, "Transmit FIFO Under flow\n");
	}		}

	if (intr_status & EESR_RDE) {		if (intr_status & EESR_RDE) {
	/* Receive Descriptor Empty int */		/* Receive Descriptor Empty int */
	ndev->stats.rx_over_errors++;		ndev->stats.rx_over_errors++;
			netif_err(mdp, rx_err, ndev, "Receive Descriptor Empty\n");
	if (netif_msg_rx_err(mdp))
	dev_err(&ndev->dev, "Receive Descriptor Empty\n");
	}		}

	if (intr_status & EESR_RFE) {		if (intr_status & EESR_RFE) {
	/* Receive FIFO Overflow int */		/* Receive FIFO Overflow int */
	ndev->stats.rx_fifo_errors++;		ndev->stats.rx_fifo_errors++;
	if (netif_msg_rx_err(mdp))		netif_err(mdp, rx_err, ndev, "Receive FIFO Overflow\n");
	dev_err(&ndev->dev, "Receive FIFO Overflow\n");
	}		}

	if (!mdp->cd->no_ade && (intr_status & EESR_ADE)) {		if (!mdp->cd->no_ade && (intr_status & EESR_ADE)) {
	/* Address Error */		/* Address Error */
	ndev->stats.tx_fifo_errors++;		ndev->stats.tx_fifo_errors++;
	if (netif_msg_tx_err(mdp))		netif_err(mdp, tx_err, ndev, "Address Error\n");
	dev_err(&ndev->dev, "Address Error\n");
	}		}

	mask = EESR_TWB \| EESR_TABT \| EESR_ADE \| EESR_TDE \| EESR_TFE;		mask = EESR_TWB \| EESR_TABT \| EESR_ADE \| EESR_TDE \| EESR_TFE;
	@@ -1615,7 +1608,7 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
	u32 edtrr = sh_eth_read(ndev, EDTRR);		u32 edtrr = sh_eth_read(ndev, EDTRR);

	/* dmesg */		/* dmesg */
	dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",		netdev_err(ndev, "TX error. status=%8.8x cur_tx=%8.8x dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
	intr_status, mdp->cur_tx, mdp->dirty_tx,		intr_status, mdp->cur_tx, mdp->dirty_tx,
	(u32)ndev->state, edtrr);		(u32)ndev->state, edtrr);
	/* dirty buffer free */		/* dirty buffer free */
	@@ -1662,7 +1655,7 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)
	EESIPR);		EESIPR);
	__napi_schedule(&mdp->napi);		__napi_schedule(&mdp->napi);
	} else {		} else {
	dev_warn(&ndev->dev,		netdev_warn(ndev,
	"ignoring interrupt, status 0x%08lx, mask 0x%08lx.\n",		"ignoring interrupt, status 0x%08lx, mask 0x%08lx.\n",
	intr_status, intr_enable);		intr_status, intr_enable);
	}		}
	@@ -1793,11 +1786,11 @@ static int sh_eth_phy_init(struct net_device *ndev)
	}		}

	if (IS_ERR(phydev)) {		if (IS_ERR(phydev)) {
	dev_err(&ndev->dev, "failed to connect PHY\n");		netdev_err(ndev, "failed to connect PHY\n");
	return PTR_ERR(phydev);		return PTR_ERR(phydev);
	}		}

	dev_info(&ndev->dev, "attached PHY %d (IRQ %d) to driver %s\n",		netdev_info(ndev, "attached PHY %d (IRQ %d) to driver %s\n",
	phydev->addr, phydev->irq, phydev->drv->name);		phydev->addr, phydev->irq, phydev->drv->name);

	mdp->phydev = phydev;		mdp->phydev = phydev;
	@@ -1979,12 +1972,12 @@ static int sh_eth_set_ringparam(struct net_device *ndev,

	ret = sh_eth_ring_init(ndev);		ret = sh_eth_ring_init(ndev);
	if (ret < 0) {		if (ret < 0) {
	dev_err(&ndev->dev, "%s: sh_eth_ring_init failed.\n", __func__);		netdev_err(ndev, "%s: sh_eth_ring_init failed.\n", __func__);
	return ret;		return ret;
	}		}
	ret = sh_eth_dev_init(ndev, false);		ret = sh_eth_dev_init(ndev, false);
	if (ret < 0) {		if (ret < 0) {
	dev_err(&ndev->dev, "%s: sh_eth_dev_init failed.\n", __func__);		netdev_err(ndev, "%s: sh_eth_dev_init failed.\n", __func__);
	return ret;		return ret;
	}		}

	@@ -2025,7 +2018,7 @@ static int sh_eth_open(struct net_device *ndev)
	ret = request_irq(ndev->irq, sh_eth_interrupt,		ret = request_irq(ndev->irq, sh_eth_interrupt,
	mdp->cd->irq_flags, ndev->name, ndev);		mdp->cd->irq_flags, ndev->name, ndev);
	if (ret) {		if (ret) {
	dev_err(&ndev->dev, "Can not assign IRQ number\n");		netdev_err(ndev, "Can not assign IRQ number\n");
	goto out_napi_off;		goto out_napi_off;
	}		}

	@@ -2063,10 +2056,9 @@ static void sh_eth_tx_timeout(struct net_device *ndev)

	netif_stop_queue(ndev);		netif_stop_queue(ndev);

	if (netif_msg_timer(mdp)) {		netif_err(mdp, timer, ndev,
	dev_err(&ndev->dev, "%s: transmit timed out, status %8.8x, resetting...\n",		"transmit timed out, status %8.8x, resetting...\n",
	ndev->name, (int)sh_eth_read(ndev, EESR));		(int)sh_eth_read(ndev, EESR));
	}

	/* tx_errors count up */		/* tx_errors count up */
	ndev->stats.tx_errors++;		ndev->stats.tx_errors++;
	@@ -2101,8 +2093,7 @@ static int sh_eth_start_xmit(struct sk_buff skb, struct net_device ndev)
	spin_lock_irqsave(&mdp->lock, flags);		spin_lock_irqsave(&mdp->lock, flags);
	if ((mdp->cur_tx - mdp->dirty_tx) >= (mdp->num_tx_ring - 4)) {		if ((mdp->cur_tx - mdp->dirty_tx) >= (mdp->num_tx_ring - 4)) {
	if (!sh_eth_txfree(ndev)) {		if (!sh_eth_txfree(ndev)) {
	if (netif_msg_tx_queued(mdp))		netif_warn(mdp, tx_queued, ndev, "TxFD exhausted.\n");
	dev_warn(&ndev->dev, "TxFD exhausted.\n");
	netif_stop_queue(ndev);		netif_stop_queue(ndev);
	spin_unlock_irqrestore(&mdp->lock, flags);		spin_unlock_irqrestore(&mdp->lock, flags);
	return NETDEV_TX_BUSY;		return NETDEV_TX_BUSY;
	@@ -2272,7 +2263,7 @@ static int sh_eth_tsu_busy(struct net_device *ndev)
	udelay(10);		udelay(10);
	timeout--;		timeout--;
	if (timeout <= 0) {		if (timeout <= 0) {
	dev_err(&ndev->dev, "%s: timeout\n", __func__);		netdev_err(ndev, "%s: timeout\n", __func__);
	return -ETIMEDOUT;		return -ETIMEDOUT;
	}		}
	}		}
	@@ -2924,7 +2915,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
	}		}

	/* print device information */		/* print device information */
	pr_info("Base address at 0x%x, %pM, IRQ %d.\n",		netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d.\n",
	(u32)ndev->base_addr, ndev->dev_addr, ndev->irq);		(u32)ndev->base_addr, ndev->dev_addr, ndev->irq);

	platform_set_drvdata(pdev, ndev);		platform_set_drvdata(pdev, ndev);