From patchwork Wed Sep 6 17:01:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suneel Garapati X-Patchwork-Id: 810732 X-Patchwork-Delegate: marek.vasut@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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lM5Y87Mn"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xnVGv6Mmwz9t3Z for ; Thu, 7 Sep 2017 03:01:27 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 829FAC21EB9; Wed, 6 Sep 2017 17:01:21 +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_H2, 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 AA76FC21E3B; Wed, 6 Sep 2017 17:01:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5CADAC21E3B; Wed, 6 Sep 2017 17:01:18 +0000 (UTC) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by lists.denx.de (Postfix) with ESMTPS id C20C0C21D88 for ; Wed, 6 Sep 2017 17:01:17 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id f84so1406745pfj.3 for ; Wed, 06 Sep 2017 10:01:17 -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=JSlVb967taIvf7rKQu4ZgW42KAQ+LWts6KB+xhEEHos=; b=lM5Y87Mn+cwY8Lm/1Pk7C6BH55AmibTXuIJ+E+UYk1g9dEo371VWcWDwZdPo7ghw5R iml9bKOlQbx1ulMqdRZPOv+OTlgjuT7jjkYsBKHpLW07IxBC0EFFwJ3tDUabJG/S0JBJ 1ym3jzNu+VqSNJBADuHUPvPaNoWDCsdNoTupiicUQp4L1LLAevsbD4+suKJQ1ashCvkE ex7cPqnGU2Gflr/x+Bf9GOHy7IANu3sYEfuIih3damRSFN9dOIYrtJkY0ZyzfDcKrUdV 5/3VVSqR1WpIebLdBSlYfjCCqG5ov+MNPXPrTOb2/nWtFxKb8W6twslCgpyNE487swEE QUEg== 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=JSlVb967taIvf7rKQu4ZgW42KAQ+LWts6KB+xhEEHos=; b=PKh57+cYOwQytc3r58QZIHWYzvMW7A/pIE6H0iuApFci5b1o4gY5+LOg9hsfXCSl17 x403z9+73+wswm1KYzy8Hk5HeW6vkafq5/PF4An1DDeC3RNaqdC9lkaO4KeacpWAc89b 1b4nETu8Kav6Xgy7i2WPG9z6ixAYzroBLcKZb4viyaY49/ROmSvwxA08AQ21epFtuf0D 9u24s9zCs762c3Ex3sIcdmEtQ4fcAs8zQOi/HFosiWTK9n6fP5pNgfiYy/4Nj7xc7gsm YG/7CucqTDKYGeqKaWnlJ7LECJyXPGOuP8xNHYodZgansflOWO4E75nbPVQYvwpEpuXm Uu0A== X-Gm-Message-State: AHPjjUiQkCi2BQ7P0h9hH3301YTnAYWG9rNjk4WzUQAzMvwbPMLNihxm PWXy4cEsx/HI9A== X-Google-Smtp-Source: ADKCNb5xoeuY4TUV0u00AZXRfD9/I/JduHirU4KKdfnvprqRWi7TCmmM4moSTUgsV4jUhCw4c7DraQ== X-Received: by 10.99.63.135 with SMTP id m129mr8612437pga.207.1504717272679; Wed, 06 Sep 2017 10:01:12 -0700 (PDT) Received: from suneel.hsd1.ca.comcast.net ([2601:646:8e00:e521:a8ab:948d:75cf:79c4]) by smtp.gmail.com with ESMTPSA id h1sm343899pfg.153.2017.09.06.10.01.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Sep 2017 10:01:12 -0700 (PDT) From: Suneel Garapati To: Stefan Roese Date: Wed, 6 Sep 2017 10:01:09 -0700 Message-Id: <1504717269-11918-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 v1] 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 Reviewed-by: Simon Glass --- Changes v1: - add separate check on blk uclass - modify description - add separate check on parent uclass as usb cmd/usb.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cmd/usb.c b/cmd/usb.c index d95bcf5..cb0e183 100644 --- a/cmd/usb.c +++ b/cmd/usb.c @@ -414,8 +414,13 @@ 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, with check on + * parent uclass as usb, we only want real devices + */ + if ((device_get_uclass_id(child) != UCLASS_USB_EMUL) && + (device_get_uclass_id(child) != UCLASS_BLK) && + (device_get_uclass_id(child->parent) == UCLASS_USB)) { usb_show_tree_graph(udev, pre); pre[index] = 0; } @@ -605,7 +610,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); }