From patchwork Tue Mar 9 10:01:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasant Hegde X-Patchwork-Id: 1449615 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=rd0Fihjz; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DvrMS0wzjz9sW8 for ; Tue, 9 Mar 2021 21:01:24 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4DvrMR3c5Hz30H5 for ; Tue, 9 Mar 2021 21:01:23 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=rd0Fihjz; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=hegdevasant@linux.vnet.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=rd0Fihjz; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4DvrMP5XDmz2xZW for ; Tue, 9 Mar 2021 21:01:20 +1100 (AEDT) Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 1299XkBj095565 for ; Tue, 9 Mar 2021 05:01:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=gqYvphJBFTKnOSQbOcj13IbNAeO7mdvBu0iqQqTw2U4=; b=rd0FihjzusLygEp7wvmsLCz2Qcxk303kIrUBnkPBLVkQOh3/gurG/zUJAVNq2zp6rLeC mMllyGAkKeHNh2IWTX1qHUmGGUBoEpRqTlfM0RgpQDcZz/3jVkVQPcX+7aKGztQakzLf mf1xMmcjRQj9vsFREbSfqOR2Ks18lwgiQz6q9LHmEoIJHvq7l+CfppL0TsHt5r+MK6wk BcGRB04/EfwaBFsfgZYS6cDcx+XjViwf6pGQTnKgQ0XakeZXEnaEFDMfon3fNSOjkHTS 16gYeK37cbQHMBj9aBnzXsMg4B5XIWe7XKLZYU1b7B9XmGoajV2O8xcHsVV3Sba+SuB6 4g== Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 375whqncdm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 09 Mar 2021 05:01:11 -0500 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 1299qhmH008849 for ; Tue, 9 Mar 2021 10:01:09 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma04ams.nl.ibm.com with ESMTP id 3741c8jmm9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 09 Mar 2021 10:01:08 +0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 129A0prO28574160 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 9 Mar 2021 10:00:51 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B8B7342045; Tue, 9 Mar 2021 10:01:06 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E445F42041; Tue, 9 Mar 2021 10:01:05 +0000 (GMT) Received: from hegdevasant.in.ibm.com (unknown [9.199.40.71]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 9 Mar 2021 10:01:05 +0000 (GMT) From: Vasant Hegde To: skiboot@lists.ozlabs.org Date: Tue, 9 Mar 2021 15:31:03 +0530 Message-Id: <20210309100103.32254-1-hegdevasant@linux.vnet.ibm.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369, 18.0.761 definitions=2021-03-09_09:2021-03-08, 2021-03-09 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 bulkscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 spamscore=0 impostorscore=0 malwarescore=0 mlxscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103090047 Subject: [Skiboot] [PATCH] opal-prd: Load opal-prd service after systemd-modules-load service X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" In some cases opal-prd daemon is failing to start during boot. This is because systemd is trying to start service before `opal-prd` kernel module load. Sample failure message: ---------------------- Feb 21 19:03:09 grsp1 opal-prd: FW: Can't open PRD device /dev/opal-prd: No such file or directory Feb 21 19:03:09 grsp1 opal-prd: FW: Error initialising PRD channel Lets start opal-prd service after systemd-modules-load is started. Also create conf file to load opal-prd module during boot. This will make sure systemd tries to start opal-prd daemon after opal-prd kernel module load. Signed-off-by: Vasant Hegde --- external/opal-prd/opal-prd.service | 1 + skiboot.spec | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/external/opal-prd/opal-prd.service b/external/opal-prd/opal-prd.service index dce0dd262..cf514e498 100644 --- a/external/opal-prd/opal-prd.service +++ b/external/opal-prd/opal-prd.service @@ -2,6 +2,7 @@ Description=OPAL PRD daemon ConditionVirtualization=false ConditionPathExists=/sys/firmware/devicetree/base/ibm,opal/diagnostics +After=systemd-modules-load.service [Service] ExecStart=/usr/sbin/opal-prd diff --git a/skiboot.spec b/skiboot.spec index 38c686811..fbb21b562 100644 --- a/skiboot.spec +++ b/skiboot.spec @@ -1,5 +1,5 @@ Name: opal-prd -Version: 5.10 +Version: 6.7 Release: 1%{?dist} Summary: OPAL Processor Recovery Diagnostics Daemon @@ -11,6 +11,7 @@ ExclusiveArch: ppc64le BuildRequires: systemd Requires: systemd +Requires: systemd-udev Source0: https://github.com/open-power/skiboot/archive/v%{version}.tar.gz @@ -62,6 +63,10 @@ make -C external/pflash install DESTDIR=%{buildroot} prefix=/usr mkdir -p %{buildroot}%{_unitdir} install -m 644 -p external/opal-prd/opal-prd.service %{buildroot}%{_unitdir}/opal-prd.service +# Auto-load kernel module after boot/reboot +mkdir -p %{buildroot}/%{_sysconfdir}/modules-load.d +echo 'opal-prd' > %{buildroot}/%{_sysconfdir}/modules-load.d/%{name}.conf + mkdir -p %{buildroot}%{_datadir}/qemu install -m 644 -p skiboot.lid %{buildroot}%{_datadir}/qemu/skiboot.lid @@ -91,6 +96,7 @@ fi %{_sbindir}/opal-prd %{_unitdir}/opal-prd.service %{_mandir}/man8/* +%config(noreplace) %{_sysconfdir}/modules-load.d/%{name}.conf %files -n opal-utils %doc README.md @@ -108,6 +114,10 @@ fi %{_datadir}/qemu/ %changelog +* Tue Mar 9 2021 Vasant Hegde - 6.7 +- Update to v6.7 release +- Create conf file to load opal-prd module at boot + * Thu Mar 01 2018 Murilo Opsfelder Araujo - 5.10-1 - Update to v5.10 release