From 4c9ee124a237411f9fcacaf6f6e67ab49759200d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 05 2019 20:20:33 +0000 Subject: import opal-prd-6.3.1-2.el8 --- diff --git a/.gitignore b/.gitignore index 92bd4f8..ec4d8d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/skiboot-6.1.tar.gz +SOURCES/skiboot-6.3.1.tar.gz diff --git a/.opal-prd.metadata b/.opal-prd.metadata index d0b8139..d860c7a 100644 --- a/.opal-prd.metadata +++ b/.opal-prd.metadata @@ -1 +1 @@ -ebd96db92d2568e5900a3fd8013e1d73d0bf2d6b SOURCES/skiboot-6.1.tar.gz +f9b89687576ed3dc073d7048a9c05175cfa4f341 SOURCES/skiboot-6.3.1.tar.gz diff --git a/SOURCES/skiboot-6.0.4-crash.patch b/SOURCES/skiboot-6.0.4-crash.patch deleted file mode 100644 index d98c0f5..0000000 --- a/SOURCES/skiboot-6.0.4-crash.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up skiboot-6.0.4/external/opal-prd/thunk.S.me skiboot-6.0.4/external/opal-prd/thunk.S ---- skiboot-6.0.4/external/opal-prd/thunk.S.me 2018-07-30 15:44:08.319427493 +0200 -+++ skiboot-6.0.4/external/opal-prd/thunk.S 2018-07-30 15:44:54.541609924 +0200 -@@ -118,7 +118,7 @@ call_le: - std %r0,(32+16)(%r1) - - /* Branch to original function */ -- mtlr %r11 -+ mtlr %r12 - blrl - - /* Restore stack and LR */ -@@ -136,7 +136,7 @@ call_le: - /* Callback from HBRT. There is one entry point per function. - * - * We assume the proper r2 is already set via the OPD, so we grab our -- * target function pointer in r11 and jump to call_le -+ * target function pointer in r12 and jump to call_le - */ - #define CALLBACK_THUNK(name) \ - .pushsection ".text","ax" ;\ -@@ -145,7 +145,7 @@ name##_thunk: ;\ - .long 0x00000038 | le_si16(__NR_switch_endian) ;\ - /* byteswapped li %r0,__NR_switch_endian */ ;\ - .long 0x02000044 /* byteswapped sc */ ;\ -- ld %r11,name@got(%r2) ;\ -+ ld %r12,name@got(%r2) ;\ - b call_le ;\ - .popsection ;\ - .pushsection ".data.thunk_opd","aw" ;\ diff --git a/SOURCES/skiboot-6.1-occ_reset_causes_hardlockup-05dc67bf4f3d85fc6212d1644d46ce6d8bd71140.patch b/SOURCES/skiboot-6.1-occ_reset_causes_hardlockup-05dc67bf4f3d85fc6212d1644d46ce6d8bd71140.patch deleted file mode 100644 index dd73e8a..0000000 --- a/SOURCES/skiboot-6.1-occ_reset_causes_hardlockup-05dc67bf4f3d85fc6212d1644d46ce6d8bd71140.patch +++ /dev/null @@ -1,52 +0,0 @@ -commit 05dc67bf4f3d85fc6212d1644d46ce6d8bd71140 -Author: Shilpasri G Bhat -Date: Tue Nov 13 10:58:54 2018 +0530 - - opal-prd: hservice: Enable hservice->wakeup() in BMC - - This patch enables HBRT to use HYP special wakeup register in openBMC - which until now was only used in FSP based machines. - - This patch also adds a capability check for opal-prd so that HBRT can - decide if the host special wakeup register can be used. - - Fixes: 49999302251b("opal-prd: Add support for runtime OCC reset in ZZ") - Signed-off-by: Shilpasri G Bhat - Signed-off-by: Stewart Smith - -diff --git a/external/opal-prd/hostboot-interface.h b/external/opal-prd/hostboot-interface.h -index 41ffcbcb..9df68882 100644 ---- a/external/opal-prd/hostboot-interface.h -+++ b/external/opal-prd/hostboot-interface.h -@@ -59,6 +59,7 @@ enum MemoryError_t - * Previous implementations may have incorrectly ignored failures. - */ - #define HBRT_CAPS_OPAL_HAS_XSCOM_RC (1ul << 0) -+#define HBRT_CAPS_OPAL_HAS_WAKEUP_SUPPORT (1ul << 1) - - /** - * Load types for the load_pm_complex() interface -diff --git a/external/opal-prd/opal-prd.c b/external/opal-prd/opal-prd.c -index e3b4439c..1452a17f 100644 ---- a/external/opal-prd/opal-prd.c -+++ b/external/opal-prd/opal-prd.c -@@ -747,7 +747,8 @@ int hservice_memory_error(uint64_t i_start_addr, uint64_t i_endAddr, - uint64_t hservice_get_interface_capabilities(uint64_t set) - { - if (set == HBRT_CAPS_SET1_OPAL) -- return HBRT_CAPS_OPAL_HAS_XSCOM_RC; -+ return HBRT_CAPS_OPAL_HAS_XSCOM_RC || -+ HBRT_CAPS_OPAL_HAS_WAKEUP_SUPPORT; - - return 0; - } -@@ -2196,9 +2197,6 @@ static int run_prd_daemon(struct opal_prd_ctx *ctx) - hinterface.pnor_write = NULL; - } - -- if (!is_fsp_system()) -- hinterface.wakeup = NULL; -- - ipmi_init(ctx); - - pr_debug("HBRT: calling hservices_init"); diff --git a/SPECS/opal-prd.spec b/SPECS/opal-prd.spec index cd5ec39..b2ff83a 100644 --- a/SPECS/opal-prd.spec +++ b/SPECS/opal-prd.spec @@ -1,8 +1,8 @@ %global project skiboot Name: opal-prd -Version: 6.1 -Release: 5%{?dist} +Version: 6.3.1 +Release: 2%{?dist} Summary: OPAL Processor Recovery Diagnostics Daemon Group: System Environment/Daemons @@ -26,10 +26,7 @@ Requires(postun): systemd Source0: https://github.com/open-power/%{project}/archive/v%{version}/%{project}-%{version}.tar.gz Source1: opal-prd-rsyslog Source2: opal-prd-logrotate -Patch0: skiboot-6.0.4-crash.patch Patch1: skiboot-6.1-annocheck.patch -# 1659458, opal-prd occ reset causes hardlockup -Patch2: skiboot-6.1-occ_reset_causes_hardlockup-05dc67bf4f3d85fc6212d1644d46ce6d8bd71140.patch %description This package provides a daemon to load and run the OpenPower firmware's @@ -59,11 +56,8 @@ OPAL firmware, aka skiboot, loads the bootloader and provides runtime services to the OS (Linux) on IBM Power and OpenPower systems. %prep - %setup -q -n %{project}-%{version} -%patch0 -p1 -b .crash %patch1 -p1 -b .annocheck -%patch2 -p1 -b .occ_reset_causes_hardlockup-05dc67bf4f3d85fc6212d1644d46ce6d8bd71140 %build OPAL_PRD_VERSION=%{version} make V=1 CC="gcc" CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" ASFLAGS="-m64 -Wa,--generate-missing-build-notes=yes" -C external/opal-prd @@ -82,8 +76,8 @@ SKIBOOT_VERSION=%{version} make V=1 CROSS= %install make -C external/opal-prd install DESTDIR=%{buildroot} prefix=/usr make -C external/gard install DESTDIR=%{buildroot} prefix=/usr -cp external/pflash/pflash %{buildroot}%{_sbindir} -cp external/xscom-utils/{get,put}scom %{buildroot}%{_sbindir} +make -C external/pflash install DESTDIR=%{buildroot} prefix=/usr +make -C external/xscom-utils install DESTDIR=%{buildroot} prefix=/usr mkdir -p %{buildroot}%{_unitdir} install -m 644 -p external/opal-prd/opal-prd.service %{buildroot}%{_unitdir}/opal-prd.service @@ -94,8 +88,8 @@ install -m 644 -p skiboot.lid.xz %{buildroot}%{_datadir}/qemu/skiboot.lid.xz # log opal-prd messages to /var/log/opal-prd.log mkdir -p %{buildroot}%{_sysconfdir}/{rsyslog.d,logrotate.d} -install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/rsyslog.d/opal-prd -install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/10-opal-prd.conf +install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/rsyslog.d/opal-prd.conf +install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/opal-prd %post %systemd_post opal-prd.service @@ -109,8 +103,8 @@ install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/10-opal-prd.co %files %doc README.md %license LICENCE -%config(noreplace) %{_sysconfdir}/logrotate.d/10-opal-prd.conf -%config(noreplace) %{_sysconfdir}/rsyslog.d/opal-prd +%config(noreplace) %{_sysconfdir}/logrotate.d/opal-prd +%config(noreplace) %{_sysconfdir}/rsyslog.d/opal-prd.conf %{_sbindir}/opal-prd %{_unitdir}/opal-prd.service %{_mandir}/man8/* @@ -122,6 +116,7 @@ install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/10-opal-prd.co %{_sbindir}/getscom %{_sbindir}/putscom %{_sbindir}/pflash +%{_sbindir}/getsram %{_mandir}/man1/* %files -n opal-firmware @@ -130,6 +125,22 @@ install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/10-opal-prd.co %{_datadir}/qemu/ %changelog +* Thu May 23 2019 Than Ngo - 6.3.1-2 +- Related: #1664099, log messages to /var/log/opal-prd.log + +* Tue May 14 2019 Than Ngo - 6.3.1-1 +- Resolves: #1664099, rebase to 6.3.1 + +* Mon Mar 25 2019 Than Ngo - 6.2-3 +- Related: #1664099. add missing man pages + +* Thu Mar 21 2019 Than Ngo - 6.2-2 +- Related: #1682400, bump release for gating on tests + +* Tue Mar 19 2019 Than Ngo - 6.2-1 +- Resolves: #1664099, rebase to 6.2 +- Resolves: #1682400, add gating on tests + * Fri Dec 14 2018 Than Ngo - 6.1-5 - Resolves: #1659458, opal-prd occ reset causes hardlockup