From b1660c8d27483b53dba9d42d2ca677b4ca1b01bb Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 16 2018 12:49:04 +0000
Subject: import opal-prd-5.9-3.el7_5


---

diff --git a/SOURCES/opal-prd-cb16e55a234b91fd42112904cff15094fbae680d.patch b/SOURCES/opal-prd-cb16e55a234b91fd42112904cff15094fbae680d.patch
new file mode 100644
index 0000000..3e1e8cc
--- /dev/null
+++ b/SOURCES/opal-prd-cb16e55a234b91fd42112904cff15094fbae680d.patch
@@ -0,0 +1,45 @@
+commit cb16e55a234b91fd42112904cff15094fbae680d
+Author: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
+Date:   Tue Apr 3 23:08:41 2018 +0530
+
+    opal-prd: Insert powernv_flash module
+    
+    Explictly load powernv_flash module on BMC based system so that we are sure
+    that flash device is created before starting opal-prd daemon.
+    
+    Note that I have replaced pnor_available() check with is_fsp_system(). As we
+    want to load module on BMC system only. Also pnor_init has enough logic to
+    detect flash device. Hence pnor_available() becomes redundant check.
+    
+    Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
+    CC: Jeremy Kerr <jeremy.kerr@au1.ibm.com>
+    CC: Stewart Smith <stewart@linux.vnet.ibm.com>
+    Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
+
+diff --git a/external/opal-prd/opal-prd.c b/external/opal-prd/opal-prd.c
+index 5a15f1d2..bc092d18 100644
+--- a/external/opal-prd/opal-prd.c
++++ b/external/opal-prd/opal-prd.c
+@@ -547,6 +547,11 @@ int hservice_wakeup(u32 core, u32 mode)
+ 	return 0;
+ }
+ 
++static void pnor_load_module(struct opal_prd_ctx *ctx)
++{
++	insert_module("powernv_flash");
++}
++
+ static void ipmi_init(struct opal_prd_ctx *ctx)
+ {
+ 	insert_module("ipmi_devintf");
+@@ -2177,7 +2182,9 @@ static int run_prd_daemon(struct opal_prd_ctx *ctx)
+ 
+ 	fixup_hinterface_table();
+ 
+-	if (pnor_available(&ctx->pnor)) {
++	if (!is_fsp_system()) {
++		pnor_load_module(ctx);
++
+ 		rc = pnor_init(&ctx->pnor);
+ 		if (rc) {
+ 			pr_log(LOG_ERR, "PNOR: Failed to open pnor: %m");
diff --git a/SPECS/opal-prd.spec b/SPECS/opal-prd.spec
index 352e6ba..c492fb8 100644
--- a/SPECS/opal-prd.spec
+++ b/SPECS/opal-prd.spec
@@ -1,6 +1,6 @@
 Name:    opal-prd
 Version: 5.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: OPAL Processor Recovery Diagnostics Daemon
 
 Group:   System Environment/Daemons
@@ -23,6 +23,7 @@ Source1:	opal-prd.service
 # upstream fix, Add support for runtime OCC load/start in ZZ
 Patch0: opal-prd-49999302251b3e3e2fdca2cbcdeb6aab9add7412.patch
 Patch1: opal-prd-781b10633945df32fa2292ee8b196c74f8ef2c7c.patch
+Patch2: opal-prd-cb16e55a234b91fd42112904cff15094fbae680d.patch
 
 %description
 This package provides a daemon to load and run the OpenPower firmware's
@@ -56,6 +57,7 @@ services to the OS (Linux) on IBM Power and OpenPower systems.
 %setup -q -n skiboot-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 OPAL_PRD_VERSION=%{version} make V=1 CFLAGS="%{optflags}" -C external/opal-prd
@@ -108,6 +110,9 @@ install -m 644 -p skiboot.lid %{buildroot}%{_datadir}/qemu/skiboot.lid
 %{_datadir}/qemu/
 
 %changelog
+* Tue Jun 26 2018 Than Ngo <than@redhat.com> - 5.9-3
+- Resolves: rhbz#1595154 - opal-prd is consuming 100% CPU
+
 * Mon Jan 22 2018 Than Ngo <than@redhat.com> - 5.9-2
 - Related: rhbz#1456536 - add support for runtime OCC load/start in ZZ