diff --git a/0001-mcelog-Change-DDR4-string-to-DDR-for-i10nm-platforms.patch b/0001-mcelog-Change-DDR4-string-to-DDR-for-i10nm-platforms.patch new file mode 100644 index 0000000000000000000000000000000000000000..32e12ca0815a3f38ebcf8d4a9ebe17bba70a59a4 --- /dev/null +++ b/0001-mcelog-Change-DDR4-string-to-DDR-for-i10nm-platforms.patch @@ -0,0 +1,44 @@ +From 41ad98a81cc2c1a85dfdbff16eafe153b99e7866 Mon Sep 17 00:00:00 2001 +From: Tony Luck +Date: Fri, 3 Dec 2021 09:44:04 -0800 +Subject: [PATCH] mcelog: Change "DDR4" string to "DDR" for i10nm platforms + +There are i10nm platforms that support DDR5 as well as some that support +DDR4. + +Change the DDR4 string to DDR to avoid confusion. + +Signed-off-by: Tony Luck +Signed-off-by: Andi Kleen +--- + i10nm.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Reference:https://github.com/andikleen/mcelog/commit/41ad98a81cc2c1a85dfdbff16eafe153b99e7866 +Conflict:NA + +diff --git a/i10nm.c b/i10nm.c +index b629c27..3a0e97c 100644 +--- a/i10nm.c ++++ b/i10nm.c +@@ -191,7 +191,7 @@ static char *imc_1[] = { + }; + + static char *imc_2[] = { +- [0x00] = "DDR4 command / address parity error", ++ [0x00] = "DDR command / address parity error", + [0x20] = "HBM command / address parity error", + [0x21] = "HBM data parity error", + }; +@@ -204,7 +204,7 @@ static char *imc_8[] = { + [0x00] = "DDR-T bad request", + [0x01] = "DDR Data response to an invalid entry", + [0x02] = "DDR data response to an entry not expecting data", +- [0x03] = "DDR4 completion to an invalid entry", ++ [0x03] = "DDR completion to an invalid entry", + [0x04] = "DDR-T completion to an invalid entry", + [0x05] = "DDR data/completion FIFO overflow", + [0x06] = "DDR-T ERID correctable parity error", +-- +2.27.0 + diff --git a/mcelog.spec b/mcelog.spec index d309a52f202253584abab25b44218fea00cb96af..182671d7227f3b6a0adc6b177a9a137f3f9f5935 100644 --- a/mcelog.spec +++ b/mcelog.spec @@ -4,7 +4,7 @@ %define aer_inject_ver 2010.03.10 Name: mcelog -Version: 194 +Version: 195 Release: 1 Epoch: 3 Summary: Linux kernel machine check handling middleware @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_mandir}/*/* %changelog +* Mon Dec 18 2023 caixiaomeng - 3:195-1 +- Backport patches from upstream + * Thu Jul 20 2023 sunhui - 3:194-1 - Update package to version 3:194-1