600ad549b5
A new time traceable flag was added to pmc agent to store the current time traceable status. This flag replaces the utc_offset_traceable flag in the HA clock selection algorithm and status command. Test plan: HA clock selection algorithm PASS: Verify the clock source which time isn't traceable is discarded by the algorithm if ha_gm_timeTraceable is enabled. PASS: Verify the clock source which time is traceable isn't discarded by the algorithm if ha_gm_timeTraceable is enabled. Regression: status command PASS: Verify the response of status command shows the correct GM time traceable. The 'valid sources' command is used to get a list of interfaces which the clock is matching the requirements. The response contains a space separated list of interfaces, or "None" when not a single clock is matching all the requirements. Test plan: valid sources command PASS: Verify that a space separated list of interface is returned when one or more clocks match the requirements. PASS: Verify that the string "None" is returned when not a single clock match the requirements. Now the GM time traceable check is enabled by default as it is an important check for both T-GM and T-BC scenarios. The GM time traceable check is controlled in configuration by using the ha_gm_timeTraceable setting, and it can be disabled using the value 0 (ha_gm_timeTraceable 0). Test plan: default value PASS Verify the check is performed by default. PASS Verify the user can disable the check by configuration. Bonus: Fixed the behavior when none clock is matching the requirements and the active clock source is disabled using the 'disable source <interface>' command. The interface is must be disabled and a new clock source is selected. Test plan: none clock is matching the requirements PASS: Verify that the active source can be disabled and a new one is selected. PASS: Verify that an attempt to disable the last active interface fails and an appopriated message is given as response. PASS: Verify that the interface with higher priority is selected after re-enabling it. PASS: Verify the active clock source doesn't change if another interface is disabled. PASS: Verify the active clock source doesn't change if another interface is re-enabled. Story: 2010723 Task: 48702 Change-Id: I64193575a995e520d36460c0ebb8dd452fa8c2b8 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/54] 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
|
|
|