853c60e2e8
This commit back ports the DPLL related commits from the upstream
kernel that are identified by Intel to provide the expected
SyncE/GNSS functionality.
There are totally 46 back ported commits included the four commits
I added are used to resolve the conflicts during back porting.
The 0046 patch is cherry picked from kernel-6.9.
The 0031-0045 patches are cherry picked from kernel-6.8.
The 0001-0030 patches are cherry picked from kernel-6.7.
We also change the in-tree ice driver version to 6.6.40-stx.2 from
6.6.40-stx.1.
* To fix the conflict of 91e43ca0090b ("ice: fix linking when
CONFIG_PTP_1588_CLOCK=n"), we cherry pick 12a5a28b565b
("ice: remove ICE_F_PTP_EXTTS feature flag") and 89776a6a702e
("ice: check netlist before enabling ICE_F_GNSS").
Adjust 12a5a28b565b because 0d1b22367ec2 ("ice: fix pin
assignment for E810-T without SMA control") already included
the part code of 12a5a28b565b.
https://git.yoctoproject.org/linux-yocto/commit/?id=0d1b22367ec2
* Cherry pick 7049fd5df7 ("netlink: specs: remove redundant type keys
from attributes in subsets") to fix the the conflict of c3c6ab95c397
("dpll: spec: add support for pin-dpll signal phase offset/adjust.")
* Cherry pick be16574609f1 ("ice: introduce hw->phy_model for handling
PTP PHY differences") to fix the confilict of 6db5f2cd9ebb ("ice:
dpll:fix output pin capabilities").
Verification:
- Build kernel and out of tree modules success for rt and std.
- Install success onto a All-in-One lab with rt kernel.
- Boot up successfully in the lab.
- interfaces are up and pass packets for rt and std.
- Check dmesg to see DDP package is loaded successfully and
the version is 1.3.36.0 for rt and std, that is same with the OOT
ice-1.14.9 driver.
- The SyncE/GNSS functionality tests were done by the network team.
Story: 2011056
Task: 50797
Change-Id: I715480681c7c43d53b0a0126b34135562e9d02a0
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
From ee4551cc0066fdd14d58353a8b7d290fe56ea863 Mon Sep 17 00:00:00 2001
|
|
From: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
|
|
Date: Thu, 8 Feb 2024 23:56:31 +0100
|
|
Subject: [PATCH 41/46] ice: fix dpll input pin phase_adjust value updates
|
|
|
|
The value of phase_adjust for input pin shall be updated in
|
|
ice_dpll_pin_state_update(..). Fix by adding proper argument to the
|
|
firmware query function call - a pin's struct field pointer where the
|
|
phase_adjust value during driver runtime is stored.
|
|
|
|
Previously the phase_adjust used to misinform user about actual
|
|
phase_adjust value. I.e., if phase_adjust was set to a non zero value and
|
|
if driver was reloaded, the user would see the value equal 0, which is
|
|
not correct - the actual value is equal to value set before driver reload.
|
|
|
|
Fixes: 90e1c90750d7 ("ice: dpll: implement phase related callbacks")
|
|
Reviewed-by: Alan Brady <alan.brady@intel.com>
|
|
Signed-off-by: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
|
|
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
|
|
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
|
|
(cherry picked from commit 3b14430c65b4f510b2a310ca4f18ed6ca7184b00)
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
---
|
|
drivers/net/ethernet/intel/ice/ice_dpll.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice_dpll.c b/drivers/net/ethernet/intel/ice/ice_dpll.c
|
|
index 0f836adc0e58..10a469060d32 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice_dpll.c
|
|
+++ b/drivers/net/ethernet/intel/ice/ice_dpll.c
|
|
@@ -373,7 +373,7 @@ ice_dpll_pin_state_update(struct ice_pf *pf, struct ice_dpll_pin *pin,
|
|
case ICE_DPLL_PIN_TYPE_INPUT:
|
|
ret = ice_aq_get_input_pin_cfg(&pf->hw, pin->idx, NULL, NULL,
|
|
NULL, &pin->flags[0],
|
|
- &pin->freq, NULL);
|
|
+ &pin->freq, &pin->phase_adjust);
|
|
if (ret)
|
|
goto err;
|
|
if (ICE_AQC_GET_CGU_IN_CFG_FLG2_INPUT_EN & pin->flags[0]) {
|
|
--
|
|
2.43.0
|
|
|