Date: Thu, 27 Jan 2011 09:05:42 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 188225 for review Message-ID: <201101270905.p0R95gcg036569@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@188225?ac=10 Change 188225 by hselasky@hselasky_laptop001 on 2011/01/27 09:04:45 Revert some local changes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#65 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#21 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mv.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehcireg.h#7 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#65 (text+ko) ==== @@ -1588,10 +1588,6 @@ usb_callout_reset(&sc->sc_tmo_pcd, hz, (void *)&ehci_pcd_enable, sc); } - /* if there was a doorbell, clear the doorbell busy flag */ - if (status & EHCI_STS_IAA) - sc->sc_flags &= ~EHCI_SCFLG_IAADBUSY; - status &= ~(EHCI_STS_INT | EHCI_STS_ERRINT | EHCI_STS_PCD | EHCI_STS_IAA); if (status != 0) { @@ -2316,7 +2312,7 @@ * XXX Certain nVidia chipsets choke when using the IAAD * feature too frequently. */ - if (sc->sc_flags & (EHCI_SCFLG_IAADBUG | EHCI_SCFLG_IAADBUSY)) + if (sc->sc_flags & EHCI_SCFLG_IAADBUG) return; /* XXX Performance quirk: Some Host Controllers have a too low @@ -2324,10 +2320,8 @@ * Controller after queueing the BULK transfer. */ temp = EOREAD4(sc, EHCI_USBCMD); - if (!(temp & EHCI_CMD_IAAD)) { + if (!(temp & EHCI_CMD_IAAD)) EOWRITE4(sc, EHCI_USBCMD, temp | EHCI_CMD_IAAD); - sc->sc_flags |= EHCI_SCFLG_IAADBUSY; - } } struct usb_pipe_methods ehci_device_bulk_methods = ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#21 (text+ko) ==== @@ -347,7 +347,6 @@ #define EHCI_SCFLG_TT 0x0020 /* transaction translator present */ #define EHCI_SCFLG_LOSTINTRBUG 0x0040 /* workaround for VIA / ATI chipsets */ #define EHCI_SCFLG_IAADBUG 0x0080 /* workaround for nVidia chipsets */ -#define EHCI_SCFLG_IAADBUSY 0x0100 /* doorbell is busy */ uint8_t sc_offs; /* offset to operational registers */ uint8_t sc_doorbell_disable; /* set on doorbell failure */ ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_mv.c#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#32 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/controller/ehcireg.h#7 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101270905.p0R95gcg036569>