Skip to content

Commit 1f7d08e

Browse files
sys-oaksys-oak
committed
Auto update to lts2024-ubuntu v6.12.51-251009T163329Z
Source of patches: 2089a9380 Add EDAC patches rebase update to v6.12.51 Signed-off-by: sys_oak <sys_oak@intel.com>
1 parent 064d8b7 commit 1f7d08e

5 files changed

Lines changed: 106 additions & 25 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=48
6+
KSUBLEVEL=51
77
KEXTRAVERSION=
88
KRTV=
99

‎kernel-patches/patches/0001-EDAC-igen6-Add-Intel-Amston-Lake-SoCs-support.edac‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From 2660ff568ce93b0810d5105c68aca7f46f280f3e Mon Sep 17 00:00:00 2001
2+
From: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
3+
Date: Tue, 8 Apr 2025 21:24:55 +0800
4+
Subject: [PATCH 1/2] EDAC/igen6: Add Intel Amston Lake SoCs support
5+
6+
Intel Amston Lake is a series of SoCs tailored for edge computing needs.
7+
The Amston Lake SoCs, equipped with IBECC(In-Band ECC) capability, share
8+
the same IBECC registers with Alder Lake-N SoCs. Add the Intel Amston Lake
9+
SoC compute die ID for EDAC support.
10+
11+
Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
12+
---
13+
drivers/edac/igen6_edac.c | 4 ++++
14+
1 file changed, 4 insertions(+)
15+
16+
diff --git a/drivers/edac/igen6_edac.c b/drivers/edac/igen6_edac.c
17+
index 77f8e003b5b27..5a26472459a68 100644
18+
--- a/drivers/edac/igen6_edac.c
19+
+++ b/drivers/edac/igen6_edac.c
20+
@@ -241,6 +241,9 @@ static struct work_struct ecclog_work;
21+
#define DID_ADL_N_SKU11 0x467c
22+
#define DID_ADL_N_SKU12 0x4632
23+
24+
+/* Compute did IDs for Amston Lake with IBECC */
25+
+#define DID_ASL_SKU1 0x464a
26+
+
27+
/* Compute die IDs for Raptor Lake-P with IBECC */
28+
#define DID_RPL_P_SKU1 0xa706
29+
#define DID_RPL_P_SKU2 0xa707
30+
@@ -596,6 +599,7 @@ static const struct pci_device_id igen6_pci_tbl[] = {
31+
{ PCI_VDEVICE(INTEL, DID_ADL_N_SKU10), (kernel_ulong_t)&adl_n_cfg },
32+
{ PCI_VDEVICE(INTEL, DID_ADL_N_SKU11), (kernel_ulong_t)&adl_n_cfg },
33+
{ PCI_VDEVICE(INTEL, DID_ADL_N_SKU12), (kernel_ulong_t)&adl_n_cfg },
34+
+ { PCI_VDEVICE(INTEL, DID_ASL_SKU1), (kernel_ulong_t)&adl_n_cfg },
35+
{ PCI_VDEVICE(INTEL, DID_RPL_P_SKU1), (kernel_ulong_t)&rpl_p_cfg },
36+
{ PCI_VDEVICE(INTEL, DID_RPL_P_SKU2), (kernel_ulong_t)&rpl_p_cfg },
37+
{ PCI_VDEVICE(INTEL, DID_RPL_P_SKU3), (kernel_ulong_t)&rpl_p_cfg },
38+
--
39+
2.43.0
40+

‎kernel-patches/patches/0002-EDAC-igen6-Add-additional-Intel-Amston-Lake-SoC-compu.edac‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
From 5f97c9c7f42efdede7a9a8aeb76dfb5fec616a98 Mon Sep 17 00:00:00 2001
2+
From: Jie Wang <jie.wang@intel.com>
3+
Date: Thu, 9 Oct 2025 14:41:21 +0000
4+
Subject: [PATCH 2/2] EDAC/igen6: Add additional Intel Amston Lake SoC compute
5+
die IDs
6+
7+
Add two more Intel Amston Lake SoC compute die IDs for EDAC support.
8+
These SoCs also feature IBECC (In-Band ECC) capability and share the
9+
same IBECC registers with Alder Lake-N SoCs.
10+
11+
Signed-off-by: Jie Wang <jie.wang@intel.com>
12+
---
13+
drivers/edac/igen6_edac.c | 6 +++++-
14+
1 file changed, 5 insertions(+), 1 deletion(-)
15+
16+
diff --git a/drivers/edac/igen6_edac.c b/drivers/edac/igen6_edac.c
17+
index 5a26472459a68..28a168cc56938 100644
18+
--- a/drivers/edac/igen6_edac.c
19+
+++ b/drivers/edac/igen6_edac.c
20+
@@ -242,7 +242,9 @@ static struct work_struct ecclog_work;
21+
#define DID_ADL_N_SKU12 0x4632
22+
23+
/* Compute did IDs for Amston Lake with IBECC */
24+
-#define DID_ASL_SKU1 0x464a
25+
+#define DID_ASL_SKU1 0x4646
26+
+#define DID_ASL_SKU2 0x464a
27+
+#define DID_ASL_SKU3 0x4652
28+
29+
/* Compute die IDs for Raptor Lake-P with IBECC */
30+
#define DID_RPL_P_SKU1 0xa706
31+
@@ -600,6 +602,8 @@ static const struct pci_device_id igen6_pci_tbl[] = {
32+
{ PCI_VDEVICE(INTEL, DID_ADL_N_SKU11), (kernel_ulong_t)&adl_n_cfg },
33+
{ PCI_VDEVICE(INTEL, DID_ADL_N_SKU12), (kernel_ulong_t)&adl_n_cfg },
34+
{ PCI_VDEVICE(INTEL, DID_ASL_SKU1), (kernel_ulong_t)&adl_n_cfg },
35+
+ { PCI_VDEVICE(INTEL, DID_ASL_SKU2), (kernel_ulong_t)&adl_n_cfg },
36+
+ { PCI_VDEVICE(INTEL, DID_ASL_SKU3), (kernel_ulong_t)&adl_n_cfg },
37+
{ PCI_VDEVICE(INTEL, DID_RPL_P_SKU1), (kernel_ulong_t)&rpl_p_cfg },
38+
{ PCI_VDEVICE(INTEL, DID_RPL_P_SKU2), (kernel_ulong_t)&rpl_p_cfg },
39+
{ PCI_VDEVICE(INTEL, DID_RPL_P_SKU3), (kernel_ulong_t)&rpl_p_cfg },
40+
--
41+
2.43.0
42+

‎kernel-patches/patches/0008-igc-Add-support-for-Frame-Preemption-verification.tsn‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Signed-off-by: Aravindhan Gunasekaran <aravindhan.gunasekaran@intel.com>
3030
drivers/net/ethernet/intel/igc/igc_main.c | 216 +++++++++++++++++++
3131
4 files changed, 261 insertions(+), 3 deletions(-)
3232

33-
diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h
34-
index b2b6da3e9c8d3..479dcd7500f56 100644
33+
Index: b/drivers/net/ethernet/intel/igc/igc.h
34+
===================================================================
3535
--- a/drivers/net/ethernet/intel/igc/igc.h
3636
+++ b/drivers/net/ethernet/intel/igc/igc.h
3737
@@ -198,6 +198,13 @@ struct igc_ring {
@@ -48,10 +48,10 @@ index b2b6da3e9c8d3..479dcd7500f56 100644
4848
/* Board specific private data structure */
4949
struct igc_adapter {
5050
struct net_device *netdev;
51-
@@ -339,6 +346,14 @@ struct igc_adapter {
52-
/* LEDs */
51+
@@ -341,6 +348,14 @@ struct igc_adapter {
5352
struct mutex led_mutex;
5453
struct igc_led_classdev *leds;
54+
bool leds_available;
5555
+
5656
+ struct delayed_work fp_verification_work;
5757
+ unsigned long fp_start;
@@ -63,8 +63,8 @@ index b2b6da3e9c8d3..479dcd7500f56 100644
6363
};
6464

6565
void igc_up(struct igc_adapter *adapter);
66-
diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h
67-
index e08dfba0ea69d..45da4ffd4ec75 100644
66+
Index: b/drivers/net/ethernet/intel/igc/igc_defines.h
67+
===================================================================
6868
--- a/drivers/net/ethernet/intel/igc/igc_defines.h
6969
+++ b/drivers/net/ethernet/intel/igc/igc_defines.h
7070
@@ -308,6 +308,8 @@
@@ -97,11 +97,11 @@ index e08dfba0ea69d..45da4ffd4ec75 100644
9797
#define IGC_RXDEXT_STATERR_L4E 0x20000000
9898
#define IGC_RXDEXT_STATERR_IPE 0x40000000
9999
#define IGC_RXDEXT_STATERR_RXE 0x80000000
100-
diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c
101-
index 52ca64569cb59..761bafd585b37 100644
100+
Index: b/drivers/net/ethernet/intel/igc/igc_ethtool.c
101+
===================================================================
102102
--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c
103103
+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c
104-
@@ -1789,6 +1789,8 @@ static int igc_ethtool_get_preempt(struct net_device *netdev,
104+
@@ -1789,6 +1789,8 @@ static int igc_ethtool_get_preempt(struc
105105

106106
fpcmd->enabled = adapter->frame_preemption_active;
107107
fpcmd->add_frag_size = adapter->add_frag_size;
@@ -110,7 +110,7 @@ index 52ca64569cb59..761bafd585b37 100644
110110

111111
return 0;
112112
}
113-
@@ -1805,10 +1807,22 @@ static int igc_ethtool_set_preempt(struct net_device *netdev,
113+
@@ -1805,10 +1807,22 @@ static int igc_ethtool_set_preempt(struc
114114
return -EINVAL;
115115
}
116116

@@ -136,8 +136,8 @@ index 52ca64569cb59..761bafd585b37 100644
136136
}
137137

138138
static int igc_ethtool_get_link_ksettings(struct net_device *netdev,
139-
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
140-
index ca720ddff3af8..a81e9240cf6c8 100644
139+
Index: b/drivers/net/ethernet/intel/igc/igc_main.c
140+
===================================================================
141141
--- a/drivers/net/ethernet/intel/igc/igc_main.c
142142
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
143143
@@ -30,6 +30,11 @@
@@ -152,7 +152,7 @@ index ca720ddff3af8..a81e9240cf6c8 100644
152152
static int debug = -1;
153153

154154
MODULE_DESCRIPTION(DRV_SUMMARY);
155-
@@ -2448,6 +2453,79 @@ static int igc_xdp_init_tx_descriptor(struct igc_ring *ring,
155+
@@ -2449,6 +2454,79 @@ unmap:
156156
return -ENOMEM;
157157
}
158158

@@ -232,7 +232,7 @@ index ca720ddff3af8..a81e9240cf6c8 100644
232232
static struct igc_ring *igc_xdp_get_tx_ring(struct igc_adapter *adapter,
233233
int cpu)
234234
{
235-
@@ -2577,6 +2655,19 @@ static void igc_update_rx_stats(struct igc_q_vector *q_vector,
235+
@@ -2578,6 +2656,19 @@ static void igc_update_rx_stats(struct i
236236
q_vector->rx.total_bytes += bytes;
237237
}
238238

@@ -252,15 +252,15 @@ index ca720ddff3af8..a81e9240cf6c8 100644
252252
static int igc_clean_rx_irq(struct igc_q_vector *q_vector, const int budget)
253253
{
254254
unsigned int total_bytes = 0, total_packets = 0;
255-
@@ -2592,6 +2683,7 @@ static int igc_clean_rx_irq(struct igc_q_vector *q_vector, const int budget)
255+
@@ -2593,6 +2684,7 @@ static int igc_clean_rx_irq(struct igc_q
256256
union igc_adv_rx_desc *rx_desc;
257257
unsigned int size, truesize;
258258
int pkt_offset = 0;
259259
+ int smd_type;
260260
void *pktbuf;
261261

262262
/* return some buffers to hardware, one at a time is too slow */
263-
@@ -2622,6 +2714,22 @@ static int igc_clean_rx_irq(struct igc_q_vector *q_vector, const int budget)
263+
@@ -2623,6 +2715,22 @@ static int igc_clean_rx_irq(struct igc_q
264264
size -= IGC_TS_HDR_LEN;
265265
}
266266

@@ -283,7 +283,7 @@ index ca720ddff3af8..a81e9240cf6c8 100644
283283
if (!skb) {
284284
xdp_init_buff(&ctx.xdp, truesize, &rx_ring->xdp_rxq);
285285
xdp_prepare_buff(&ctx.xdp, pktbuf - igc_rx_offset(rx_ring),
286-
@@ -6548,6 +6656,107 @@ static int igc_tsn_enable_cbs(struct igc_adapter *adapter,
286+
@@ -6552,6 +6660,107 @@ static int igc_tsn_enable_cbs(struct igc
287287
return igc_tsn_offload_apply(adapter);
288288
}
289289

@@ -391,15 +391,15 @@ index ca720ddff3af8..a81e9240cf6c8 100644
391391
static int igc_tc_query_caps(struct igc_adapter *adapter,
392392
struct tc_query_caps_base *base)
393393
{
394-
@@ -7122,6 +7331,7 @@ static int igc_probe(struct pci_dev *pdev,
394+
@@ -7130,6 +7339,7 @@ static int igc_probe(struct pci_dev *pde
395395

396396
INIT_WORK(&adapter->reset_task, igc_reset_task);
397397
INIT_WORK(&adapter->watchdog_task, igc_watchdog_task);
398398
+ INIT_DELAYED_WORK(&adapter->fp_verification_work, igc_fp_verification_work);
399399

400400
hrtimer_init(&adapter->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
401401
adapter->hrtimer.function = &igc_qbv_scheduling_timer;
402-
@@ -7148,6 +7358,12 @@ static int igc_probe(struct pci_dev *pdev,
402+
@@ -7156,6 +7366,12 @@ static int igc_probe(struct pci_dev *pde
403403

404404
igc_tsn_clear_schedule(adapter);
405405

@@ -412,6 +412,3 @@ index ca720ddff3af8..a81e9240cf6c8 100644
412412
/* reset the hardware with the new settings */
413413
igc_reset(adapter);
414414

415-
--
416-
2.25.1
417-

‎kernel-patches/patches/series‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Series file for v6.12.48 linux kernel
2-
# f1e375d5eb68f Linux 6.12.48
1+
# Series file for v6.12.51 linux kernel
2+
# a9152eb181ada Linux 6.12.51
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
@@ -145,6 +145,8 @@
145145
0013-EDAC-ie31200-Switch-Raptor-Lake-S-to-interrupt-mode.edac
146146
0001-EDAC-ie31200-Add-two-Intel-SoCs-for-EDAC-support.edac
147147
0002-ie31200-EDAC-Add-Intel-Bartlett-Lake-S-SoCs-support.edac
148+
0001-EDAC-igen6-Add-Intel-Amston-Lake-SoCs-support.edac
149+
0002-EDAC-igen6-Add-additional-Intel-Amston-Lake-SoC-compu.edac
148150
#tsn
149151
0001-net-pcs-xpcs-enable-xpcs-reset-skipping.tsn
150152
0002-net-stmmac-Bugfix-on-stmmac_interrupt-for-WOL.tsn

0 commit comments

Comments
 (0)