From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1AA331F98C; Thu, 7 May 2026 08:20:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778142057; cv=none; b=c710MZIdwO9/nzuTr5BQOgkOzzr9J3PYXbn3ZLvZ5exbklAplj7sG7SF70C/x3EeDoY9EfvUqr2ElKeXIO95jWX/06QyfAbsGkhzZcNddwOYuHJpuiCpkzg330kU/uDqlBxwbonOdzZBH1UIHSkXHOHP6ECShXlcfu4ybbLhWy0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778142057; c=relaxed/simple; bh=xvtPRT9MCdePBI34IJ/ECAcSUUPQ6pENCScaz1ZCrHc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=mm9067S8Q+bwCXa2C2DRgBeC9VHfDwv6Gqb8GtZpGEaOhgxpYXoC79xLG/eHgihxCfawfof9QdxaJ78SmNqT6S1OPrnE06yWCbHBP6U9vQeSU25v6px92nkSULvkDsk0kTyxSJjXiV3ALtLIKqcn3gSdSV323SaYTGbBkfbh5Hc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Tm8vK2ar; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Tm8vK2ar" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1778142055; x=1809678055; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xvtPRT9MCdePBI34IJ/ECAcSUUPQ6pENCScaz1ZCrHc=; b=Tm8vK2armfTcCk5eErMmj8wRpaFmmU2gleZTSO54XcnPYukz85sQ0k6+ A9GE1UTuQVXXm7yWc2TGTLQqfRnwRHw9bqgVwpIELnGnmM1M94wdBk6lq paSM2zfN8aOWy4dvqFv4Rhue1x1hwl8NQjn8HUcKZNCBWj8sx5WZ4RGlk MueAmRsVYDJ6w5JGQN06kPqTb4McMg+cO/2KIH1JztCB9rO64rgb9KlJi GXp2kFAKihEDFK+KFoTUj4dX3GNwO6+kBY+GP3JW+kRBEmJy2mDUuhGZT 2oYl4vVMkJc+Ee0s/GP7+cWUY+K90ZZ7CRbv+ZP0Wnaxlb93rMMltngJs w==; X-CSE-ConnectionGUID: 4NSfcFxRQv6zL4V8QGbs9g== X-CSE-MsgGUID: w9bILCCZTHy6kDSqy9Hliw== X-IronPort-AV: E=McAfee;i="6800,10657,11778"; a="79195480" X-IronPort-AV: E=Sophos;i="6.23,221,1770624000"; d="scan'208";a="79195480" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 May 2026 01:20:55 -0700 X-CSE-ConnectionGUID: Chid+uljQye2m9hbixrtTg== X-CSE-MsgGUID: WGCoWU2rQ9KCy5x/wg+CMQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,221,1770624000"; d="scan'208";a="241379129" Received: from gklab-003-001.igk.intel.com ([10.91.173.48]) by fmviesa005.fm.intel.com with ESMTP; 07 May 2026 01:20:52 -0700 From: Grzegorz Nitka To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, richardcochran@gmail.com, jacob.e.keller@intel.com, linux-kernel@vger.kernel.org, Grzegorz Nitka , stable@vger.kernel.org, Aleksandr Loktionov Subject: [PATCH iwl-net] ice: restore PTP Rx timestamp config after ethtool set-channels Date: Thu, 7 May 2026 10:16:53 +0200 Message-Id: <20260507081653.1717172-1-grzegorz.nitka@intel.com> X-Mailer: git-send-email 2.39.3 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When ethtool -L changes queue counts, ice_vsi_recfg_qs() closes and rebuilds the VSI, reallocating Rx rings. The newly allocated rings have ptp_rx cleared, so RX hardware timestamps are no longer attached to skb until hwtstamp configuration is applied again. Restore timestamp mode after ice_vsi_open() in the queue reconfiguration path, matching reset/rebuild behavior and ensuring newly rebuilt Rx rings have PTP RX timestamping re-enabled. Testing hints: - run ptp4l application in client synchronization mode: ptp4l -i ethX -m -s - run PTP traffic - change queue number on ethX netdev interface: ethtool -L ethX combined new_queue_size - observe ptp4l output - expected result: no "received DELAY_REQ without timestamp" messages Fixes: 77a781155a65 ("ice: enable receive hardware timestamping") Cc: stable@vger.kernel.org Reviewed-by: Aleksandr Loktionov Signed-off-by: Grzegorz Nitka --- drivers/net/ethernet/intel/ice/ice_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 79f2906eda99..b87accaf7d14 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -4110,6 +4110,12 @@ int ice_vsi_recfg_qs(struct ice_vsi *vsi, int new_rx, int new_tx, bool locked) } ice_pf_dcb_recfg(pf, locked); ice_vsi_open(vsi); + /* Rx rings are reallocated during VSI rebuild and lose their ptp_rx + * flag. Restore timestamp mode so newly allocated rings are set up + * for hardware Rx timestamping. + */ + if (test_bit(ICE_FLAG_PTP_SUPPORTED, pf->flags)) + ice_ptp_restore_timestamp_mode(pf); goto done; rebuild_err: base-commit: f0cfdedb42fe64b06fd048bd490ef835beeda658 -- 2.39.3