Skip to content

OCPBUGS-111584: Calibrate delays on XR8720t A00 - #635

Open
vitus133 wants to merge 3 commits into
openshift:release-4.22from
vitus133:4.22-backport-OCPBUGS-111584
Open

OCPBUGS-111584: Calibrate delays on XR8720t A00#635
vitus133 wants to merge 3 commits into
openshift:release-4.22from
vitus133:4.22-backport-OCPBUGS-111584

Conversation

@vitus133

@vitus133 vitus133 commented Aug 18, 2026

Copy link
Copy Markdown
Contributor

Summary

Backport of upstream fix for OCPBUGS-98473 to release-4.22.

Dell XR8720t A0 PTP delays were not correctly calibrated: the DPLL phase-in delay compensation for ETH01_SDP_TIMESYNC_2 / ETH01_SDP_TIMESYNC_0 was set to -5000ps instead of the correct -8600ps (calibrated on Calnex Neo).

Cherry-picked commits

From k8snetworkplumbingwg/linuxptp-daemon#243 (merged downstream via #628):

  • 56565ad0 "Calibrate delays on XR8720t A00" — the actual bug fix (delays.yaml)
  • 00d28175 "Reduce log noise" — downgrades several glog.Infof/glog.Info calls to glog.V(14)
  • 6ddba26d "Decode DPLL FFO sint attributes as 4- or 8-byte values" — fixes DPLL fractional-frequency-offset decoding that could abort pin dumps

Not backported: eadc9073 "Log DPLL pin tables only on lock-status change" depends on a prerequisite commit (d1756b6a, "dump DPLL pin states on source lock transitions") that introduced the nl.LogPinTable call in nlUpdateState. That prerequisite is not present on release-4.22, so eadc9073's diff has nothing to apply to on this branch (no-op / dead code). Skipped by agreement.

Note: 00d28175 had a merge conflict in pkg/event/event_tbc.go because two of its target log lines (isSourceLostBC[%s], DPLL detail: ...) don't exist in release-4.22's version of isSourceLostBC (added by a separate, un-backported commit on main). Those hunks were dropped since there's nothing to reduce; the rest of the commit (converging on glog.V(14) for existing log lines in updateBCState, convergeConfig, and ptpdev.go) applied normally.

Verification

Verify on target hardware:

sudo podman run --privileged --network=host <tools image> \
  dpll pin show -j | jq -r '.pin[] | select(."module-name" == "zl3073x") | select(."phase-adjust" != 0) | "\(.id) | \(."package-label") | \(."board-label") | \(."phase-adjust")"' | column -s '|' -t

Expected pin delays:

ID Name Value
6 ETH01_SDP_TIMESYNC_2 -8600
7 ETH01_SDP_TIMESYNC_0 -8600
26 1EPPS_OUT_SW -25000
27 EPPS_10M_ADD_IN_CARD_SYNC -25000
30 ETH01_SDP_TIMESYNC_3 -5000
31 ETH01_SDP_TIMESYNC_1 -5000

Jira: https://redhat.atlassian.net/browse/OCPBUGS-111584

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 18, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@vitus133: This pull request references Jira Issue OCPBUGS-111584, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Summary

Backport of upstream fix for OCPBUGS-98473 to release-4.22.

Dell XR8720t A0 PTP delays were not correctly calibrated: the DPLL phase-in delay compensation for ETH01_SDP_TIMESYNC_2 / ETH01_SDP_TIMESYNC_0 was set to -5000ps instead of the correct -8600ps (calibrated on Calnex Neo).

Cherry-picked commit

Only the delay calibration commit was backported; the other commits bundled in the original upstream PR (#243) address unrelated issues (log noise reduction, DPLL FFO decoding) and are not part of this bug.

Verification

Verify on target hardware:

sudo podman run --privileged --network=host <tools image> \
 dpll pin show -j | jq -r '.pin[] | select(."module-name" == "zl3073x") | select(."phase-adjust" != 0) | "\(.id) | \(."package-label") | \(."board-label") | \(."phase-adjust")"' | column -s '|' -t

Expected pin delays:

ID Name Value
6 ETH01_SDP_TIMESYNC_2 -8600
7 ETH01_SDP_TIMESYNC_0 -8600
26 1EPPS_OUT_SW -25000
27 EPPS_10M_ADD_IN_CARD_SYNC -25000
30 ETH01_SDP_TIMESYNC_3 -5000
31 ETH01_SDP_TIMESYNC_1 -5000

Jira: https://redhat.atlassian.net/browse/OCPBUGS-111584

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci

openshift-ci Bot commented Aug 18, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vitus133

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 18, 2026
vitus133 and others added 2 commits August 18, 2026 06:45
Kernel nla_put_sint encodes fractional-frequency-offset(-ppt) with variable width; Int32 decoding aborted pin dumps when PPT arrived as 8 bytes.

Co-authored-by: Cursor <cursoragent@cursor.com>
@vitus133

Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 18, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@vitus133: This pull request references Jira Issue OCPBUGS-111584, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-98473 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-98473 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (bblock@redhat.com), skipping review request.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@vitus133

Copy link
Copy Markdown
Contributor Author

/label backport-risk-assessed
/verified later @bblock

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Aug 18, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@vitus133: This PR has been marked to be verified later by @bblock.

Details

In response to this:

/label backport-risk-assessed
/verified later @bblock

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Aug 18, 2026
@openshift-ci

openshift-ci Bot commented Aug 18, 2026

Copy link
Copy Markdown
Contributor

@vitus133: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. verified Signifies that the PR passed pre-merge verification criteria verified-later

Projects

None yet

Development

Successfully merging this pull request may close these issues.