Skip to content

Commit 94b5f2f

Browse files
committed
Auto update to lts2024-ubuntu v6.12.42-250819T115223Z
Source of patches: c1309d1ca rebase update to v6.12.42 Signed-off-by: sys_oak <sys_oak@intel.com>
1 parent f8cda28 commit 94b5f2f

10 files changed

Lines changed: 22 additions & 136 deletions

config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
KVERSION=6
55
KPATCHLEVEL=12
6-
KSUBLEVEL=41
6+
KSUBLEVEL=42
77
KEXTRAVERSION=
88
KRTV=
99

kernel-config/emt/dm-integrity.cfg

Lines changed: 0 additions & 8 deletions
This file was deleted.

kernel-config/emt/dmabuf.cfg

Lines changed: 0 additions & 1 deletion
This file was deleted.

kernel-config/emt/kernel-hardening.cfg

Lines changed: 0 additions & 88 deletions
This file was deleted.

kernel-config/emt/nvidia.cfg

Lines changed: 0 additions & 1 deletion
This file was deleted.

kernel-config/emt/tdx.cfg

Lines changed: 0 additions & 15 deletions
This file was deleted.

kernel-config/features/features.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,7 @@ CONFIG_INTEL_MEI_PXP=m
3838
CONFIG_INTEL_MEI_GSC_PROXY=m
3939

4040
CONFIG_FRAME_WARN=2048
41+
42+
# TSN Trace
43+
CONFIG_STMMAC_TSN_TRACE=y
44+
CONFIG_IGC_TSN_TRACE=y

kernel-patches/patches/0003-Revert-ice-ptp-Remove-convert_art_to_tsc.tgpio

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,18 @@ Signed-off-by: Hao Li <hao3.li@intel.com>
1010
drivers/net/ethernet/intel/ice/ice_ptp.c | 3 +--
1111
1 file changed, 1 insertion(+), 2 deletions(-)
1212

13-
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
14-
index ef2e858f49bb0..6c7921261ff57 100644
13+
Index: b/drivers/net/ethernet/intel/ice/ice_ptp.c
14+
===================================================================
1515
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
1616
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
17-
@@ -2221,8 +2221,7 @@ ice_ptp_get_syncdevicetime(ktime_t *device,
17+
@@ -2224,9 +2224,7 @@ ice_ptp_get_syncdevicetime(ktime_t *devi
1818
hh_ts_lo = rd32(hw, GLHH_ART_TIME_L);
1919
hh_ts_hi = rd32(hw, GLHH_ART_TIME_H);
2020
hh_ts = ((u64)hh_ts_hi << 32) | hh_ts_lo;
2121
- system->cycles = hh_ts;
2222
- system->cs_id = CSID_X86_ART;
23+
- system->use_nsecs = true;
2324
+ *system = convert_art_ns_to_tsc(hh_ts);
2425
/* Read Device source clock time */
2526
hh_ts_lo = rd32(hw, GLTSYN_HHTIME_L(tmr_idx));
2627
hh_ts_hi = rd32(hw, GLTSYN_HHTIME_H(tmr_idx));
27-
--
28-
2.25.1
29-

kernel-patches/patches/0025-net-sched-taprio-fix-too-early-schedules-switching.tsn

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ Signed-off-by: Faizal Rahim <faizal.abdul.rahim@linux.intel.com>
1616
net/sched/sch_taprio.c | 12 ++++++++++--
1717
1 file changed, 10 insertions(+), 2 deletions(-)
1818

19-
diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
20-
index 8623dc0bafc09..1d17fe58ec867 100644
19+
Index: b/net/sched/sch_taprio.c
20+
===================================================================
2121
--- a/net/sched/sch_taprio.c
2222
+++ b/net/sched/sch_taprio.c
23-
@@ -43,6 +43,7 @@ static struct static_key_false taprio_have_working_mqprio;
23+
@@ -43,6 +43,7 @@ static struct static_key_false taprio_ha
2424
#define TAPRIO_SUPPORTED_FLAGS \
2525
(TCA_TAPRIO_ATTR_FLAG_TXTIME_ASSIST | TCA_TAPRIO_ATTR_FLAG_FULL_OFFLOAD)
2626
#define TAPRIO_FLAGS_INVALID U32_MAX
2727
+#define CYCLE_TIME_CORRECTION_UNSPEC S64_MIN
28-
29-
struct sched_entry {
30-
/* Durations between this GCL entry and the GCL entry where the
31-
@@ -77,6 +78,7 @@ struct sched_gate_list {
28+
/* Minimum value for picos_per_byte to ensure non-zero duration
29+
* for minimum-sized Ethernet frames (ETH_ZLEN = 60).
30+
* 60 * 17 > PSEC_PER_NSEC (1000)
31+
@@ -82,6 +83,7 @@ struct sched_gate_list {
3232
ktime_t cycle_end_time;
3333
s64 cycle_time;
3434
s64 cycle_time_extension;
3535
+ s64 cycle_time_correction;
3636
s64 base_time;
3737
};
3838

39-
@@ -215,6 +217,11 @@ static void switch_schedules(struct taprio_sched *q,
39+
@@ -220,6 +222,11 @@ static void switch_schedules(struct tapr
4040
*admin = NULL;
4141
}
4242

@@ -48,7 +48,7 @@ index 8623dc0bafc09..1d17fe58ec867 100644
4848
/* Get how much time has been already elapsed in the current cycle. */
4949
static s32 get_cycle_time_elapsed(struct sched_gate_list *sched, ktime_t time)
5050
{
51-
@@ -929,7 +936,7 @@ static enum hrtimer_restart advance_sched(struct hrtimer *timer)
51+
@@ -934,7 +941,7 @@ static enum hrtimer_restart advance_sche
5252
admin = rcu_dereference_protected(q->admin_sched,
5353
lockdep_is_held(&q->current_entry_lock));
5454

@@ -57,7 +57,7 @@ index 8623dc0bafc09..1d17fe58ec867 100644
5757
switch_schedules(q, &admin, &oper);
5858

5959
/* This can happen in two cases: 1. this is the very first run
60-
@@ -970,7 +977,7 @@ static enum hrtimer_restart advance_sched(struct hrtimer *timer)
60+
@@ -975,7 +982,7 @@ static enum hrtimer_restart advance_sche
6161
* schedule runs.
6262
*/
6363
end_time = sched_base_time(admin);
@@ -66,14 +66,11 @@ index 8623dc0bafc09..1d17fe58ec867 100644
6666
}
6767

6868
next->end_time = end_time;
69-
@@ -1165,6 +1172,7 @@ static int parse_taprio_schedule(struct taprio_sched *q, struct nlattr **tb,
69+
@@ -1170,6 +1177,7 @@ static int parse_taprio_schedule(struct
7070
}
7171

7272
taprio_calculate_gate_durations(q, new);
7373
+ new->cycle_time_correction = CYCLE_TIME_CORRECTION_UNSPEC;
7474

7575
return 0;
7676
}
77-
--
78-
2.25.1
79-

kernel-patches/patches/series

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Series file for v6.12.41 linux kernel
2-
# 4d24835ed14b6 Linux 6.12.41
1+
# Series file for v6.12.42 linux kernel
2+
# 880e4ff5d6c8d Linux 6.12.42
33
#sriov
44
0001-drm-i915-mtl-Add-C10-table-for-HDMI-Clock-25175.sriov
55
0002-drm-i915-mtl-Copy-c10-phy-pll-sw-state-from-master-t.sriov

0 commit comments

Comments
 (0)