From patchwork Mon May 6 04:00:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1095684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44y8D734s9z9s7T for ; Mon, 6 May 2019 14:00:55 +1000 (AEST) 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.b="pJplVcDm"; 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 44y8D71yNfzDqH6 for ; Mon, 6 May 2019 14:00:55 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::542; helo=mail-pg1-x542.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.b="pJplVcDm"; dkim-atps=neutral Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) (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 44y8D04NbFzDqGn for ; Mon, 6 May 2019 14:00:46 +1000 (AEST) Received: by mail-pg1-x542.google.com with SMTP id c13so5802289pgt.1 for ; Sun, 05 May 2019 21:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5sb0Oiz5Ox5pfXfxkdg5WKCz0JhIW+lOrWQjbcZ/wb0=; b=pJplVcDmRlJatoO6rmRTMnmKXwr59q9u5E/oJup3/j/bP+/crO7doB5wqbhdVQN3b/ XLn0S8fh3Shf2xOu87+ZnIb4TDmD5EF8XItGLEMUFMTUXRbuGOghj+q/zwew2o8eTlO0 HZB5ZsRdeuUF0qOxMF06pmj9bwRokNhuC0SsQoxTtL6o1u5QfTyBRZzCa8zp4brhFfte ih4mQ+wpZfH2YmDg6b6Y05Hz53rvcQ5o+cBN+Xe19ghruVUu5zXryR/KURHiM5UUJusc ylRbMSj/2WEP0vX7AXa8TA/56blKr5ZcwMiNdTq2kV3t9Q2QEBYOWRyM8UC0nmdZi5L9 gF/Q== 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:mime-version :content-transfer-encoding; bh=5sb0Oiz5Ox5pfXfxkdg5WKCz0JhIW+lOrWQjbcZ/wb0=; b=N5hLzLuHwki0f3ZEljoNx4QniUurG+qURiGSqeWOJ7BYsjivWyRMWYq7b7XJOZ7GgG fVdUknI5bTMUkKisZzmSDmUyeT54qxaprQfp5hH6WiQPePbWxmG09WKMIq3c84/ER9Qn KY1cdhb0Pl87ZjpSDG0Pi2x9+WkrC5GmF0A3bctChyGDEzSJwNOK4BAYwQCLjQIoyOfD eCxK+KcE+tMmwYybvnc1VbjAaJexesUP/+H0qytutsQyUQHPAwqDgbNbAynzRDiEm6to wKKISFD0c0URJfQvWK5irZzv5vKfSvEfIUTM3J8bjgfASQ/aELvOfCBchL3CpcH71jqF 0xmA== X-Gm-Message-State: APjAAAVkXDvR4h31xFj7636qwBuhsb5/3rNdf9nspRnAFxvmldvc91Tf S9ewYRgBl0Ud9a6Xh4hYKyqB/jmK X-Google-Smtp-Source: APXvYqxn0kS462Rc7a6+dpuOe1wGWbB3sV+ShJV2dKy3OQXpzaliL1loWKcWL3Wv3TEtzTug0xD05A== X-Received: by 2002:a63:8741:: with SMTP id i62mr29365214pge.313.1557115242771; Sun, 05 May 2019 21:00:42 -0700 (PDT) Received: from wafer.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id s79sm18733255pfa.31.2019.05.05.21.00.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 05 May 2019 21:00:41 -0700 (PDT) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Mon, 6 May 2019 14:00:29 +1000 Message-Id: <20190506040029.9215-1-oohall@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Skiboot] [PATCH] hw/phb4: Make pci-tracing print at PR_NOTICE 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" When pci-tracing is enabled we print each trace status message and the final trace status at PR_ERROR. The final status messages are similar to those printed when we fail to train in the non-pci-tracing path and this has resulted in spurious op-test failures. This patch reduces the log-level of the tracing message to PR_NOTICE so they're not accidently interpreted as actual error messages. PR_NOTICE messages are still printed to the console during boot. Signed-off-by: Oliver O'Halloran --- hw/phb4.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/phb4.c b/hw/phb4.c index 3b0ebfba886b..740924a6fa9e 100644 --- a/hw/phb4.c +++ b/hw/phb4.c @@ -137,6 +137,9 @@ static void phb4_init_hw(struct phb4 *p); #define PHBINF(p, fmt, a...) prlog(PR_INFO, "PHB#%04x[%d:%d]: " fmt, \ (p)->phb.opal_id, (p)->chip_id, \ (p)->index, ## a) +#define PHBNOTICE(p, fmt, a...) prlog(PR_NOTICE, "PHB#%04x[%d:%d]: " fmt, \ + (p)->phb.opal_id, (p)->chip_id, \ + (p)->index, ## a) #define PHBERR(p, fmt, a...) prlog(PR_ERR, "PHB#%04x[%d:%d]: " fmt, \ (p)->phb.opal_id, (p)->chip_id, \ (p)->index, ## a) @@ -2385,7 +2388,7 @@ static void phb4_train_info(struct phb4 *p, uint64_t reg, unsigned long time) default: snprintf(s, sizeof(s), "%sunvalid", s); } - PHBERR(p, "%s\n", s); + PHBNOTICE(p, "%s\n", s); } static void phb4_dump_pec_err_regs(struct phb4 *p) @@ -2663,15 +2666,15 @@ static void phb4_training_trace(struct phb4 *p) reglast = reg; if (!phb4_check_reg(p, reg)) { - PHBERR(p, "TRACE: PHB fence waiting link.\n"); + PHBNOTICE(p, "TRACE: PHB fence waiting link.\n"); break; } if (reg & PHB_PCIE_DLP_TL_LINKACT) { - PHBERR(p, "TRACE: Link trained.\n"); + PHBNOTICE(p, "TRACE: Link trained.\n"); break; } if ((now - start) > secs_to_tb(3)) { - PHBERR(p, "TRACE: Timeout waiting for link up.\n"); + PHBNOTICE(p, "TRACE: Timeout waiting for link up.\n"); break; } }