From owner-p4-projects@FreeBSD.ORG Mon Sep 7 17:45:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27DC01065694; Mon, 7 Sep 2009 17:45:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E01A3106568D for ; Mon, 7 Sep 2009 17:45:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B52EE8FC1F for ; Mon, 7 Sep 2009 17:45:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n87HjQB3096915 for ; Mon, 7 Sep 2009 17:45:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n87HjQmw096913 for perforce@freebsd.org; Mon, 7 Sep 2009 17:45:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 7 Sep 2009 17:45:26 GMT Message-Id: <200909071745.n87HjQmw096913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 168288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2009 17:45:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=168288 Change 168288 by hselasky@hselasky_laptop001 on 2009/09/07 17:44:26 USB controller: - import two PCI quirks from Linux - reported by: Dorian Büttner - patch by: HPS Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/usb_pci.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#11 (text+ko) ==== @@ -240,6 +240,36 @@ } } +static void +ehci_pci_ati_quirk(device_t dev, uint8_t match_dev) +{ + uint32_t temp; + uint16_t b; + uint16_t f; + uint16_t s; + + /* Look for ATI SMB PCI controller */ + + for (b = 0; b <= PCI_BUSMAX; b++) { + for (f = 0; f <= PCI_FUNCMAX; f++) { + for (s = 0; s <= PCI_SLOTMAX; s++) { + temp = pcib_read_config(dev, b, s, f, PCIR_DEVVENDOR, 4); + if (temp == 0x43851002) { + temp = pcib_read_config(dev, b, s, f, PCIR_REVID, 1); + if (match_dev || (temp == 0x3a) || (temp == 0x3b)) { + temp = pcib_read_config(dev, b, s, f, 0x53, 1); + if (!(temp & 0x08)) { + temp |= 0x08; + pcib_write_config(dev, b, s, f, 0x53, temp, 1); + device_printf(dev, "ATI-quirk applied\n"); + } + } + } + } + } + } +} + static int ehci_pci_attach(device_t self) { @@ -370,6 +400,41 @@ goto error; } ehci_pci_takecontroller(self); + + /* Undocumented quirks taken from Linux */ + + switch (pci_get_vendor(self)) { + case PCI_EHCI_VENDORID_ATI: + /* SB600 and SB700 EHCI quirk through SMB PCI device */ + switch (pci_get_device(self)) { + case 0x4386: + ehci_pci_ati_quirk(self, 1); + break; + case 0x4396: + ehci_pci_ati_quirk(self, 0); + break; + default: + break; + } + break; + + case PCI_EHCI_VENDORID_VIA: + if ((pci_get_device(self) == 0x3104) && + ((pci_get_revid(self) & 0xf0) == 0x60)) { + /* Correct schedule sleep time to 10us */ + uint8_t temp; + temp = pci_read_config(self, 0x4b, 1); + if (temp & 0x20) + break; + pci_write_config(self, 0x4b, temp, 1); + device_printf(self, "VIA-quirk applied\n"); + } + break; + + default: + break; + } + err = ehci_init(sc); if (!err) { err = device_probe_and_attach(sc->sc_bus.bdev); ==== //depot/projects/usb/src/sys/dev/usb/usb_pci.h#3 (text+ko) ==== @@ -33,6 +33,7 @@ */ #include #include +#include #include