CVS commit: [nick-nhusb] src/sys/dev/pci
Module Name:src
Committed By: skrll
Date: Tue Apr 5 15:36:48 UTC 2016
Modified Files:
src/sys/dev/pci [nick-nhusb]: xhci_pci.c
Log Message:
Switch PCI xhci(4) attachment from pci_intr_map() to
pci_intr_alloc()/pci_intr_release().
This enables MSI where available.
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.4 -r1.4.2.5 src/sys/dev/pci/xhci_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/xhci_pci.c
diff -u src/sys/dev/pci/xhci_pci.c:1.4.2.4 src/sys/dev/pci/xhci_pci.c:1.4.2.5
--- src/sys/dev/pci/xhci_pci.c:1.4.2.4 Mon Aug 31 08:33:03 2015
+++ src/sys/dev/pci/xhci_pci.c Tue Apr 5 15:36:48 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci_pci.c,v 1.4.2.4 2015/08/31 08:33:03 skrll Exp $ */
+/* $NetBSD: xhci_pci.c,v 1.4.2.5 2016/04/05 15:36:48 skrll Exp $ */
/* OpenBSD: xhci_pci.c,v 1.4 2014/07/12 17:38:51 yuo Exp */
/*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.4.2.4 2015/08/31 08:33:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.4.2.5 2016/04/05 15:36:48 skrll Exp $");
#include
#include
@@ -70,6 +70,7 @@ struct xhci_pci_softc {
pci_chipset_tag_t sc_pc;
pcitag_t sc_tag;
void *sc_ih;
+ pci_intr_handle_t *sc_pihp;
};
static int
@@ -142,7 +143,6 @@ xhci_pci_attach(device_t parent, device_
const pci_chipset_tag_t pc = pa->pa_pc;
const pcitag_t tag = pa->pa_tag;
char const *intrstr;
- pci_intr_handle_t ih;
pcireg_t csr, memtype;
int err;
uint32_t hccparams;
@@ -198,17 +198,15 @@ xhci_pci_attach(device_t parent, device_
pci_conf_write(pc, tag, PCI_COMMAND_STATUS_REG,
csr | PCI_COMMAND_MASTER_ENABLE);
- /* Map and establish the interrupt. */
- if (pci_intr_map(pa, &ih)) {
- aprint_error_dev(self, "couldn't map interrupt\n");
+ /* Allocate and establish the interrupt. */
+ if (pci_intr_alloc(pa, &psc->sc_pihp, NULL, 0)) {
+ aprint_error_dev(self, "can't allocate handler\n");
goto fail;
}
-
- /*
- * Allocate IRQ
- */
- intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- psc->sc_ih = pci_intr_establish(pc, ih, IPL_USB, xhci_intr, sc);
+ intrstr = pci_intr_string(pc, psc->sc_pihp[0], intrbuf,
+ sizeof(intrbuf));
+ psc->sc_ih = pci_intr_establish(pc, psc->sc_pihp[0], IPL_USB,
+ xhci_intr, sc);
if (psc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
@@ -251,7 +249,7 @@ xhci_pci_attach(device_t parent, device_
fail:
if (psc->sc_ih) {
- pci_intr_disestablish(psc->sc_pc, psc->sc_ih);
+ pci_intr_release(psc->sc_pc, psc->sc_pihp, 1);
psc->sc_ih = NULL;
}
if (sc->sc_ios) {
@@ -285,7 +283,7 @@ xhci_pci_detach(device_t self, int flags
}
if (psc->sc_ih != NULL) {
- pci_intr_disestablish(psc->sc_pc, psc->sc_ih);
+ pci_intr_release(psc->sc_pc, psc->sc_pihp, 1);
psc->sc_ih = NULL;
}
if (sc->sc_ios) {
CVS commit: [nick-nhusb] src/sys/dev/pci
Module Name:src Committed By: skrll Date: Mon Sep 21 16:21:19 UTC 2015 Modified Files: src/sys/dev/pci [nick-nhusb]: pcidevs Log Message: Sync with HEAD To generate a diff of this commit: cvs rdiff -u -r1.1205.2.2 -r1.1205.2.3 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1205.2.2 src/sys/dev/pci/pcidevs:1.1205.2.3 --- src/sys/dev/pci/pcidevs:1.1205.2.2 Sat Jun 6 14:40:09 2015 +++ src/sys/dev/pci/pcidevs Mon Sep 21 16:21:19 2015 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1205.2.2 2015/06/06 14:40:09 skrll Exp $ +$NetBSD: pcidevs,v 1.1205.2.3 2015/09/21 16:21:19 skrll Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -634,6 +634,7 @@ vendor ASPEED 0x1a03 ASPEED Technology vendor EVE 0x1adb EVE vendor QUMRANET 0x1af4 Qumranet vendor ASMEDIA 0x1b21 ASMedia +vendor REDHAT 0x1b36 Red Hat vendor FRESCO 0x1b73 Fresco Logic vendor QINHENG2 0x1c00 Nanjing QinHeng Electronics (PCIe) vendor SYMPHONY2 0x1c1c Symphony Labs (2nd PCI Vendor ID) @@ -1164,7 +1165,8 @@ product ASMEDIA ASM1061_01 0x0601 ASM106 product ASMEDIA ASM1061_02 0x0602 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_11 0x0611 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_12 0x0612 ASM1061 AHCI SATA III Controller -product ASMEDIA ASM1042 0x1042 ASM1042 xHCI USB 3.0 +product ASMEDIA ASM1042 0x1042 ASM1042 USB 3.0 Host Controller +product ASMEDIA ASM1042A 0x1142 ASM1042A USB 3.0 Host Controller /* Asustek products */ product ASUSTEK HFCPCI 0x0675 ISDN @@ -2353,6 +2355,9 @@ product MARVELL MV78200 0x7820 MV78200 product MARVELL MV78230 0x7823 MV78230 SoC Armada XP product MARVELL MV78260 0x7826 MV78260 SoC Armada XP product MARVELL MV78460 0x7846 MV78460 SoC Armada XP +product MARVELL 88F6810 0x6810 88F6810 SoC Armada 38x +product MARVELL 88F6820 0x6820 88F6820 SoC Armada 38x +product MARVELL 88F6828 0x6828 88F6828 SoC Armada 38x product MARVELL 88W8660 0x8660 88W8660 SoC Orion1 product MARVELL2 88SE9120 0x9120 88SE9120 SATA @@ -2639,6 +2644,7 @@ product INTEL X1000_HS_UART 0x0936 Quark product INTEL X1000_MAC 0x0937 Quark X1000 10/100 Ethernet MAC product INTEL X1000_EHCI 0x0939 Quark X1000 EHCI product INTEL X1000_OHCI 0x093a Quark X1000 OHCI +product INTEL PCIE_NVME_SSD 0x0953 PCIe NVMe SSD product INTEL X1000_HB 0x0958 Quark X1000 Host Bridge product INTEL WIFI_LINK_7265_1 0x095a Dual Band Wireless AC 7265 product INTEL WIFI_LINK_7265_2 0x095b Dual Band Wireless AC 7265 @@ -3533,6 +3539,7 @@ product INTEL 82Q45_HB 0x2e10 82Q45 Hos product INTEL 82Q45_EXP 0x2e11 82Q45 PCI Express Bridge product INTEL 82Q45_IGD 0x2e12 82Q45 Integrated Graphics Device product INTEL 82Q45_IGD_1 0x2e13 82Q45 Integrated Graphics Device +product INTEL 82Q45_KT_1 0x2e17 82Q45 KT product INTEL 82G45_HB 0x2e20 82G45 Host Bridge product INTEL 82G45_IGD 0x2e22 82G45 Integrated Graphics Device product INTEL 82G41_HB 0x2e30 82G41 Host Bridge @@ -3609,6 +3616,7 @@ product INTEL XE5_V3_IMC0_DDRIO_9 0x2fd8 product INTEL XE5_V3_IMC0_DDRIO_A 0x2fd9 Xeon E5 v3 IMC DDRIO product INTEL XE5_V3_IMC0_DDRIO_B 0x2fda Xeon E5 v3 IMC DDRIO product INTEL XE5_V3_IMC0_DDRIO_C 0x2fdb Xeon E5 v3 IMC DDRIO +product INTEL WIFI_LINK_3165_1 0x3165 Dual Band Wireless AC 3165 product INTEL 31244 0x3200 31244 Serial ATA Controller product INTEL 82855PM_DDR 0x3340 82855PM MCH Host Controller product INTEL 82855PM_AGP 0x3341 82855PM Host-AGP Bridge @@ -5077,6 +5085,7 @@ product PLANEX FNW_3800_TX 0xab07 FNW-38 product PLX PCI_400 0x1077 VScom PCI-400 4 port serial product PLX PCI_800 0x1076 VScom PCI-800 8 port serial product PLX PCI_200 0x1103 VScom PCI-200 2 port serial +product PLX PEX_8111 0x8111 PEX 8111 PCIe-to-PCI Bridge product PLX PEX_8112 0x8112 PEX 8112 PCIe-to-PCI Bridge product PLX PEX_8114 0x8114 PEX 8114 PCIe-to-PCI/PCI-X Bridge product PLX 9030 0x9030 9030 I/O Accelrator @@ -5286,10 +5295,15 @@ product REALTEK RT8169SC 0x8167 8169SC/8 product REALTEK RT8168 0x8168 8168/8111 10/100/1000 Ethernet product REALTEK RT8169 0x8169 8169/8110 10/100/1000 Ethernet product REALTEK RTL8188CE 0x8176 RTL8188CE Wireless LAN 802.11n PCI-E NIC +product REALTEK RTL8192CE 0x8178 RTL8192CE Wireless LAN 802.11n PCI-E NIC product REALTEK RTL8188EE 0x8179 RTL8188EE Wireless LAN 802.11n PCI-E NIC product REALTEK RT8180 0x8180 8180 802.11b product REALTEK RT8185 0x8185 8185 802.11a/b/g +/* Red Hat products */ +product REDHAT PPB 0x0001 Qemu PCI-PCI +product REDHAT QXL 0x0100 QXL Video + /* Renesas products */ product RENESAS SH7780 0x0002 SH7780 PCI Controller product RENESAS SH7785 0x0007 SH7785 PCI Controller
CVS commit: [nick-nhusb] src/sys/dev/pci
Module Name:src Committed By: skrll Date: Mon Sep 21 16:26:15 UTC 2015 Modified Files: src/sys/dev/pci [nick-nhusb]: pcidevs.h pcidevs_data.h Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.1199.2.2 -r1.1199.2.3 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1198.2.2 -r1.1198.2.3 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: [nick-nhusb] src/sys/dev/pci
Module Name:src Committed By: skrll Date: Mon Apr 6 12:17:30 UTC 2015 Modified Files: src/sys/dev/pci [nick-nhusb]: xhci_pci.c Log Message: Remove useless break; To generate a diff of this commit: cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/sys/dev/pci/xhci_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/xhci_pci.c diff -u src/sys/dev/pci/xhci_pci.c:1.4.2.1 src/sys/dev/pci/xhci_pci.c:1.4.2.2 --- src/sys/dev/pci/xhci_pci.c:1.4.2.1 Wed Dec 3 12:52:07 2014 +++ src/sys/dev/pci/xhci_pci.c Mon Apr 6 12:17:30 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: xhci_pci.c,v 1.4.2.1 2014/12/03 12:52:07 skrll Exp $ */ +/* $NetBSD: xhci_pci.c,v 1.4.2.2 2015/04/06 12:17:30 skrll Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.4.2.1 2014/12/03 12:52:07 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.4.2.2 2015/04/06 12:17:30 skrll Exp $"); #include #include @@ -117,7 +117,6 @@ xhci_pci_attach(device_t parent, device_ default: aprint_error_dev(self, "BAR not 64 or 32-bit MMIO\n"); return; - break; } psc->sc_pc = pc;
