github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 00:53:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'net-stmmac-further-ptp-cleanups'

Browse Source 
Russell King says:

====================
net: stmmac: further ptp cleanups

The first uses a local variable when setting n_ext_ts which is a minor
simplification of the code. The second removes the now unnecessary
"available" flag for the PPS outputs.
====================

Link: https://patch.msgid.link/aawDiK7DjcSXSs1X@shell.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2026-03-09 19:45:31 -07:00
commit 52ede1bce5
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/stmicro/stmmac/dwmac5.c
View File

@ -525,8 +525,6 @@ int dwmac5_flex_pps_config(void __iomem *ioaddr, int index,
u32 val = readl(ioaddr + MAC_PPS_CONTROL);
u64 period;
if (!cfg->available)
return -EINVAL;
if (tnsec & TRGTBUSY0)
return -EBUSY;
if (!sub_second_inc || !systime_flags)

2
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
View File

@ -1162,8 +1162,6 @@ static int dwxgmac2_flex_pps_config(void __iomem *ioaddr, int index,
u32 val = readl(ioaddr + XGMAC_PPS_CONTROL);
u64 period;
if (!cfg->available)
return -EINVAL;
if (tnsec & XGMAC_TRGTBUSY0)
return -EBUSY;
if (!sub_second_inc || !systime_flags)

1
drivers/net/ethernet/stmicro/stmmac/stmmac.h
View File

@ -181,7 +181,6 @@ struct stmmac_tc_entry {
#define STMMAC_PPS_MAX 4
struct stmmac_pps_cfg {
bool available;
struct timespec64 start;
struct timespec64 period;
};

10
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
View File

@ -335,7 +335,7 @@ const struct ptp_clock_info dwmac1000_ptp_clock_ops = {
void stmmac_ptp_register(struct stmmac_priv *priv)
{
unsigned int pps_out_num = priv->dma_cap.pps_out_num;
int i;
unsigned int n_ext_ts;
if (pps_out_num > STMMAC_PPS_MAX) {
dev_warn(priv->device,
@ -344,9 +344,6 @@ void stmmac_ptp_register(struct stmmac_priv *priv)
pps_out_num = STMMAC_PPS_MAX;
}
for (i = 0; i < pps_out_num; i++)
priv->pps[i].available = true;
/* Calculate the clock domain crossing (CDC) error if necessary */
priv->plat->cdc_error_adj = 0;
if (priv->plat->core_type == DWMAC_CORE_GMAC4)
@ -358,8 +355,9 @@ void stmmac_ptp_register(struct stmmac_priv *priv)
if (pps_out_num)
priv->ptp_clock_ops.n_per_out = pps_out_num;
if (priv->dma_cap.aux_snapshot_n)
priv->ptp_clock_ops.n_ext_ts = priv->dma_cap.aux_snapshot_n;
n_ext_ts = priv->dma_cap.aux_snapshot_n;
if (n_ext_ts)
priv->ptp_clock_ops.n_ext_ts = n_ext_ts;
if (priv->plat->ptp_max_adj)
priv->ptp_clock_ops.max_adj = priv->plat->ptp_max_adj;