ice: Use more generic names for ice_ptp_tx fields

Some supported devices have per-port timestamp memory blocks while
others have shared ones within quads. Rename the struct ice_ptp_tx
fields to reflect the block entities it works with

Signed-off-by: Sergey Temerkhanov <sergey.temerkhanov@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
index 13e75279e71c7337afa191de2e3b6f44ed0d71ed..f41f4674cadd535259f15cb03cb665881b6c8196 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -651,14 +651,14 @@ static bool ice_ptp_tx_tstamp(struct ice_ptp_tx *tx)
 
        for_each_set_bit(idx, tx->in_use, tx->len) {
                struct skb_shared_hwtstamps shhwtstamps = {};
-               u8 phy_idx = idx + tx->quad_offset;
+               u8 phy_idx = idx + tx->offset;
                u64 raw_tstamp, tstamp;
                struct sk_buff *skb;
                int err;
 
                ice_trace(tx_tstamp_fw_req, tx->tstamps[idx].skb, idx);
 
-               err = ice_read_phy_tstamp(&pf->hw, tx->quad, phy_idx,
+               err = ice_read_phy_tstamp(&pf->hw, tx->block, phy_idx,
                                          &raw_tstamp);
                if (err)
                        continue;
@@ -713,7 +713,7 @@ static bool ice_ptp_tx_tstamp(struct ice_ptp_tx *tx)
  * @tx: Tx tracking structure to initialize
  *
  * Assumes that the length has already been initialized. Do not call directly,
- * use the ice_ptp_init_tx_e822 or ice_ptp_init_tx_e810 instead.
+ * use the ice_ptp_init_tx_* instead.
  */
 static int
 ice_ptp_alloc_tx_tracker(struct ice_ptp_tx *tx)
@@ -747,7 +747,7 @@ ice_ptp_flush_tx_tracker(struct ice_pf *pf, struct ice_ptp_tx *tx)
        u8 idx;
 
        for (idx = 0; idx < tx->len; idx++) {
-               u8 phy_idx = idx + tx->quad_offset;
+               u8 phy_idx = idx + tx->offset;
 
                spin_lock(&tx->lock);
                if (tx->tstamps[idx].skb) {
@@ -760,7 +760,7 @@ ice_ptp_flush_tx_tracker(struct ice_pf *pf, struct ice_ptp_tx *tx)
 
                /* Clear any potential residual timestamp in the PHY block */
                if (!pf->hw.reset_ongoing)
-                       ice_clear_phy_tstamp(&pf->hw, tx->quad, phy_idx);
+                       ice_clear_phy_tstamp(&pf->hw, tx->block, phy_idx);
        }
 }
 
@@ -801,9 +801,9 @@ ice_ptp_release_tx_tracker(struct ice_pf *pf, struct ice_ptp_tx *tx)
 static int
 ice_ptp_init_tx_e822(struct ice_pf *pf, struct ice_ptp_tx *tx, u8 port)
 {
-       tx->quad = port / ICE_PORTS_PER_QUAD;
-       tx->quad_offset = (port % ICE_PORTS_PER_QUAD) * INDEX_PER_PORT;
-       tx->len = INDEX_PER_PORT;
+       tx->block = port / ICE_PORTS_PER_QUAD;
+       tx->offset = (port % ICE_PORTS_PER_QUAD) * INDEX_PER_PORT_E822;
+       tx->len = INDEX_PER_PORT_E822;
 
        return ice_ptp_alloc_tx_tracker(tx);
 }
@@ -819,9 +819,9 @@ ice_ptp_init_tx_e822(struct ice_pf *pf, struct ice_ptp_tx *tx, u8 port)
 static int
 ice_ptp_init_tx_e810(struct ice_pf *pf, struct ice_ptp_tx *tx)
 {
-       tx->quad = pf->hw.port_info->lport;
-       tx->quad_offset = 0;
-       tx->len = INDEX_PER_QUAD;
+       tx->block = pf->hw.port_info->lport;
+       tx->offset = 0;
+       tx->len = INDEX_PER_PORT_E810;
 
        return ice_ptp_alloc_tx_tracker(tx);
 }
@@ -854,7 +854,7 @@ static void ice_ptp_tx_tstamp_cleanup(struct ice_pf *pf, struct ice_ptp_tx *tx)
                        continue;
 
                /* Read tstamp to be able to use this register again */
-               ice_read_phy_tstamp(hw, tx->quad, idx + tx->quad_offset,
+               ice_read_phy_tstamp(hw, tx->block, idx + tx->offset,
                                    &raw_tstamp);
 
                spin_lock(&tx->lock);
@@ -2359,7 +2359,7 @@ s8 ice_ptp_request_ts(struct ice_ptp_tx *tx, struct sk_buff *skb)
        if (idx >= tx->len)
                return -1;
        else
-               return idx + tx->quad_offset;
+               return idx + tx->offset;
 }
 
 /**

diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.h b/drivers/net/ethernet/intel/ice/ice_ptp.h
index 028349295b719b6459439b46d5d45ab15fe44389..ca0fbfd71ed2159587d7a51d25b9e62450652055 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ptp.h
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.h
@@ -108,8 +108,8 @@ struct ice_tx_tstamp {
  * @lock: lock to prevent concurrent write to in_use bitmap
  * @tstamps: array of len to store outstanding requests
  * @in_use: bitmap of len to indicate which slots are in use
- * @quad: which quad the timestamps are captured in
- * @quad_offset: offset into timestamp block of the quad to get the real index
+ * @block: which memory block (quad or port) the timestamps are captured in
+ * @offset: offset into timestamp block to get the real index
  * @len: length of the tstamps and in_use fields.
  * @init: if true, the tracker is initialized;
  * @calibrating: if true, the PHY is calibrating the Tx offset. During this
@@ -119,8 +119,8 @@ struct ice_ptp_tx {
        spinlock_t lock; /* lock protecting in_use bitmap */
        struct ice_tx_tstamp *tstamps;
        unsigned long *in_use;
-       u8 quad;
-       u8 quad_offset;
+       u8 block;
+       u8 offset;
        u8 len;
        u8 init;
        u8 calibrating;
@@ -128,7 +128,8 @@ struct ice_ptp_tx {
 
 /* Quad and port information for initializing timestamp blocks */
 #define INDEX_PER_QUAD                 64
-#define INDEX_PER_PORT                 (INDEX_PER_QUAD / ICE_PORTS_PER_QUAD)
+#define INDEX_PER_PORT_E822            16
+#define INDEX_PER_PORT_E810            64
 
 /**
  * struct ice_ptp_port - data used to initialize an external port for PTP