From patchwork Sat Jun 6 02:34:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David VomLehn X-Patchwork-Id: 28180 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 6559CB70A9 for ; Sat, 6 Jun 2009 13:01:45 +1000 (EST) Received: by ozlabs.org (Postfix) id 56004DDD1B; Sat, 6 Jun 2009 13:01:45 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id ED19CDDD0B for ; Sat, 6 Jun 2009 13:01:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754517AbZFFDBA (ORCPT ); Fri, 5 Jun 2009 23:01:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753858AbZFFDAs (ORCPT ); Fri, 5 Jun 2009 23:00:48 -0400 Received: from sj-iport-6.cisco.com ([171.71.176.117]:62814 "EHLO sj-iport-6.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753130AbZFFDAn (ORCPT ); Fri, 5 Jun 2009 23:00:43 -0400 X-IronPort-AV: E=Sophos;i="4.41,314,1241395200"; d="scan'208";a="317953828" Received: from sj-dkim-2.cisco.com ([171.71.179.186]) by sj-iport-6.cisco.com with ESMTP; 06 Jun 2009 02:34:05 +0000 Received: from sj-core-1.cisco.com (sj-core-1.cisco.com [171.71.177.237]) by sj-dkim-2.cisco.com (8.12.11/8.12.11) with ESMTP id n562Y5GV006908; Fri, 5 Jun 2009 19:34:05 -0700 Received: from cuplxvomd02.corp.sa.net ([64.101.20.155]) by sj-core-1.cisco.com (8.13.8/8.13.8) with ESMTP id n562Y56L011593; Sat, 6 Jun 2009 02:34:05 GMT Date: Fri, 5 Jun 2009 19:34:05 -0700 From: David VomLehn To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, linux-usb@vger.kernel.org, greg@kroah.com, linux-scsi@vger.kernel.org, netdev@vger.kernel.org, arjan@infradead.org Subject: [PATCH 2/7] initdev:kernel:USB init device discovery notification, v3 Message-ID: <20090606023405.GA5670@cuplxvomd02.corp.sa.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; l=2456; t=1244255645; x=1245119645; c=relaxed/simple; s=sjdkim2002; h=Content-Type:From:Subject:Content-Transfer-Encoding:MIME-Version; d=cisco.com; i=dvomlehn@cisco.com; z=From:=20David=20VomLehn=20 |Subject:=20[PATCH=202/7]=20initdev=3Akernel=3AUSB=20init=2 0device=20discovery=20notification,=0A=09v3 |Sender:=20; bh=M1g+w/x8mQPPfdy3Bp6T9gZGS6qfQ/RxgmJMFBEaNhs=; b=Hp5PlimNopL1T+NrPdGw5JsFbgC/MpCi++8DfeWo+4QpueXDb+fismLMH1 9Ml6ndFHhqCH0Ec/tt4Kqm9T3R/ywrvSIUXk17P40NaVY20bP6IZljG1fSxr dt/sd76ys5; Authentication-Results: sj-dkim-2; header.From=dvomlehn@cisco.com; dkim=pass ( sig from cisco.com/sjdkim2002 verified; ); Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Alan Stern Use init device discovery infrastructure to provide notification of availability of USB devices. History v3 Changes names from BOOTDEV_* to INITDEV_*. v2 Change names from bootdev_* to initdev_*. v1.1 Changed check for blockdevice in #if to use || instead of | v1 Initial versions Signed-off-by: Alan Stern Signed-off-by: David VomLehn --- drivers/usb/core/hub.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index be86ae3..08baee0 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -37,6 +37,20 @@ #endif #endif +/* The mask of possible USB boot devices depends on what drivers and + * options have been configured into the kernel. There are too many + * USB network config options to list here, so just assume it is always + * possible to have a USB network device. + */ +static int usb_initdev_mask = 0 +#ifdef CONFIG_USB_SERIAL_CONSOLE + | INITDEV_CONSOLE_MASK +#endif +#if defined(CONFIG_USB_STORAGE) || defined(CONFIG_BLK_DEV_UB) + | INITDEV_BLOCK_MASK +#endif + | INITDEV_NETDEV_MASK; + struct usb_hub { struct device *intfdev; /* the "interface" device */ struct usb_device *hdev; @@ -73,6 +87,7 @@ struct usb_hub { unsigned limited_power:1; unsigned quiescing:1; unsigned disconnected:1; + unsigned probing:1; unsigned has_indicators:1; u8 indicator[USB_MAXCHILDREN]; @@ -1079,6 +1094,9 @@ static int hub_configure(struct usb_hub *hub, if (hub->has_indicators && blinkenlights) hub->indicator [0] = INDICATOR_CYCLE; + hub->probing = 1; + initdev_found(usb_initdev_mask); + hub_activate(hub, HUB_INIT); return 0; @@ -1124,6 +1142,9 @@ static void hub_disconnect(struct usb_interface *intf) usb_buffer_free(hub->hdev, sizeof(*hub->buffer), hub->buffer, hub->buffer_dma); + if (hub->probing) + initdev_probe_done(usb_initdev_mask); + kref_put(&hub->kref, hub_release); } @@ -3135,6 +3156,11 @@ static void hub_events(void) portstatus, portchange); } /* end for i */ + if (hub->probing) { + hub->probing = 0; + initdev_probe_done(usb_initdev_mask); + } + /* deal with hub status changes */ if (test_and_clear_bit(0, hub->event_bits) == 0) ; /* do nothing */