From patchwork Tue Jan 21 07:28:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1226269 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (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 4820Xz55Dnz9sPJ for ; Tue, 21 Jan 2020 18:29:39 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=RufJ9EGq; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4820Xz1nwjzDqVS for ; Tue, 21 Jan 2020 18:29:39 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::1042; helo=mail-pj1-x1042.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=RufJ9EGq; dkim-atps=neutral Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4820X80ZtLzDqTR for ; Tue, 21 Jan 2020 18:28:55 +1100 (AEDT) Received: by mail-pj1-x1042.google.com with SMTP id m13so1054760pjb.2 for ; Mon, 20 Jan 2020 23:28:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K3QZbuyxO21Vb3qYCph4vA5LSNSbzwVSFAAl5RIb8mc=; b=RufJ9EGqAVU2rCTCnIiHU/8rEHVGiByOgErpCMPbCgOzy7kEA0m0SeoecAz1sZGKTR 2DPrcPuSVTecIijn5xiWYeYHxrLgguCZ3E0Cx7y3976UMkbTDxQR3bL0RbUIIVjfnBOG NgRqaYxlJP7MS2LbMXSNmwzSxhsKCzbIJV3cE7BHebvEn0FoT9i/LKnzLg2emXM5hUQ/ bWdtD2/Tr7saqyibc3OIC57ILVi2nENd8SgIy7LCkBRpHAAOUkokFhqimz205SVeiu3I HPU4NBZMt9ZyFRxe7IgJ4OFDWaxbA8aptPKnkTa6zQvDkN4y6NVuyHsbugW+JwpuWrDi zvBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K3QZbuyxO21Vb3qYCph4vA5LSNSbzwVSFAAl5RIb8mc=; b=b6L1dKcDuxTQUe8hfATeT7DlIYCxb2SQLHC0jXfLjF5JaWKH/oP2Xt4yMR7PNST+rP y54FymexxityfYYSCmEKQn6FYE2X5n41esMbuiHXDD43VTTKOJjMNKGDUmxD0rx8qoJw cwqGU3Kjep7kKzfZt+atfpT0bv/7V97H5S5ys+gJjGh9A1t/7hQ2KdsnFB8ofBCQSzBV z53WgAE7uU/tBAuFmppN0Gba3DSSKt05qeSv4njOkh8WvhLk0bkQFI5UasqC4WXy1ymu Eek2oFIWKz3j9WqfKSw9FaR+dPTlflSV7Piqw7et0GavR60orzXkknb+sfVVQuykZ2Ee XhBA== X-Gm-Message-State: APjAAAX8bD/9zFs8w+Q/QQlOJkwnoYZzMyeoNf2cnIw+8FUrSlfhsxeO cGH7vxDcgyWLqAqX/GYY9+3GnaBH X-Google-Smtp-Source: APXvYqyx63MSRW6Sthq4hx8YB+COMMA4rJgbjynFptQZYhze/3nNX8jcPZ1EvgCM91qN85mO9os3HA== X-Received: by 2002:a17:902:fe11:: with SMTP id g17mr4181516plj.261.1579591733613; Mon, 20 Jan 2020 23:28:53 -0800 (PST) Received: from wafer.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id u3sm41027750pga.72.2020.01.20.23.28.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 23:28:53 -0800 (PST) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Tue, 21 Jan 2020 18:28:36 +1100 Message-Id: <20200121072838.2771-3-oohall@gmail.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200121072838.2771-1-oohall@gmail.com> References: <20200121072838.2771-1-oohall@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [PATCH 3/5] hw/phb4: Don't disable TXE(12) interrupt if on P9 DD2.0 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: , Cc: Michael Neuling Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Commit 7dbf80d1db45 ("phb4: Generate checkstop on AIB ECC corr/uncorr for DD2.0 parts") changed the PHB inits so that on DD2.0 TXE error bit 12 would cause a checkstop. The patch also changes the TXE_ERR_IRQ_ENABLE settings to prevent this bit from causing a PHB error interrupt. However, there's not much point in doing this since the system is going to checkstop anyway. Removing the code to disable the interrupt simplifies the situation a bit and avoids conflating FIR propagation with the normal PHB error interrupts. The PHB spec is actively confusing in this area since it describes the TXE Error summary bit in the LEM FIR as an "interrupt" even though it's completely seperate to the PHB's LSI error reporting interrupt. Cc: Michael Neuling Signed-off-by: Oliver O'Halloran --- Mikey, please check if I'm speaking crap. I might have missed something. --- hw/phb4.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/phb4.c b/hw/phb4.c index 2591c0390d5f..7bbed8a8a829 100644 --- a/hw/phb4.c +++ b/hw/phb4.c @@ -5303,10 +5303,7 @@ static void phb4_init_hw(struct phb4 *p) /* Init_126..130 - Re-enable error interrupts */ out_be64(p->regs + PHB_ERR_IRQ_ENABLE, 0xca8880cc00000000ull); - if (phb4_is_dd20(p)) - out_be64(p->regs + PHB_TXE_ERR_IRQ_ENABLE, 0x2000400e08200000ull); - else - out_be64(p->regs + PHB_TXE_ERR_IRQ_ENABLE, 0x2008400e08200000ull); + out_be64(p->regs + PHB_TXE_ERR_IRQ_ENABLE, 0x2008400e08200000ull); out_be64(p->regs + PHB_RXE_ARB_ERR_IRQ_ENABLE, 0xc40038fc01804070ull); out_be64(p->regs + PHB_RXE_MRG_ERR_IRQ_ENABLE, 0x00006100008000a8ull); out_be64(p->regs + PHB_RXE_TCE_ERR_IRQ_ENABLE, 0x60510050c0000000ull);