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>
82 lines
2.4 KiB
Diff
82 lines
2.4 KiB
Diff
From 95e4983c9ab517b9dda1faf171721f0dd877e076 Mon Sep 17 00:00:00 2001
|
|
From: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
Date: Mon, 12 Jun 2023 15:04:11 -0300
|
|
Subject: [PATCH 19/49] Introduce error codes for the run_pmc method.
|
|
|
|
The run_pmc function is used by several of the PMC agent methods, but it
|
|
breaks the pattern of returning zero on success. However, the user facing
|
|
PMC agent methods will need to conform to the return code convention used
|
|
throughout the stack.
|
|
|
|
In order to migrate to proper return codes, this patch replaces the hard
|
|
coded result values with macros so that the interface methods can translate
|
|
them to the required semantics of zero on success.
|
|
|
|
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
|
|
[commit 802259bbe40faa5f8bdebab36e6fbcbc51c3c2a2 upstream]
|
|
Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
---
|
|
pmc_agent.c | 19 +++++++++----------
|
|
1 file changed, 9 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/pmc_agent.c b/pmc_agent.c
|
|
index 6e9c023..22d9c5b 100644
|
|
--- a/pmc_agent.c
|
|
+++ b/pmc_agent.c
|
|
@@ -93,12 +93,11 @@ static int get_mgt_err_id(struct ptp_message *msg)
|
|
return mgt->id;
|
|
}
|
|
|
|
-/* Return values:
|
|
- * 1: success
|
|
- * 0: timeout
|
|
- * -1: error reported by the other side
|
|
- * -2: local error, fatal
|
|
- */
|
|
+#define RUN_PMC_OKAY 1
|
|
+#define RUN_PMC_TMO 0
|
|
+#define RUN_PMC_NODEV -1
|
|
+#define RUN_PMC_INTR -2
|
|
+
|
|
static int run_pmc(struct pmc_agent *node, int timeout, int ds_id,
|
|
struct ptp_message **msg)
|
|
{
|
|
@@ -115,12 +114,12 @@ static int run_pmc(struct pmc_agent *node, int timeout, int ds_id,
|
|
cnt = poll(pollfd, N_FD, timeout);
|
|
if (cnt < 0) {
|
|
pr_err("poll failed");
|
|
- return -2;
|
|
+ return RUN_PMC_INTR;
|
|
}
|
|
if (!cnt) {
|
|
/* Request the data set again in the next run. */
|
|
node->pmc_ds_requested = 0;
|
|
- return 0;
|
|
+ return RUN_PMC_TMO;
|
|
}
|
|
|
|
/* Send a new request if there are no pending messages. */
|
|
@@ -154,7 +153,7 @@ static int run_pmc(struct pmc_agent *node, int timeout, int ds_id,
|
|
res = is_msg_mgt(*msg);
|
|
if (res < 0 && get_mgt_err_id(*msg) == ds_id) {
|
|
node->pmc_ds_requested = 0;
|
|
- return -1;
|
|
+ return RUN_PMC_NODEV;
|
|
}
|
|
if (res <= 0 ||
|
|
node->recv_subscribed(node->recv_context, *msg, ds_id) ||
|
|
@@ -164,7 +163,7 @@ static int run_pmc(struct pmc_agent *node, int timeout, int ds_id,
|
|
continue;
|
|
}
|
|
node->pmc_ds_requested = 0;
|
|
- return 1;
|
|
+ return RUN_PMC_OKAY;
|
|
}
|
|
}
|
|
|
|
--
|
|
2.25.1
|
|
|