summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-04-16 13:58:43 -0400
committerDavid S. Miller <davem@davemloft.net>2015-04-16 13:58:43 -0400
commit51b5df886874816ff986fe66fe0d7b7eca9f6cd1 (patch)
treed9bc05f136558819d3ca4ca67f2ef74798cdd743 /include
parente743471f8d9c6ad00eb10a6d1e05803231e1de83 (diff)
parentf88203a229cca0b3634738b7dae47419d1da6dc8 (diff)
downloadop-kernel-dev-51b5df886874816ff986fe66fe0d7b7eca9f6cd1.zip
op-kernel-dev-51b5df886874816ff986fe66fe0d7b7eca9f6cd1.tar.gz
Merge branch 'stmmac-flow-control'
Vince Bridgers says: ==================== stmmac: Correct flow control configuration This series of patches corrects flow control configuration for the Synopsys GMAC driver. Flow control is configured based on a configurable receive fifo size. If less than 4Kbytes flow control is left disabled and a warning is presented. If a receive fifo size is not specified, flow control is left disabled to maintain current behavior. Unicast pause detection was disabled, but is now enabled. The pause time was modified to be maximum time per a XON/XOFF flow control mode of operation. This patch was tested on an Altera Cyclone 5 and an Altera Arria 10 devkit, and verified that flow control operates as expected when enabled. Please consider this series for inclusion so that flow control will function as expected for the Synopsys GMAC controller. ==================== Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/stmmac.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index cd63851..7f484a2 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -114,6 +114,8 @@ struct plat_stmmacenet_data {
int maxmtu;
int multicast_filter_bins;
int unicast_filter_entries;
+ int tx_fifo_size;
+ int rx_fifo_size;
void (*fix_mac_speed)(void *priv, unsigned int speed);
void (*bus_setup)(void __iomem *ioaddr);
void *(*setup)(struct platform_device *pdev);
OpenPOWER on IntegriCloud