* [PATCH v3 0/3] dpaa_eth: add ethtool coalesce control
@ 2018-11-21 11:41 Madalin Bucur
2018-11-21 11:41 ` [PATCH v3 1/3] soc: fsl: qbman: read ithresh from HW Madalin Bucur
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Madalin Bucur @ 2018-11-21 11:41 UTC (permalink / raw)
To: davem, netdev
Cc: Madalin Bucur, roy.pledge, linux-kernel, leoyang.li,
linuxppc-dev, linux-arm-kernel
Add control of the DPAA portal interrupt coalescing settings from
ethtool.
changes from v2: read ithresh from HW, set previous values on failure
changes from v1: added range checking for the QMan APIs
Madalin Bucur (3):
soc: fsl: qbman: read ithresh from HW
soc/qman: add return value to interrupt coalesce changing APIs
dpaa_eth: add ethtool coalesce control
drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 71 ++++++++++++++++++++++
drivers/soc/fsl/qbman/qman.c | 35 ++++++++---
include/soc/fsl/qman.h | 8 ++-
3 files changed, 104 insertions(+), 10 deletions(-)
--
2.1.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3 1/3] soc: fsl: qbman: read ithresh from HW
2018-11-21 11:41 [PATCH v3 0/3] dpaa_eth: add ethtool coalesce control Madalin Bucur
@ 2018-11-21 11:41 ` Madalin Bucur
2018-11-21 11:41 ` [PATCH v3 2/3] soc/qman: add return value to interrupt coalesce changing APIs Madalin Bucur
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Madalin Bucur @ 2018-11-21 11:41 UTC (permalink / raw)
To: davem, netdev
Cc: Madalin Bucur, roy.pledge, linux-kernel, leoyang.li,
linuxppc-dev, linux-arm-kernel
Read the DQRR interrupt threshold directly from the hardware.
Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
---
drivers/soc/fsl/qbman/qman.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c
index 5ce24718c2fd..ce7c03052e33 100644
--- a/drivers/soc/fsl/qbman/qman.c
+++ b/drivers/soc/fsl/qbman/qman.c
@@ -1025,7 +1025,7 @@ EXPORT_SYMBOL(qman_dqrr_set_ithresh);
void qman_dqrr_get_ithresh(struct qman_portal *portal, u8 *ithresh)
{
if (portal && ithresh)
- *ithresh = portal->p.dqrr.ithresh;
+ *ithresh = qm_in(&portal->p, QM_REG_DQRR_ITR);
}
EXPORT_SYMBOL(qman_dqrr_get_ithresh);
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 2/3] soc/qman: add return value to interrupt coalesce changing APIs
2018-11-21 11:41 [PATCH v3 0/3] dpaa_eth: add ethtool coalesce control Madalin Bucur
2018-11-21 11:41 ` [PATCH v3 1/3] soc: fsl: qbman: read ithresh from HW Madalin Bucur
@ 2018-11-21 11:41 ` Madalin Bucur
2018-11-21 11:41 ` [PATCH v3 3/3] dpaa_eth: add ethtool coalesce control Madalin Bucur
2018-11-23 19:17 ` [PATCH v3 0/3] " David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Madalin Bucur @ 2018-11-21 11:41 UTC (permalink / raw)
To: davem, netdev
Cc: Madalin Bucur, roy.pledge, linux-kernel, leoyang.li,
linuxppc-dev, linux-arm-kernel
Check that the values received by the portal interrupt coalesce
change APIs are in range.
Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
---
drivers/soc/fsl/qbman/qman.c | 33 ++++++++++++++++++++++++++-------
include/soc/fsl/qman.h | 8 ++++++--
2 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c
index ce7c03052e33..52c153cd795a 100644
--- a/drivers/soc/fsl/qbman/qman.c
+++ b/drivers/soc/fsl/qbman/qman.c
@@ -36,6 +36,8 @@
#define MAX_IRQNAME 16 /* big enough for "QMan portal %d" */
#define QMAN_POLL_LIMIT 32
#define QMAN_PIRQ_DQRR_ITHRESH 12
+#define QMAN_DQRR_IT_MAX 15
+#define QMAN_ITP_MAX 0xFFF
#define QMAN_PIRQ_MR_ITHRESH 4
#define QMAN_PIRQ_IPERIOD 100
@@ -727,9 +729,15 @@ static inline void qm_dqrr_vdqcr_set(struct qm_portal *portal, u32 vdqcr)
qm_out(portal, QM_REG_DQRR_VDQCR, vdqcr);
}
-static inline void qm_dqrr_set_ithresh(struct qm_portal *portal, u8 ithresh)
+static inline int qm_dqrr_set_ithresh(struct qm_portal *portal, u8 ithresh)
{
+
+ if (ithresh > QMAN_DQRR_IT_MAX)
+ return -EINVAL;
+
qm_out(portal, QM_REG_DQRR_ITR, ithresh);
+
+ return 0;
}
/* --- MR API --- */
@@ -1012,13 +1020,20 @@ static inline void put_affine_portal(void)
static struct workqueue_struct *qm_portal_wq;
-void qman_dqrr_set_ithresh(struct qman_portal *portal, u8 ithresh)
+int qman_dqrr_set_ithresh(struct qman_portal *portal, u8 ithresh)
{
+ int res;
+
if (!portal)
- return;
+ return -EINVAL;
+
+ res = qm_dqrr_set_ithresh(&portal->p, ithresh);
+ if (res)
+ return res;
- qm_dqrr_set_ithresh(&portal->p, ithresh);
portal->p.dqrr.ithresh = ithresh;
+
+ return 0;
}
EXPORT_SYMBOL(qman_dqrr_set_ithresh);
@@ -1036,10 +1051,14 @@ void qman_portal_get_iperiod(struct qman_portal *portal, u32 *iperiod)
}
EXPORT_SYMBOL(qman_portal_get_iperiod);
-void qman_portal_set_iperiod(struct qman_portal *portal, u32 iperiod)
+int qman_portal_set_iperiod(struct qman_portal *portal, u32 iperiod)
{
- if (portal)
- qm_out(&portal->p, QM_REG_ITPR, iperiod);
+ if (!portal || iperiod > QMAN_ITP_MAX)
+ return -EINVAL;
+
+ qm_out(&portal->p, QM_REG_ITPR, iperiod);
+
+ return 0;
}
EXPORT_SYMBOL(qman_portal_set_iperiod);
diff --git a/include/soc/fsl/qman.h b/include/soc/fsl/qman.h
index 56877660d5ba..5cc7af06c1ba 100644
--- a/include/soc/fsl/qman.h
+++ b/include/soc/fsl/qman.h
@@ -1205,8 +1205,10 @@ void qman_dqrr_get_ithresh(struct qman_portal *portal, u8 *ithresh);
* qman_dqrr_set_ithresh - Set coalesce interrupt threshold
* @portal: portal to set the new value on
* @ithresh: new threshold value
+ *
+ * Returns 0 on success, or a negative error code.
*/
-void qman_dqrr_set_ithresh(struct qman_portal *portal, u8 ithresh);
+int qman_dqrr_set_ithresh(struct qman_portal *portal, u8 ithresh);
/**
* qman_dqrr_get_iperiod - Get coalesce interrupt period
@@ -1219,7 +1221,9 @@ void qman_portal_get_iperiod(struct qman_portal *portal, u32 *iperiod);
* qman_dqrr_set_iperiod - Set coalesce interrupt period
* @portal: portal to set the new value on
* @ithresh: new period value
+ *
+ * Returns 0 on success, or a negative error code.
*/
-void qman_portal_set_iperiod(struct qman_portal *portal, u32 iperiod);
+int qman_portal_set_iperiod(struct qman_portal *portal, u32 iperiod);
#endif /* __FSL_QMAN_H */
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 3/3] dpaa_eth: add ethtool coalesce control
2018-11-21 11:41 [PATCH v3 0/3] dpaa_eth: add ethtool coalesce control Madalin Bucur
2018-11-21 11:41 ` [PATCH v3 1/3] soc: fsl: qbman: read ithresh from HW Madalin Bucur
2018-11-21 11:41 ` [PATCH v3 2/3] soc/qman: add return value to interrupt coalesce changing APIs Madalin Bucur
@ 2018-11-21 11:41 ` Madalin Bucur
2018-11-23 19:17 ` [PATCH v3 0/3] " David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Madalin Bucur @ 2018-11-21 11:41 UTC (permalink / raw)
To: davem, netdev
Cc: Madalin Bucur, roy.pledge, linux-kernel, leoyang.li,
linuxppc-dev, linux-arm-kernel
Allow ethtool control of the DPAA QMan portal interrupt coalescing
settings.
Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
---
drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 71 ++++++++++++++++++++++
1 file changed, 71 insertions(+)
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
index 13d6e2272ece..62497119c85f 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
@@ -529,6 +529,75 @@ static int dpaa_get_ts_info(struct net_device *net_dev,
return 0;
}
+static int dpaa_get_coalesce(struct net_device *dev,
+ struct ethtool_coalesce *c)
+{
+ struct qman_portal *portal;
+ u32 period;
+ u8 thresh;
+
+ portal = qman_get_affine_portal(smp_processor_id());
+ qman_portal_get_iperiod(portal, &period);
+ qman_dqrr_get_ithresh(portal, &thresh);
+
+ c->rx_coalesce_usecs = period;
+ c->rx_max_coalesced_frames = thresh;
+ c->use_adaptive_rx_coalesce = false;
+
+ return 0;
+}
+
+static int dpaa_set_coalesce(struct net_device *dev,
+ struct ethtool_coalesce *c)
+{
+ const cpumask_t *cpus = qman_affine_cpus();
+ bool needs_revert[NR_CPUS] = {false};
+ struct qman_portal *portal;
+ u32 period, prev_period;
+ u8 thresh, prev_thresh;
+ int cpu, res;
+
+ if (c->use_adaptive_rx_coalesce)
+ return -EINVAL;
+
+ period = c->rx_coalesce_usecs;
+ thresh = c->rx_max_coalesced_frames;
+
+ /* save previous values */
+ portal = qman_get_affine_portal(smp_processor_id());
+ qman_portal_get_iperiod(portal, &prev_period);
+ qman_dqrr_get_ithresh(portal, &prev_thresh);
+
+ /* set new values */
+ for_each_cpu(cpu, cpus) {
+ portal = qman_get_affine_portal(cpu);
+ res = qman_portal_set_iperiod(portal, period);
+ if (res)
+ goto revert_values;
+ res = qman_dqrr_set_ithresh(portal, thresh);
+ if (res) {
+ qman_portal_set_iperiod(portal, prev_period);
+ goto revert_values;
+ }
+ needs_revert[cpu] = true;
+ }
+
+ return 0;
+
+revert_values:
+ /* restore previous values */
+ for_each_cpu(cpu, cpus) {
+ if (!needs_revert[cpu])
+ continue;
+ portal = qman_get_affine_portal(cpu);
+ /* previous values will not fail, ignore return value */
+ qman_portal_set_iperiod(portal, prev_period);
+ qman_dqrr_set_ithresh(portal, prev_thresh);
+ }
+
+ return res;
+}
+
const struct ethtool_ops dpaa_ethtool_ops = {
.get_drvinfo = dpaa_get_drvinfo,
.get_msglevel = dpaa_get_msglevel,
@@ -545,4 +614,6 @@ const struct ethtool_ops dpaa_ethtool_ops = {
.get_rxnfc = dpaa_get_rxnfc,
.set_rxnfc = dpaa_set_rxnfc,
.get_ts_info = dpaa_get_ts_info,
+ .get_coalesce = dpaa_get_coalesce,
+ .set_coalesce = dpaa_set_coalesce,
};
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v3 0/3] dpaa_eth: add ethtool coalesce control
2018-11-21 11:41 [PATCH v3 0/3] dpaa_eth: add ethtool coalesce control Madalin Bucur
` (2 preceding siblings ...)
2018-11-21 11:41 ` [PATCH v3 3/3] dpaa_eth: add ethtool coalesce control Madalin Bucur
@ 2018-11-23 19:17 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2018-11-23 19:17 UTC (permalink / raw)
To: madalin.bucur
Cc: netdev, roy.pledge, linux-kernel, leoyang.li, linuxppc-dev,
linux-arm-kernel
From: Madalin Bucur <madalin.bucur@nxp.com>
Date: Wed, 21 Nov 2018 13:41:06 +0200
> Add control of the DPAA portal interrupt coalescing settings from
> ethtool.
>
> changes from v2: read ithresh from HW, set previous values on failure
> changes from v1: added range checking for the QMan APIs
Series applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-11-23 19:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-21 11:41 [PATCH v3 0/3] dpaa_eth: add ethtool coalesce control Madalin Bucur
2018-11-21 11:41 ` [PATCH v3 1/3] soc: fsl: qbman: read ithresh from HW Madalin Bucur
2018-11-21 11:41 ` [PATCH v3 2/3] soc/qman: add return value to interrupt coalesce changing APIs Madalin Bucur
2018-11-21 11:41 ` [PATCH v3 3/3] dpaa_eth: add ethtool coalesce control Madalin Bucur
2018-11-23 19:17 ` [PATCH v3 0/3] " David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).