Message ID | 1347346514-23411-6-git-send-email-peppe.cavallaro@st.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
On Tue, 2012-09-11 at 08:55 +0200, Giuseppe CAVALLARO wrote: > This patch is to get/set the tx/rx coalesce parameters > via ethtool interface. > > Tests have been done on several platform with > different GMAC chips w/o w/ RX watchdog feature. > > V2: reject coalesce settings that are not supported. > > Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> Reviewed-by: Ben Hutchings <bhutchings@solarflare.com> > --- > drivers/net/ethernet/stmicro/stmmac/common.h | 8 ++- > drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + > .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 85 ++++++++++++++++++++ > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20 +++--- > 4 files changed, 103 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h > index 02eb2da..b9033cc 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/common.h > +++ b/drivers/net/ethernet/stmicro/stmmac/common.h > @@ -169,7 +169,13 @@ struct stmmac_extra_stats { > #define DMA_HW_FEAT_SAVLANINS 0x08000000 /* Source Addr or VLAN Insertion */ > #define DMA_HW_FEAT_ACTPHYIF 0x70000000 /* Active/selected PHY interface */ > #define DEFAULT_DMA_PBL 8 > -#define DEFAULT_DMA_RIWT 0xff /* Max RI Watchdog Timer count */ > + > +/* Coalesce defines */ > +#define MAX_DMA_RIWT 0xff /* Max RI Watchdog Timer count */ > +#define MIN_DMA_RIWT 0x20 > +#define STMMAC_COAL_TX_TIMER 40000 > +#define STMMAC_MAX_COAL_TX_TICK 100000 > +#define STMMAC_TX_MAX_FRAMES 32 > > enum rx_frame_status { /* IPC status */ > good_frame = 0, > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h > index 6901e3c..ad4f6b9 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h > @@ -93,6 +93,7 @@ struct stmmac_priv { > u32 tx_count_frames; > u32 tx_coal_frames; > u32 tx_coal_timer; > + u32 rx_riwt; > }; > > extern int phyaddr; > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c > index 48ad0bc..d27cc18 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c > @@ -522,6 +522,89 @@ static int stmmac_ethtool_op_set_eee(struct net_device *dev, > return phy_ethtool_set_eee(priv->phydev, edata); > } > > +static u32 stmmac_usec2riwt(u32 usec, struct stmmac_priv *priv) > +{ > + unsigned long clk = clk_get_rate(priv->stmmac_clk); > + > + if (!clk) > + return 0; > + > + return (usec * (clk / 1000000)) / 256; > +} > + > +static u32 stmmac_riwt2usec(u32 riwt, struct stmmac_priv *priv) > +{ > + unsigned long clk = clk_get_rate(priv->stmmac_clk); > + > + if (!clk) > + return 0; > + > + return (riwt * 256) / (clk / 1000000); > +} > + > +static int stmmac_get_coalesce(struct net_device *dev, > + struct ethtool_coalesce *ec) > +{ > + struct stmmac_priv *priv = netdev_priv(dev); > + > + ec->tx_coalesce_usecs = priv->tx_coal_timer; > + ec->tx_max_coalesced_frames = priv->tx_coal_frames; > + > + if (priv->use_riwt) > + ec->rx_coalesce_usecs = stmmac_riwt2usec(priv->rx_riwt, priv); > + > + return 0; > +} > + > +static int stmmac_set_coalesce(struct net_device *dev, > + struct ethtool_coalesce *ec) > +{ > + struct stmmac_priv *priv = netdev_priv(dev); > + unsigned int rx_riwt; > + > + /* Check not supported parameters */ > + if ((ec->rx_max_coalesced_frames) || (ec->rx_coalesce_usecs_irq) || > + (ec->rx_max_coalesced_frames_irq) || (ec->tx_coalesce_usecs_irq) || > + (ec->use_adaptive_rx_coalesce) || (ec->use_adaptive_tx_coalesce) || > + (ec->pkt_rate_low) || (ec->rx_coalesce_usecs_low) || > + (ec->rx_max_coalesced_frames_low) || (ec->tx_coalesce_usecs_high) || > + (ec->tx_max_coalesced_frames_low) || (ec->pkt_rate_high) || > + (ec->tx_coalesce_usecs_low) || (ec->rx_coalesce_usecs_high) || > + (ec->rx_max_coalesced_frames_high) || > + (ec->tx_max_coalesced_frames_irq) || > + (ec->stats_block_coalesce_usecs) || > + (ec->tx_max_coalesced_frames_high) || (ec->rate_sample_interval)) > + return -EOPNOTSUPP; > + > + /* No rx interrupts will be generated if both are zero */ > + if (ec->rx_coalesce_usecs == 0) > + return -EINVAL; > + > + /* No tx interrupts will be generated if both are zero */ > + if ((ec->tx_coalesce_usecs == 0) && > + (ec->tx_max_coalesced_frames == 0)) > + return -EINVAL; > + > + if ((ec->tx_coalesce_usecs > STMMAC_COAL_TX_TIMER) || > + (ec->tx_max_coalesced_frames > STMMAC_TX_MAX_FRAMES)) > + return -EINVAL; > + > + rx_riwt = stmmac_usec2riwt(ec->rx_coalesce_usecs, priv); > + > + if ((rx_riwt > MAX_DMA_RIWT) || (rx_riwt < MIN_DMA_RIWT)) > + return -EINVAL; > + else if (!priv->use_riwt) > + return -EOPNOTSUPP; > + > + /* Only copy relevant parameters, ignore all others. */ > + priv->tx_coal_frames = ec->tx_max_coalesced_frames; > + priv->tx_coal_timer = ec->tx_coalesce_usecs; > + priv->rx_riwt = rx_riwt; > + priv->hw->dma->rx_watchdog(priv->ioaddr, priv->rx_riwt); > + > + return 0; > +} > + > static const struct ethtool_ops stmmac_ethtool_ops = { > .begin = stmmac_check_if_running, > .get_drvinfo = stmmac_ethtool_getdrvinfo, > @@ -542,6 +625,8 @@ static const struct ethtool_ops stmmac_ethtool_ops = { > .set_eee = stmmac_ethtool_op_set_eee, > .get_sset_count = stmmac_get_sset_count, > .get_ts_info = ethtool_op_get_ts_info, > + .get_coalesce = stmmac_get_coalesce, > + .set_coalesce = stmmac_set_coalesce, > }; > > void stmmac_set_ethtool_ops(struct net_device *netdev) > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 8e610a1..b0731e6 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -77,8 +77,6 @@ > > #define STMMAC_ALIGN(x) L1_CACHE_ALIGN(x) > #define JUMBO_LEN 9000 > -#define STMMAC_TX_TM 40000 > -#define STMMAC_TX_MAX_FRAMES 32 /* Max coalesced frame */ > > /* Module parameters */ > #define TX_TIMEO 5000 /* default 5 seconds */ > @@ -140,6 +138,8 @@ static int stmmac_init_fs(struct net_device *dev); > static void stmmac_exit_fs(void); > #endif > > +#define STMMAC_COAL_TIMER(x) (jiffies + usecs_to_jiffies(x)) > + > /** > * stmmac_verify_args - verify the driver parameters. > * Description: it verifies if some wrong parameter is passed to the driver. > @@ -996,9 +996,9 @@ static void stmmac_init_tx_coalesce(struct stmmac_priv *priv) > { > /* Set Tx coalesce parameters and timers */ > priv->tx_coal_frames = STMMAC_TX_MAX_FRAMES; > - priv->tx_coal_timer = jiffies + usecs_to_jiffies(STMMAC_TX_TM); > + priv->tx_coal_timer = STMMAC_COAL_TX_TIMER; > init_timer(&priv->txtimer); > - priv->txtimer.expires = priv->tx_coal_timer; > + priv->txtimer.expires = STMMAC_COAL_TIMER(priv->tx_coal_timer); > priv->txtimer.data = (unsigned long)priv; > priv->txtimer.function = stmmac_txtimer; > add_timer(&priv->txtimer); > @@ -1118,11 +1118,10 @@ static int stmmac_open(struct net_device *dev) > > stmmac_init_tx_coalesce(priv); > > - if ((priv->use_riwt) && (priv->hw->dma->rx_watchdog)) > - /* Program RX Watchdog register to the default values > - * FIXME: provide user value for RIWT > - */ > - priv->hw->dma->rx_watchdog(priv->ioaddr, DEFAULT_DMA_RIWT); > + if ((priv->use_riwt) && (priv->hw->dma->rx_watchdog)) { > + priv->rx_riwt = MAX_DMA_RIWT; > + priv->hw->dma->rx_watchdog(priv->ioaddr, MAX_DMA_RIWT); > + } > > napi_enable(&priv->napi); > > @@ -1299,7 +1298,8 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) > priv->xstats.tx_reset_ic_bit++; > TX_DBG("\t[entry %d]: tx_count_frames %d\n", entry, > priv->tx_count_frames); > - mod_timer(&priv->txtimer, priv->tx_coal_timer); > + mod_timer(&priv->txtimer, > + STMMAC_COAL_TIMER(priv->tx_coal_timer)); > } else > priv->tx_count_frames = 0; >
diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h index 02eb2da..b9033cc 100644 --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -169,7 +169,13 @@ struct stmmac_extra_stats { #define DMA_HW_FEAT_SAVLANINS 0x08000000 /* Source Addr or VLAN Insertion */ #define DMA_HW_FEAT_ACTPHYIF 0x70000000 /* Active/selected PHY interface */ #define DEFAULT_DMA_PBL 8 -#define DEFAULT_DMA_RIWT 0xff /* Max RI Watchdog Timer count */ + +/* Coalesce defines */ +#define MAX_DMA_RIWT 0xff /* Max RI Watchdog Timer count */ +#define MIN_DMA_RIWT 0x20 +#define STMMAC_COAL_TX_TIMER 40000 +#define STMMAC_MAX_COAL_TX_TICK 100000 +#define STMMAC_TX_MAX_FRAMES 32 enum rx_frame_status { /* IPC status */ good_frame = 0, diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index 6901e3c..ad4f6b9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -93,6 +93,7 @@ struct stmmac_priv { u32 tx_count_frames; u32 tx_coal_frames; u32 tx_coal_timer; + u32 rx_riwt; }; extern int phyaddr; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c index 48ad0bc..d27cc18 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c @@ -522,6 +522,89 @@ static int stmmac_ethtool_op_set_eee(struct net_device *dev, return phy_ethtool_set_eee(priv->phydev, edata); } +static u32 stmmac_usec2riwt(u32 usec, struct stmmac_priv *priv) +{ + unsigned long clk = clk_get_rate(priv->stmmac_clk); + + if (!clk) + return 0; + + return (usec * (clk / 1000000)) / 256; +} + +static u32 stmmac_riwt2usec(u32 riwt, struct stmmac_priv *priv) +{ + unsigned long clk = clk_get_rate(priv->stmmac_clk); + + if (!clk) + return 0; + + return (riwt * 256) / (clk / 1000000); +} + +static int stmmac_get_coalesce(struct net_device *dev, + struct ethtool_coalesce *ec) +{ + struct stmmac_priv *priv = netdev_priv(dev); + + ec->tx_coalesce_usecs = priv->tx_coal_timer; + ec->tx_max_coalesced_frames = priv->tx_coal_frames; + + if (priv->use_riwt) + ec->rx_coalesce_usecs = stmmac_riwt2usec(priv->rx_riwt, priv); + + return 0; +} + +static int stmmac_set_coalesce(struct net_device *dev, + struct ethtool_coalesce *ec) +{ + struct stmmac_priv *priv = netdev_priv(dev); + unsigned int rx_riwt; + + /* Check not supported parameters */ + if ((ec->rx_max_coalesced_frames) || (ec->rx_coalesce_usecs_irq) || + (ec->rx_max_coalesced_frames_irq) || (ec->tx_coalesce_usecs_irq) || + (ec->use_adaptive_rx_coalesce) || (ec->use_adaptive_tx_coalesce) || + (ec->pkt_rate_low) || (ec->rx_coalesce_usecs_low) || + (ec->rx_max_coalesced_frames_low) || (ec->tx_coalesce_usecs_high) || + (ec->tx_max_coalesced_frames_low) || (ec->pkt_rate_high) || + (ec->tx_coalesce_usecs_low) || (ec->rx_coalesce_usecs_high) || + (ec->rx_max_coalesced_frames_high) || + (ec->tx_max_coalesced_frames_irq) || + (ec->stats_block_coalesce_usecs) || + (ec->tx_max_coalesced_frames_high) || (ec->rate_sample_interval)) + return -EOPNOTSUPP; + + /* No rx interrupts will be generated if both are zero */ + if (ec->rx_coalesce_usecs == 0) + return -EINVAL; + + /* No tx interrupts will be generated if both are zero */ + if ((ec->tx_coalesce_usecs == 0) && + (ec->tx_max_coalesced_frames == 0)) + return -EINVAL; + + if ((ec->tx_coalesce_usecs > STMMAC_COAL_TX_TIMER) || + (ec->tx_max_coalesced_frames > STMMAC_TX_MAX_FRAMES)) + return -EINVAL; + + rx_riwt = stmmac_usec2riwt(ec->rx_coalesce_usecs, priv); + + if ((rx_riwt > MAX_DMA_RIWT) || (rx_riwt < MIN_DMA_RIWT)) + return -EINVAL; + else if (!priv->use_riwt) + return -EOPNOTSUPP; + + /* Only copy relevant parameters, ignore all others. */ + priv->tx_coal_frames = ec->tx_max_coalesced_frames; + priv->tx_coal_timer = ec->tx_coalesce_usecs; + priv->rx_riwt = rx_riwt; + priv->hw->dma->rx_watchdog(priv->ioaddr, priv->rx_riwt); + + return 0; +} + static const struct ethtool_ops stmmac_ethtool_ops = { .begin = stmmac_check_if_running, .get_drvinfo = stmmac_ethtool_getdrvinfo, @@ -542,6 +625,8 @@ static const struct ethtool_ops stmmac_ethtool_ops = { .set_eee = stmmac_ethtool_op_set_eee, .get_sset_count = stmmac_get_sset_count, .get_ts_info = ethtool_op_get_ts_info, + .get_coalesce = stmmac_get_coalesce, + .set_coalesce = stmmac_set_coalesce, }; void stmmac_set_ethtool_ops(struct net_device *netdev) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 8e610a1..b0731e6 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -77,8 +77,6 @@ #define STMMAC_ALIGN(x) L1_CACHE_ALIGN(x) #define JUMBO_LEN 9000 -#define STMMAC_TX_TM 40000 -#define STMMAC_TX_MAX_FRAMES 32 /* Max coalesced frame */ /* Module parameters */ #define TX_TIMEO 5000 /* default 5 seconds */ @@ -140,6 +138,8 @@ static int stmmac_init_fs(struct net_device *dev); static void stmmac_exit_fs(void); #endif +#define STMMAC_COAL_TIMER(x) (jiffies + usecs_to_jiffies(x)) + /** * stmmac_verify_args - verify the driver parameters. * Description: it verifies if some wrong parameter is passed to the driver. @@ -996,9 +996,9 @@ static void stmmac_init_tx_coalesce(struct stmmac_priv *priv) { /* Set Tx coalesce parameters and timers */ priv->tx_coal_frames = STMMAC_TX_MAX_FRAMES; - priv->tx_coal_timer = jiffies + usecs_to_jiffies(STMMAC_TX_TM); + priv->tx_coal_timer = STMMAC_COAL_TX_TIMER; init_timer(&priv->txtimer); - priv->txtimer.expires = priv->tx_coal_timer; + priv->txtimer.expires = STMMAC_COAL_TIMER(priv->tx_coal_timer); priv->txtimer.data = (unsigned long)priv; priv->txtimer.function = stmmac_txtimer; add_timer(&priv->txtimer); @@ -1118,11 +1118,10 @@ static int stmmac_open(struct net_device *dev) stmmac_init_tx_coalesce(priv); - if ((priv->use_riwt) && (priv->hw->dma->rx_watchdog)) - /* Program RX Watchdog register to the default values - * FIXME: provide user value for RIWT - */ - priv->hw->dma->rx_watchdog(priv->ioaddr, DEFAULT_DMA_RIWT); + if ((priv->use_riwt) && (priv->hw->dma->rx_watchdog)) { + priv->rx_riwt = MAX_DMA_RIWT; + priv->hw->dma->rx_watchdog(priv->ioaddr, MAX_DMA_RIWT); + } napi_enable(&priv->napi); @@ -1299,7 +1298,8 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) priv->xstats.tx_reset_ic_bit++; TX_DBG("\t[entry %d]: tx_count_frames %d\n", entry, priv->tx_count_frames); - mod_timer(&priv->txtimer, priv->tx_coal_timer); + mod_timer(&priv->txtimer, + STMMAC_COAL_TIMER(priv->tx_coal_timer)); } else priv->tx_count_frames = 0;
This patch is to get/set the tx/rx coalesce parameters via ethtool interface. Tests have been done on several platform with different GMAC chips w/o w/ RX watchdog feature. V2: reject coalesce settings that are not supported. Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> --- drivers/net/ethernet/stmicro/stmmac/common.h | 8 ++- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 85 ++++++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20 +++--- 4 files changed, 103 insertions(+), 11 deletions(-)