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>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 44ad8b2bd48e3a01f46e10aebb59e8e0a52dc9b1 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
|
|
Date: Mon, 25 Sep 2023 07:43:05 +0200
|
|
Subject: [PATCH 11/46] MAINTAINERS: adjust header file entry in DPLL SUBSYSTEM
|
|
|
|
Commit 9431063ad323 ("dpll: core: Add DPLL framework base functions") adds
|
|
the section DPLL SUBSYSTEM in MAINTAINERS and includes a file entry to the
|
|
non-existing file 'include/net/dpll.h'.
|
|
|
|
Hence, ./scripts/get_maintainer.pl --self-test=patterns complains about a
|
|
broken reference. Looking at the file stat of the commit above, this entry
|
|
clearly intended to refer to 'include/linux/dpll.h'.
|
|
|
|
Adjust this header file entry in DPLL SUBSYSTEM.
|
|
|
|
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
|
|
Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
(cherry picked from commit 20f7cce7cf18020cd2b052a6441a7d1623f0e352)
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
---
|
|
MAINTAINERS | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/MAINTAINERS b/MAINTAINERS
|
|
index 531d44ed1e7b..ba98a1973524 100644
|
|
--- a/MAINTAINERS
|
|
+++ b/MAINTAINERS
|
|
@@ -6373,7 +6373,7 @@ L: netdev@vger.kernel.org
|
|
S: Supported
|
|
F: Documentation/driver-api/dpll.rst
|
|
F: drivers/dpll/*
|
|
-F: include/net/dpll.h
|
|
+F: include/linux/dpll.h
|
|
F: include/uapi/linux/dpll.h
|
|
|
|
DRBD DRIVER
|
|
--
|
|
2.43.0
|
|
|