Skip to contentSkip to conversation

USB: Provide USB boot device availability notification

PATCH In review David VomLehn 3 participants 6 messages Apr 30, 2009 USB

lore
Share & tools
lore
#0 lore raw

PATCH 2/5 USB: Provide USB boot device availability notification

From: Alan Stern <[email protected]>

Use boot device discovery infrastructure to report availability of USB devices.

---
 drivers/usb/core/hub.c |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
drivers/usb/core/hub.c +26 -0
index be86ae3..01a9b76 100644
@@ -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_bootdev_mask = 0
+#ifdef CONFIG_USB_SERIAL_CONSOLE
+				| BOOTDEV_CONSOLE_MASK
+#endif
+#if defined(CONFIG_USB_STORAGE) | defined(CONFIG_BLK_DEV_UB)
+				| BOOTDEV_BLOCK_MASK
+#endif
+				| BOOTDEV_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;
+	bootdev_found(usb_bootdev_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)
+		bootdev_probe_done(usb_bootdev_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;
+			bootdev_probe_done(usb_bootdev_mask);
+		}
+
 		/* deal with hub status changes */
 		if (test_and_clear_bit(0, hub->event_bits) == 0)
 			;	/* do nothing */
#1 lore raw

Hello.

Quoted 7 lines · David VomLehn

From: Alan Stern <[email protected]>

Use boot device discovery infrastructure to report availability of USB devices.

[...]

Quoted 8 lines
drivers/usb/core/hub.c +0 -0
index be86ae3..01a9b76 100644
@@ -37,6 +37,20 @@
 #endif
 #endif
 

drivers/usb/core/hub.c line 49

Quoted 10 lines
drivers/usb/core/hub.c +10 -0
+/* 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_bootdev_mask = 0
+#ifdef CONFIG_USB_SERIAL_CONSOLE
+				| BOOTDEV_CONSOLE_MASK
+#endif
+#if defined(CONFIG_USB_STORAGE) | defined(CONFIG_BLK_DEV_UB)

It should be ||, not bitwise | here, no?

WBR, Sergei

#2 lore raw
Quoted 4 lines · Sergei Shtylyov
Quoted 4 lines

+/* 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.

Quoted 8 lines

drivers/usb/core/hub.c line 49

Quoted 6 lines

+ */

drivers/usb/core/hub.c +5 -0
+static int usb_bootdev_mask = 0
+#ifdef CONFIG_USB_SERIAL_CONSOLE
+				| BOOTDEV_CONSOLE_MASK
+#endif
+#if defined(CONFIG_USB_STORAGE) | defined(CONFIG_BLK_DEV_UB)
    It should be ||, not bitwise | here, no?

No, it should be bitwise |. The value being constructed is a union of disjoint mask bits.

Alan Stern

#3 lore raw
Quoted 13 lines · Alan Stern
Quoted 4 lines
Quoted 4 lines

+/* 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.

Quoted 8 lines

drivers/usb/core/hub.c line 49

Quoted 6 lines

+ */

drivers/usb/core/hub.c +5 -0
+static int usb_bootdev_mask = 0
+#ifdef CONFIG_USB_SERIAL_CONSOLE
+				| BOOTDEV_CONSOLE_MASK
+#endif
+#if defined(CONFIG_USB_STORAGE) | defined(CONFIG_BLK_DEV_UB)

It should be ||, not bitwise | here, no?

Quoted 1 line

No, it should be bitwise |. The value being constructed is a union of disjoint mask bits.

I meant the #if line only. Although it shouldn't matter really...

Quoted 1 line

Alan Stern

WBR, Sergei

#4 lore raw
Quoted 15 lines · Sergei Shtylyov
Quoted 12 lines · Alan Stern
Quoted 12 lines

drivers/usb/core/hub.c line 49

Quoted 10 lines
drivers/usb/core/hub.c +10 -0
+/* 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_bootdev_mask = 0
+#ifdef CONFIG_USB_SERIAL_CONSOLE
+				| BOOTDEV_CONSOLE_MASK
+#endif
+#if defined(CONFIG_USB_STORAGE) | defined(CONFIG_BLK_DEV_UB)

It should be ||, not bitwise | here, no?

Quoted 4 lines
Quoted 2 lines

No, it should be bitwise |. The value being constructed is a union of disjoint mask bits.

I meant the #if line only. Although it shouldn't matter really...

Oh, sorry. Yes, you're right about that (and you're right that it doesn't really matter...).

David, you can go ahead and change the patch, but don't bother to submit a new version for such a small thing. The next time this gets pushed it'll have the right operator.

Alan Stern

#5 lore raw
Quoted 20 lines · Alan Stern
Quoted 18 lines · Sergei Shtylyov
Quoted 15 lines · Alan Stern
Quoted 4 lines
Quoted 4 lines

+/* 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.

Quoted 8 lines

drivers/usb/core/hub.c line 49

Quoted 6 lines

+ */

drivers/usb/core/hub.c +5 -0
+static int usb_bootdev_mask = 0
+#ifdef CONFIG_USB_SERIAL_CONSOLE
+				| BOOTDEV_CONSOLE_MASK
+#endif
+#if defined(CONFIG_USB_STORAGE) | defined(CONFIG_BLK_DEV_UB)

It should be ||, not bitwise | here, no?

No, it should be bitwise |. The value being constructed is a union of disjoint mask bits.

Quoted 8 lines
Quoted 1 line

I meant the #if line only. Although it shouldn't matter really...

Oh, sorry. Yes, you're right about that (and you're right that it doesn't really matter...).

David, you can go ahead and change the patch, but don't bother to submit a new version for such a small thing. The next time this gets pushed it'll have the right operator.

Done. It will be in the next submission.

Quoted 1 line

Alan Stern

David VomLehn