Module Name: src
Committed By: knakahara
Date: Mon Jul 11 06:14:51 UTC 2016
Modified Files:
src/share/man/man9: pci_msi.9
src/sys/arch/x86/include: pci_machdep_common.h
src/sys/arch/x86/pci: pci_intr_machdep.c
src/sys/dev/pci: if_bge.c if_wm.c ismt.c nvme_pci.c pci_stub.c pcivar.h
virtio.c
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
pci_intr_type() is required pci_chipset_tag_t argument by other than x86.
pointed out by nonaka@n.o.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/share/man/man9/pci_msi.9
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x86/include/pci_machdep_common.h
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/x86/pci/pci_intr_machdep.c
cvs rdiff -u -r1.297 -r1.298 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.415 -r1.416 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/ismt.c src/sys/dev/pci/nvme_pci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/pci_stub.c
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/pci/pcivar.h
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/virtio.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/ixgbe/ixgbe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/pci_msi.9
diff -u src/share/man/man9/pci_msi.9:1.7 src/share/man/man9/pci_msi.9:1.8
--- src/share/man/man9/pci_msi.9:1.7 Thu Aug 13 05:01:04 2015
+++ src/share/man/man9/pci_msi.9 Mon Jul 11 06:14:51 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: pci_msi.9,v 1.7 2015/08/13 05:01:04 msaitoh Exp $
+.\" $NetBSD: pci_msi.9,v 1.8 2016/07/11 06:14:51 knakahara Exp $
.\"
.\" Copyright (c) 2015 Internet Initiative Japan Inc.
.\" All rights reserved.
@@ -75,7 +75,8 @@
.Fn pci_intr_release "pci_chipset_tag_t pc" \
"pci_intr_handle_t *pih" "int count"
.Ft pci_intr_type_t
-.Fn pci_intr_type "pci_intr_handle_t ih"
+.Fn pci_intr_type "pci_chipset_tag_t pc" \
+"pci_intr_handle_t ih"
.Sh DESCRIPTION
The
.Nm
Index: src/sys/arch/x86/include/pci_machdep_common.h
diff -u src/sys/arch/x86/include/pci_machdep_common.h:1.22 src/sys/arch/x86/include/pci_machdep_common.h:1.23
--- src/sys/arch/x86/include/pci_machdep_common.h:1.22 Thu Oct 22 09:45:32 2015
+++ src/sys/arch/x86/include/pci_machdep_common.h Mon Jul 11 06:14:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep_common.h,v 1.22 2015/10/22 09:45:32 knakahara Exp $ */
+/* $NetBSD: pci_machdep_common.h,v 1.23 2016/07/11 06:14:51 knakahara Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -127,7 +127,7 @@ typedef enum {
PCI_INTR_TYPE_SIZE,
} pci_intr_type_t;
-pci_intr_type_t pci_intr_type(pci_intr_handle_t);
+pci_intr_type_t pci_intr_type(pci_chipset_tag_t, pci_intr_handle_t);
/*
* Wrapper function for generally unitied allocation to fallback MSI-X/MSI/INTx
* automatically.
Index: src/sys/arch/x86/pci/pci_intr_machdep.c
diff -u src/sys/arch/x86/pci/pci_intr_machdep.c:1.37 src/sys/arch/x86/pci/pci_intr_machdep.c:1.38
--- src/sys/arch/x86/pci/pci_intr_machdep.c:1.37 Mon Aug 17 06:16:03 2015
+++ src/sys/arch/x86/pci/pci_intr_machdep.c Mon Jul 11 06:14:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_intr_machdep.c,v 1.37 2015/08/17 06:16:03 knakahara Exp $ */
+/* $NetBSD: pci_intr_machdep.c,v 1.38 2016/07/11 06:14:51 knakahara Exp $ */
/*-
* Copyright (c) 1997, 1998, 2009 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.37 2015/08/17 06:16:03 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.38 2016/07/11 06:14:51 knakahara Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -352,7 +352,7 @@ pci_intr_disestablish(pci_chipset_tag_t
#if NIOAPIC > 0
pci_intr_type_t
-pci_intr_type(pci_intr_handle_t ih)
+pci_intr_type(pci_chipset_tag_t pc, pci_intr_handle_t ih)
{
if (INT_VIA_MSI(ih)) {
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.297 src/sys/dev/pci/if_bge.c:1.298
--- src/sys/dev/pci/if_bge.c:1.297 Fri Jun 10 13:27:14 2016
+++ src/sys/dev/pci/if_bge.c Mon Jul 11 06:14:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.297 2016/06/10 13:27:14 ozaki-r Exp $ */
+/* $NetBSD: if_bge.c,v 1.298 2016/07/11 06:14:51 knakahara Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.297 2016/06/10 13:27:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.298 2016/07/11 06:14:51 knakahara Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -3744,7 +3744,7 @@ alloc_retry:
sc->bge_intrhand = pci_intr_establish(pc, sc->bge_pihp[0], IPL_NET,
bge_intr, sc);
if (sc->bge_intrhand == NULL) {
- intr_type = pci_intr_type(sc->bge_pihp[0]);
+ intr_type = pci_intr_type(pc, sc->bge_pihp[0]);
aprint_error_dev(sc->bge_dev,"unable to establish %s\n",
(intr_type == PCI_INTR_TYPE_MSI) ? "MSI" : "INTx");
pci_intr_release(pc, sc->bge_pihp, 1);
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.415 src/sys/dev/pci/if_wm.c:1.416
--- src/sys/dev/pci/if_wm.c:1.415 Mon Jun 20 08:34:59 2016
+++ src/sys/dev/pci/if_wm.c Mon Jul 11 06:14:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.415 2016/06/20 08:34:59 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.416 2016/07/11 06:14:51 knakahara Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.415 2016/06/20 08:34:59 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.416 2016/07/11 06:14:51 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1681,7 +1681,7 @@ alloc_retry:
return;
}
- if (pci_intr_type(sc->sc_intrs[0]) == PCI_INTR_TYPE_MSIX) {
+ if (pci_intr_type(pc, sc->sc_intrs[0]) == PCI_INTR_TYPE_MSIX) {
error = wm_setup_msix(sc);
if (error) {
pci_intr_release(pc, sc->sc_intrs,
@@ -1693,7 +1693,7 @@ alloc_retry:
counts[PCI_INTR_TYPE_INTX] = 1;
goto alloc_retry;
}
- } else if (pci_intr_type(sc->sc_intrs[0]) == PCI_INTR_TYPE_MSI) {
+ } else if (pci_intr_type(pc, sc->sc_intrs[0]) == PCI_INTR_TYPE_MSI) {
wm_adjust_qnum(sc, 0); /* must not use multiqueue */
error = wm_setup_legacy(sc);
if (error) {
@@ -4334,7 +4334,7 @@ wm_setup_legacy(struct wm_softc *sc)
IPL_NET, wm_intr_legacy, sc, device_xname(sc->sc_dev));
if (sc->sc_ihs[0] == NULL) {
aprint_error_dev(sc->sc_dev,"unable to establish %s\n",
- (pci_intr_type(sc->sc_intrs[0])
+ (pci_intr_type(pc, sc->sc_intrs[0])
== PCI_INTR_TYPE_MSI) ? "MSI" : "INTx");
return ENOMEM;
}
Index: src/sys/dev/pci/ismt.c
diff -u src/sys/dev/pci/ismt.c:1.3 src/sys/dev/pci/ismt.c:1.4
--- src/sys/dev/pci/ismt.c:1.3 Mon Feb 1 08:53:36 2016
+++ src/sys/dev/pci/ismt.c Mon Jul 11 06:14:51 2016
@@ -60,7 +60,7 @@
#if 0
__FBSDID("$FreeBSD: head/sys/dev/ismt/ismt.c 266474 2014-05-20 19:55:06Z jimharris $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: ismt.c,v 1.3 2016/02/01 08:53:36 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ismt.c,v 1.4 2016/07/11 06:14:51 knakahara Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -765,12 +765,12 @@ ismt_attach(device_t parent, device_t se
ismt_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->pcidev, "unable to establish %s\n",
- (pci_intr_type(sc->sc_pihp[0])
+ (pci_intr_type(pa->pa_pc, sc->sc_pihp[0])
== PCI_INTR_TYPE_MSI) ? "MSI" : "INTx");
/* Polling */
}
- if (pci_intr_type(sc->sc_pihp[0]) == PCI_INTR_TYPE_MSI)
+ if (pci_intr_type(pa->pa_pc, sc->sc_pihp[0]) == PCI_INTR_TYPE_MSI)
sc->using_msi = 1;
aprint_normal_dev(sc->pcidev, "interrupting at %s\n", intrstr);
Index: src/sys/dev/pci/nvme_pci.c
diff -u src/sys/dev/pci/nvme_pci.c:1.3 src/sys/dev/pci/nvme_pci.c:1.4
--- src/sys/dev/pci/nvme_pci.c:1.3 Fri Jun 24 15:25:43 2016
+++ src/sys/dev/pci/nvme_pci.c Mon Jul 11 06:14:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nvme_pci.c,v 1.3 2016/06/24 15:25:43 nonaka Exp $ */
+/* $NetBSD: nvme_pci.c,v 1.4 2016/07/11 06:14:51 knakahara Exp $ */
/* $OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
/*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.3 2016/06/24 15:25:43 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.4 2016/07/11 06:14:51 knakahara Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -257,7 +257,8 @@ nvme_pci_intr_establish(struct nvme_soft
device_xname(sc->sc_dev), qid);
}
ih_arg = q;
- if (pci_intr_type(psc->psc_intrs[qid]) == PCI_INTR_TYPE_MSIX)
+ if (pci_intr_type(psc->psc_pc, psc->psc_intrs[qid])
+ == PCI_INTR_TYPE_MSIX)
ih_func = nvme_mq_msix_intr;
else
ih_func = nvme_mq_msi_intr;
@@ -399,7 +400,7 @@ retry:
return error;
}
- intr_type = pci_intr_type(ihps[0]);
+ intr_type = pci_intr_type(pa->pa_pc, ihps[0]);
if (alloced_counts[intr_type] < counts[intr_type]) {
if (intr_type != PCI_INTR_TYPE_INTX) {
pci_intr_release(pa->pa_pc, ihps,
Index: src/sys/dev/pci/pci_stub.c
diff -u src/sys/dev/pci/pci_stub.c:1.4 src/sys/dev/pci/pci_stub.c:1.5
--- src/sys/dev/pci/pci_stub.c:1.4 Thu Oct 22 09:45:32 2015
+++ src/sys/dev/pci/pci_stub.c Mon Jul 11 06:14:51 2016
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_stub.c,v 1.4 2015/10/22 09:45:32 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_stub.c,v 1.5 2016/07/11 06:14:51 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -17,7 +17,7 @@ int default_pci_bus_devorder(pci_chipset
int default_pci_chipset_tag_create(pci_chipset_tag_t, uint64_t,
const struct pci_overrides *, void *, pci_chipset_tag_t *);
void default_pci_chipset_tag_destroy(pci_chipset_tag_t);
-pci_intr_type_t default_pci_intr_type(pci_intr_handle_t);
+pci_intr_type_t default_pci_intr_type(pci_chipset_tag_t, pci_intr_handle_t);
int default_pci_intr_alloc(const struct pci_attach_args *,
pci_intr_handle_t **, int *, pci_intr_type_t);
void default_pci_intr_release(pci_chipset_tag_t, pci_intr_handle_t *, int);
@@ -59,7 +59,7 @@ default_pci_chipset_tag_create(pci_chips
}
pci_intr_type_t
-default_pci_intr_type(pci_intr_handle_t ih)
+default_pci_intr_type(pci_chipset_tag_t pc, pci_intr_handle_t ih)
{
return PCI_INTR_TYPE_INTX;
Index: src/sys/dev/pci/pcivar.h
diff -u src/sys/dev/pci/pcivar.h:1.107 src/sys/dev/pci/pcivar.h:1.108
--- src/sys/dev/pci/pcivar.h:1.107 Fri Oct 30 20:03:45 2015
+++ src/sys/dev/pci/pcivar.h Mon Jul 11 06:14:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pcivar.h,v 1.107 2015/10/30 20:03:45 msaitoh Exp $ */
+/* $NetBSD: pcivar.h,v 1.108 2016/07/11 06:14:51 knakahara Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -359,7 +359,7 @@ typedef enum {
} pci_intr_type_t;
pci_intr_type_t
- pci_intr_type(pci_intr_handle_t);
+ pci_intr_type(pci_chipset_tag_t, pci_intr_handle_t);
int pci_intr_alloc(const struct pci_attach_args *, pci_intr_handle_t **,
int *, pci_intr_type_t);
void pci_intr_release(pci_chipset_tag_t, pci_intr_handle_t *, int);
Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.15 src/sys/dev/pci/virtio.c:1.16
--- src/sys/dev/pci/virtio.c:1.15 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/pci/virtio.c Mon Jul 11 06:14:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.15 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: virtio.c,v 1.16 2016/07/11 06:14:51 knakahara Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.15 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.16 2016/07/11 06:14:51 knakahara Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -265,7 +265,7 @@ virtio_setup_interrupts(struct virtio_so
return -1;
}
- if (pci_intr_type(sc->sc_ihp[0]) == PCI_INTR_TYPE_MSIX) {
+ if (pci_intr_type(pc, sc->sc_ihp[0]) == PCI_INTR_TYPE_MSIX) {
sc->sc_ihs = kmem_alloc(sizeof(*sc->sc_ihs) * 2,
KM_SLEEP);
if (sc->sc_ihs == NULL) {
@@ -290,7 +290,7 @@ virtio_setup_interrupts(struct virtio_so
sc->sc_ihs_num = 2;
sc->sc_config_offset = VIRTIO_CONFIG_DEVICE_CONFIG_MSI;
- } else if (pci_intr_type(sc->sc_ihp[0]) == PCI_INTR_TYPE_INTX) {
+ } else if (pci_intr_type(pc, sc->sc_ihp[0]) == PCI_INTR_TYPE_INTX) {
sc->sc_ihs = kmem_alloc(sizeof(*sc->sc_ihs) * 1,
KM_SLEEP);
if (sc->sc_ihs == NULL) {
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.38 src/sys/dev/pci/ixgbe/ixgbe.c:1.39
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.38 Fri Jun 10 13:27:14 2016
+++ src/sys/dev/pci/ixgbe/ixgbe.c Mon Jul 11 06:14:51 2016
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe.c 279805 2015-03-09 10:29:15Z araujo $*/
-/*$NetBSD: ixgbe.c,v 1.38 2016/06/10 13:27:14 ozaki-r Exp $*/
+/*$NetBSD: ixgbe.c,v 1.39 2016/07/11 06:14:51 knakahara Exp $*/
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -2536,7 +2536,8 @@ alloc_retry:
adapter->osdep.ihs[0] = pci_intr_establish(adapter->osdep.pc,
adapter->osdep.intrs[0], IPL_NET, ixgbe_legacy_irq, que);
if (adapter->osdep.ihs[0] == NULL) {
- intr_type = pci_intr_type(adapter->osdep.intrs[0]);
+ intr_type = pci_intr_type(adapter->osdep.pc,
+ adapter->osdep.intrs[0]);
aprint_error_dev(dev,"unable to establish %s\n",
(intr_type == PCI_INTR_TYPE_MSI) ? "MSI" : "INTx");
pci_intr_release(adapter->osdep.pc, adapter->osdep.intrs, 1);
