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>
59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
From 2f2ca7f272758284fb9c15ed5f513cdeaefee46c Mon Sep 17 00:00:00 2001
|
|
From: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
|
|
Date: Tue, 31 Oct 2023 18:06:54 +0100
|
|
Subject: [PATCH 27/46] ice: dpll: fix check for dpll input priority range
|
|
|
|
Supported priority value for input pins may differ with regard of NIC
|
|
firmware version. E810T NICs with 3.20/4.00 FW versions would accept
|
|
priority range 0-31, where firmware 4.10+ would support the range 0-9
|
|
and extra value of 255.
|
|
Remove the in-range check as the driver has no information on supported
|
|
values from the running firmware, let firmware decide if given value is
|
|
correct and return extack error if the value is not supported.
|
|
|
|
Fixes: d7999f5ea64b ("ice: implement dpll interface to control cgu")
|
|
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
|
|
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
|
|
Signed-off-by: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
|
|
Tested-by: Sunitha Mekala <sunithax.d.mekala@intel.com> (A Contingent worker at Intel)
|
|
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
|
|
(cherry picked from commit 4a4027f25dc3f39c2aafb3bf8926125c5378c9dc)
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
---
|
|
drivers/net/ethernet/intel/ice/ice_dpll.c | 6 ------
|
|
drivers/net/ethernet/intel/ice/ice_dpll.h | 1 -
|
|
2 files changed, 7 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice_dpll.c b/drivers/net/ethernet/intel/ice/ice_dpll.c
|
|
index 607f534055b6..831ba6683962 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice_dpll.c
|
|
+++ b/drivers/net/ethernet/intel/ice/ice_dpll.c
|
|
@@ -815,12 +815,6 @@ ice_dpll_input_prio_set(const struct dpll_pin *pin, void *pin_priv,
|
|
struct ice_pf *pf = d->pf;
|
|
int ret;
|
|
|
|
- if (prio > ICE_DPLL_PRIO_MAX) {
|
|
- NL_SET_ERR_MSG_FMT(extack, "prio out of supported range 0-%d",
|
|
- ICE_DPLL_PRIO_MAX);
|
|
- return -EINVAL;
|
|
- }
|
|
-
|
|
mutex_lock(&pf->dplls.lock);
|
|
ret = ice_dpll_hw_input_prio_set(pf, d, p, prio, extack);
|
|
mutex_unlock(&pf->dplls.lock);
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice_dpll.h b/drivers/net/ethernet/intel/ice/ice_dpll.h
|
|
index bb32b6d88373..93172e93995b 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice_dpll.h
|
|
+++ b/drivers/net/ethernet/intel/ice/ice_dpll.h
|
|
@@ -6,7 +6,6 @@
|
|
|
|
#include "ice.h"
|
|
|
|
-#define ICE_DPLL_PRIO_MAX 0xF
|
|
#define ICE_DPLL_RCLK_NUM_MAX 4
|
|
|
|
/** ice_dpll_pin - store info about pins
|
|
--
|
|
2.43.0
|
|
|