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>
103 lines
3.9 KiB
Diff
103 lines
3.9 KiB
Diff
From a13fb6033eb54791b67f6a62c2328baf1b3ed85a Mon Sep 17 00:00:00 2001
|
|
From: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
|
|
Date: Fri, 1 Dec 2023 10:08:40 -0800
|
|
Subject: [PATCH 31/46] ice: add CGU info to devlink info callback
|
|
|
|
If Clock Generation Unit is present on NIC board user shall know its
|
|
details.
|
|
Provide the devlink info callback with a new:
|
|
- fixed type object (cgu.id) indicating hardware variant of onboard CGU,
|
|
- running type object (fw.cgu) consisting of CGU id, config and firmware
|
|
versions.
|
|
These information shall be known for debugging purposes.
|
|
|
|
Test (on NIC board with CGU)
|
|
$ devlink dev info <bus_name>/<dev_name> | grep cgu
|
|
cgu.id 36
|
|
fw.cgu 8032.16973825.6021
|
|
|
|
Test (on NIC board without CGU)
|
|
$ devlink dev info <bus_name>/<dev_name> | grep cgu -c
|
|
0
|
|
|
|
Reviewed-by: Larysa Zaremba <larysa.zaremba@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>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
(cherry picked from commit b86455a1cbef6829e8da3f93d37a233be2616569)
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
---
|
|
Documentation/networking/devlink/ice.rst | 9 +++++++++
|
|
drivers/net/ethernet/intel/ice/ice_devlink.c | 20 ++++++++++++++++++++
|
|
2 files changed, 29 insertions(+)
|
|
|
|
diff --git a/Documentation/networking/devlink/ice.rst b/Documentation/networking/devlink/ice.rst
|
|
index 2f60e34ab926..7f30ebd5debb 100644
|
|
--- a/Documentation/networking/devlink/ice.rst
|
|
+++ b/Documentation/networking/devlink/ice.rst
|
|
@@ -38,6 +38,10 @@ The ``ice`` driver reports the following versions
|
|
- fixed
|
|
- K65390-000
|
|
- The Product Board Assembly (PBA) identifier of the board.
|
|
+ * - ``cgu.id``
|
|
+ - fixed
|
|
+ - 36
|
|
+ - The Clock Generation Unit (CGU) hardware revision identifier.
|
|
* - ``fw.mgmt``
|
|
- running
|
|
- 2.1.7
|
|
@@ -104,6 +108,11 @@ The ``ice`` driver reports the following versions
|
|
- running
|
|
- 0xee16ced7
|
|
- The first 4 bytes of the hash of the netlist module contents.
|
|
+ * - ``fw.cgu``
|
|
+ - running
|
|
+ - 8032.16973825.6021
|
|
+ - The version of Clock Generation Unit (CGU). Format:
|
|
+ <CGU type>.<configuration version>.<firmware version>.
|
|
|
|
Flash Update
|
|
============
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c b/drivers/net/ethernet/intel/ice/ice_devlink.c
|
|
index 80dc5445b50d..3a2261823d93 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice_devlink.c
|
|
+++ b/drivers/net/ethernet/intel/ice/ice_devlink.c
|
|
@@ -193,6 +193,24 @@ ice_info_pending_netlist_build(struct ice_pf __always_unused *pf,
|
|
snprintf(ctx->buf, sizeof(ctx->buf), "0x%08x", netlist->hash);
|
|
}
|
|
|
|
+static void ice_info_cgu_fw_build(struct ice_pf *pf, struct ice_info_ctx *ctx)
|
|
+{
|
|
+ u32 id, cfg_ver, fw_ver;
|
|
+
|
|
+ if (!ice_is_feature_supported(pf, ICE_F_CGU))
|
|
+ return;
|
|
+ if (ice_aq_get_cgu_info(&pf->hw, &id, &cfg_ver, &fw_ver))
|
|
+ return;
|
|
+ snprintf(ctx->buf, sizeof(ctx->buf), "%u.%u.%u", id, cfg_ver, fw_ver);
|
|
+}
|
|
+
|
|
+static void ice_info_cgu_id(struct ice_pf *pf, struct ice_info_ctx *ctx)
|
|
+{
|
|
+ if (!ice_is_feature_supported(pf, ICE_F_CGU))
|
|
+ return;
|
|
+ snprintf(ctx->buf, sizeof(ctx->buf), "%u", pf->hw.cgu_part_number);
|
|
+}
|
|
+
|
|
#define fixed(key, getter) { ICE_VERSION_FIXED, key, getter, NULL }
|
|
#define running(key, getter) { ICE_VERSION_RUNNING, key, getter, NULL }
|
|
#define stored(key, getter, fallback) { ICE_VERSION_STORED, key, getter, fallback }
|
|
@@ -235,6 +253,8 @@ static const struct ice_devlink_version {
|
|
running("fw.app.bundle_id", ice_info_ddp_pkg_bundle_id),
|
|
combined("fw.netlist", ice_info_netlist_ver, ice_info_pending_netlist_ver),
|
|
combined("fw.netlist.build", ice_info_netlist_build, ice_info_pending_netlist_build),
|
|
+ fixed("cgu.id", ice_info_cgu_id),
|
|
+ running("fw.cgu", ice_info_cgu_fw_build),
|
|
};
|
|
|
|
/**
|
|
--
|
|
2.43.0
|
|
|