From patchwork Wed Jul 26 10:50:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Neuling X-Patchwork-Id: 793824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xHX4W40Rrz9sMN for ; Wed, 26 Jul 2017 20:52:27 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xHX4W1yr3zDqnM for ; Wed, 26 Jul 2017 20:52:27 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xHX255RH6zDqnF for ; Wed, 26 Jul 2017 20:50:21 +1000 (AEST) Received: from localhost.localdomain (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 3xHX254QLkz9t1n; Wed, 26 Jul 2017 20:50:21 +1000 (AEST) Received: by localhost.localdomain (Postfix, from userid 1000) id 560DFEED7F2; Wed, 26 Jul 2017 20:50:21 +1000 (AEST) From: Michael Neuling To: stewart@linux.vnet.ibm.com Date: Wed, 26 Jul 2017 20:50:08 +1000 Message-Id: <20170726105013.24948-9-mikey@neuling.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170726105013.24948-1-mikey@neuling.org> References: <20170726105013.24948-1-mikey@neuling.org> Subject: [Skiboot] [PATCH 09/14] phb4: Split clearing REGB into new function X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: skiboot@lists.ozlabs.org, Michael Neuling MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" So others can call it. Signed-off-by: Michael Neuling --- hw/phb4.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/hw/phb4.c b/hw/phb4.c index af15b71d06..f17a5eb483 100644 --- a/hw/phb4.c +++ b/hw/phb4.c @@ -1690,6 +1690,17 @@ static void phb4_rc_err_clear(struct phb4 *p) 0xffffffff); } +static void phb4_err_clear_regb(struct phb4 *p) +{ + uint64_t val64; + + val64 = phb4_read_reg(p, PHB_REGB_ERR_STATUS); + phb4_write_reg(p, PHB_REGB_ERR_STATUS, val64); + phb4_write_reg(p, PHB_REGB_ERR1_STATUS, 0x0ul); + phb4_write_reg(p, PHB_REGB_ERR_LOG_0, 0x0ul); + phb4_write_reg(p, PHB_REGB_ERR_LOG_1, 0x0ul); +} + /* * The function can be called during error recovery for all classes of * errors. This is new to PHB4; previous revisions had separate @@ -1716,11 +1727,7 @@ static void phb4_err_clear(struct phb4 *p) phb4_write_reg(p, PHB_PBL_ERR_LOG_1, 0x0ul); /* Rec 24...31: Clear REGB errors */ - val64 = phb4_read_reg(p, PHB_REGB_ERR_STATUS); - phb4_write_reg(p, PHB_REGB_ERR_STATUS, val64); - phb4_write_reg(p, PHB_REGB_ERR1_STATUS, 0x0ul); - phb4_write_reg(p, PHB_REGB_ERR_LOG_0, 0x0ul); - phb4_write_reg(p, PHB_REGB_ERR_LOG_1, 0x0ul); + phb4_err_clear_regb(p); /* Rec 32...59: Clear PHB error trap */ val64 = phb4_read_reg(p, PHB_TXE_ERR_STATUS);