From: Tanmay Patil <[email protected]>
If the base-time for taprio is in the past, start the schedule at the time
of the form "base_time + N*cycle_time" where N is the smallest possible
integer such that the above time is in the future.
Signed-off-by: Tanmay Patil <[email protected]>
Signed-off-by: Chintan Vankar <[email protected]>
---
This patch is based on net-next commit d80687161271.
drivers/net/ethernet/ti/am65-cpsw-qos.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.c b/drivers/net/ethernet/ti/am65-cpsw-qos.c
index 16f192a5b160..fa96db7c1a13 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-qos.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-qos.c
@@ -9,6 +9,7 @@
#include <linux/pm_runtime.h>
#include <linux/math.h>
+#include <linux/math64.h>
#include <linux/time.h>
#include <linux/units.h>
#include <net/pkt_cls.h>
@@ -837,6 +838,7 @@ static int am65_cpsw_taprio_replace(struct net_device *ndev,
struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
struct am65_cpts *cpts = common->cpts;
struct am65_cpsw_est *est_new;
+ u64 cur_time, n;
int ret, tact;
if (!netif_running(ndev)) {
@@ -888,13 +890,21 @@ static int am65_cpsw_taprio_replace(struct net_device *ndev,
if (tact == TACT_PROG)
am65_cpsw_timer_stop(ndev);
- if (!est_new->taprio.base_time)
- est_new->taprio.base_time = am65_cpts_ns_gettime(cpts);
-
am65_cpsw_port_est_get_buf_num(ndev, est_new);
am65_cpsw_est_set_sched_list(ndev, est_new);
am65_cpsw_port_est_assign_buf_num(ndev, est_new->buf);
+ /* If the base-time is in the past, start schedule from the time:
+ * base_time + (N*cycle_time)
+ * where N is the smallest possible integer such that the above
+ * time is in the future.
+ */
+ cur_time = am65_cpts_ns_gettime(cpts);
+ if (est_new->taprio.base_time < cur_time) {
+ n = div64_u64(cur_time - est_new->taprio.base_time, est_new->taprio.cycle_time);
+ est_new->taprio.base_time += (n + 1) * est_new->taprio.cycle_time;
+ }
+
am65_cpsw_est_set(ndev, 1);
if (tact == TACT_PROG) {
--
2.34.1
On Thu, Apr 25, 2024 at 04:01:42PM +0530, Chintan Vankar wrote:
> From: Tanmay Patil <[email protected]>
>
> If the base-time for taprio is in the past, start the schedule at the time
> of the form "base_time + N*cycle_time" where N is the smallest possible
> integer such that the above time is in the future.
>
> Signed-off-by: Tanmay Patil <[email protected]>
> Signed-off-by: Chintan Vankar <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
Hello:
This patch was applied to netdev/net-next.git (main)
by David S. Miller <[email protected]>:
On Thu, 25 Apr 2024 16:01:42 +0530 you wrote:
> From: Tanmay Patil <[email protected]>
>
> If the base-time for taprio is in the past, start the schedule at the time
> of the form "base_time + N*cycle_time" where N is the smallest possible
> integer such that the above time is in the future.
>
> Signed-off-by: Tanmay Patil <[email protected]>
> Signed-off-by: Chintan Vankar <[email protected]>
>
> [...]
Here is the summary with links:
- [net-next] net: ethernet: ti: am65-cpsw-qos: Add support to taprio for past base_time
https://git.kernel.org/netdev/net-next/c/d63394abc923
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html