Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2000357pxa; Mon, 24 Aug 2020 02:02:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjFrS8nJzga+KTV1/ySBOykK0gRRlsSBG8WdtW84cmmxJOfSeObWdkdNC0n+XpgxEwFt4n X-Received: by 2002:a17:906:3647:: with SMTP id r7mr444304ejb.336.1598259771468; Mon, 24 Aug 2020 02:02:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598259771; cv=none; d=google.com; s=arc-20160816; b=qoNOPDjDwFo8DtjW9rICdPcUkQWez2n9egGZTGmVPgp0BRpYqmeAGT/CW7MHvSmBin y9CJ6gKEc6tlm+snvmWx9M6KLpytSMDzUG9Q3gfLdRkfQ68VbBMl3qaEsikb22CRQAY2 AYP3az1WdPMg3nmtvFsAH9xYB0YTytqlJLYTUNSK8OwNew5tpiUKVQl25a/nsc2heTwK 2B1Gn77oUlxXHle8NXruxJD2jToMKmv4FNE3v8r1lCz63mMjkf7kZxF/O+nyIO2AJX6R LhmNLTxqi1R4+mwTg4uRBBgYD/dc94AhuDAJND/vjNSz9GMqNYRYGVZkMAEEl1LaEIUP zbMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8hvn6J70m6iM5dkPgnMUx32nkq9p8EvH3nHfeBfsfaA=; b=QOQJLlSvi2/HIbAzTs33WZwPBj8+soQyRbPYpyf72Kf+i7euMfDfdKg4f9TZWyUXsd 2wavk3pklAc0YqnweEkgpwQQGYuDOXEwjByuXbrEBGo9Y5DPecixgh/Jhwt8+9DVDcKi F7IoDYm0ZZh1KT2vlezrQ5+dt5tUPZW0cgeYgp2/IgYu/Cep14WZZHQmaZx232VpAtBL KiFTHz9u4WH0SIh3eT0740eZJxX32barYyuIWQTeKTN576hTP7XXiSke7mSWApX5OfoB z21RnCNQFKeQwKX8h8OG5UAW1J+mvPScCr2xrcsLJ7tzAgKNsDqLV0wQzb392usbUS5h IZ2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vKI+LAci; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t19si6206707ejd.62.2020.08.24.02.02.28; Mon, 24 Aug 2020 02:02:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vKI+LAci; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730217AbgHXI7p (ORCPT + 99 others); Mon, 24 Aug 2020 04:59:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:44724 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730678AbgHXI5e (ORCPT ); Mon, 24 Aug 2020 04:57:34 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 302E42072D; Mon, 24 Aug 2020 08:57:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598259453; bh=zb+KGsttukQkJGMCIGufXytEYdL92m671OyjPkUYgkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vKI+LAciUD54J+fWjEZpCzNiDA5j/JDBtXgrKoavareuW29W9V86Vjz7/wR14Z8Yg 8gXGBpar+zM4/KY1kyzAUugscTKU1972QP0dnFqBMwsLatkQ8oZMcem52VqdyGKfu5 LWYHff9D01fAzbTaipHyXXDBWekaPX8hcPQoFQ1g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vasant Hegde , Michael Ellerman Subject: [PATCH 4.19 65/71] powerpc/pseries: Do not initiate shutdown when system is running on UPS Date: Mon, 24 Aug 2020 10:31:56 +0200 Message-Id: <20200824082359.202438041@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200824082355.848475917@linuxfoundation.org> References: <20200824082355.848475917@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vasant Hegde commit 90a9b102eddf6a3f987d15f4454e26a2532c1c98 upstream. As per PAPR we have to look for both EPOW sensor value and event modifier to identify the type of event and take appropriate action. In LoPAPR v1.1 section 10.2.2 includes table 136 "EPOW Action Codes": SYSTEM_SHUTDOWN 3 The system must be shut down. An EPOW-aware OS logs the EPOW error log information, then schedules the system to be shut down to begin after an OS defined delay internal (default is 10 minutes.) Then in section 10.3.2.2.8 there is table 146 "Platform Event Log Format, Version 6, EPOW Section", which includes the "EPOW Event Modifier": For EPOW sensor value = 3 0x01 = Normal system shutdown with no additional delay 0x02 = Loss of utility power, system is running on UPS/Battery 0x03 = Loss of system critical functions, system should be shutdown 0x04 = Ambient temperature too high All other values = reserved We have a user space tool (rtas_errd) on LPAR to monitor for EPOW_SHUTDOWN_ON_UPS. Once it gets an event it initiates shutdown after predefined time. It also starts monitoring for any new EPOW events. If it receives "Power restored" event before predefined time it will cancel the shutdown. Otherwise after predefined time it will shutdown the system. Commit 79872e35469b ("powerpc/pseries: All events of EPOW_SYSTEM_SHUTDOWN must initiate shutdown") changed our handling of the "on UPS/Battery" case, to immediately shutdown the system. This breaks existing setups that rely on the userspace tool to delay shutdown and let the system run on the UPS. Fixes: 79872e35469b ("powerpc/pseries: All events of EPOW_SYSTEM_SHUTDOWN must initiate shutdown") Cc: stable@vger.kernel.org # v4.0+ Signed-off-by: Vasant Hegde [mpe: Massage change log and add PAPR references] Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20200820061844.306460-1-hegdevasant@linux.vnet.ibm.com Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/platforms/pseries/ras.c | 1 - 1 file changed, 1 deletion(-) --- a/arch/powerpc/platforms/pseries/ras.c +++ b/arch/powerpc/platforms/pseries/ras.c @@ -118,7 +118,6 @@ static void handle_system_shutdown(char case EPOW_SHUTDOWN_ON_UPS: pr_emerg("Loss of system power detected. System is running on" " UPS/battery. Check RTAS error log for details\n"); - orderly_poweroff(true); break; case EPOW_SHUTDOWN_LOSS_OF_CRITICAL_FUNCTIONS: