Date: Tue, 19 Feb 2002 13:44:14 +0000 From: Josef Karthauser <joe@tao.org.uk> To: Andrew Gordon <arg-bsd@arg1.demon.co.uk> Cc: Rasputin <rasputin@submonkey.net>, stable@freebsd.org Subject: Re: Total system freeze; usb / uhci / ulpt broken? Message-ID: <20020219134413.GA60481@genius.tao.org.uk> In-Reply-To: <20020219124419.Q76693-100000@server.arg.sj.co.uk> References: <20020219093932.A1006@shikima.mine.nu> <20020219124419.Q76693-100000@server.arg.sj.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
--3lcZGd9BuhuYXNfi
Content-Type: multipart/mixed; boundary="ikeVEW9yuYc//A+q"
Content-Disposition: inline
--ikeVEW9yuYc//A+q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Tue, Feb 19, 2002 at 01:16:35PM +0000, Andrew Gordon wrote:
> On Tue, 19 Feb 2002, Rasputin wrote:
>=20
> > * Rasputin <rasputin@submonkey.net> [020218 13:13]:
> >
> > Sorry to reply to my own post, but thought I'd best mention the patchse=
t caused me
> > big trouble - the kernel won't boot past detecting the USB card
> > (it finds the card, but hangs where it would normally detect ums and up=
lt)
> > - and booting with the older kernel, then trying usbdevs -v gives:
> >
> > rasputin@shikima rasputin]$usbdevs -v
> > Controller /dev/usb0:
> > addr 1: I/O error
>=20
> [cut]
>=20
> I am not sure that this problem is down to mouse support as such; I don't
> have ums in my kernel, and things have gone wrong before usbd has had a
> chance to auto-load it. Maybe it's support for low-speed devices in
> general that is broken? Unfortunately I don't have any other low speed
> devices to test this theory; all my keyboards are PS/2.
>=20
Try the attached patch in addition to the patchset. It was committed to
-current yesterday.
Joe
--ikeVEW9yuYc//A+q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="uhub.c-patch"
Content-Transfer-Encoding: quoted-printable
Index: uhub.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs//src/sys/dev/usb/uhub.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- uhub.c 28 Jan 2002 01:03:19 -0000 1.33
+++ uhub.c 19 Feb 2002 02:00:27 -0000 1.34
@@ -338,6 +338,7 @@
struct uhub_softc *sc =3D dev->hub->hubsoftc;
struct usbd_port *up;
usbd_status err;
+ int speed;
int port;
int change, status;
=20
@@ -437,10 +438,18 @@
continue;
}
=20
+ /* Figure out device speed */
+ if (status & UPS_HIGH_SPEED)
+ speed =3D USB_SPEED_HIGH;
+ else if (status & UPS_LOW_SPEED)
+ speed =3D USB_SPEED_LOW;
+ else
+ speed =3D USB_SPEED_FULL;
+
/* Get device info and set its address. */
err =3D usbd_new_device(USBDEV(sc->sc_dev), dev->bus,=20
- dev->depth + 1, status & UPS_LOW_SPEED,=20
- port, up);
+ dev->depth + 1, speed, port, up);
+
/* XXX retry a few times? */
if (err) {
DPRINTFN(-1,("uhub_explore: usb_new_device failed, "
--ikeVEW9yuYc//A+q--
--3lcZGd9BuhuYXNfi
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (FreeBSD)
Comment: For info see http://www.gnupg.org
iEYEARECAAYFAjxyVq0ACgkQXVIcjOaxUBay1gCfeTi7rF/QmsHUsQWUBIutRYma
1tIAoJ/QV/REN41cLNLpYnivEDbLjOeK
=j4eI
-----END PGP SIGNATURE-----
--3lcZGd9BuhuYXNfi--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020219134413.GA60481>