Received: by 10.223.185.116 with SMTP id b49csp1021051wrg; Wed, 21 Feb 2018 10:42:02 -0800 (PST) X-Google-Smtp-Source: AH8x227Ms3FiMCDrrNonBivAuvmJ7r0KbB14oGFuwSDMy6n5S8M0Z1K+s4ps0upmMYekQKzhxxGD X-Received: by 2002:a17:902:bd04:: with SMTP id p4-v6mr3918770pls.253.1519238522000; Wed, 21 Feb 2018 10:42:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519238521; cv=none; d=google.com; s=arc-20160816; b=GXrqi2jTGyl36qbmlOpG7QPmUENhNv1zQxyD4SwtdGxpnU3pUFa1h7Gk7eROZlRP39 tPbpDEnHbXhyEkSxdkFfCHE92x4MoCi/+EpfuojVJDyrMd6aWOM4mEC78LhOc12Z9Aiy dvOkxemYiaOAIO6UTyNbG5xrDq6v0YTuq4O3+0I5B+hcfNOBS1+4aftxiv2x+mHyz4ue iXar4pf7z0rdJZaAigW+gqsSNofmIGiFLoYCeM07fFyDRjAxf+5xWvgc/vshKVVlK/c6 iZCjbAqTJ72cp1n6y+TgiWIHIIW81O58lCPRWEVAd+H1Yh+z7LjkSDK2B1zDtni8r0sF e5zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Tjf2ZxS0mULtNKE7gLRXOFf5GWjx7zDqeVAzKPvQbO0=; b=CTvqs1xsdiAI2o+xUa5b4uSUbHeRWrcas4+53M8WHt8HEx3t0j2DIIonmZbWWqDfdI F6ji94DDdgz0PEwllpEEi1VT/pRu5AISs6R/qZo03y8kdXxOYU3ZLbTKPrTeQ4qNnWCb 583+z+3CjU/mLFDWqSShpbUPlx9loBnHdHYGU6xOAjB3Ad01Q1feCvxb0iyb/vrL+2QL 3KHibFLcOOkY9q4dJTLZqI8MlCCZKg1hCqTbCFa03PS03n8OxdqKHNxbbFkzG+oKlP+o tSI4uqt8fN88z7cr/PqlSS519DL6+AzZLyqbVnfkAGexvhe3/RoI0dp85Ww4zEqFp1aK wruw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f35-v6si1874772plh.475.2018.02.21.10.41.47; Wed, 21 Feb 2018 10:42:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936628AbeBUNXX (ORCPT + 99 others); Wed, 21 Feb 2018 08:23:23 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:45356 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936419AbeBUNLl (ORCPT ); Wed, 21 Feb 2018 08:11:41 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id DC083E7F; Wed, 21 Feb 2018 13:11:40 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stewart Smith , Michael Ellerman Subject: [PATCH 4.15 099/163] rtc-opal: Fix handling of firmware error codes, prevent busy loops Date: Wed, 21 Feb 2018 13:48:48 +0100 Message-Id: <20180221124535.766623327@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180221124529.931834518@linuxfoundation.org> References: <20180221124529.931834518@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stewart Smith commit 5b8b58063029f02da573120ef4dc9079822e3cda upstream. According to the OPAL docs: skiboot-5.2.5/doc/opal-api/opal-rtc-read-3.txt skiboot-5.2.5/doc/opal-api/opal-rtc-write-4.txt OPAL_HARDWARE may be returned from OPAL_RTC_READ or OPAL_RTC_WRITE and this indicates either a transient or permanent error. Prior to this patch, Linux was not dealing with OPAL_HARDWARE being a permanent error particularly well, in that you could end up in a busy loop. This was not too hard to trigger on an AMI BMC based OpenPOWER machine doing a continuous "ipmitool mc reset cold" to the BMC, the result of that being that we'd get stuck in an infinite loop in opal_get_rtc_time(). We now retry a few times before returning the error higher up the stack. Fixes: 16b1d26e77b1 ("rtc/tpo: Driver to support rtc and wakeup on PowerNV platform") Cc: stable@vger.kernel.org # v3.19+ Signed-off-by: Stewart Smith Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- drivers/rtc/rtc-opal.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) --- a/drivers/rtc/rtc-opal.c +++ b/drivers/rtc/rtc-opal.c @@ -58,6 +58,7 @@ static void tm_to_opal(struct rtc_time * static int opal_get_rtc_time(struct device *dev, struct rtc_time *tm) { long rc = OPAL_BUSY; + int retries = 10; u32 y_m_d; u64 h_m_s_ms; __be32 __y_m_d; @@ -67,8 +68,11 @@ static int opal_get_rtc_time(struct devi rc = opal_rtc_read(&__y_m_d, &__h_m_s_ms); if (rc == OPAL_BUSY_EVENT) opal_poll_events(NULL); - else + else if (retries-- && (rc == OPAL_HARDWARE + || rc == OPAL_INTERNAL_ERROR)) msleep(10); + else if (rc != OPAL_BUSY && rc != OPAL_BUSY_EVENT) + break; } if (rc != OPAL_SUCCESS) @@ -84,6 +88,7 @@ static int opal_get_rtc_time(struct devi static int opal_set_rtc_time(struct device *dev, struct rtc_time *tm) { long rc = OPAL_BUSY; + int retries = 10; u32 y_m_d = 0; u64 h_m_s_ms = 0; @@ -92,8 +97,11 @@ static int opal_set_rtc_time(struct devi rc = opal_rtc_write(y_m_d, h_m_s_ms); if (rc == OPAL_BUSY_EVENT) opal_poll_events(NULL); - else + else if (retries-- && (rc == OPAL_HARDWARE + || rc == OPAL_INTERNAL_ERROR)) msleep(10); + else if (rc != OPAL_BUSY && rc != OPAL_BUSY_EVENT) + break; } return rc == OPAL_SUCCESS ? 0 : -EIO;