From patchwork Tue Dec 3 05:46:17 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: 1203528 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 47RrZy0Wr4z9sPV for ; Tue, 3 Dec 2019 16:46:50 +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.b="ajRl1Ukc"; 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 47RrZx1lxVzDqTG for ; Tue, 3 Dec 2019 16:46:49 +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::544; helo=mail-pg1-x544.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="ajRl1Ukc"; dkim-atps=neutral Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (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 47RrZl24jrzDqN1 for ; Tue, 3 Dec 2019 16:46:39 +1100 (AEDT) Received: by mail-pg1-x544.google.com with SMTP id k25so1139119pgt.7 for ; Mon, 02 Dec 2019 21:46:38 -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:mime-version :content-transfer-encoding; bh=2oKqNhmL9Vi0jWnj+kwAIfJTGV7t8TPc4HeId3gKtxU=; b=ajRl1Ukc0e1s7ZaaxAvMlZ8gRoZAX959uqpHaMqcTtAK9nZEzx3wF4RXHoHRqFUoTB hNSwZ6diTjnkBcf0KJC9/23MBIsLBmVmUWyNm1hbdWMoKOFkPfVDQJxquNFdxScL0qY5 d/5mGXxZLJOgHl0FLLBhJyhUK193mIRhZ4jrxLfsGZXj3DUBs8UHqIqvhBnV1x5STBZV Y7PMdms1T04kyO9XHT4aFN3Y2Tw/QsRthnQIOU6OZ94NUgR2wSS837MCg5/9cKqonsyY y7YHzIIzKhhuZyyZtcg/vr3eEpuuiNY4yP50EW7IUoLXp/Ku8PqXo9/hZwrkj87AyyEg hPKA== 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=2oKqNhmL9Vi0jWnj+kwAIfJTGV7t8TPc4HeId3gKtxU=; b=oijU302dfL3zM/AXjtNG2GbcbqeYGHs8Xhy9o3IEHF0sXMm/GriWvyJyS9tFPv0O9e acKiUip7y7COcfWYiuJmKfq4Igj1lQPt/FRZO50XJczMirG+dXI3R5/hwASc+LuiQQ/r xzLe1bhlRCg4kHqTc0Cee9WC99EqvCcN26g9lC84VXEvINK/6fmpXYPYNG2fiN9uCYCv ipMzPQyymBiqseQ1ftQQK8/M3i1/aTloeSP9ATVIV6w2R4fAerbAO8jKdX1CPgNO8sLT yX0A1Ck6s/Qzh5qypxzv72k12nx7E3ekFW0hQkd1voEBfZ1mVFHwqPbgRxJVTFHgTpNf 38TA== X-Gm-Message-State: APjAAAUuJK+ThpPQAGxV2MD6+G2mnZH6sSaR9vgvSyTbwjDgsVA0waSc IXETJPZVDFOwLh0QOkmPnmg+BbRf X-Google-Smtp-Source: APXvYqzz10h8WRCLBVFlAyf7rJRVWSsNyFwXAKT+0wIa7e1tHRAwAdvGmsWeCY+3ZnZYttKAKuwCkg== X-Received: by 2002:aa7:8007:: with SMTP id j7mr2987560pfi.73.1575351996370; Mon, 02 Dec 2019 21:46:36 -0800 (PST) Received: from wafer.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id i9sm1602365pfk.24.2019.12.02.21.46.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 21:46:35 -0800 (PST) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Tue, 3 Dec 2019 16:46:17 +1100 Message-Id: <20191203054619.20068-1-oohall@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Skiboot] [PATCH 1/3] hw/p8-i2c: Don't print warnings when dumping registers 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" There's not much point complaining if we can't collect debug data. Log a obviously-wrong value and continue. Also convert to using i2cm_read_reg() rather than xscom_read() directly while we're here. Signed-off-by: Oliver O'Halloran --- hw/p8-i2c.c | 52 ++++++++++------------------------------------------ 1 file changed, 10 insertions(+), 42 deletions(-) diff --git a/hw/p8-i2c.c b/hw/p8-i2c.c index 1b2806208613..990dfca7a154 100644 --- a/hw/p8-i2c.c +++ b/hw/p8-i2c.c @@ -237,7 +237,6 @@ static void p8_i2c_print_debug_info(struct p8_i2c_master_port *port, { struct p8_i2c_master *master = port->master; uint64_t cmd, mode, stat, estat, intm, intc; - int rc; /* Print master and request structure bits */ log_simple_error(&e_info(OPAL_RC_I2C_TRANSFER), @@ -255,48 +254,17 @@ static void p8_i2c_print_debug_info(struct p8_i2c_master_port *port, " start_time=%016llx end_time=%016llx (duration=%016llx)\n", master->start_time, end_time, end_time - master->start_time); - /* Dump the current state of i2c registers */ - rc = xscom_read(master->chip_id, master->xscom_base + I2C_CMD_REG, - &cmd); - if (rc) { - prlog(PR_DEBUG, "I2C: Failed to read CMD_REG\n"); - cmd = 0ull; - } - - rc = xscom_read(master->chip_id, master->xscom_base + I2C_MODE_REG, - &mode); - if (rc) { - prlog(PR_DEBUG, "I2C: Failed to read MODE_REG\n"); - mode = 0ull; - } - - rc = xscom_read(master->chip_id, master->xscom_base + I2C_STAT_REG, - &stat); - if (rc) { - prlog(PR_DEBUG, "I2C: Failed to read STAT_REG\n"); - stat = 0ull; - } + /* initialise to some fake value in case of read errors */ + cmd = mode = stat = estat = intm = intc = 0xDEAD; - rc = xscom_read(master->chip_id, master->xscom_base + I2C_EXTD_STAT_REG, - &estat); - if (rc) { - prlog(PR_DEBUG, "I2C: Failed to read EXTD_STAT_REG\n"); - estat = 0ull; - } - - rc = xscom_read(master->chip_id, master->xscom_base + I2C_INTR_MASK_REG, - &intm); - if (rc) { - prlog(PR_DEBUG, "I2C: Failed to read INTR_MASK_REG\n"); - intm = 0ull; - } - - rc = xscom_read(master->chip_id, master->xscom_base + I2C_INTR_COND_REG, - &intc); - if (rc) { - prlog(PR_DEBUG, "I2C: Failed to read INTR_COND_REG\n"); - intc = 0ull; - } + /* Dump the current state of i2c registers */ + i2cm_read_reg(master, I2C_CMD_REG, &cmd); + i2cm_read_reg(master, I2C_MODE_REG, &mode); + i2cm_read_reg(master, I2C_MODE_REG, &mode); + i2cm_read_reg(master, I2C_STAT_REG, &stat); + i2cm_read_reg(master, I2C_EXTD_STAT_REG, &estat); + i2cm_read_reg(master, I2C_INTR_MASK_REG, &intm); + i2cm_read_reg(master, I2C_INTR_COND_REG, &intc); log_simple_error(&e_info(OPAL_RC_I2C_TRANSFER), "I2C: Register dump--\n" " cmd:0x%016llx\tmode:0x%016llx\tstat:0x%016llx\n"