lkml.org 
[lkml]   [2022]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 011/200] net: stmmac: configure PTP clock source prior to PTP initialization
    Date
    From: Mohammad Athari Bin Ismail <mohammad.athari.ismail@intel.com>

    commit 94c82de43e01ef5747a95e4a590880de863fe423 upstream.

    For Intel platform, it is required to configure PTP clock source prior PTP
    initialization in MAC. So, need to move ptp_clk_freq_config execution from
    stmmac_ptp_register() to stmmac_init_ptp().

    Fixes: 76da35dc99af ("stmmac: intel: Add PSE and PCH PTP clock source selection")
    Cc: <stable@vger.kernel.org> # 5.15.x
    Signed-off-by: Mohammad Athari Bin Ismail <mohammad.athari.ismail@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +++
    drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 3 ---
    2 files changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
    +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
    @@ -899,6 +899,9 @@ static int stmmac_init_ptp(struct stmmac
    bool xmac = priv->plat->has_gmac4 || priv->plat->has_xgmac;
    int ret;

    + if (priv->plat->ptp_clk_freq_config)
    + priv->plat->ptp_clk_freq_config(priv);
    +
    ret = stmmac_init_tstamp_counter(priv, STMMAC_HWTS_ACTIVE);
    if (ret)
    return ret;
    --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
    +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
    @@ -297,9 +297,6 @@ void stmmac_ptp_register(struct stmmac_p
    {
    int i;

    - if (priv->plat->ptp_clk_freq_config)
    - priv->plat->ptp_clk_freq_config(priv);
    -
    for (i = 0; i < priv->dma_cap.pps_out_num; i++) {
    if (i >= STMMAC_PPS_MAX)
    break;

    \
     
     \ /
      Last update: 2022-01-31 13:09    [W:2.202 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site