From patchwork Tue Sep 19 05:55:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suneel Garapati X-Patchwork-Id: 815281 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kxnvERh9"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xxBtn1fPZz9s7m for ; Tue, 19 Sep 2017 15:55:45 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DF220C21E6E; Tue, 19 Sep 2017 05:55:42 +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=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 1E386C21D64; Tue, 19 Sep 2017 05:55:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9666FC21D64; Tue, 19 Sep 2017 05:55:38 +0000 (UTC) Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by lists.denx.de (Postfix) with ESMTPS id 003D5C21D57 for ; Tue, 19 Sep 2017 05:55:38 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id v5so1485614pgn.4 for ; Mon, 18 Sep 2017 22:55:37 -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; bh=2Qu60feLUiSmsR1vj3Z9Lvqxsop/Deu5VKVpUxzs5YI=; b=kxnvERh9Hf/X8/nLBJ642nmqtuEwp8OxGz6rmQfnMZgMhPvLcAAZLCUwGR3xS3apyV Dx8ymSub915qwfVqFtjWhiSEcNFtC/di/A0P0TZsSmVhD9nP8XDLAgb/T3hwNu53Eos9 0+8/JmqA+zHqGUtBH4Dqdq4mMb7e+LQSclVDkXN+qJofFLGQQsW4OlUfYcvHo3aOaqjI wMqq28KXapkE0McoXS8iMTDXUeQ3jGvbIJBB82nhpBnVT72QfRrFdVVq1a6Mdiw+yqTm 0xrnhVhkAE1rZ8wyuX4r94SbtZAt+S4duoRpKcK7OjxSyxRRGjjw5MHHlnx0iBkbNbui AB1A== 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; bh=2Qu60feLUiSmsR1vj3Z9Lvqxsop/Deu5VKVpUxzs5YI=; b=LhxVaE90OD7sacMfQ30bUPy/Us/fqMTlP4eCqEGPY+n7L0ymhd6IAkULWb7Oc4CzEe NMBiym/MdagQX3NgBkRhIUrklVuM9Wys+mtT6X1VJelWNbspMMxj9+e+gaGX3DQZ5U0M EhoYbDteMoUwCWQz8xmC8LwKhM3xP84zLMAQebQCF+L2rqiVTLc38XlmPjm222w/xhO7 bYHKTlykREKjXeIdfloQM89cijbknNoCEJ1a//d4GttlswpkrHMshfBlpHJv7SD5fnQI S8jkNeZWXeCxNsVT94vNfa9Xaba4Bgs5iQ8BGtVPrYowjMB3zbz2K/7RsHLPPfg/okL0 guWw== X-Gm-Message-State: AHPjjUijzQKRdtU5eUp/YjBWo4MIKEMFGxgE0beGXj40lJJcCRxsVB/d YAKexIjK67Z2DK1iCXgXsgA= X-Google-Smtp-Source: AOwi7QD2Mvjuu3iwv9LvzwJk2D0nPM2yzjHbal2+GYhnusRBB03FpGE9Y8ogTq1shAbRpOZ69/3otw== X-Received: by 10.98.35.210 with SMTP id q79mr279899pfj.340.1505800536470; Mon, 18 Sep 2017 22:55:36 -0700 (PDT) Received: from suneel.hsd1.ca.comcast.net ([2601:646:8e00:e521:9471:9261:7a36:b20e]) by smtp.gmail.com with ESMTPSA id l30sm1516642pgc.78.2017.09.18.22.55.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Sep 2017 22:55:35 -0700 (PDT) From: Suneel Garapati To: Stefan Roese Date: Mon, 18 Sep 2017 22:55:33 -0700 Message-Id: <1505800533-1623-1-git-send-email-suneelglinux@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: u-boot@lists.denx.de, Michal Simek Subject: [U-Boot] [PATCH v3] cmd: usb: add blk devices to ignore list in tree graph 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" add blk child devices to ignore list while displaying usb tree graph, otherwise usb tree and info commands may cause crash treating blk as usb device. Signed-off-by: Suneel Garapati --- Changes v3: - remove 'check on parent uclass' in description Changes v2: - remove check on parent uclass Changes v1: - add separate check on blk uclass - modify description - add separate check on parent uclass as usb cmd/usb.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cmd/usb.c b/cmd/usb.c index d95bcf5..3889994 100644 --- a/cmd/usb.c +++ b/cmd/usb.c @@ -414,8 +414,12 @@ static void usb_show_tree_graph(struct usb_device *dev, char *pre) udev = dev_get_parent_priv(child); - /* Ignore emulators, we only want real devices */ - if (device_get_uclass_id(child) != UCLASS_USB_EMUL) { + /* + * Ignore emulators and block child devices, we only want + * real devices + */ + if ((device_get_uclass_id(child) != UCLASS_USB_EMUL) && + (device_get_uclass_id(child) != UCLASS_BLK)) { usb_show_tree_graph(udev, pre); pre[index] = 0; } @@ -605,7 +609,8 @@ static void usb_show_info(struct usb_device *udev) for (device_find_first_child(udev->dev, &child); child; device_find_next_child(&child)) { - if (device_active(child)) { + if (device_active(child) && + (device_get_uclass_id(child) != UCLASS_BLK)) { udev = dev_get_parent_priv(child); usb_show_info(udev); }