59b3912596
Include GM clock quality parameters clock accuracy and offset scaled log variance to the clock selection algorithm. Those checks together with the clock class can check the remote clock quality, enhancing T-BC support. The existing ha_min_local_clockClass, ha_min_clockAccuracy, ha_min_gm_offsetScaledLogVariance and ha_min_gm_ClockClass were renamed. Now their names are ha_max* because they represent the maximum value the clock can present to be considered valid. The existing ha_timeTraceable and ha_frequencyTraceable were renamed. Now their names contain gm to explain and show they correspond to the GM time and frequency traceability. The ha_min_local_clockClass is now ha_max_local_clockClass, and Its default value was changed to 255. The ha_min_clockAccuracy is now ha_max_local_clockAccuracy, its name now contains the local key to differentiate from the GM configuration option. The ha_min_offsetScaledLogVariance is now ha_max_local_offsetScaledLogVar. Its name now contains the local key to differentiate from the GM configuration option, and the word Variace was shortened Var due to the size limit of the name. The ha_min_gm_ClockClass is now ha_max_gm_clockClass, and its default value was changed to 6. The ha_max_local_clockClass and ha_max_gm_clockClass default values were changed to make it easier to configure both T-GM and T-BC scenarios. The new ha_max_gm_clockAccuracy option is a global setting for the maximum GM clock accuracy requirement. It ranges from 0x00 to 0xff and its default is 0xfe. The new ha_max_gm_offsetScaledLogVar option is a global setting for the maximum GM offset scaled log variance requirement. It ranges from 0x0000 to 0xffff and its default is 0xffff. The status command now includes the GM clock accuracy and offset scaled log variance values. Test plan: new GM fields PASS Verify the clock is discarded because GM clock accuracy is out of requirement PASS Verify the clock is discarded because GM offset scaled log variance is out of the requirement PASS Verify the status command shows the new fields gm.clockAcc and gm.offset Test plan: new default values PASS Verify the ha_max_gm_ClockClass and ha_max_local_clockClass default values. Test plan: renamed fields PASS Verify the a configuration containing all HA configuration options is accepted. Story: 2010723 Task: 48675 Change-Id: I7ed1300a51cbdcaa44d7f350dcdc92e54469a497 Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
84 lines
2.6 KiB
Diff
84 lines
2.6 KiB
Diff
From e4fd6a930213e6f0f009eb070d51b1e14db60d1b Mon Sep 17 00:00:00 2001
|
|
From: Miroslav Lichvar <mlichvar@redhat.com>
|
|
Date: Wed, 18 May 2022 11:33:38 +0200
|
|
Subject: [PATCH 10/49] phc2sys: Don't exit when reading of PHC fails with EBUSY.
|
|
|
|
Reading of the PHC can occasionally fail with some drivers, e.g. the ice
|
|
driver returns EBUSY when it fails to get a lock. Continue in the loop
|
|
instead of exiting on the error.
|
|
|
|
Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
|
|
|
|
[ commit e8dc364f9fd5fbdac5d2c5e433f28e9da0028d49 upstream
|
|
We drop two hunks of it, namely the stuff that applies to
|
|
clockadj_compare, because they apply to the source code
|
|
ahead of baseline currently used by StarlingX ]
|
|
|
|
Signed-off-by: Douglas Henrique Koerich <douglashenrique.koerich@windriver.com>
|
|
---
|
|
phc2sys.c | 31 +++++++++++++++++++------------
|
|
1 file changed, 19 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/phc2sys.c b/phc2sys.c
|
|
index 44d6872..7959015 100644
|
|
--- a/phc2sys.c
|
|
+++ b/phc2sys.c
|
|
@@ -722,6 +722,7 @@ static int do_loop(struct phc2sys_private *priv, int subscriptions)
|
|
struct clock *clock;
|
|
uint64_t ts;
|
|
int64_t offset, delay;
|
|
+ int err;
|
|
|
|
interval.tv_sec = priv->phc_interval;
|
|
interval.tv_nsec = (priv->phc_interval - interval.tv_sec) * 1e9;
|
|
@@ -765,28 +766,34 @@ static int do_loop(struct phc2sys_private *priv, int subscriptions)
|
|
if (clock->clkid == CLOCK_REALTIME &&
|
|
priv->master->sysoff_method >= 0) {
|
|
/* use sysoff */
|
|
- if (sysoff_measure(CLOCKID_TO_FD(priv->master->clkid),
|
|
- priv->master->sysoff_method,
|
|
- priv->phc_readings,
|
|
- &offset, &ts, &delay) < 0)
|
|
- return -1;
|
|
+ err = sysoff_measure(CLOCKID_TO_FD(priv->master->clkid),
|
|
+ priv->master->sysoff_method,
|
|
+ priv->phc_readings,
|
|
+ &offset, &ts, &delay);
|
|
} else if (priv->master->clkid == CLOCK_REALTIME &&
|
|
clock->sysoff_method >= 0) {
|
|
/* use reversed sysoff */
|
|
- if (sysoff_measure(CLOCKID_TO_FD(clock->clkid),
|
|
- clock->sysoff_method,
|
|
- priv->phc_readings,
|
|
- &offset, &ts, &delay) < 0)
|
|
- return -1;
|
|
- offset = -offset;
|
|
- ts += offset;
|
|
+ err = sysoff_measure(CLOCKID_TO_FD(clock->clkid),
|
|
+ clock->sysoff_method,
|
|
+ priv->phc_readings,
|
|
+ &offset, &ts, &delay);
|
|
+ if (!err) {
|
|
+ offset = -offset;
|
|
+ ts += offset;
|
|
+ }
|
|
} else {
|
|
+ err = 0;
|
|
/* use phc */
|
|
if (!read_phc(priv->master->clkid, clock->clkid,
|
|
priv->phc_readings,
|
|
&offset, &ts, &delay))
|
|
continue;
|
|
}
|
|
+ if (err == -EBUSY)
|
|
+ continue;
|
|
+ if (err)
|
|
+ return -1;
|
|
+
|
|
update_clock(priv, clock, offset, ts, delay);
|
|
}
|
|
}
|
|
--
|
|
2.29.2
|
|
|