[Intel-wired-lan] [PATCH v2 iwl-next 10/10] ice: move TSPLL init calls to ice_ptp.c

[Karol Kolacinski]

Initialize TSPLL after initializing PHC in ice_ptp.c instead of calling
for each product in PHC init in ice_ptp_hw.c.

Reviewed-by: Michal Kubiak <michal.kub...@intel.com>
Reviewed-by: Milena Olech <milena.ol...@intel.com>
Signed-off-by: Karol Kolacinski <karol.kolacin...@intel.com>
---
 drivers/net/ethernet/intel/ice/ice_ptp.c    | 11 +++++++++++
 drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 22 +--------------------
 drivers/net/ethernet/intel/ice/ice_tspll.c  |  5 +++++
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c 
b/drivers/net/ethernet/intel/ice/ice_ptp.c
index ce0a95f80c2e..96f69277c79e 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -2897,6 +2897,10 @@ static int ice_ptp_rebuild_owner(struct ice_pf *pf)
        if (err)
                return err;
 
+       err = ice_tspll_init(hw);
+       if (err)
+               return err;
+
        /* Acquire the global hardware lock */
        if (!ice_ptp_lock(hw)) {
                err = -EBUSY;
@@ -3064,6 +3068,13 @@ static int ice_ptp_init_owner(struct ice_pf *pf)
                return err;
        }
 
+       err = ice_tspll_init(hw);
+       if (err) {
+               dev_err(ice_pf_to_dev(pf), "Failed to initialize CGU, status 
%d\n",
+                       err);
+               return err;
+       }
+
        /* Acquire the global hardware lock */
        if (!ice_ptp_lock(hw)) {
                err = -EBUSY;
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c 
b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
index 278231443546..e8e439fd64a4 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
@@ -2115,20 +2115,6 @@ int ice_start_phy_timer_eth56g(struct ice_hw *hw, u8 
port)
        return 0;
 }
 
-/**
- * ice_ptp_init_phc_e825 - Perform E825 specific PHC initialization
- * @hw: pointer to HW struct
- *
- * Perform E825-specific PTP hardware clock initialization steps.
- *
- * Return: 0 on success, negative error code otherwise.
- */
-static int ice_ptp_init_phc_e825(struct ice_hw *hw)
-{
-       /* Initialize the Clock Generation Unit */
-       return ice_tspll_init(hw);
-}
-
 /**
  * ice_ptp_read_tx_hwtstamp_status_eth56g - Get TX timestamp status
  * @hw: pointer to the HW struct
@@ -2788,7 +2774,6 @@ static int ice_ptp_set_vernier_wl(struct ice_hw *hw)
  */
 static int ice_ptp_init_phc_e82x(struct ice_hw *hw)
 {
-       int err;
        u32 val;
 
        /* Enable reading switch and PHY registers over the sideband queue */
@@ -2798,11 +2783,6 @@ static int ice_ptp_init_phc_e82x(struct ice_hw *hw)
        val |= (PF_SB_REM_DEV_CTL_SWITCH_READ | PF_SB_REM_DEV_CTL_PHY0);
        wr32(hw, PF_SB_REM_DEV_CTL, val);
 
-       /* Initialize the Clock Generation Unit */
-       err = ice_tspll_init(hw);
-       if (err)
-               return err;
-
        /* Set window length for all the ports */
        return ice_ptp_set_vernier_wl(hw);
 }
@@ -5584,7 +5564,7 @@ int ice_ptp_init_phc(struct ice_hw *hw)
        case ICE_MAC_GENERIC:
                return ice_ptp_init_phc_e82x(hw);
        case ICE_MAC_GENERIC_3K_E825:
-               return ice_ptp_init_phc_e825(hw);
+               return 0;
        default:
                return -EOPNOTSUPP;
        }
diff --git a/drivers/net/ethernet/intel/ice/ice_tspll.c 
b/drivers/net/ethernet/intel/ice/ice_tspll.c
index b81eb6d2a0de..e9625ac521f0 100644
--- a/drivers/net/ethernet/intel/ice/ice_tspll.c
+++ b/drivers/net/ethernet/intel/ice/ice_tspll.c
@@ -477,6 +477,11 @@ int ice_tspll_init(struct ice_hw *hw)
        enum ice_clk_src clk_src;
        int err;
 
+       /* Only E822, E823 and E825 products support TSPLL */
+       if (hw->mac_type != ICE_MAC_GENERIC &&
+           hw->mac_type != ICE_MAC_GENERIC_3K_E825)
+               return 0;
+
        tspll_freq = (enum ice_tspll_freq)ts_info->time_ref;
        clk_src = (enum ice_clk_src)ts_info->clk_src;
        if (!ice_tspll_check_params(hw, tspll_freq, clk_src))
-- 
2.49.0