Skip to content

Commit 90cf87d

Browse files
vladimirolteankuba-moo
authored andcommitted
enetc: Let the hardware auto-advance the taprio base-time of 0
The tc-taprio base time indicates the beginning of the tc-taprio schedule, which is cyclic by definition (where the length of the cycle in nanoseconds is called the cycle time). The base time is a 64-bit PTP time in the TAI domain. Logically, the base-time should be a future time. But that imposes some restrictions to user space, which has to retrieve the current PTP time from the NIC first, then calculate a base time that will still be larger than the base time by the time the kernel driver programs this value into the hardware. Actually ensuring that the programmed base time is in the future is still a problem even if the kernel alone deals with this. Luckily, the enetc hardware already advances a base-time that is in the past into a congruent time in the immediate future, according to the same formula that can be found in the software implementation of taprio (in taprio_get_start_time): /* Schedule the start time for the beginning of the next * cycle. */ n = div64_s64(ktime_sub_ns(now, base), cycle); *start = ktime_add_ns(base, (n + 1) * cycle); There's only one problem: the driver doesn't let the hardware do that. It interferes with the base-time passed from user space, by special-casing the situation when the base-time is zero, and replaces that with the current PTP time. This changes the intended effective base-time of the schedule, which will in the end have a different phase offset than if the base-time of 0.000000000 was to be advanced by an integer multiple of the cycle-time. Fixes: 34c6adf ("enetc: Configure the Time-Aware Scheduler via tc-taprio offload") Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Link: https://lore.kernel.org/r/20201124220259.3027991-1-vladimir.oltean@nxp.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 2543a60 commit 90cf87d

1 file changed

Lines changed: 2 additions & 12 deletions

File tree

drivers/net/ethernet/freescale/enetc/enetc_qos.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,8 @@ static int enetc_setup_taprio(struct net_device *ndev,
9292
gcl_config->atc = 0xff;
9393
gcl_config->acl_len = cpu_to_le16(gcl_len);
9494

95-
if (!admin_conf->base_time) {
96-
gcl_data->btl =
97-
cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR0));
98-
gcl_data->bth =
99-
cpu_to_le32(enetc_rd(&priv->si->hw, ENETC_SICTR1));
100-
} else {
101-
gcl_data->btl =
102-
cpu_to_le32(lower_32_bits(admin_conf->base_time));
103-
gcl_data->bth =
104-
cpu_to_le32(upper_32_bits(admin_conf->base_time));
105-
}
106-
95+
gcl_data->btl = cpu_to_le32(lower_32_bits(admin_conf->base_time));
96+
gcl_data->bth = cpu_to_le32(upper_32_bits(admin_conf->base_time));
10797
gcl_data->ct = cpu_to_le32(admin_conf->cycle_time);
10898
gcl_data->cte = cpu_to_le32(admin_conf->cycle_time_extension);
10999

0 commit comments

Comments
 (0)