Code Review / pti / rtp.git / blob
? search:


a7c02ed2c1a71aef8abcecd9dd94ea860afbe7da
[pti/rtp.git] /
1 From cc78fc23ff6c9be14464e3880d5491415c020e8b Mon Sep 17 00:00:00 2001
2 From: Jackie Huang <jackie.huang@windriver.com>
3 Date: Fri, 26 Jan 2024 04:14:19 -0500
4 Subject: [PATCH 3/7] intel-ice: limit the hw timestamp for x86 only
5
6 It failed to build due to missing hw timestamp support on Arm platform,
7 So limit the configuration macro for x86 only.
8
9 The patch is backported from ice 1.13.7
10
11 Test Plan:
12 PASS: build-pkgs on x86-64 host
13 PASS: build-image on x86-64 host
14 PASS: build-pkgs on arm64 host
15 PASS: build-image on arm64 host
16 PASS: Deploy AIO-SX on x86-64 target
17 PASS: Deploy AIO-SX on arm64 target
18 PASS: Deploy AIO-SX(low-latency) on arm64 target
19 PASS: Deploy AIO-DX on arm64 targets
20 PASS: Check the ice module loaded successfully
21
22 Story: 2010739
23 Task: 48018
24
25 Change-Id: I05a25e3e0d2e05b9593e44ebbef476c7c3d1b2ad
26 Signed-off-by: Tianyu Li <tianyu.li@arm.com>
27 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
28 ---
29  ...-limit-the-hw-timestamp-for-x86-only.patch | 33 +++++++++++++++++++
30  .../debian/deb_folder/patches/series          |  1 +
31  ...-limit-the-hw-timestamp-for-x86-only.patch | 33 +++++++++++++++++++
32  .../debian/deb_folder/patches/series          |  1 +
33  ...-limit-the-hw-timestamp-for-x86-only.patch | 33 +++++++++++++++++++
34  .../debian/deb_folder/patches/series          |  1 +
35  6 files changed, 102 insertions(+)
36  create mode 100644 kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/0005-limit-the-hw-timestamp-for-x86-only.patch
37  create mode 100644 kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/patches/0006-limit-the-hw-timestamp-for-x86-only.patch
38  create mode 100644 kernel-modules/intel-ice/debian/deb_folder/patches/0001-limit-the-hw-timestamp-for-x86-only.patch
39
40 diff --git a/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/0005-limit-the-hw-timestamp-for-x86-only.patch b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/0005-limit-the-hw-timestamp-for-x86-only.patch
41 new file mode 100644
42 index 0000000..06b1032
43 --- /dev/null
44 +++ b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/0005-limit-the-hw-timestamp-for-x86-only.patch
45 @@ -0,0 +1,33 @@
46 +From 36f42b9a661ac673e3d6b742576283cd2d9abcaa Mon Sep 17 00:00:00 2001
47 +From: Jackie Huang <jackie.huang@windriver.com>
48 +Date: Mon, 22 Jan 2024 04:06:33 -0500
49 +Subject: [PATCH] limit the hw timestamp for x86 only
50 +
51 +It failed to build due to missing hw timestamp support on Arm platform,
52 +So limit the configuration macro for x86 only.
53 +
54 +This is backported from ice 1.13.7
55 +
56 +Signed-off-by: Tianyu Li <tianyu.li@arm.com>
57 +Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
58 +---
59 + src/kcompat.h | 2 ++
60 + 1 file changed, 2 insertions(+)
61 +
62 +diff --git a/src/kcompat.h b/src/kcompat.h
63 +index 469094f..eff5162 100644
64 +--- a/src/kcompat.h
65 ++++ b/src/kcompat.h
66 +@@ -2273,7 +2273,9 @@ int _kc_kstrtobool(const char *s, bool *res);
67 + #else /* >= 4.6.0 */
68 + #define HAVE_PAGE_COUNT_BULK_UPDATE
69 + #define HAVE_ETHTOOL_FLOW_UNION_IP6_SPEC
70 ++#ifdef CONFIG_X86
71 + #define HAVE_PTP_CROSSTIMESTAMP
72 ++#endif
73 + #define HAVE_TC_SETUP_CLSFLOWER
74 + #define HAVE_TC_SETUP_CLSU32
75 + #endif /* 4.6.0 */
76 +-- 
77 +2.30.2
78 +
79 diff --git a/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/series b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/series
80 index 1be2042..16d59ea 100644
81 --- a/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/series
82 +++ b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/series
83 @@ -2,3 +2,4 @@
84  0002-ice_main-ice_lib-Use-irq_update_affinity_hint.patch
85  0003-ddp-change-ddp-file-name-for-legacy-driver.patch
86  0004-Disable-irq_msix_misc-before-ptp-release.patch
87 +0005-limit-the-hw-timestamp-for-x86-only.patch
88 diff --git a/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/patches/0006-limit-the-hw-timestamp-for-x86-only.patch b/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/patches/0006-limit-the-hw-timestamp-for-x86-only.patch
89 new file mode 100644
90 index 0000000..06b1032
91 --- /dev/null
92 +++ b/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/patches/0006-limit-the-hw-timestamp-for-x86-only.patch
93 @@ -0,0 +1,33 @@
94 +From 36f42b9a661ac673e3d6b742576283cd2d9abcaa Mon Sep 17 00:00:00 2001
95 +From: Jackie Huang <jackie.huang@windriver.com>
96 +Date: Mon, 22 Jan 2024 04:06:33 -0500
97 +Subject: [PATCH] limit the hw timestamp for x86 only
98 +
99 +It failed to build due to missing hw timestamp support on Arm platform,
100 +So limit the configuration macro for x86 only.
101 +
102 +This is backported from ice 1.13.7
103 +
104 +Signed-off-by: Tianyu Li <tianyu.li@arm.com>
105 +Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
106 +---
107 + src/kcompat.h | 2 ++
108 + 1 file changed, 2 insertions(+)
109 +
110 +diff --git a/src/kcompat.h b/src/kcompat.h
111 +index 469094f..eff5162 100644
112 +--- a/src/kcompat.h
113 ++++ b/src/kcompat.h
114 +@@ -2273,7 +2273,9 @@ int _kc_kstrtobool(const char *s, bool *res);
115 + #else /* >= 4.6.0 */
116 + #define HAVE_PAGE_COUNT_BULK_UPDATE
117 + #define HAVE_ETHTOOL_FLOW_UNION_IP6_SPEC
118 ++#ifdef CONFIG_X86
119 + #define HAVE_PTP_CROSSTIMESTAMP
120 ++#endif
121 + #define HAVE_TC_SETUP_CLSFLOWER
122 + #define HAVE_TC_SETUP_CLSU32
123 + #endif /* 4.6.0 */
124 +-- 
125 +2.30.2
126 +
127 diff --git a/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/patches/series b/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/patches/series
128 index c845385..36d5a99 100644
129 --- a/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/patches/series
130 +++ b/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/patches/series
131 @@ -3,3 +3,4 @@
132  0003-rename-the-ddp-file-to-avoid-conflict.patch
133  0004-Disable-irq_msix_misc-before-ptp-release.patch
134  0005-ICE-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET-.patch
135 +0006-limit-the-hw-timestamp-for-x86-only.patch
136 diff --git a/kernel-modules/intel-ice/debian/deb_folder/patches/0001-limit-the-hw-timestamp-for-x86-only.patch b/kernel-modules/intel-ice/debian/deb_folder/patches/0001-limit-the-hw-timestamp-for-x86-only.patch
137 new file mode 100644
138 index 0000000..06b1032
139 --- /dev/null
140 +++ b/kernel-modules/intel-ice/debian/deb_folder/patches/0001-limit-the-hw-timestamp-for-x86-only.patch
141 @@ -0,0 +1,33 @@
142 +From 36f42b9a661ac673e3d6b742576283cd2d9abcaa Mon Sep 17 00:00:00 2001
143 +From: Jackie Huang <jackie.huang@windriver.com>
144 +Date: Mon, 22 Jan 2024 04:06:33 -0500
145 +Subject: [PATCH] limit the hw timestamp for x86 only
146 +
147 +It failed to build due to missing hw timestamp support on Arm platform,
148 +So limit the configuration macro for x86 only.
149 +
150 +This is backported from ice 1.13.7
151 +
152 +Signed-off-by: Tianyu Li <tianyu.li@arm.com>
153 +Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
154 +---
155 + src/kcompat.h | 2 ++
156 + 1 file changed, 2 insertions(+)
157 +
158 +diff --git a/src/kcompat.h b/src/kcompat.h
159 +index 469094f..eff5162 100644
160 +--- a/src/kcompat.h
161 ++++ b/src/kcompat.h
162 +@@ -2273,7 +2273,9 @@ int _kc_kstrtobool(const char *s, bool *res);
163 + #else /* >= 4.6.0 */
164 + #define HAVE_PAGE_COUNT_BULK_UPDATE
165 + #define HAVE_ETHTOOL_FLOW_UNION_IP6_SPEC
166 ++#ifdef CONFIG_X86
167 + #define HAVE_PTP_CROSSTIMESTAMP
168 ++#endif
169 + #define HAVE_TC_SETUP_CLSFLOWER
170 + #define HAVE_TC_SETUP_CLSU32
171 + #endif /* 4.6.0 */
172 +-- 
173 +2.30.2
174 +
175 diff --git a/kernel-modules/intel-ice/debian/deb_folder/patches/series b/kernel-modules/intel-ice/debian/deb_folder/patches/series
176 index fe60ba8..200e193 100644
177 --- a/kernel-modules/intel-ice/debian/deb_folder/patches/series
178 +++ b/kernel-modules/intel-ice/debian/deb_folder/patches/series
179 @@ -3,3 +3,4 @@
180  0001-rename-the-ddp-file-to-avoid-conflict.patch
181  0001-Disable-irq_msix_misc-before-ptp-release.patch
182  0001-ICE-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET-.patch
183 +0001-limit-the-hw-timestamp-for-x86-only.patch
184 -- 
185 2.30.2
186
Performance Tuned Infrastructure