ice: initialize cached_phctime when creating Rx rings
authorJacob Keller <jacob.e.keller@intel.com>
Wed, 27 Jul 2022 23:15:58 +0000 (16:15 -0700)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Tue, 16 Aug 2022 16:04:37 +0000 (09:04 -0700)
When we create new Rx rings, the cached_phctime field is zero initialized.
This could result in incorrect timestamp reporting due to the cached value
not yet being updated. Although a background task will periodically update
the cached value, ensure it matches the existing cached value in the PF
structure at ring initialization.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Gurucharan <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/ice/ice_ethtool.c
drivers/net/ethernet/intel/ice/ice_lib.c

index bbf6a30..3a18762 100644 (file)
@@ -2885,6 +2885,7 @@ process_rx:
                /* clone ring and setup updated count */
                rx_rings[i] = *vsi->rx_rings[i];
                rx_rings[i].count = new_rx_cnt;
+               rx_rings[i].cached_phctime = pf->ptp.cached_phc_time;
                rx_rings[i].desc = NULL;
                rx_rings[i].rx_buf = NULL;
                /* this is to allow wr32 to have something to write to
index a830f7f..6795290 100644 (file)
@@ -1522,6 +1522,7 @@ static int ice_vsi_alloc_rings(struct ice_vsi *vsi)
                ring->netdev = vsi->netdev;
                ring->dev = dev;
                ring->count = vsi->num_rx_desc;
+               ring->cached_phctime = pf->ptp.cached_phc_time;
                WRITE_ONCE(vsi->rx_rings[i], ring);
        }