From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 43BCB2EAE5; Thu, 12 Dec 2024 15:02:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734015763; cv=none; b=owfBUo1bvmbVg7YeIRXrK2MQyFqkUzG5bDwOn6schdxICXqfaq4PLLablBcA++DvfjeIZDisDVXh6YNdK+7mc5Vek3Q9JdXxFQiYzJmhvdxPL5dcAFEmsSFBQZCRYA9ad5poURdb3YFyqa8FwQdvReaQFcEMUmzYyhpZbzJUJe4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734015763; c=relaxed/simple; bh=P2iHxQH/kTjVABD5dA48MeGVJ+R6YBo/UM6IGFAZSpU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SRP0eLQRylPvjd/W+7ZOoKeWbN/tbwaHRPNucs5lf2Y2DnTFuCM+EU0iJBMdMKHJ2R3VlZXKkRBEd7G4Rxcczoebwzq3CTfxB9T/We+jNYpDaUJLhGpamu3Lf2zgn/NqgaRh/5ue3zK4XaKZ9SMUWbqwVnu3ouRFaXoY8LMYFwk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cymLdN5z; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cymLdN5z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4987BC4CECE; Thu, 12 Dec 2024 15:02:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734015762; bh=P2iHxQH/kTjVABD5dA48MeGVJ+R6YBo/UM6IGFAZSpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cymLdN5zEj8OK68J3dvOYlFW51AT2FXxA2gSUxB0znHnWELv0UWo7cINYXQbajNV0 U//zfl1//trWsoPtFZ+y47J1faV9toans+lUBNQGAgBUKPNFNnp8m6QLaJJc82abAH eHBomg3E3qdarE8+/GpgfNHzkFy8G1GtYux0urW0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Przemek Kitszel , Simon Horman , Przemyslaw Korba , Tony Nguyen , Sasha Levin , Pucha Himasekhar Reddy Subject: [PATCH 6.12 038/466] ice: fix PHY timestamp extraction for ETH56G Date: Thu, 12 Dec 2024 15:53:27 +0100 Message-ID: <20241212144308.190972231@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144306.641051666@linuxfoundation.org> References: <20241212144306.641051666@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Przemyslaw Korba [ Upstream commit 3214fae85e8336fe13e20cf78fc9b6a668bdedff ] Fix incorrect PHY timestamp extraction for ETH56G. It's better to use FIELD_PREP() than manual shift. Fixes: 7cab44f1c35f ("ice: Introduce ETH56G PHY model for E825C products") Reviewed-by: Przemek Kitszel Reviewed-by: Simon Horman Signed-off-by: Przemyslaw Korba Tested-by: Pucha Himasekhar Reddy (A Contingent worker at Intel) Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 3 ++- drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c index ec8db830ac73a..3816e45b6ab44 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c +++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c @@ -1495,7 +1495,8 @@ static int ice_read_ptp_tstamp_eth56g(struct ice_hw *hw, u8 port, u8 idx, * lower 8 bits in the low register, and the upper 32 bits in the high * register. */ - *tstamp = ((u64)hi) << TS_PHY_HIGH_S | ((u64)lo & TS_PHY_LOW_M); + *tstamp = FIELD_PREP(TS_PHY_HIGH_M, hi) | + FIELD_PREP(TS_PHY_LOW_M, lo); return 0; } diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.h b/drivers/net/ethernet/intel/ice/ice_ptp_hw.h index 6cedc1a906afb..4c8b845713442 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.h +++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.h @@ -663,9 +663,8 @@ static inline u64 ice_get_base_incval(struct ice_hw *hw) #define TS_HIGH_M 0xFF #define TS_HIGH_S 32 -#define TS_PHY_LOW_M 0xFF -#define TS_PHY_HIGH_M 0xFFFFFFFF -#define TS_PHY_HIGH_S 8 +#define TS_PHY_LOW_M GENMASK(7, 0) +#define TS_PHY_HIGH_M GENMASK_ULL(39, 8) #define BYTES_PER_IDX_ADDR_L_U 8 #define BYTES_PER_IDX_ADDR_L 4 -- 2.43.0