Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7e1b37e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'gianfar-fixes'



Claudiu Manoil says:

====================
gianfar: Misc. fixes and updates

Various fixes for some older issues, including having a
MAINTAINERS entry for this driver.
I'd recommend applying them on top of net, thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 30aa7b18 abb1ed7b
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -4427,6 +4427,14 @@ L: linuxppc-dev@lists.ozlabs.org
S:	Maintained
F:	drivers/net/ethernet/freescale/ucc_geth*

FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
M:	Claudiu Manoil <claudiu.manoil@freescale.com>
L:	netdev@vger.kernel.org
S:	Maintained
F:	drivers/net/ethernet/freescale/gianfar*
X:	drivers/net/ethernet/freescale/gianfar_ptp.c
F:	Documentation/devicetree/bindings/net/fsl-tsec-phy.txt

FREESCALE QUICC ENGINE UCC UART DRIVER
M:	Timur Tabi <timur@tabi.org>
L:	linuxppc-dev@lists.ozlabs.org
+3 −5
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static void gfar_rx_offload_en(struct gfar_private *priv)
	if (priv->ndev->features & (NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX))
		priv->uses_rxfcb = 1;

	if (priv->hwts_rx_en)
	if (priv->hwts_rx_en || priv->rx_filer_enable)
		priv->uses_rxfcb = 1;
}

@@ -351,7 +351,7 @@ static void gfar_mac_rx_config(struct gfar_private *priv)
	u32 rctrl = 0;

	if (priv->rx_filer_enable) {
		rctrl |= RCTRL_FILREN;
		rctrl |= RCTRL_FILREN | RCTRL_PRSDEP_INIT;
		/* Program the RIR0 reg with the required distribution */
		if (priv->poll_mode == GFAR_SQ_POLLING)
			gfar_write(&regs->rir0, DEFAULT_2RXQ_RIR0);
@@ -3462,11 +3462,9 @@ static irqreturn_t gfar_error(int irq, void *grp_id)
		netif_dbg(priv, tx_err, dev, "Transmit Error\n");
	}
	if (events & IEVENT_BSY) {
		dev->stats.rx_errors++;
		dev->stats.rx_over_errors++;
		atomic64_inc(&priv->extra_stats.rx_bsy);

		gfar_receive(irq, grp_id);

		netif_dbg(priv, rx_err, dev, "busy error (rstat: %x)\n",
			  gfar_read(&regs->rstat));
	}
+2 −2
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
		gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
		priv->cur_filer_idx = priv->cur_filer_idx - 1;

		fcr = RQFCR_PID_DAL | RQFCR_AND | RQFCR_CMP_NOMATCH |
		fcr = RQFCR_PID_DAL | RQFCR_CMP_NOMATCH |
		      RQFCR_HASH | RQFCR_AND | RQFCR_HASHTBL_0;
		priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
		priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;