Date: Sun, 3 Apr 2011 20:17:49 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r220303 - in head/sys: arm/econa dev/usb/controller mips/atheros mips/rmi Message-ID: <201104032017.p33KHnut054538@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Sun Apr 3 20:17:49 2011 New Revision: 220303 URL: http://svn.freebsd.org/changeset/base/220303 Log: - Correct EHCI interrupt disabling at detach. Submitted by: Luiz Otavio O Souza MFC after: 7 days Approved by: thompsa (mentor) Modified: head/sys/arm/econa/ehci_ebus.c head/sys/dev/usb/controller/ehci_ixp4xx.c head/sys/dev/usb/controller/ehci_mv.c head/sys/dev/usb/controller/ehci_pci.c head/sys/mips/atheros/ar71xx_ehci.c head/sys/mips/rmi/xls_ehci.c Modified: head/sys/arm/econa/ehci_ebus.c ============================================================================== --- head/sys/arm/econa/ehci_ebus.c Sun Apr 3 20:15:41 2011 (r220302) +++ head/sys/arm/econa/ehci_ebus.c Sun Apr 3 20:17:49 2011 (r220303) @@ -241,7 +241,7 @@ ehci_ebus_detach(device_t self) * disable interrupts that might have been switched on in ehci_init */ if (sc->sc_io_res) { - EWRITE4(sc, EHCI_USBINTR, 0); + EOWRITE4(sc, EHCI_USBINTR, 0); EWRITE4(sc, USB_BRIDGE_INTR_MASK, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) { Modified: head/sys/dev/usb/controller/ehci_ixp4xx.c ============================================================================== --- head/sys/dev/usb/controller/ehci_ixp4xx.c Sun Apr 3 20:15:41 2011 (r220302) +++ head/sys/dev/usb/controller/ehci_ixp4xx.c Sun Apr 3 20:17:49 2011 (r220303) @@ -263,7 +263,7 @@ ehci_ixp_detach(device_t self) * disable interrupts that might have been switched on in ehci_init */ if (sc->sc_io_res) { - EWRITE4(sc, EHCI_USBINTR, 0); + EOWRITE4(sc, EHCI_USBINTR, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) { Modified: head/sys/dev/usb/controller/ehci_mv.c ============================================================================== --- head/sys/dev/usb/controller/ehci_mv.c Sun Apr 3 20:15:41 2011 (r220302) +++ head/sys/dev/usb/controller/ehci_mv.c Sun Apr 3 20:17:49 2011 (r220303) @@ -295,7 +295,7 @@ mv_ehci_detach(device_t self) * disable interrupts that might have been switched on in ehci_init */ if (sc->sc_io_res) { - EWRITE4(sc, EHCI_USBINTR, 0); + EOWRITE4(sc, EHCI_USBINTR, 0); EWRITE4(sc, USB_BRIDGE_INTR_MASK, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) { Modified: head/sys/dev/usb/controller/ehci_pci.c ============================================================================== --- head/sys/dev/usb/controller/ehci_pci.c Sun Apr 3 20:15:41 2011 (r220302) +++ head/sys/dev/usb/controller/ehci_pci.c Sun Apr 3 20:17:49 2011 (r220303) @@ -506,7 +506,7 @@ ehci_pci_detach(device_t self) * disable interrupts that might have been switched on in ehci_init */ if (sc->sc_io_res) { - EWRITE4(sc, EHCI_USBINTR, 0); + EOWRITE4(sc, EHCI_USBINTR, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) { /* Modified: head/sys/mips/atheros/ar71xx_ehci.c ============================================================================== --- head/sys/mips/atheros/ar71xx_ehci.c Sun Apr 3 20:15:41 2011 (r220302) +++ head/sys/mips/atheros/ar71xx_ehci.c Sun Apr 3 20:17:49 2011 (r220303) @@ -250,7 +250,7 @@ ar71xx_ehci_detach(device_t self) * disable interrupts that might have been switched on in ehci_init */ if (sc->sc_io_res) { - EWRITE4(sc, EHCI_USBINTR, 0); + EOWRITE4(sc, EHCI_USBINTR, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) { Modified: head/sys/mips/rmi/xls_ehci.c ============================================================================== --- head/sys/mips/rmi/xls_ehci.c Sun Apr 3 20:15:41 2011 (r220302) +++ head/sys/mips/rmi/xls_ehci.c Sun Apr 3 20:17:49 2011 (r220303) @@ -220,7 +220,7 @@ ehci_xls_detach(device_t self) * disable interrupts that might have been switched on in ehci_init */ if (sc->sc_io_res) { - EWRITE4(sc, EHCI_USBINTR, 0); + EOWRITE4(sc, EHCI_USBINTR, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104032017.p33KHnut054538>