From patchwork Fri Jul 19 03:23:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1133895 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rock-chips.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="sn2y7vkO"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qbx30Hyhz9s00 for ; Fri, 19 Jul 2019 13:25:26 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B001AC22073; Fri, 19 Jul 2019 03:25:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6D778C2200E; Fri, 19 Jul 2019 03:24:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4F018C2209F; Fri, 19 Jul 2019 03:24:58 +0000 (UTC) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by lists.denx.de (Postfix) with ESMTPS id 76D21C21FC7 for ; Fri, 19 Jul 2019 03:24:07 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id m9so14834759pls.8 for ; Thu, 18 Jul 2019 20:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=DSGOacGHaeZw1E5pPkxZJgjHFQeXIly8LAKkb459t6g=; b=sn2y7vkOgAcbG718oPpxTz62VBw48O9r24pE9LPwM05obduowrlTJnA5J+vIg/PG3S gYxM5q6OdATSsaDpN8UUPaEqAmolVTqlpERLjA8l/YMG1NKt3h36n5uGxVYQGUHgPO/G 1edHxdSajAz95KPtRbojX5kNqSFSDKL1DowTrHZXQnH7Fpl8nqMNvBFq+DMLw6405lIA WT45Ox+WNJBs5BIRz1IJU6oLkdWyiNpQVN/pWSafel3YR1GcYpce/1epU+/ivxYVsqlT nPhUbwBqFRNLGaCXcJ+WdBih+LrVKVSpa32ZE2v5XG3kanAZvmB20apvMNlR1YzUag+j sTjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=DSGOacGHaeZw1E5pPkxZJgjHFQeXIly8LAKkb459t6g=; b=fBVERE2sD+RfHBE/VF7TrXAUxDS6xLdYK/cIQcunGlafIQvu5tLw4Isy5Nx70IbsCl lgkkCHzPxll2RFkQn5PXofZNYXnyw1kD57+pZ38PG75oMGOno6zChQ6TIvRT+HgUHnSc 6+WPviYlOKp3Sqj6TGIzS6/EF9M8e1O7op4gMJVcy3W+AaW3XBNhk/UjFlgp2Z4Rj8OP Va0ne2TOguAOi3aO+z+f9p89TJESxfacEE37k5VAZSb9Z6q3u13ajONl30kwS1TCdN21 q3hQZgg2et2IimMTs8XZZwtYer9iMswLXRlSzhNtCTZnNI0ZiYrSN1iiy2aQFVSDQhQl rn6g== X-Gm-Message-State: APjAAAUY2iZFqKCFKi5NSJxEaMAm1EjDgMR5HqvBKE2rVODAA/2mvOZD MSaOfJR80wmjubCUWwkKGnSRJhGl X-Google-Smtp-Source: APXvYqxdXrbRmP0dRIhYOLODM0Jg2BEs+8SS7Iq5aV9QlCtlj91lqJm1PA/dOJi8TuWypzJ91sV1OQ== X-Received: by 2002:a17:902:543:: with SMTP id 61mr54113145plf.20.1563506645663; Thu, 18 Jul 2019 20:24:05 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id e6sm33653744pfn.71.2019.07.18.20.24.04 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 20:24:05 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Fri, 19 Jul 2019 11:23:47 +0800 Message-Id: <20190719032347.27561-1-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.17.1 Subject: [U-Boot] [PATCH] core: ofnode: do not assert if node not valid in ofnode_get_name() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" In some case with LIVE DT, some node always not valid, or not have a valid name, eg. blk driver add by mmc. Return fail instead of Assert for this kind of ofnode, and this help with assert happen from time to time when of_live is enabled and DEBUG is enabled. Signed-off-by: Kever Yang Reviewed-by: Simon Glass --- drivers/core/ofnode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index c72c6e2673..bd338a4c68 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -212,7 +212,11 @@ ofnode ofnode_get_parent(ofnode node) const char *ofnode_get_name(ofnode node) { - assert(ofnode_valid(node)); + if (!ofnode_valid(node)) { + debug("%s node not valid\n", __func__); + return NULL; + } + if (ofnode_is_np(node)) return strrchr(node.np->full_name, '/') + 1;