usb/163732: Patch for BUFFALO WLI-UC-GNM (USB WLAN)
Number: 163732 Category: usb Synopsis: Patch for BUFFALO WLI-UC-GNM (USB WLAN) Confidential: no Severity: non-critical Priority: low Responsible:freebsd-usb State: open Quarter: Keywords: Date-Required: Class: update Submitter-Id: current-users Arrival-Date: Sat Dec 31 09:40:10 UTC 2011 Closed-Date: Last-Modified: Originator: Huang Wen Hui Release:9.0-PRERELEASE FreeBSD Organization: GDDSN Environment: FreeBSD mbp.gddsn.org.cn 9.0-PRERELEASE FreeBSD 9.0-PRERELEASE #2: Sat Dec 31 15:17:32 CST 2011 h...@mbp.gddsn.org.cn:/usr/obj/usr/src/sys/MACBOOK amd64 Description: This is patch for BUFFALO WLI-UC-GNM (USB WLAN Unit) It works fine. (if_run) run0: 1.0 on usbus1 run0: MAC/BBP RT3070 (rev 0x0201), RF RT3020 (MIMO 1T1R), address 4c:e6:76:d4:c9:5e run0: firmware RT2870 loaded wlan0: Ethernet address: 4c:e6:76:d4:c9:5e wlan0: link state changed to UP How-To-Repeat: Fix: Patch attached with submission follows: --- /sys/dev/usb/usbdevs2011-11-02 06:00:49.0 +0800 +++ /sys/dev/usb/usbdevs.hwh2011-12-31 15:25:31.0 +0800 @@ -2179,6 +2179,7 @@ product MELCO RT2870_2 0x0150 RT2870 product MELCO WLIUCGN 0x015d WLI-UC-GN product MELCO WLIUCG301N 0x016f WLI-UC-G301N +product MELCO WLIUCGNM 0x01a2 WLI-UC-GNM /* Merlin products */ product MERLIN V620 0x1110 Merlin V620 --- /sys/dev/usb/wlan/if_run.c 2011-11-02 06:00:49.0 +0800 +++ /sys/dev/usb/wlan/if_run.c.hwh 2011-12-31 15:25:46.0 +0800 @@ -214,6 +214,7 @@ RUN_DEV(MELCO, WLIUCG300N), RUN_DEV(MELCO, WLIUCG301N), RUN_DEV(MELCO, WLIUCGN), +RUN_DEV(MELCO, WLIUCGNM), RUN_DEV(MOTOROLA4, RT2770), RUN_DEV(MOTOROLA4, RT3070), RUN_DEV(MSI, RT3070_1), Release-Note: Audit-Trail: Unformatted: ___ freebsd-usb@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-usb To unsubscribe, send any mail to freebsd-usb-unsubscr...@freebsd.org
Re: umass regression
On Friday 30 December 2011 23:23:16 Bartosz Fabianowski wrote: With USB_DEBUG, I see that da0 has the NO_SYNCHRONIZE_CACHE set. But I still have no idea where the second umass device is gone that used to show up in 8-STABLE :(. Is there any other debug option I could enable to chase after that? I see no trace of another umass or even a ugen device. - Bartosz Here is the output I get now: ugen1.3: vendor 0x091e at usbus1 umass0: vendor 0x091e product 0x23c0, class 0/0, rev 1.10/5.09, addr 3 on usbus1 umass0: SCSI over Bulk-Only; quirks = 0x4000 umass0:3:0:-1: Attached to scbus3 da0 at umass-sim0 bus 0 scbus3 target 0 lun 0 da0: Garmin GARMIN Flash 1.00 Removable Direct Access SCSI-5 device da0: 1.000MB/s transfers da0: 934MB (1912832 512 byte sectors: 64H 32S/T 934C) Try to set the no synchronize cache quirk. Then reattach your device. It might be the msctest which is causing your problem! usbconfig -h | grep quirk --HPS ___ freebsd-usb@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-usb To unsubscribe, send any mail to freebsd-usb-unsubscr...@freebsd.org
Re: umass regression
Try to set the no synchronize cache quirk. Then reattach your device. It might be the msctest which is causing your problem! I tried setting the quirk just for the device but I failed to find the right magic numbers. The device shows up as: vendor 0x091e product 0x23c0, class 0/0, rev 1.10/5.09, addr 5 So I tried the following: usbconfig add_dev_quirk_vplh 0x091e 0x23c0 0x0509 0x0110 UQ_MSC_NO_SYNC_CACHE On re-attach, I see an unchanged quirks = 0x4000. I then tried setting the quirk globally: usbconfig add_quirk UQ_MSC_NO_SYNC_CACHE On re-attach, I see an unchanged quirks = 0x4000. How do I make the quirk actually stick? usbconfig -h | grep quirk I have seen you post this line before. At least on my system, it does not work. usbconfig writes straight to the screen, grep does not filter anything. - Bartosz ___ freebsd-usb@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-usb To unsubscribe, send any mail to freebsd-usb-unsubscr...@freebsd.org
Re: umass regression
On Saturday 31 December 2011 13:44:37 Bartosz Fabianowski wrote: Try to set the no synchronize cache quirk. Then reattach your device. It might be the msctest which is causing your problem! I tried setting the quirk just for the device but I failed to find the right magic numbers. The device shows up as: vendor 0x091e product 0x23c0, class 0/0, rev 1.10/5.09, addr 5 So I tried the following: usbconfig add_dev_quirk_vplh 0x091e 0x23c0 0x0509 0x0110 UQ_MSC_NO_SYNC_CACHE On re-attach, I see an unchanged quirks = 0x4000. I then tried setting the quirk globally: usbconfig add_quirk UQ_MSC_NO_SYNC_CACHE ^^ Set -d ugenX.Y first. Then add quirk. Then re-plug. On re-attach, I see an unchanged quirks = 0x4000. The quirk mask should be the same, only there should be two luns. Else enable umass and usb debuggin, and dmesg | grep -i lun How do I make the quirk actually stick? --HPS ___ freebsd-usb@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-usb To unsubscribe, send any mail to freebsd-usb-unsubscr...@freebsd.org
Re: umass regression
Set -d ugenX.Y first. Then add quirk. Then re-plug. OK, thanks, I did that. The quirk mask should be the same, only there should be two luns. No, still just one :(. Else enable umass and usb debuggin, and dmesg | grep -i lun I have USB_DEBUG enabled. The output I get is: da0 at umass-sim0 bus 0 scbus3 target 0 lun 0 (repeated for each time I plugged in the device). - Bartosz ___ freebsd-usb@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-usb To unsubscribe, send any mail to freebsd-usb-unsubscr...@freebsd.org
Re: kern/163091: commit references a PR
The following reply was made to PR kern/163091; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/163091: commit references a PR
Date: Sat, 31 Dec 2011 14:24:41 + (UTC)
Author: hselasky
Date: Sat Dec 31 14:24:22 2011
New Revision: 229097
URL: http://svn.freebsd.org/changeset/base/229097
Log:
MFC r228758:
Fix for race against user-space applications trying to change the
configuration on USB HUBs.
PR: kern/163091
Modified:
stable/9/sys/dev/usb/usb_hub.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/dev/usb/usb_hub.c
==
--- stable/9/sys/dev/usb/usb_hub.c Sat Dec 31 14:22:02 2011
(r229096)
+++ stable/9/sys/dev/usb/usb_hub.c Sat Dec 31 14:24:22 2011
(r229097)
@@ -707,6 +707,13 @@ uhub_explore(struct usb_device *udev)
DPRINTF(Device is suspended!\n);
return (0);
}
+
+ /*
+ * Make sure we don't race against user-space applications
+ * like LibUSB:
+ */
+ usbd_enum_lock(udev);
+
for (x = 0; x != hub-nports; x++) {
up = hub-ports + x;
portno = x + 1;
@@ -784,6 +791,8 @@ uhub_explore(struct usb_device *udev)
up-restartcnt = 0;
}
+ usbd_enum_unlock(udev);
+
/* initial status checked */
sc-sc_flags |= UHUB_FLAG_DID_EXPLORE;
___
svn-src-...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
___
freebsd-usb@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-usb
To unsubscribe, send any mail to freebsd-usb-unsubscr...@freebsd.org
Re: usb/163732: commit references a PR
The following reply was made to PR usb/163732; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: usb/163732: commit references a PR Date: Sat, 31 Dec 2011 15:14:19 + (UTC) Author: hselasky Date: Sat Dec 31 15:14:07 2011 New Revision: 229115 URL: http://svn.freebsd.org/changeset/base/229115 Log: MFC r227781: Add new USB IDs. PR: usb/162712, usb/163732 Modified: stable/9/sys/dev/usb/usbdevs stable/9/sys/dev/usb/wlan/if_run.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/dev/usb/usbdevs == --- stable/9/sys/dev/usb/usbdevs Sat Dec 31 15:11:47 2011 (r229114) +++ stable/9/sys/dev/usb/usbdevs Sat Dec 31 15:14:07 2011 (r229115) @@ -2084,6 +2084,7 @@ product LINKSYS4 RT3070 0x0078 RT3070 product LINKSYS4 WUSB600NV2 0x0079 WUSB600N v2 /* Logitech products */ +product LOGITECH LANW300NU2 0x0166 LAN-W300N/U2 product LOGITECH M24520x0203 M2452 keyboard product LOGITECH M48480x0301 M4848 mouse product LOGITECH PAGESCAN 0x040f PageScan @@ -2179,6 +2180,7 @@ product MELCO RT2870_1 0x0148 RT2870 product MELCO RT2870_20x0150 RT2870 product MELCO WLIUCGN 0x015d WLI-UC-GN product MELCO WLIUCG301N 0x016f WLI-UC-G301N +product MELCO WLIUCGNM0x01a2 WLI-UC-GNM /* Merlin products */ product MERLIN V620 0x1110 Merlin V620 Modified: stable/9/sys/dev/usb/wlan/if_run.c == --- stable/9/sys/dev/usb/wlan/if_run.c Sat Dec 31 15:11:47 2011 (r229114) +++ stable/9/sys/dev/usb/wlan/if_run.c Sat Dec 31 15:14:07 2011 (r229115) @@ -208,12 +208,14 @@ static const STRUCT_USB_HOST_ID run_devs RUN_DEV(LOGITEC, RT2870_1), RUN_DEV(LOGITEC, RT2870_2), RUN_DEV(LOGITEC, RT2870_3), +RUN_DEV(LOGITECH, LANW300NU2), RUN_DEV(MELCO,RT2870_1), RUN_DEV(MELCO,RT2870_2), RUN_DEV(MELCO,WLIUCAG300N), RUN_DEV(MELCO,WLIUCG300N), RUN_DEV(MELCO,WLIUCG301N), RUN_DEV(MELCO,WLIUCGN), +RUN_DEV(MELCO,WLIUCGNM), RUN_DEV(MOTOROLA4,RT2770), RUN_DEV(MOTOROLA4,RT3070), RUN_DEV(MSI, RT3070_1), ___ svn-src-...@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org ___ freebsd-usb@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-usb To unsubscribe, send any mail to freebsd-usb-unsubscr...@freebsd.org
Re: umass regression
On Sat, 31 Dec 2011, Bartosz Fabianowski wrote: How do I make the quirk actually stick? usbconfig -h | grep quirk I have seen you post this line before. At least on my system, it does not work. usbconfig writes straight to the screen, grep does not filter anything. -h output is being written to stderr. Redirect it: sh(1): usbconfig -h 21 | grep quirk csh(1): usbconfig -h | grep quirk Maybe there is a reason for this. Otherwise, line 268 of usbconfig.c could be changed to print to stdout. ___ freebsd-usb@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-usb To unsubscribe, send any mail to freebsd-usb-unsubscr...@freebsd.org
Re: umass regression
Did you kldload usb_quirk ? %kldload usb_quirk kldload: can't load usb_quirk: File exists It seems to be compiled into my kernel (even though I did not enable any option with quirk in its name). - Bartosz ___ freebsd-usb@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-usb To unsubscribe, send any mail to freebsd-usb-unsubscr...@freebsd.org
