From ff5aacf7e4a9b63d2fc2c983447e6a03301b2077 Mon Sep 17 00:00:00 2001
From: Michel Lind <salimma@centosproject.org>
Date: Oct 05 2023 22:11:59 +0000
Subject: Update unified SEL logging to only log correctable errors


Limit unified SEL logging changes to hs+fb builds for now

Signed-off-by: Michel Lind <salimma@centosproject.org>

---

diff --git a/rasdaemon-fix-typo.diff b/rasdaemon-fix-typo.diff
new file mode 100644
index 0000000..e96d35b
--- /dev/null
+++ b/rasdaemon-fix-typo.diff
@@ -0,0 +1,24 @@
+From bcffec13f53796fe150f6464540d5e324ea6977d Mon Sep 17 00:00:00 2001
+From: Krishna Dhulipala <krishnad@meta.com>
+Date: Mon, 25 Sep 2023 19:36:05 -0700
+Subject: [PATCH] Fix typo in comment
+
+---
+ unified-sel.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/unified-sel.c b/unified-sel.c
+index 4398da1..2fcdcc0 100644
+--- a/unified-sel.c
++++ b/unified-sel.c
+@@ -99,8 +99,8 @@ int openbmc_unified_sel_log(uint64_t severity, const char *dev_name, uint64_t st
+   sscanf(dev_name, "%*x:%x:%x.%x", &bus, &dev, &fn);
+   dev_fn = (((dev & 0x1f) << 3) | (fn & 0x7));
+ 
+-  /* Use the appropriate correctable or uncorrectable error status ID
+-   * for a gien severity level
++  /* Use the appropriate correctable error status ID
++   * for a given severity level
+    */
+   if (severity == HW_EVENT_AER_CORRECTED) {
+       if (verify_id_log_sel(status, cor_error_ids, bus, dev_fn) < 0)
diff --git a/rasdaemon-log-correctable-errors-only.diff b/rasdaemon-log-correctable-errors-only.diff
new file mode 100644
index 0000000..afa302b
--- /dev/null
+++ b/rasdaemon-log-correctable-errors-only.diff
@@ -0,0 +1,34 @@
+From 626f7c90ff943be9cdc5ca3d3bbeac644bef2485 Mon Sep 17 00:00:00 2001
+From: Krishna Dhulipala <krishnad@meta.com>
+Date: Mon, 25 Sep 2023 19:29:43 -0700
+Subject: [PATCH] Only log correctable errors for unified SEL
+
+Summary:
+
+Test Plan:
+
+Reviewers:
+
+Subscribers:
+
+Tasks:
+
+Tags:
+---
+ unified-sel.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/unified-sel.c b/unified-sel.c
+index 287bb4f..4398da1 100644
+--- a/unified-sel.c
++++ b/unified-sel.c
+@@ -106,9 +106,5 @@ int openbmc_unified_sel_log(uint64_t severity, const char *dev_name, uint64_t st
+       if (verify_id_log_sel(status, cor_error_ids, bus, dev_fn) < 0)
+         return -1;
+   }
+-  else {
+-      if (verify_id_log_sel(status, uncor_error_ids, bus, dev_fn) < 0)
+-        return -1;
+-  }
+   return 0;
+ }
diff --git a/rasdaemon.spec b/rasdaemon.spec
index eb1e6ba..d0a7133 100644
--- a/rasdaemon.spec
+++ b/rasdaemon.spec
@@ -7,7 +7,11 @@ URL:			http://git.infradead.org/users/mchehab/rasdaemon.git
 Source0:		http://www.infradead.org/~mchehab/rasdaemon/%{name}-%{version}.tar.bz2
 # add unified SEL logging for OpenBMC
 # https://github.com/mchehab/rasdaemon/pull/97
-Patch0:			https://github.com/mchehab/rasdaemon/pull/97.patch#/%{name}-openbmc-unified-sel.diff
+# not downloading the latest as we can't cleanly apply the PR
+Patch0:			%{name}-openbmc-unified-sel.diff
+# Patch1:			https://github.com/mchehab/rasdaemon/pull/97/commits/414a8bc15285ab9cad8523b90daf0a86f7843ba0.patch#/%%{name}-cli-logging-argument.diff
+Patch2:			https://github.com/mchehab/rasdaemon/pull/97/commits/626f7c90ff943be9cdc5ca3d3bbeac644bef2485.patch#/%{name}-log-correctable-errors-only.diff
+Patch3:			https://github.com/mchehab/rasdaemon/pull/97/commits/bcffec13f53796fe150f6464540d5e324ea6977d.patch#/%{name}-fix-typo.diff
 
 ExcludeArch:		s390 s390x
 BuildRequires:		autoconf
@@ -41,7 +45,11 @@ EDAC drivers and DIMM labels are loaded at system startup, as well as
 an utility for reporting current error counts from the EDAC sysfs files.
 
 %prep
+%if 0%{?facebook}
 %autosetup -p1
+%else
+%autosetup -N
+%endif
 autoreconf -fiv
 
 %build
@@ -70,6 +78,10 @@ rm INSTALL %{buildroot}/usr/include/*.h
 %endif
 
 %changelog
+* Thu Oct 05 2023 Michel Lind <salimma@centosproject.org> - 0.6.7-4
+- Update unified SEL logging to only log correctable errors
+- Limit unified SEL logging changes to hs+fb builds for now
+
 * Tue Jun 27 2023 Michel Alexandre Salim <salimma@centosproject.org> - 0.6.7-3
 - Enable unified SEL logging for OpenBMC