Skip to content

Commit 607ecc9

Browse files
renjiaoxsys-oak
andauthored
Update kernel to 6.12.44 base on 3.0-dev branch (open-edge-platform#430)
Signed-off-by: sys_oak <sys_oak@intel.com> Co-authored-by: sys_oak <sys_oak@intel.com>
1 parent 1440982 commit 607ecc9

File tree

864 files changed

+271053
-7879
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

864 files changed

+271053
-7879
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"lts-v6.12.39-emt-250721T212915Z.tar.gz": "10747ca512fe0a07eb19d6c40d3ec2edea7a17b1fd232214d6d279c29a054f6a"
3+
"linux-6.12.44.tar.gz": "fac0ed5371cbd46ebc8a2a1e152ac5fbb5fc2660e748a7fc1d28b8e399854a1a"
44
}
55
}

SPECS/kernel-headers/kernel-headers.spec

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
Summary: Linux API header files
1515
Name: kernel-headers
16-
Version: 6.12.39
16+
Version: 6.12.44
1717
Release: 1%{?dist}
1818
License: GPLv2
1919
Vendor: Intel Corporation
2020
Distribution: Edge Microvisor Toolkit
2121
Group: System Environment/Kernel
22-
URL: https://github.com/intel/linux-intel-lts
23-
Source0: https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.39-emt-250721T212915Z.tar.gz
22+
URL: https://www.kernel.org/pub/linux/kernel
23+
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.12.44.tar.gz
2424
# Historical name shipped by other distros
2525
Provides: glibc-kernheaders = %{version}-%{release}
2626
BuildArch: noarch
@@ -41,7 +41,7 @@ cross-glibc package.
4141
%endif
4242

4343
%prep
44-
%setup -q -n lts-v6.12.39-emt-250721T212915Z
44+
%setup -q -n linux-6.12.44
4545

4646
%build
4747
make mrproper
@@ -76,6 +76,9 @@ done
7676
%endif
7777

7878
%changelog
79+
* Tue Sep 09 2025 Ren Jiaojiao <jiaojiaox.ren@intel.com> - 6.12.44-1
80+
- Update kernel to 6.12.44
81+
7982
* Thu Jul 24 2025 Ren Jiaojiao <jiaojiaox.ren@intel.com> - 6.12.39-1
8083
- Update kernel to 6.12.39
8184

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 3a01e64f0d80c5154743e5c304774066ceb10972 Mon Sep 17 00:00:00 2001
2+
From: Lili Li <lili.li@intel.com>
3+
Date: Tue, 24 Oct 2023 10:33:36 +0800
4+
Subject: [PATCH] Add security.md file
5+
6+
Add security.md file to open source repository.
7+
8+
Signed-off-by: Lili Li <lili.li@intel.com>
9+
---
10+
security.md | 5 +++++
11+
1 file changed, 5 insertions(+)
12+
create mode 100644 security.md
13+
14+
diff --git a/security.md b/security.md
15+
new file mode 100644
16+
index 0000000000000..b6eefdf389795
17+
--- /dev/null
18+
+++ b/security.md
19+
@@ -0,0 +1,5 @@
20+
+Security Policy
21+
+Intel is committed to rapidly addressing security vulnerabilities affecting our customers and providing clear guidance on the solution, impact, severity and mitigation.
22+
+
23+
+Reporting a Vulnerability
24+
+Please report any security vulnerabilities in this project [utilizing the guidelines here](https://www.intel.com/content/www/us/en/security-center/vulnerability-handling-guidelines.html).
25+
--
26+
2.25.1
27+
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
From a5a73973d12960de08a3b4cb623d7161b20c3527 Mon Sep 17 00:00:00 2001
2+
From: Atapasex <amardeepx.tapase@intel.com>
3+
Date: Tue, 21 Jan 2025 11:20:08 +0530
4+
Subject: [PATCH 2/6] Added spi_set_cs() for more stable r/w operations in SPI
5+
Mode 3 -TWL
6+
7+
Signed-off-by: Atapasex <amardeepx.tapase@intel.com>
8+
---
9+
drivers/spi/spi-pxa2xx.c | 4 ++++
10+
drivers/spi/spi.c | 3 ++-
11+
include/linux/spi/spi.h | 2 ++
12+
3 files changed, 8 insertions(+), 1 deletion(-)
13+
14+
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
15+
index bf1f34b0ffc8e..878ec83feaca2 100644
16+
--- a/drivers/spi/spi-pxa2xx.c
17+
+++ b/drivers/spi/spi-pxa2xx.c
18+
@@ -1055,6 +1055,8 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *controller,
19+
if (!pxa25x_ssp_comp(drv_data))
20+
pxa2xx_spi_write(drv_data, SSTO, TIMOUT_DFLT);
21+
22+
+ spi_set_cs(spi, false, false);
23+
+
24+
/* First set CR1 without interrupt and service enables */
25+
pxa2xx_spi_update(drv_data, SSCR1, change_mask, cr1);
26+
27+
@@ -1064,6 +1066,8 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *controller,
28+
/* Restart the SSP */
29+
pxa_ssp_enable(drv_data->ssp);
30+
31+
+ spi_set_cs(spi, true, false);
32+
+
33+
if (is_mmp2_ssp(drv_data)) {
34+
u8 tx_level = read_SSSR_bits(drv_data, SSSR_TFL_MASK) >> 8;
35+
36+
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
37+
index 0f3e6e2c24743..e2ee9627336b1 100644
38+
--- a/drivers/spi/spi.c
39+
+++ b/drivers/spi/spi.c
40+
@@ -1074,7 +1074,7 @@ static void spi_toggle_csgpiod(struct spi_device *spi, u8 idx, bool enable, bool
41+
spi_delay_exec(&spi->cs_inactive, NULL);
42+
}
43+
44+
-static void spi_set_cs(struct spi_device *spi, bool enable, bool force)
45+
+void spi_set_cs(struct spi_device *spi, bool enable, bool force)
46+
{
47+
bool activate = enable;
48+
u8 idx;
49+
@@ -1129,6 +1129,7 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force)
50+
spi_delay_exec(&spi->cs_inactive, NULL);
51+
}
52+
}
53+
+EXPORT_SYMBOL_GPL(spi_set_cs);
54+
55+
#ifdef CONFIG_HAS_DMA
56+
static int spi_map_buf_attrs(struct spi_controller *ctlr, struct device *dev,
57+
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
58+
index 4b95663163e0b..c5e9bef5d03d8 100644
59+
--- a/include/linux/spi/spi.h
60+
+++ b/include/linux/spi/spi.h
61+
@@ -811,6 +811,8 @@ extern int spi_controller_resume(struct spi_controller *ctlr);
62+
extern struct spi_message *spi_get_next_queued_message(struct spi_controller *ctlr);
63+
extern void spi_finalize_current_message(struct spi_controller *ctlr);
64+
extern void spi_finalize_current_transfer(struct spi_controller *ctlr);
65+
+/* SPI driver calls this function to assert/deassert the chip select */
66+
+extern void spi_set_cs(struct spi_device *spi, bool enable, bool force);
67+
68+
/* Helper calls for driver to timestamp transfer */
69+
void spi_take_timestamp_pre(struct spi_controller *ctlr,
70+
--
71+
2.25.1
72+
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From ed20e3ad5cce3759718c722b6b9f1589cf0656f3 Mon Sep 17 00:00:00 2001
2+
From: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
3+
Date: Tue, 22 Apr 2025 21:44:50 +0800
4+
Subject: [PATCH 1/2] EDAC/ie31200: Add two Intel SoCs for EDAC support
5+
6+
Add two compute die IDs for Raptor Lake-S and Alder Lake-S for EDAC
7+
support. Note that because Alder Lake-S shares the same memory controller
8+
registers as Raptor Lake-S, it can reuse the configuration data of Raptor
9+
Lake-S for EDAC support.
10+
11+
Tested-by: James Jernigan <jameswestonjernigan@gmail.com>
12+
Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
13+
---
14+
drivers/edac/ie31200_edac.c | 6 ++++++
15+
1 file changed, 6 insertions(+)
16+
17+
diff --git a/drivers/edac/ie31200_edac.c b/drivers/edac/ie31200_edac.c
18+
index 2048341495798..55cf54741aa0b 100644
19+
--- a/drivers/edac/ie31200_edac.c
20+
+++ b/drivers/edac/ie31200_edac.c
21+
@@ -89,6 +89,10 @@
22+
#define PCI_DEVICE_ID_INTEL_IE31200_RPL_S_1 0xa703
23+
#define PCI_DEVICE_ID_INTEL_IE31200_RPL_S_2 0x4640
24+
#define PCI_DEVICE_ID_INTEL_IE31200_RPL_S_3 0x4630
25+
+#define PCI_DEVICE_ID_INTEL_IE31200_RPL_S_4 0xa700
26+
+
27+
+/* Alder Lake-S */
28+
+#define PCI_DEVICE_ID_INTEL_IE31200_ADL_S_1 0x4660
29+
30+
#define IE31200_RANKS_PER_CHANNEL 8
31+
#define IE31200_DIMMS_PER_CHANNEL 2
32+
@@ -734,6 +738,8 @@ static const struct pci_device_id ie31200_pci_tbl[] = {
33+
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IE31200_RPL_S_1), (kernel_ulong_t)&rpl_s_cfg},
34+
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IE31200_RPL_S_2), (kernel_ulong_t)&rpl_s_cfg},
35+
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IE31200_RPL_S_3), (kernel_ulong_t)&rpl_s_cfg},
36+
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IE31200_RPL_S_4), (kernel_ulong_t)&rpl_s_cfg},
37+
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IE31200_ADL_S_1), (kernel_ulong_t)&rpl_s_cfg},
38+
{ 0, } /* 0 terminated list. */
39+
};
40+
MODULE_DEVICE_TABLE(pci, ie31200_pci_tbl);
41+
--
42+
2.34.1
43+

0 commit comments

Comments
 (0)