From patchwork Mon Nov 14 02:06:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Herrenschmidt X-Patchwork-Id: 694328 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 AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tHDYF2NXMz9rxw for ; Mon, 14 Nov 2016 13:12:01 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tHDYF0rTjzDvgS for ; Mon, 14 Nov 2016 13:12:01 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tHDWY5j7xzDvRc for ; Mon, 14 Nov 2016 13:10:33 +1100 (AEDT) Received: from pasglop.ozlabs.ibm.com (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id uAE26UWf006812; Sun, 13 Nov 2016 20:06:58 -0600 From: Benjamin Herrenschmidt To: skiboot@lists.ozlabs.org Date: Mon, 14 Nov 2016 13:06:21 +1100 Message-Id: <1479089181-18410-21-git-send-email-benh@kernel.crashing.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479089181-18410-1-git-send-email-benh@kernel.crashing.org> References: <1479089181-18410-1-git-send-email-benh@kernel.crashing.org> Subject: [Skiboot] [PATCH 21/21] chiptod: More hardening against -1 chip ID 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: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Signed-off-by: Benjamin Herrenschmidt --- hw/chiptod.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/chiptod.c b/hw/chiptod.c index 0a7ea2f..16dd0ae 100644 --- a/hw/chiptod.c +++ b/hw/chiptod.c @@ -454,6 +454,9 @@ static enum chiptod_chip_status _chiptod_get_chip_status(int32_t chip_id) uint64_t tod_status; enum chiptod_chip_status status = -1; + if (chip_id < 0) + return chiptod_backup_disabled; + if (xscom_read(chip_id, TOD_STATUS, &tod_status)) { prerror("XSCOM error reading TOD_STATUS reg\n"); return status; @@ -477,6 +480,9 @@ static void chiptod_update_topology(enum chiptod_topology topo) { int32_t chip_id = chiptod_topology_info[topo].id; + if (chip_id < 0) + return; + chiptod_topology_info[topo].role = chiptod_get_chip_role(topo, chip_id); chiptod_topology_info[topo].status = chiptod_get_chip_status(topo);