| Message ID | 20230616135323.98215-15-radu-nicolae.pirea@oss.nxp.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Add TJA1120 support | expand |
| Context | Check | Description |
|---|---|---|
| netdev/series_format | success | Posting correctly formatted |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 8 this patch: 8 |
| netdev/cc_maintainers | success | CCed 9 of 9 maintainers |
| netdev/build_clang | success | Errors and warnings before: 8 this patch: 8 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/deprecated_api | success | None detected |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 8 this patch: 8 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 58 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
The 06/16/2023 16:53, Radu Pirea (NXP OSS) wrote: Hi Radu, > > On TJA1120 engineering samples, the new timestamp is stuck in the FIFO. > If the MORE_TS bit is set and the VALID bit is not set, we know that we > have a timestamp in the FIFO but not in the buffer. > > To move the new timestamp in the buffer registers, the current > timestamp(which is invalid) is unlocked by writing any of the buffer > registers. Shouldn't this be split and merged in patch 9 and patch 10? As those two patches introduced this functions with issues. > > Signed-off-by: Radu Pirea (NXP OSS) <radu-nicolae.pirea@oss.nxp.com> > --- > drivers/net/phy/nxp-c45-tja11xx.c | 31 ++++++++++++++++++++++++++++--- > 1 file changed, 28 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c > index 0d22eb7534dc..3543c8fe099c 100644 > --- a/drivers/net/phy/nxp-c45-tja11xx.c > +++ b/drivers/net/phy/nxp-c45-tja11xx.c > @@ -532,15 +532,30 @@ static bool nxp_c45_get_extts(struct nxp_c45_phy *priv, > static bool tja1120_get_extts(struct nxp_c45_phy *priv, > struct timespec64 *extts) > { > + const struct nxp_c45_regmap *regmap = nxp_c45_get_regmap(priv->phydev); > + bool more_ts; > bool valid; > u16 reg; > > + reg = phy_read_mmd(priv->phydev, MDIO_MMD_VEND1, > + regmap->vend1_ext_trg_ctrl); > + more_ts = !!(reg & TJA1120_MORE_TS); > + > reg = phy_read_mmd(priv->phydev, MDIO_MMD_VEND1, > TJA1120_VEND1_PTP_TRIG_DATA_S); > valid = !!(reg & TJA1120_TS_VALID); > if (valid) > return nxp_c45_get_extts(priv, extts); > > + /* Bug workaround for TJA1120 enegineering samples: move the new > + * timestamp from the FIFO to the buffer. > + */ > + if (more_ts) { > + phy_write_mmd(priv->phydev, MDIO_MMD_VEND1, > + regmap->vend1_ext_trg_ctrl, RING_DONE); > + return nxp_c45_get_extts(priv, extts); > + } > + > return valid; > } > > @@ -588,15 +603,25 @@ static bool tja1120_get_hwtxts(struct nxp_c45_phy *priv, > struct nxp_c45_hwts *hwts) > { > struct phy_device *phydev = priv->phydev; > + bool more_ts; > bool valid; > u16 reg; > > mutex_lock(&priv->ptp_lock); > + reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, TJA1120_EGRESS_TS_END); > + more_ts = !!(reg & TJA1120_MORE_TS); > reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, TJA1120_EGRESS_TS_DATA_S); > valid = !!(reg & TJA1120_TS_VALID); > - if (!valid) > - goto tja1120_get_hwtxts_out; > - > + if (!valid) { > + if (!more_ts) > + goto tja1120_get_hwtxts_out; > + /* Bug workaround for TJA1120 enegineering samples: move the > + * new timestamp from the FIFO to the buffer. > + */ > + phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1, > + TJA1120_EGRESS_TS_END, TJA1120_TS_VALID); > + valid = true; > + } > nxp_c45_read_egress_ts(priv, hwts); > phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1, TJA1120_EGRESS_TS_DATA_S, > TJA1120_TS_VALID); > -- > 2.34.1 > >
On 19.06.2023 11:58, Horatiu Vultur wrote: > The 06/16/2023 16:53, Radu Pirea (NXP OSS) wrote: > > Hi Radu, > >> >> On TJA1120 engineering samples, the new timestamp is stuck in the FIFO. >> If the MORE_TS bit is set and the VALID bit is not set, we know that we >> have a timestamp in the FIFO but not in the buffer. >> >> To move the new timestamp in the buffer registers, the current >> timestamp(which is invalid) is unlocked by writing any of the buffer >> registers. > > Shouldn't this be split and merged in patch 9 and patch 10? > As those two patches introduced this functions with issues. > Ok. I will merge the workarounds in patches 9 and 12 if it looks better to you. The intention here was to implement the timestamp reading sequence in a clean way and to add the workarounds later. >> >> > > -- > /Horatiu
diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c index 0d22eb7534dc..3543c8fe099c 100644 --- a/drivers/net/phy/nxp-c45-tja11xx.c +++ b/drivers/net/phy/nxp-c45-tja11xx.c @@ -532,15 +532,30 @@ static bool nxp_c45_get_extts(struct nxp_c45_phy *priv, static bool tja1120_get_extts(struct nxp_c45_phy *priv, struct timespec64 *extts) { + const struct nxp_c45_regmap *regmap = nxp_c45_get_regmap(priv->phydev); + bool more_ts; bool valid; u16 reg; + reg = phy_read_mmd(priv->phydev, MDIO_MMD_VEND1, + regmap->vend1_ext_trg_ctrl); + more_ts = !!(reg & TJA1120_MORE_TS); + reg = phy_read_mmd(priv->phydev, MDIO_MMD_VEND1, TJA1120_VEND1_PTP_TRIG_DATA_S); valid = !!(reg & TJA1120_TS_VALID); if (valid) return nxp_c45_get_extts(priv, extts); + /* Bug workaround for TJA1120 enegineering samples: move the new + * timestamp from the FIFO to the buffer. + */ + if (more_ts) { + phy_write_mmd(priv->phydev, MDIO_MMD_VEND1, + regmap->vend1_ext_trg_ctrl, RING_DONE); + return nxp_c45_get_extts(priv, extts); + } + return valid; } @@ -588,15 +603,25 @@ static bool tja1120_get_hwtxts(struct nxp_c45_phy *priv, struct nxp_c45_hwts *hwts) { struct phy_device *phydev = priv->phydev; + bool more_ts; bool valid; u16 reg; mutex_lock(&priv->ptp_lock); + reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, TJA1120_EGRESS_TS_END); + more_ts = !!(reg & TJA1120_MORE_TS); reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, TJA1120_EGRESS_TS_DATA_S); valid = !!(reg & TJA1120_TS_VALID); - if (!valid) - goto tja1120_get_hwtxts_out; - + if (!valid) { + if (!more_ts) + goto tja1120_get_hwtxts_out; + /* Bug workaround for TJA1120 enegineering samples: move the + * new timestamp from the FIFO to the buffer. + */ + phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1, + TJA1120_EGRESS_TS_END, TJA1120_TS_VALID); + valid = true; + } nxp_c45_read_egress_ts(priv, hwts); phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1, TJA1120_EGRESS_TS_DATA_S, TJA1120_TS_VALID);
On TJA1120 engineering samples, the new timestamp is stuck in the FIFO. If the MORE_TS bit is set and the VALID bit is not set, we know that we have a timestamp in the FIFO but not in the buffer. To move the new timestamp in the buffer registers, the current timestamp(which is invalid) is unlocked by writing any of the buffer registers. Signed-off-by: Radu Pirea (NXP OSS) <radu-nicolae.pirea@oss.nxp.com> --- drivers/net/phy/nxp-c45-tja11xx.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)