mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-28 22:44:08 -04:00
Replace the per-reference frequency offset measurement (which was redundant with measured-frequency) with a direct read of the DPLL's delta frequency offset vs its tracked input reference. The new implementation uses the dpll_df_offset_x register with ref_ofst=1 via the dpll_df_read_x semaphore mechanism. This provides 2^-48 resolution (~3.5 fE) and reports the actual frequency difference between the DPLL and its active input. Switch supported_ffo from DPLL_FFO_PORT_RXTX_RATE to DPLL_FFO_PIN_DEVICE so FFO is reported only in the per-parent context for the active input pin. Use atomic64_t for freq_offset to prevent torn reads on 32-bit architectures between the periodic worker and netlink callbacks. Rewrite ffo_check to compare the cached df_offset converted to PPT instead of using the old per-reference measurement. Remove the ref_ffo_update periodic measurement and the ref ffo field since they are no longer needed. Changes v3 -> v4: - Switch to DPLL_FFO_PIN_DEVICE, remove dpll=NULL guard - Use atomic64_t for freq_offset (torn read on 32-bit) Reviewed-by: Petr Oros <poros@redhat.com> Signed-off-by: Ivan Vecera <ivecera@redhat.com> Link: https://patch.msgid.link/20260511155816.99936-3-ivecera@redhat.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
193 lines
4.9 KiB
C
193 lines
4.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
|
|
#include <linux/cleanup.h>
|
|
#include <linux/dev_printk.h>
|
|
#include <linux/string.h>
|
|
#include <linux/types.h>
|
|
|
|
#include "chan.h"
|
|
#include "core.h"
|
|
|
|
/**
|
|
* zl3073x_chan_state_update - update DPLL channel status from HW
|
|
* @zldev: pointer to zl3073x_dev structure
|
|
* @index: DPLL channel index
|
|
*
|
|
* Return: 0 on success, <0 on error
|
|
*/
|
|
int zl3073x_chan_state_update(struct zl3073x_dev *zldev, u8 index)
|
|
{
|
|
struct zl3073x_chan *chan = &zldev->chan[index];
|
|
u64 val;
|
|
int rc;
|
|
|
|
rc = zl3073x_read_u8(zldev, ZL_REG_DPLL_MON_STATUS(index),
|
|
&chan->mon_status);
|
|
if (rc)
|
|
return rc;
|
|
|
|
rc = zl3073x_read_u8(zldev, ZL_REG_DPLL_REFSEL_STATUS(index),
|
|
&chan->refsel_status);
|
|
if (rc)
|
|
return rc;
|
|
|
|
/* Read df_offset vs tracked reference */
|
|
rc = zl3073x_poll_zero_u8(zldev, ZL_REG_DPLL_DF_READ(index),
|
|
ZL_DPLL_DF_READ_SEM);
|
|
if (rc)
|
|
return rc;
|
|
|
|
rc = zl3073x_write_u8(zldev, ZL_REG_DPLL_DF_READ(index),
|
|
ZL_DPLL_DF_READ_SEM | ZL_DPLL_DF_READ_REF_OFST);
|
|
if (rc)
|
|
return rc;
|
|
|
|
rc = zl3073x_poll_zero_u8(zldev, ZL_REG_DPLL_DF_READ(index),
|
|
ZL_DPLL_DF_READ_SEM);
|
|
if (rc)
|
|
return rc;
|
|
|
|
rc = zl3073x_read_u48(zldev, ZL_REG_DPLL_DF_OFFSET(index), &val);
|
|
if (rc)
|
|
return rc;
|
|
|
|
chan->df_offset = sign_extend64(val, 47);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* zl3073x_chan_state_fetch - fetch DPLL channel state from hardware
|
|
* @zldev: pointer to zl3073x_dev structure
|
|
* @index: DPLL channel index to fetch state for
|
|
*
|
|
* Reads the mode_refsel register and reference priority registers for
|
|
* the given DPLL channel and stores the raw values for later use.
|
|
*
|
|
* Return: 0 on success, <0 on error
|
|
*/
|
|
int zl3073x_chan_state_fetch(struct zl3073x_dev *zldev, u8 index)
|
|
{
|
|
struct zl3073x_chan *chan = &zldev->chan[index];
|
|
int rc, i;
|
|
|
|
rc = zl3073x_read_u8(zldev, ZL_REG_DPLL_MODE_REFSEL(index),
|
|
&chan->mode_refsel);
|
|
if (rc)
|
|
return rc;
|
|
|
|
dev_dbg(zldev->dev, "DPLL%u mode: %u, ref: %u\n", index,
|
|
zl3073x_chan_mode_get(chan), zl3073x_chan_ref_get(chan));
|
|
|
|
rc = zl3073x_chan_state_update(zldev, index);
|
|
if (rc)
|
|
return rc;
|
|
|
|
dev_dbg(zldev->dev,
|
|
"DPLL%u lock_state: %u, ho: %u, sel_state: %u, sel_ref: %u\n",
|
|
index, zl3073x_chan_lock_state_get(chan),
|
|
zl3073x_chan_is_ho_ready(chan) ? 1 : 0,
|
|
zl3073x_chan_refsel_state_get(chan),
|
|
zl3073x_chan_refsel_ref_get(chan));
|
|
|
|
guard(mutex)(&zldev->multiop_lock);
|
|
|
|
/* Read DPLL configuration from mailbox */
|
|
rc = zl3073x_mb_op(zldev, ZL_REG_DPLL_MB_SEM, ZL_DPLL_MB_SEM_RD,
|
|
ZL_REG_DPLL_MB_MASK, BIT(index));
|
|
if (rc)
|
|
return rc;
|
|
|
|
/* Read reference priority registers */
|
|
for (i = 0; i < ARRAY_SIZE(chan->ref_prio); i++) {
|
|
rc = zl3073x_read_u8(zldev, ZL_REG_DPLL_REF_PRIO(i),
|
|
&chan->ref_prio[i]);
|
|
if (rc)
|
|
return rc;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* zl3073x_chan_state_get - get current DPLL channel state
|
|
* @zldev: pointer to zl3073x_dev structure
|
|
* @index: DPLL channel index to get state for
|
|
*
|
|
* Return: pointer to given DPLL channel state
|
|
*/
|
|
const struct zl3073x_chan *zl3073x_chan_state_get(struct zl3073x_dev *zldev,
|
|
u8 index)
|
|
{
|
|
return &zldev->chan[index];
|
|
}
|
|
|
|
/**
|
|
* zl3073x_chan_state_set - commit DPLL channel state changes to hardware
|
|
* @zldev: pointer to zl3073x_dev structure
|
|
* @index: DPLL channel index to set state for
|
|
* @chan: desired channel state
|
|
*
|
|
* Skips the HW write if the configuration is unchanged, and otherwise
|
|
* writes only the changed registers to hardware. The mode_refsel register
|
|
* is written directly, while the reference priority registers are written
|
|
* via the DPLL mailbox interface.
|
|
*
|
|
* Return: 0 on success, <0 on HW error
|
|
*/
|
|
int zl3073x_chan_state_set(struct zl3073x_dev *zldev, u8 index,
|
|
const struct zl3073x_chan *chan)
|
|
{
|
|
struct zl3073x_chan *dchan = &zldev->chan[index];
|
|
int rc, i;
|
|
|
|
/* Skip HW write if configuration hasn't changed */
|
|
if (!memcmp(&dchan->cfg, &chan->cfg, sizeof(chan->cfg)))
|
|
return 0;
|
|
|
|
/* Direct register write for mode_refsel */
|
|
if (dchan->mode_refsel != chan->mode_refsel) {
|
|
rc = zl3073x_write_u8(zldev, ZL_REG_DPLL_MODE_REFSEL(index),
|
|
chan->mode_refsel);
|
|
if (rc)
|
|
return rc;
|
|
dchan->mode_refsel = chan->mode_refsel;
|
|
}
|
|
|
|
/* Mailbox write for ref_prio if changed */
|
|
if (!memcmp(dchan->ref_prio, chan->ref_prio, sizeof(chan->ref_prio))) {
|
|
dchan->cfg = chan->cfg;
|
|
return 0;
|
|
}
|
|
|
|
guard(mutex)(&zldev->multiop_lock);
|
|
|
|
/* Read DPLL configuration into mailbox */
|
|
rc = zl3073x_mb_op(zldev, ZL_REG_DPLL_MB_SEM, ZL_DPLL_MB_SEM_RD,
|
|
ZL_REG_DPLL_MB_MASK, BIT(index));
|
|
if (rc)
|
|
return rc;
|
|
|
|
/* Update changed ref_prio registers */
|
|
for (i = 0; i < ARRAY_SIZE(chan->ref_prio); i++) {
|
|
if (dchan->ref_prio[i] != chan->ref_prio[i]) {
|
|
rc = zl3073x_write_u8(zldev,
|
|
ZL_REG_DPLL_REF_PRIO(i),
|
|
chan->ref_prio[i]);
|
|
if (rc)
|
|
return rc;
|
|
}
|
|
}
|
|
|
|
/* Commit DPLL configuration */
|
|
rc = zl3073x_mb_op(zldev, ZL_REG_DPLL_MB_SEM, ZL_DPLL_MB_SEM_WR,
|
|
ZL_REG_DPLL_MB_MASK, BIT(index));
|
|
if (rc)
|
|
return rc;
|
|
|
|
/* After successful write store new state */
|
|
dchan->cfg = chan->cfg;
|
|
|
|
return 0;
|
|
}
|