Module Name: src
Committed By: maxv
Date: Wed Nov 27 19:21:37 UTC 2019
Modified Files:
src/sys/arch/x86/pci: if_vmx.c
src/sys/dev/pci: mfii.c
Log Message:
localify
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/x86/pci/if_vmx.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/mfii.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/arch/x86/pci/if_vmx.c
diff -u src/sys/arch/x86/pci/if_vmx.c:1.51 src/sys/arch/x86/pci/if_vmx.c:1.52
--- src/sys/arch/x86/pci/if_vmx.c:1.51 Thu Oct 10 08:55:08 2019
+++ src/sys/arch/x86/pci/if_vmx.c Wed Nov 27 19:21:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vmx.c,v 1.51 2019/10/10 08:55:08 knakahara Exp $ */
+/* $NetBSD: if_vmx.c,v 1.52 2019/11/27 19:21:36 maxv Exp $ */
/* $OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.51 2019/10/10 08:55:08 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.52 2019/11/27 19:21:36 maxv Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -340,118 +340,117 @@ typedef enum {
#define vtophys(va) 0 /* XXX ok? */
-int vmxnet3_match(device_t, cfdata_t, void *);
-void vmxnet3_attach(device_t, device_t, void *);
-int vmxnet3_detach(device_t, int);
-
-int vmxnet3_alloc_pci_resources(struct vmxnet3_softc *);
-void vmxnet3_free_pci_resources(struct vmxnet3_softc *);
-int vmxnet3_check_version(struct vmxnet3_softc *);
-void vmxnet3_check_multiqueue(struct vmxnet3_softc *);
-
-int vmxnet3_alloc_msix_interrupts(struct vmxnet3_softc *);
-int vmxnet3_alloc_msi_interrupts(struct vmxnet3_softc *);
-int vmxnet3_alloc_legacy_interrupts(struct vmxnet3_softc *);
-int vmxnet3_alloc_interrupts(struct vmxnet3_softc *);
-void vmxnet3_free_interrupts(struct vmxnet3_softc *);
-
-int vmxnet3_setup_msix_interrupts(struct vmxnet3_softc *);
-int vmxnet3_setup_msi_interrupt(struct vmxnet3_softc *);
-int vmxnet3_setup_legacy_interrupt(struct vmxnet3_softc *);
-void vmxnet3_set_interrupt_idx(struct vmxnet3_softc *);
-int vmxnet3_setup_interrupts(struct vmxnet3_softc *);
-int vmxnet3_setup_sysctl(struct vmxnet3_softc *);
-
-int vmxnet3_setup_stats(struct vmxnet3_softc *);
-void vmxnet3_teardown_stats(struct vmxnet3_softc *);
-
-int vmxnet3_init_rxq(struct vmxnet3_softc *, int);
-int vmxnet3_init_txq(struct vmxnet3_softc *, int);
-int vmxnet3_alloc_rxtx_queues(struct vmxnet3_softc *);
-void vmxnet3_destroy_rxq(struct vmxnet3_rxqueue *);
-void vmxnet3_destroy_txq(struct vmxnet3_txqueue *);
-void vmxnet3_free_rxtx_queues(struct vmxnet3_softc *);
-
-int vmxnet3_alloc_shared_data(struct vmxnet3_softc *);
-void vmxnet3_free_shared_data(struct vmxnet3_softc *);
-int vmxnet3_alloc_txq_data(struct vmxnet3_softc *);
-void vmxnet3_free_txq_data(struct vmxnet3_softc *);
-int vmxnet3_alloc_rxq_data(struct vmxnet3_softc *);
-void vmxnet3_free_rxq_data(struct vmxnet3_softc *);
-int vmxnet3_alloc_queue_data(struct vmxnet3_softc *);
-void vmxnet3_free_queue_data(struct vmxnet3_softc *);
-int vmxnet3_alloc_mcast_table(struct vmxnet3_softc *);
-void vmxnet3_free_mcast_table(struct vmxnet3_softc *);
-void vmxnet3_init_shared_data(struct vmxnet3_softc *);
-void vmxnet3_reinit_rss_shared_data(struct vmxnet3_softc *);
-void vmxnet3_reinit_shared_data(struct vmxnet3_softc *);
-int vmxnet3_alloc_data(struct vmxnet3_softc *);
-void vmxnet3_free_data(struct vmxnet3_softc *);
-int vmxnet3_setup_interface(struct vmxnet3_softc *);
-
-void vmxnet3_evintr(struct vmxnet3_softc *);
-bool vmxnet3_txq_eof(struct vmxnet3_txqueue *, u_int);
-int vmxnet3_newbuf(struct vmxnet3_softc *, struct vmxnet3_rxqueue *,
+static int vmxnet3_match(device_t, cfdata_t, void *);
+static void vmxnet3_attach(device_t, device_t, void *);
+static int vmxnet3_detach(device_t, int);
+
+static int vmxnet3_alloc_pci_resources(struct vmxnet3_softc *);
+static void vmxnet3_free_pci_resources(struct vmxnet3_softc *);
+static int vmxnet3_check_version(struct vmxnet3_softc *);
+static void vmxnet3_check_multiqueue(struct vmxnet3_softc *);
+
+static int vmxnet3_alloc_msix_interrupts(struct vmxnet3_softc *);
+static int vmxnet3_alloc_msi_interrupts(struct vmxnet3_softc *);
+static int vmxnet3_alloc_legacy_interrupts(struct vmxnet3_softc *);
+static int vmxnet3_alloc_interrupts(struct vmxnet3_softc *);
+static void vmxnet3_free_interrupts(struct vmxnet3_softc *);
+
+static int vmxnet3_setup_msix_interrupts(struct vmxnet3_softc *);
+static int vmxnet3_setup_msi_interrupt(struct vmxnet3_softc *);
+static int vmxnet3_setup_legacy_interrupt(struct vmxnet3_softc *);
+static void vmxnet3_set_interrupt_idx(struct vmxnet3_softc *);
+static int vmxnet3_setup_interrupts(struct vmxnet3_softc *);
+static int vmxnet3_setup_sysctl(struct vmxnet3_softc *);
+
+static int vmxnet3_setup_stats(struct vmxnet3_softc *);
+static void vmxnet3_teardown_stats(struct vmxnet3_softc *);
+
+static int vmxnet3_init_rxq(struct vmxnet3_softc *, int);
+static int vmxnet3_init_txq(struct vmxnet3_softc *, int);
+static int vmxnet3_alloc_rxtx_queues(struct vmxnet3_softc *);
+static void vmxnet3_destroy_rxq(struct vmxnet3_rxqueue *);
+static void vmxnet3_destroy_txq(struct vmxnet3_txqueue *);
+static void vmxnet3_free_rxtx_queues(struct vmxnet3_softc *);
+
+static int vmxnet3_alloc_shared_data(struct vmxnet3_softc *);
+static void vmxnet3_free_shared_data(struct vmxnet3_softc *);
+static int vmxnet3_alloc_txq_data(struct vmxnet3_softc *);
+static void vmxnet3_free_txq_data(struct vmxnet3_softc *);
+static int vmxnet3_alloc_rxq_data(struct vmxnet3_softc *);
+static void vmxnet3_free_rxq_data(struct vmxnet3_softc *);
+static int vmxnet3_alloc_queue_data(struct vmxnet3_softc *);
+static void vmxnet3_free_queue_data(struct vmxnet3_softc *);
+static int vmxnet3_alloc_mcast_table(struct vmxnet3_softc *);
+static void vmxnet3_free_mcast_table(struct vmxnet3_softc *);
+static void vmxnet3_init_shared_data(struct vmxnet3_softc *);
+static void vmxnet3_reinit_rss_shared_data(struct vmxnet3_softc *);
+static void vmxnet3_reinit_shared_data(struct vmxnet3_softc *);
+static int vmxnet3_alloc_data(struct vmxnet3_softc *);
+static void vmxnet3_free_data(struct vmxnet3_softc *);
+static int vmxnet3_setup_interface(struct vmxnet3_softc *);
+
+static void vmxnet3_evintr(struct vmxnet3_softc *);
+static bool vmxnet3_txq_eof(struct vmxnet3_txqueue *, u_int);
+static int vmxnet3_newbuf(struct vmxnet3_softc *, struct vmxnet3_rxqueue *,
struct vmxnet3_rxring *);
-void vmxnet3_rxq_eof_discard(struct vmxnet3_rxqueue *,
+static void vmxnet3_rxq_eof_discard(struct vmxnet3_rxqueue *,
struct vmxnet3_rxring *, int);
-void vmxnet3_rxq_discard_chain(struct vmxnet3_rxqueue *);
-void vmxnet3_rx_csum(struct vmxnet3_rxcompdesc *, struct mbuf *);
-void vmxnet3_rxq_input(struct vmxnet3_rxqueue *,
+static void vmxnet3_rxq_discard_chain(struct vmxnet3_rxqueue *);
+static void vmxnet3_rx_csum(struct vmxnet3_rxcompdesc *, struct mbuf *);
+static void vmxnet3_rxq_input(struct vmxnet3_rxqueue *,
struct vmxnet3_rxcompdesc *, struct mbuf *);
-bool vmxnet3_rxq_eof(struct vmxnet3_rxqueue *, u_int);
-int vmxnet3_legacy_intr(void *);
-int vmxnet3_txrxq_intr(void *);
-void vmxnet3_handle_queue(void *);
-void vmxnet3_handle_queue_work(struct work *, void *);
-int vmxnet3_event_intr(void *);
-
-void vmxnet3_txstop(struct vmxnet3_softc *, struct vmxnet3_txqueue *);
-void vmxnet3_rxstop(struct vmxnet3_softc *, struct vmxnet3_rxqueue *);
-void vmxnet3_stop_locked(struct vmxnet3_softc *);
-void vmxnet3_stop_rendezvous(struct vmxnet3_softc *);
-void vmxnet3_stop(struct ifnet *, int);
-
-void vmxnet3_txinit(struct vmxnet3_softc *, struct vmxnet3_txqueue *);
-int vmxnet3_rxinit(struct vmxnet3_softc *, struct vmxnet3_rxqueue *);
-int vmxnet3_reinit_queues(struct vmxnet3_softc *);
-int vmxnet3_enable_device(struct vmxnet3_softc *);
-void vmxnet3_reinit_rxfilters(struct vmxnet3_softc *);
-int vmxnet3_reinit(struct vmxnet3_softc *);
-
-void vmxnet3_rx_csum(struct vmxnet3_rxcompdesc *, struct mbuf *);
-int vmxnet3_init_locked(struct vmxnet3_softc *);
-int vmxnet3_init(struct ifnet *);
-
-int vmxnet3_txq_offload_ctx(struct vmxnet3_txqueue *, struct mbuf *, int *, int *);
-int vmxnet3_txq_load_mbuf(struct vmxnet3_txqueue *, struct mbuf **, bus_dmamap_t);
-void vmxnet3_txq_unload_mbuf(struct vmxnet3_txqueue *, bus_dmamap_t);
-int vmxnet3_txq_encap(struct vmxnet3_txqueue *, struct mbuf **);
-void vmxnet3_start_locked(struct ifnet *);
-void vmxnet3_start(struct ifnet *);
-void vmxnet3_transmit_locked(struct ifnet *, struct vmxnet3_txqueue *);
-int vmxnet3_transmit(struct ifnet *, struct mbuf *);
-void vmxnet3_deferred_transmit(void *);
-
-void vmxnet3_set_rxfilter(struct vmxnet3_softc *);
-int vmxnet3_ioctl(struct ifnet *, u_long, void *);
-int vmxnet3_ifflags_cb(struct ethercom *);
-
-int vmxnet3_watchdog(struct vmxnet3_txqueue *);
-void vmxnet3_refresh_host_stats(struct vmxnet3_softc *);
-void vmxnet3_tick(void *);
-void vmxnet3_link_status(struct vmxnet3_softc *);
-void vmxnet3_media_status(struct ifnet *, struct ifmediareq *);
-int vmxnet3_media_change(struct ifnet *);
-void vmxnet3_set_lladdr(struct vmxnet3_softc *);
-void vmxnet3_get_lladdr(struct vmxnet3_softc *);
+static bool vmxnet3_rxq_eof(struct vmxnet3_rxqueue *, u_int);
+static int vmxnet3_legacy_intr(void *);
+static int vmxnet3_txrxq_intr(void *);
+static void vmxnet3_handle_queue(void *);
+static void vmxnet3_handle_queue_work(struct work *, void *);
+static int vmxnet3_event_intr(void *);
+
+static void vmxnet3_txstop(struct vmxnet3_softc *, struct vmxnet3_txqueue *);
+static void vmxnet3_rxstop(struct vmxnet3_softc *, struct vmxnet3_rxqueue *);
+static void vmxnet3_stop_locked(struct vmxnet3_softc *);
+static void vmxnet3_stop_rendezvous(struct vmxnet3_softc *);
+static void vmxnet3_stop(struct ifnet *, int);
+
+static void vmxnet3_txinit(struct vmxnet3_softc *, struct vmxnet3_txqueue *);
+static int vmxnet3_rxinit(struct vmxnet3_softc *, struct vmxnet3_rxqueue *);
+static int vmxnet3_reinit_queues(struct vmxnet3_softc *);
+static int vmxnet3_enable_device(struct vmxnet3_softc *);
+static void vmxnet3_reinit_rxfilters(struct vmxnet3_softc *);
+static int vmxnet3_reinit(struct vmxnet3_softc *);
+
+static int vmxnet3_init_locked(struct vmxnet3_softc *);
+static int vmxnet3_init(struct ifnet *);
+
+static int vmxnet3_txq_offload_ctx(struct vmxnet3_txqueue *, struct mbuf *, int *, int *);
+static int vmxnet3_txq_load_mbuf(struct vmxnet3_txqueue *, struct mbuf **, bus_dmamap_t);
+static void vmxnet3_txq_unload_mbuf(struct vmxnet3_txqueue *, bus_dmamap_t);
+static int vmxnet3_txq_encap(struct vmxnet3_txqueue *, struct mbuf **);
+static void vmxnet3_start_locked(struct ifnet *);
+static void vmxnet3_start(struct ifnet *);
+static void vmxnet3_transmit_locked(struct ifnet *, struct vmxnet3_txqueue *);
+static int vmxnet3_transmit(struct ifnet *, struct mbuf *);
+static void vmxnet3_deferred_transmit(void *);
+
+static void vmxnet3_set_rxfilter(struct vmxnet3_softc *);
+static int vmxnet3_ioctl(struct ifnet *, u_long, void *);
+static int vmxnet3_ifflags_cb(struct ethercom *);
+
+static int vmxnet3_watchdog(struct vmxnet3_txqueue *);
+static void vmxnet3_refresh_host_stats(struct vmxnet3_softc *);
+static void vmxnet3_tick(void *);
+static void vmxnet3_link_status(struct vmxnet3_softc *);
+static void vmxnet3_media_status(struct ifnet *, struct ifmediareq *);
+static int vmxnet3_media_change(struct ifnet *);
+static void vmxnet3_set_lladdr(struct vmxnet3_softc *);
+static void vmxnet3_get_lladdr(struct vmxnet3_softc *);
-void vmxnet3_enable_all_intrs(struct vmxnet3_softc *);
-void vmxnet3_disable_all_intrs(struct vmxnet3_softc *);
+static void vmxnet3_enable_all_intrs(struct vmxnet3_softc *);
+static void vmxnet3_disable_all_intrs(struct vmxnet3_softc *);
-int vmxnet3_dma_malloc(struct vmxnet3_softc *, bus_size_t, bus_size_t,
+static int vmxnet3_dma_malloc(struct vmxnet3_softc *, bus_size_t, bus_size_t,
struct vmxnet3_dma_alloc *);
-void vmxnet3_dma_free(struct vmxnet3_softc *, struct vmxnet3_dma_alloc *);
+static void vmxnet3_dma_free(struct vmxnet3_softc *, struct vmxnet3_dma_alloc *);
CFATTACH_DECL3_NEW(vmx, sizeof(struct vmxnet3_softc),
vmxnet3_match, vmxnet3_attach, vmxnet3_detach, NULL, NULL, NULL, 0);
@@ -568,7 +567,7 @@ vmxnet3_barrier(struct vmxnet3_softc *sc
}
}
-int
+static int
vmxnet3_match(device_t parent, cfdata_t match, void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
@@ -580,7 +579,7 @@ vmxnet3_match(device_t parent, cfdata_t
return 0;
}
-void
+static void
vmxnet3_attach(device_t parent, device_t self, void *aux)
{
struct vmxnet3_softc *sc = device_private(self);
@@ -655,7 +654,7 @@ vmxnet3_attach(device_t parent, device_t
sc->vmx_flags |= VMXNET3_FLAG_ATTACHED;
}
-int
+static int
vmxnet3_detach(device_t self, int flags)
{
struct vmxnet3_softc *sc;
@@ -691,7 +690,7 @@ vmxnet3_detach(device_t self, int flags)
return (0);
}
-int
+static int
vmxnet3_alloc_pci_resources(struct vmxnet3_softc *sc)
{
struct pci_attach_args *pa = sc->vmx_pa;
@@ -718,7 +717,7 @@ vmxnet3_alloc_pci_resources(struct vmxne
return (0);
}
-void
+static void
vmxnet3_free_pci_resources(struct vmxnet3_softc *sc)
{
@@ -733,7 +732,7 @@ vmxnet3_free_pci_resources(struct vmxnet
}
}
-int
+static int
vmxnet3_check_version(struct vmxnet3_softc *sc)
{
u_int ver;
@@ -757,7 +756,7 @@ vmxnet3_check_version(struct vmxnet3_sof
return (0);
}
-void
+static void
vmxnet3_check_multiqueue(struct vmxnet3_softc *sc)
{
@@ -778,7 +777,7 @@ out:
sc->vmx_nrxqueues = 1;
}
-int
+static int
vmxnet3_alloc_msix_interrupts(struct vmxnet3_softc *sc)
{
int required;
@@ -801,7 +800,7 @@ vmxnet3_alloc_msix_interrupts(struct vmx
return (1);
}
-int
+static int
vmxnet3_alloc_msi_interrupts(struct vmxnet3_softc *sc)
{
int nmsi, required;
@@ -821,7 +820,7 @@ vmxnet3_alloc_msi_interrupts(struct vmxn
return (1);
}
-int
+static int
vmxnet3_alloc_legacy_interrupts(struct vmxnet3_softc *sc)
{
@@ -833,7 +832,7 @@ vmxnet3_alloc_legacy_interrupts(struct v
return (1);
}
-int
+static int
vmxnet3_alloc_interrupts(struct vmxnet3_softc *sc)
{
u_int config;
@@ -874,7 +873,7 @@ vmxnet3_alloc_interrupts(struct vmxnet3_
return (error);
}
-void
+static void
vmxnet3_free_interrupts(struct vmxnet3_softc *sc)
{
pci_chipset_tag_t pc = sc->vmx_pc;
@@ -893,7 +892,7 @@ vmxnet3_free_interrupts(struct vmxnet3_s
pci_intr_release(pc, sc->vmx_intrs, sc->vmx_nintrs);
}
-int
+static int
vmxnet3_setup_msix_interrupts(struct vmxnet3_softc *sc)
{
pci_chipset_tag_t pc = sc->vmx_pa->pa_pc;
@@ -977,7 +976,7 @@ vmxnet3_setup_msix_interrupts(struct vmx
return (0);
}
-int
+static int
vmxnet3_setup_msi_interrupt(struct vmxnet3_softc *sc)
{
pci_chipset_tag_t pc = sc->vmx_pa->pa_pc;
@@ -1021,7 +1020,7 @@ vmxnet3_setup_msi_interrupt(struct vmxne
return (0);
}
-int
+static int
vmxnet3_setup_legacy_interrupt(struct vmxnet3_softc *sc)
{
pci_chipset_tag_t pc = sc->vmx_pa->pa_pc;
@@ -1065,7 +1064,7 @@ vmxnet3_setup_legacy_interrupt(struct vm
return (0);
}
-void
+static void
vmxnet3_set_interrupt_idx(struct vmxnet3_softc *sc)
{
struct vmxnet3_queue *vmxq;
@@ -1092,7 +1091,7 @@ vmxnet3_set_interrupt_idx(struct vmxnet3
}
}
-int
+static int
vmxnet3_setup_interrupts(struct vmxnet3_softc *sc)
{
int error;
@@ -1118,7 +1117,7 @@ vmxnet3_setup_interrupts(struct vmxnet3_
return (error);
}
-int
+static int
vmxnet3_init_rxq(struct vmxnet3_softc *sc, int q)
{
struct vmxnet3_rxqueue *rxq;
@@ -1146,7 +1145,7 @@ vmxnet3_init_rxq(struct vmxnet3_softc *s
return (0);
}
-int
+static int
vmxnet3_init_txq(struct vmxnet3_softc *sc, int q)
{
struct vmxnet3_txqueue *txq;
@@ -1181,7 +1180,7 @@ vmxnet3_init_txq(struct vmxnet3_softc *s
return (0);
}
-int
+static int
vmxnet3_alloc_rxtx_queues(struct vmxnet3_softc *sc)
{
int i, error, max_nqueues;
@@ -1228,7 +1227,7 @@ vmxnet3_alloc_rxtx_queues(struct vmxnet3
return (0);
}
-void
+static void
vmxnet3_destroy_rxq(struct vmxnet3_rxqueue *rxq)
{
struct vmxnet3_rxring *rxr;
@@ -1250,7 +1249,7 @@ vmxnet3_destroy_rxq(struct vmxnet3_rxque
mutex_obj_free(rxq->vxrxq_mtx);
}
-void
+static void
vmxnet3_destroy_txq(struct vmxnet3_txqueue *txq)
{
struct vmxnet3_txring *txr;
@@ -1276,7 +1275,7 @@ vmxnet3_destroy_txq(struct vmxnet3_txque
mutex_obj_free(txq->vxtxq_mtx);
}
-void
+static void
vmxnet3_free_rxtx_queues(struct vmxnet3_softc *sc)
{
int i;
@@ -1296,7 +1295,7 @@ vmxnet3_free_rxtx_queues(struct vmxnet3_
}
}
-int
+static int
vmxnet3_alloc_shared_data(struct vmxnet3_softc *sc)
{
device_t dev;
@@ -1349,7 +1348,7 @@ vmxnet3_alloc_shared_data(struct vmxnet3
return (0);
}
-void
+static void
vmxnet3_free_shared_data(struct vmxnet3_softc *sc)
{
@@ -1369,7 +1368,7 @@ vmxnet3_free_shared_data(struct vmxnet3_
}
}
-int
+static int
vmxnet3_alloc_txq_data(struct vmxnet3_softc *sc)
{
device_t dev;
@@ -1422,7 +1421,7 @@ vmxnet3_alloc_txq_data(struct vmxnet3_so
return (0);
}
-void
+static void
vmxnet3_free_txq_data(struct vmxnet3_softc *sc)
{
struct vmxnet3_txqueue *txq;
@@ -1457,7 +1456,7 @@ vmxnet3_free_txq_data(struct vmxnet3_sof
}
}
-int
+static int
vmxnet3_alloc_rxq_data(struct vmxnet3_softc *sc)
{
device_t dev;
@@ -1534,7 +1533,7 @@ vmxnet3_alloc_rxq_data(struct vmxnet3_so
return (0);
}
-void
+static void
vmxnet3_free_rxq_data(struct vmxnet3_softc *sc)
{
struct vmxnet3_rxqueue *rxq;
@@ -1582,7 +1581,7 @@ vmxnet3_free_rxq_data(struct vmxnet3_sof
}
}
-int
+static int
vmxnet3_alloc_queue_data(struct vmxnet3_softc *sc)
{
int error;
@@ -1598,7 +1597,7 @@ vmxnet3_alloc_queue_data(struct vmxnet3_
return (0);
}
-void
+static void
vmxnet3_free_queue_data(struct vmxnet3_softc *sc)
{
@@ -1608,7 +1607,7 @@ vmxnet3_free_queue_data(struct vmxnet3_s
}
}
-int
+static int
vmxnet3_alloc_mcast_table(struct vmxnet3_softc *sc)
{
int error;
@@ -1623,7 +1622,7 @@ vmxnet3_alloc_mcast_table(struct vmxnet3
return (error);
}
-void
+static void
vmxnet3_free_mcast_table(struct vmxnet3_softc *sc)
{
@@ -1633,7 +1632,7 @@ vmxnet3_free_mcast_table(struct vmxnet3_
}
}
-void
+static void
vmxnet3_init_shared_data(struct vmxnet3_softc *sc)
{
struct vmxnet3_driver_shared *ds;
@@ -1719,7 +1718,7 @@ vmxnet3_init_shared_data(struct vmxnet3_
}
}
-void
+static void
vmxnet3_reinit_rss_shared_data(struct vmxnet3_softc *sc)
{
/*
@@ -1751,7 +1750,7 @@ vmxnet3_reinit_rss_shared_data(struct vm
rss->ind_table[i] = i % sc->vmx_nrxqueues;
}
-void
+static void
vmxnet3_reinit_shared_data(struct vmxnet3_softc *sc)
{
struct ifnet *ifp;
@@ -1782,7 +1781,7 @@ vmxnet3_reinit_shared_data(struct vmxnet
(uint64_t) sc->vmx_ds_dma.dma_paddr >> 32);
}
-int
+static int
vmxnet3_alloc_data(struct vmxnet3_softc *sc)
{
int error;
@@ -1804,7 +1803,7 @@ vmxnet3_alloc_data(struct vmxnet3_softc
return (0);
}
-void
+static void
vmxnet3_free_data(struct vmxnet3_softc *sc)
{
@@ -1813,7 +1812,7 @@ vmxnet3_free_data(struct vmxnet3_softc *
vmxnet3_free_shared_data(sc);
}
-int
+static int
vmxnet3_setup_interface(struct vmxnet3_softc *sc)
{
struct ifnet *ifp = &sc->vmx_ethercom.ec_if;
@@ -1876,7 +1875,7 @@ vmxnet3_setup_interface(struct vmxnet3_s
return (0);
}
-int
+static int
vmxnet3_setup_sysctl(struct vmxnet3_softc *sc)
{
const char *devname;
@@ -1945,7 +1944,7 @@ out:
return error;
}
-int
+static int
vmxnet3_setup_stats(struct vmxnet3_softc *sc)
{
struct vmxnet3_queue *vmxq;
@@ -2005,7 +2004,7 @@ vmxnet3_setup_stats(struct vmxnet3_softc
return 0;
}
-void
+static void
vmxnet3_teardown_stats(struct vmxnet3_softc *sc)
{
struct vmxnet3_queue *vmxq;
@@ -2044,7 +2043,7 @@ vmxnet3_teardown_stats(struct vmxnet3_so
evcnt_detach(&sc->vmx_event_debug);
}
-void
+static void
vmxnet3_evintr(struct vmxnet3_softc *sc)
{
device_t dev;
@@ -2101,7 +2100,7 @@ vmxnet3_evintr(struct vmxnet3_softc *sc)
VMXNET3_CORE_UNLOCK(sc);
}
-bool
+static bool
vmxnet3_txq_eof(struct vmxnet3_txqueue *txq, u_int limit)
{
struct vmxnet3_softc *sc;
@@ -2162,7 +2161,7 @@ vmxnet3_txq_eof(struct vmxnet3_txqueue *
return more;
}
-int
+static int
vmxnet3_newbuf(struct vmxnet3_softc *sc, struct vmxnet3_rxqueue *rxq,
struct vmxnet3_rxring *rxr)
{
@@ -2225,9 +2224,7 @@ vmxnet3_newbuf(struct vmxnet3_softc *sc,
return (0);
}
-
-
-void
+static void
vmxnet3_rxq_eof_discard(struct vmxnet3_rxqueue *rxq,
struct vmxnet3_rxring *rxr, int idx)
{
@@ -2238,7 +2235,7 @@ vmxnet3_rxq_eof_discard(struct vmxnet3_r
vmxnet3_rxr_increment_fill(rxr);
}
-void
+static void
vmxnet3_rxq_discard_chain(struct vmxnet3_rxqueue *rxq)
{
struct vmxnet3_softc *sc;
@@ -2271,7 +2268,7 @@ vmxnet3_rxq_discard_chain(struct vmxnet3
} while (!eof);
}
-void
+static void
vmxnet3_rx_csum(struct vmxnet3_rxcompdesc *rxcd, struct mbuf *m)
{
if (rxcd->no_csum)
@@ -2301,7 +2298,7 @@ vmxnet3_rx_csum(struct vmxnet3_rxcompdes
}
}
-void
+static void
vmxnet3_rxq_input(struct vmxnet3_rxqueue *rxq,
struct vmxnet3_rxcompdesc *rxcd, struct mbuf *m)
{
@@ -2328,7 +2325,7 @@ vmxnet3_rxq_input(struct vmxnet3_rxqueue
if_percpuq_enqueue(ifp->if_percpuq, m);
}
-bool
+static bool
vmxnet3_rxq_eof(struct vmxnet3_rxqueue *rxq, u_int limit)
{
struct vmxnet3_softc *sc;
@@ -2487,7 +2484,7 @@ vmxnet3_sched_handle_queue(struct vmxnet
}
}
-int
+static int
vmxnet3_legacy_intr(void *xsc)
{
struct vmxnet3_softc *sc;
@@ -2529,7 +2526,7 @@ vmxnet3_legacy_intr(void *xsc)
return (1);
}
-int
+static int
vmxnet3_txrxq_intr(void *xvmxq)
{
struct vmxnet3_softc *sc;
@@ -2574,7 +2571,7 @@ vmxnet3_txrxq_intr(void *xvmxq)
return (1);
}
-void
+static void
vmxnet3_handle_queue(void *xvmxq)
{
struct vmxnet3_softc *sc;
@@ -2615,7 +2612,7 @@ vmxnet3_handle_queue(void *xvmxq)
vmxnet3_enable_intr(sc, vmxq->vxq_intr_idx);
}
-void
+static void
vmxnet3_handle_queue_work(struct work *wk, void *context)
{
struct vmxnet3_queue *vmxq;
@@ -2624,7 +2621,7 @@ vmxnet3_handle_queue_work(struct work *w
vmxnet3_handle_queue(vmxq);
}
-int
+static int
vmxnet3_event_intr(void *xsc)
{
struct vmxnet3_softc *sc;
@@ -2644,7 +2641,7 @@ vmxnet3_event_intr(void *xsc)
return (1);
}
-void
+static void
vmxnet3_txstop(struct vmxnet3_softc *sc, struct vmxnet3_txqueue *txq)
{
struct vmxnet3_txring *txr;
@@ -2668,7 +2665,7 @@ vmxnet3_txstop(struct vmxnet3_softc *sc,
}
}
-void
+static void
vmxnet3_rxstop(struct vmxnet3_softc *sc, struct vmxnet3_rxqueue *rxq)
{
struct vmxnet3_rxring *rxr;
@@ -2700,7 +2697,7 @@ vmxnet3_rxstop(struct vmxnet3_softc *sc,
}
}
-void
+static void
vmxnet3_stop_rendezvous(struct vmxnet3_softc *sc)
{
struct vmxnet3_rxqueue *rxq;
@@ -2719,7 +2716,7 @@ vmxnet3_stop_rendezvous(struct vmxnet3_s
}
}
-void
+static void
vmxnet3_stop_locked(struct vmxnet3_softc *sc)
{
struct ifnet *ifp;
@@ -2746,7 +2743,7 @@ vmxnet3_stop_locked(struct vmxnet3_softc
vmxnet3_write_cmd(sc, VMXNET3_CMD_RESET);
}
-void
+static void
vmxnet3_stop(struct ifnet *ifp, int disable)
{
struct vmxnet3_softc *sc = ifp->if_softc;
@@ -2756,7 +2753,7 @@ vmxnet3_stop(struct ifnet *ifp, int disa
VMXNET3_CORE_UNLOCK(sc);
}
-void
+static void
vmxnet3_txinit(struct vmxnet3_softc *sc, struct vmxnet3_txqueue *txq)
{
struct vmxnet3_txring *txr;
@@ -2776,7 +2773,7 @@ vmxnet3_txinit(struct vmxnet3_softc *sc,
txc->vxcr_ndesc * sizeof(struct vmxnet3_txcompdesc));
}
-int
+static int
vmxnet3_rxinit(struct vmxnet3_softc *sc, struct vmxnet3_rxqueue *rxq)
{
struct vmxnet3_rxring *rxr;
@@ -2817,7 +2814,7 @@ vmxnet3_rxinit(struct vmxnet3_softc *sc,
return (0);
}
-int
+static int
vmxnet3_reinit_queues(struct vmxnet3_softc *sc)
{
device_t dev;
@@ -2838,7 +2835,7 @@ vmxnet3_reinit_queues(struct vmxnet3_sof
return (0);
}
-int
+static int
vmxnet3_enable_device(struct vmxnet3_softc *sc)
{
int q;
@@ -2857,7 +2854,7 @@ vmxnet3_enable_device(struct vmxnet3_sof
return (0);
}
-void
+static void
vmxnet3_reinit_rxfilters(struct vmxnet3_softc *sc)
{
@@ -2867,7 +2864,7 @@ vmxnet3_reinit_rxfilters(struct vmxnet3_
vmxnet3_write_cmd(sc, VMXNET3_CMD_VLAN_FILTER);
}
-int
+static int
vmxnet3_reinit(struct vmxnet3_softc *sc)
{
@@ -2885,11 +2882,7 @@ vmxnet3_reinit(struct vmxnet3_softc *sc)
return (0);
}
-
-
-
-
-int
+static int
vmxnet3_init_locked(struct vmxnet3_softc *sc)
{
struct ifnet *ifp = &sc->vmx_ethercom.ec_if;
@@ -2912,7 +2905,7 @@ vmxnet3_init_locked(struct vmxnet3_softc
return (0);
}
-int
+static int
vmxnet3_init(struct ifnet *ifp)
{
struct vmxnet3_softc *sc = ifp->if_softc;
@@ -2925,7 +2918,7 @@ vmxnet3_init(struct ifnet *ifp)
return (error);
}
-int
+static int
vmxnet3_txq_offload_ctx(struct vmxnet3_txqueue *txq, struct mbuf *m,
int *start, int *csum_start)
{
@@ -3003,7 +2996,7 @@ vmxnet3_txq_offload_ctx(struct vmxnet3_t
return (0);
}
-int
+static int
vmxnet3_txq_load_mbuf(struct vmxnet3_txqueue *txq, struct mbuf **m0,
bus_dmamap_t dmap)
{
@@ -3035,14 +3028,14 @@ vmxnet3_txq_load_mbuf(struct vmxnet3_txq
return (error);
}
-void
+static void
vmxnet3_txq_unload_mbuf(struct vmxnet3_txqueue *txq, bus_dmamap_t dmap)
{
bus_dmamap_unload(txq->vxtxq_sc->vmx_dmat, dmap);
}
-int
+static int
vmxnet3_txq_encap(struct vmxnet3_txqueue *txq, struct mbuf **m0)
{
struct vmxnet3_softc *sc;
@@ -3058,6 +3051,7 @@ vmxnet3_txq_encap(struct vmxnet3_txqueue
txd = NULL;
txr = &txq->vxtxq_cmd_ring;
dmap = txr->vxtxr_txbuf[txr->vxtxr_head].vtxb_dmamap;
+ csum_start = 0; /* GCC */
error = vmxnet3_txq_load_mbuf(txq, m0, dmap);
if (error)
@@ -3197,7 +3191,7 @@ vmxnet3_tx_common_locked(struct ifnet *i
txq->vxtxq_watchdog = VMXNET3_WATCHDOG_TIMEOUT;
}
-void
+static void
vmxnet3_start_locked(struct ifnet *ifp)
{
struct vmxnet3_softc *sc;
@@ -3209,7 +3203,6 @@ vmxnet3_start_locked(struct ifnet *ifp)
vmxnet3_tx_common_locked(ifp, txq, VMXNET3_TX_START);
}
-
void
vmxnet3_start(struct ifnet *ifp)
{
@@ -3246,14 +3239,14 @@ vmxnet3_select_txqueue(struct ifnet *ifp
return cpuid % sc->vmx_ntxqueues;
}
-void
+static void
vmxnet3_transmit_locked(struct ifnet *ifp, struct vmxnet3_txqueue *txq)
{
vmxnet3_tx_common_locked(ifp, txq, VMXNET3_TX_TRANSMIT);
}
-int
+static int
vmxnet3_transmit(struct ifnet *ifp, struct mbuf *m)
{
struct vmxnet3_softc *sc;
@@ -3284,7 +3277,7 @@ vmxnet3_transmit(struct ifnet *ifp, stru
return 0;
}
-void
+static void
vmxnet3_deferred_transmit(void *arg)
{
struct vmxnet3_txqueue *txq = arg;
@@ -3298,7 +3291,7 @@ vmxnet3_deferred_transmit(void *arg)
VMXNET3_TXQ_UNLOCK(txq);
}
-void
+static void
vmxnet3_set_rxfilter(struct vmxnet3_softc *sc)
{
struct ifnet *ifp = &sc->vmx_ethercom.ec_if;
@@ -3369,7 +3362,7 @@ setit:
vmxnet3_write_cmd(sc, VMXNET3_CMD_SET_RXMODE);
}
-int
+static int
vmxnet3_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct vmxnet3_softc *sc = ifp->if_softc;
@@ -3447,7 +3440,7 @@ vmxnet3_ioctl(struct ifnet *ifp, u_long
return error;
}
-int
+static int
vmxnet3_ifflags_cb(struct ethercom *ec)
{
struct vmxnet3_softc *sc;
@@ -3461,7 +3454,7 @@ vmxnet3_ifflags_cb(struct ethercom *ec)
return 0;
}
-int
+static int
vmxnet3_watchdog(struct vmxnet3_txqueue *txq)
{
struct vmxnet3_softc *sc;
@@ -3483,14 +3476,14 @@ vmxnet3_watchdog(struct vmxnet3_txqueue
return (1);
}
-void
+static void
vmxnet3_refresh_host_stats(struct vmxnet3_softc *sc)
{
vmxnet3_write_cmd(sc, VMXNET3_CMD_GET_STATS);
}
-void
+static void
vmxnet3_tick(void *xsc)
{
struct vmxnet3_softc *sc;
@@ -3514,7 +3507,7 @@ vmxnet3_tick(void *xsc)
VMXNET3_CORE_UNLOCK(sc);
}
-void
+static void
vmxnet3_link_status(struct vmxnet3_softc *sc)
{
struct ifnet *ifp = &sc->vmx_ethercom.ec_if;
@@ -3534,7 +3527,7 @@ vmxnet3_link_status(struct vmxnet3_softc
if_link_state_change(ifp, link);
}
-void
+static void
vmxnet3_media_status(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct vmxnet3_softc *sc = ifp->if_softc;
@@ -3557,13 +3550,13 @@ vmxnet3_media_status(struct ifnet *ifp,
VMXNET3_CORE_UNLOCK(sc);
}
-int
+static int
vmxnet3_media_change(struct ifnet *ifp)
{
return 0;
}
-void
+static void
vmxnet3_set_lladdr(struct vmxnet3_softc *sc)
{
uint32_t ml, mh;
@@ -3579,7 +3572,7 @@ vmxnet3_set_lladdr(struct vmxnet3_softc
vmxnet3_write_bar1(sc, VMXNET3_BAR1_MACH, mh);
}
-void
+static void
vmxnet3_get_lladdr(struct vmxnet3_softc *sc)
{
uint32_t ml, mh;
@@ -3595,7 +3588,7 @@ vmxnet3_get_lladdr(struct vmxnet3_softc
sc->vmx_lladdr[5] = mh >> 8;
}
-void
+static void
vmxnet3_enable_all_intrs(struct vmxnet3_softc *sc)
{
int i;
@@ -3605,7 +3598,7 @@ vmxnet3_enable_all_intrs(struct vmxnet3_
vmxnet3_enable_intr(sc, i);
}
-void
+static void
vmxnet3_disable_all_intrs(struct vmxnet3_softc *sc)
{
int i;
@@ -3615,8 +3608,7 @@ vmxnet3_disable_all_intrs(struct vmxnet3
vmxnet3_disable_intr(sc, i);
}
-
-int
+static int
vmxnet3_dma_malloc(struct vmxnet3_softc *sc, bus_size_t size, bus_size_t align,
struct vmxnet3_dma_alloc *dma)
{
@@ -3667,7 +3659,7 @@ fail1:
return (error);
}
-void
+static void
vmxnet3_dma_free(struct vmxnet3_softc *sc, struct vmxnet3_dma_alloc *dma)
{
bus_dma_tag_t t = sc->vmx_dmat;
Index: src/sys/dev/pci/mfii.c
diff -u src/sys/dev/pci/mfii.c:1.5 src/sys/dev/pci/mfii.c:1.6
--- src/sys/dev/pci/mfii.c:1.5 Sun Nov 10 21:16:36 2019
+++ src/sys/dev/pci/mfii.c Wed Nov 27 19:21:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mfii.c,v 1.5 2019/11/10 21:16:36 chs Exp $ */
+/* $NetBSD: mfii.c,v 1.6 2019/11/27 19:21:36 maxv Exp $ */
/* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.5 2019/11/10 21:16:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.6 2019/11/27 19:21:36 maxv Exp $");
#include "bio.h"
@@ -385,11 +385,11 @@ uint32_t mfii_debug = 0
#define DNPRINTF(n,x...)
#endif
-int mfii_match(device_t, cfdata_t, void *);
-void mfii_attach(device_t, device_t, void *);
-int mfii_detach(device_t, int);
-int mfii_rescan(device_t, const char *, const int *);
-void mfii_childdetached(device_t, device_t);
+static int mfii_match(device_t, cfdata_t, void *);
+static void mfii_attach(device_t, device_t, void *);
+static int mfii_detach(device_t, int);
+static int mfii_rescan(device_t, const char *, const int *);
+static void mfii_childdetached(device_t, device_t);
static bool mfii_suspend(device_t, const pmf_qual_t *);
static bool mfii_resume(device_t, const pmf_qual_t *);
static bool mfii_shutdown(device_t, int);
@@ -399,94 +399,91 @@ CFATTACH_DECL3_NEW(mfii, sizeof(struct m
mfii_match, mfii_attach, mfii_detach, NULL, mfii_rescan,
mfii_childdetached, DVF_DETACH_SHUTDOWN);
-void mfii_scsipi_request(struct scsipi_channel *,
+static void mfii_scsipi_request(struct scsipi_channel *,
scsipi_adapter_req_t, void *);
-void mfii_scsi_cmd_done(struct mfii_softc *, struct mfii_ccb *);
+static void mfii_scsi_cmd_done(struct mfii_softc *, struct mfii_ccb *);
#define DEVNAME(_sc) (device_xname((_sc)->sc_dev))
static u_int32_t mfii_read(struct mfii_softc *, bus_size_t);
static void mfii_write(struct mfii_softc *, bus_size_t, u_int32_t);
-struct mfii_dmamem * mfii_dmamem_alloc(struct mfii_softc *, size_t);
-void mfii_dmamem_free(struct mfii_softc *,
+static struct mfii_dmamem * mfii_dmamem_alloc(struct mfii_softc *, size_t);
+static void mfii_dmamem_free(struct mfii_softc *,
struct mfii_dmamem *);
-struct mfii_ccb * mfii_get_ccb(struct mfii_softc *);
-void mfii_put_ccb(struct mfii_softc *, struct mfii_ccb *);
-int mfii_init_ccb(struct mfii_softc *);
-void mfii_scrub_ccb(struct mfii_ccb *);
-
-int mfii_transition_firmware(struct mfii_softc *);
-int mfii_initialise_firmware(struct mfii_softc *);
-int mfii_get_info(struct mfii_softc *);
-
-void mfii_start(struct mfii_softc *, struct mfii_ccb *);
-void mfii_done(struct mfii_softc *, struct mfii_ccb *);
-int mfii_poll(struct mfii_softc *, struct mfii_ccb *);
-void mfii_poll_done(struct mfii_softc *, struct mfii_ccb *);
-int mfii_exec(struct mfii_softc *, struct mfii_ccb *);
-void mfii_exec_done(struct mfii_softc *, struct mfii_ccb *);
-int mfii_my_intr(struct mfii_softc *);
-int mfii_intr(void *);
-void mfii_postq(struct mfii_softc *);
+static struct mfii_ccb * mfii_get_ccb(struct mfii_softc *);
+static void mfii_put_ccb(struct mfii_softc *, struct mfii_ccb *);
+static int mfii_init_ccb(struct mfii_softc *);
+static void mfii_scrub_ccb(struct mfii_ccb *);
+
+static int mfii_transition_firmware(struct mfii_softc *);
+static int mfii_initialise_firmware(struct mfii_softc *);
+static int mfii_get_info(struct mfii_softc *);
+
+static void mfii_start(struct mfii_softc *, struct mfii_ccb *);
+static void mfii_done(struct mfii_softc *, struct mfii_ccb *);
+static int mfii_poll(struct mfii_softc *, struct mfii_ccb *);
+static void mfii_poll_done(struct mfii_softc *, struct mfii_ccb *);
+static int mfii_exec(struct mfii_softc *, struct mfii_ccb *);
+static void mfii_exec_done(struct mfii_softc *, struct mfii_ccb *);
+static int mfii_my_intr(struct mfii_softc *);
+static int mfii_intr(void *);
+static void mfii_postq(struct mfii_softc *);
-int mfii_load_ccb(struct mfii_softc *, struct mfii_ccb *,
+static int mfii_load_ccb(struct mfii_softc *, struct mfii_ccb *,
void *, int);
-int mfii_load_mfa(struct mfii_softc *, struct mfii_ccb *,
+static int mfii_load_mfa(struct mfii_softc *, struct mfii_ccb *,
void *, int);
-int mfii_mfa_poll(struct mfii_softc *, struct mfii_ccb *);
+static int mfii_mfa_poll(struct mfii_softc *, struct mfii_ccb *);
-int mfii_mgmt(struct mfii_softc *, uint32_t,
+static int mfii_mgmt(struct mfii_softc *, uint32_t,
const union mfi_mbox *, void *, size_t,
mfii_direction_t, bool);
-int mfii_do_mgmt(struct mfii_softc *, struct mfii_ccb *,
+static int mfii_do_mgmt(struct mfii_softc *, struct mfii_ccb *,
uint32_t, const union mfi_mbox *, void *, size_t,
mfii_direction_t, bool);
-void mfii_empty_done(struct mfii_softc *, struct mfii_ccb *);
+static void mfii_empty_done(struct mfii_softc *, struct mfii_ccb *);
-int mfii_scsi_cmd_io(struct mfii_softc *,
+static int mfii_scsi_cmd_io(struct mfii_softc *,
struct mfii_ccb *, struct scsipi_xfer *);
-int mfii_scsi_cmd_cdb(struct mfii_softc *,
+static int mfii_scsi_cmd_cdb(struct mfii_softc *,
struct mfii_ccb *, struct scsipi_xfer *);
-void mfii_scsi_cmd_tmo(void *);
+static void mfii_scsi_cmd_tmo(void *);
-int mfii_dev_handles_update(struct mfii_softc *sc);
-void mfii_dev_handles_dtor(void *, void *);
-
-void mfii_abort_task(struct work *, void *);
-void mfii_abort(struct mfii_softc *, struct mfii_ccb *,
+static void mfii_abort_task(struct work *, void *);
+static void mfii_abort(struct mfii_softc *, struct mfii_ccb *,
uint16_t, uint16_t, uint8_t, uint32_t);
-void mfii_scsi_cmd_abort_done(struct mfii_softc *,
+static void mfii_scsi_cmd_abort_done(struct mfii_softc *,
struct mfii_ccb *);
-int mfii_aen_register(struct mfii_softc *);
-void mfii_aen_start(struct mfii_softc *, struct mfii_ccb *,
+static int mfii_aen_register(struct mfii_softc *);
+static void mfii_aen_start(struct mfii_softc *, struct mfii_ccb *,
struct mfii_dmamem *, uint32_t);
-void mfii_aen_done(struct mfii_softc *, struct mfii_ccb *);
-void mfii_aen(struct work *, void *);
-void mfii_aen_unregister(struct mfii_softc *);
+static void mfii_aen_done(struct mfii_softc *, struct mfii_ccb *);
+static void mfii_aen(struct work *, void *);
+static void mfii_aen_unregister(struct mfii_softc *);
-void mfii_aen_pd_insert(struct mfii_softc *,
+static void mfii_aen_pd_insert(struct mfii_softc *,
const struct mfi_evtarg_pd_address *);
-void mfii_aen_pd_remove(struct mfii_softc *,
+static void mfii_aen_pd_remove(struct mfii_softc *,
const struct mfi_evtarg_pd_address *);
-void mfii_aen_pd_state_change(struct mfii_softc *,
+static void mfii_aen_pd_state_change(struct mfii_softc *,
const struct mfi_evtarg_pd_state *);
-void mfii_aen_ld_update(struct mfii_softc *);
+static void mfii_aen_ld_update(struct mfii_softc *);
#if NBIO > 0
-int mfii_ioctl(device_t, u_long, void *);
-int mfii_ioctl_inq(struct mfii_softc *, struct bioc_inq *);
-int mfii_ioctl_vol(struct mfii_softc *, struct bioc_vol *);
-int mfii_ioctl_disk(struct mfii_softc *, struct bioc_disk *);
-int mfii_ioctl_alarm(struct mfii_softc *, struct bioc_alarm *);
-int mfii_ioctl_blink(struct mfii_softc *sc, struct bioc_blink *);
-int mfii_ioctl_setstate(struct mfii_softc *,
+static int mfii_ioctl(device_t, u_long, void *);
+static int mfii_ioctl_inq(struct mfii_softc *, struct bioc_inq *);
+static int mfii_ioctl_vol(struct mfii_softc *, struct bioc_vol *);
+static int mfii_ioctl_disk(struct mfii_softc *, struct bioc_disk *);
+static int mfii_ioctl_alarm(struct mfii_softc *, struct bioc_alarm *);
+static int mfii_ioctl_blink(struct mfii_softc *sc, struct bioc_blink *);
+static int mfii_ioctl_setstate(struct mfii_softc *,
struct bioc_setstate *);
-int mfii_bio_hs(struct mfii_softc *, int, int, void *);
-int mfii_bio_getitall(struct mfii_softc *);
+static int mfii_bio_hs(struct mfii_softc *, int, int, void *);
+static int mfii_bio_getitall(struct mfii_softc *);
#endif /* NBIO > 0 */
#if 0
@@ -507,13 +504,13 @@ static const char *mfi_bbu_indicators[]
};
#endif
-void mfii_init_ld_sensor(struct mfii_softc *, envsys_data_t *, int);
-void mfii_refresh_ld_sensor(struct mfii_softc *, envsys_data_t *);
+static void mfii_init_ld_sensor(struct mfii_softc *, envsys_data_t *, int);
+static void mfii_refresh_ld_sensor(struct mfii_softc *, envsys_data_t *);
static void mfii_attach_sensor(struct mfii_softc *, envsys_data_t *);
-int mfii_create_sensors(struct mfii_softc *);
+static int mfii_create_sensors(struct mfii_softc *);
static int mfii_destroy_sensors(struct mfii_softc *);
-void mfii_refresh_sensor(struct sysmon_envsys *, envsys_data_t *);
-void mfii_bbu(struct mfii_softc *, envsys_data_t *);
+static void mfii_refresh_sensor(struct sysmon_envsys *, envsys_data_t *);
+static void mfii_bbu(struct mfii_softc *, envsys_data_t *);
/*
* mfii boards support asynchronous (and non-polled) completion of
@@ -526,8 +523,7 @@ void mfii_bbu(struct mfii_softc *, envs
* hold the dcmd, we reuse the sense memory buffer for it.
*/
-void mfii_dcmd_start(struct mfii_softc *,
- struct mfii_ccb *);
+static void mfii_dcmd_start(struct mfii_softc *, struct mfii_ccb *);
static inline void
mfii_dcmd_scrub(struct mfii_ccb *ccb)
@@ -551,7 +547,7 @@ mfii_dcmd_sync(struct mfii_softc *sc, st
#define mfii_fw_state(_sc) mfii_read((_sc), MFI_OSP)
-const struct mfii_iop mfii_iop_thunderbolt = {
+static const struct mfii_iop mfii_iop_thunderbolt = {
MFII_BAR,
MFII_IOP_NUM_SGE_LOC_ORIG,
0,
@@ -564,7 +560,7 @@ const struct mfii_iop mfii_iop_thunderbo
/*
* a lot of these values depend on us not implementing fastpath yet.
*/
-const struct mfii_iop mfii_iop_25 = {
+static const struct mfii_iop mfii_iop_25 = {
MFII_BAR,
MFII_IOP_NUM_SGE_LOC_ORIG,
MFII_RAID_CTX_RL_FLAGS_CPU0, /* | MFII_RAID_CTX_RL_FLAGS_SEQNO_EN */
@@ -574,7 +570,7 @@ const struct mfii_iop mfii_iop_25 = {
MFII_SGE_END_OF_LIST
};
-const struct mfii_iop mfii_iop_35 = {
+static const struct mfii_iop mfii_iop_35 = {
MFII_BAR_35,
MFII_IOP_NUM_SGE_LOC_35,
MFII_RAID_CTX_ROUTING_FLAGS_CPU0, /* | MFII_RAID_CTX_ROUTING_FLAGS_SQN */
@@ -590,7 +586,7 @@ struct mfii_device {
const struct mfii_iop *mpd_iop;
};
-const struct mfii_device mfii_devices[] = {
+static const struct mfii_device mfii_devices[] = {
{ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_MEGARAID_2208,
&mfii_iop_thunderbolt },
{ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_MEGARAID_3008,
@@ -611,9 +607,9 @@ const struct mfii_device mfii_devices[]
&mfii_iop_35 }
};
-const struct mfii_iop *mfii_find_iop(struct pci_attach_args *);
+static const struct mfii_iop *mfii_find_iop(struct pci_attach_args *);
-const struct mfii_iop *
+static const struct mfii_iop *
mfii_find_iop(struct pci_attach_args *pa)
{
const struct mfii_device *mpd;
@@ -630,13 +626,13 @@ mfii_find_iop(struct pci_attach_args *pa
return (NULL);
}
-int
+static int
mfii_match(device_t parent, cfdata_t match, void *aux)
{
return ((mfii_find_iop(aux) != NULL) ? 2 : 0);
}
-void
+static void
mfii_attach(device_t parent, device_t self, void *aux)
{
struct mfii_softc *sc = device_private(self);
@@ -913,7 +909,7 @@ mfii_dev_handle(struct mfii_softc *sc, u
return (handle);
}
-int
+static int
mfii_dev_handles_update(struct mfii_softc *sc)
{
struct mfii_ld_map *lm;
@@ -948,7 +944,7 @@ free_lm:
return (rv);
}
-void
+static void
mfii_dev_handles_dtor(void *null, void *v)
{
uint16_t *dev_handles = v;
@@ -957,7 +953,7 @@ mfii_dev_handles_dtor(void *null, void *
}
#endif /* 0 */
-int
+static int
mfii_detach(device_t self, int flags)
{
struct mfii_softc *sc = device_private(self);
@@ -988,7 +984,7 @@ mfii_detach(device_t self, int flags)
return (0);
}
-int
+static int
mfii_rescan(device_t self, const char *ifattr, const int *locators)
{
struct mfii_softc *sc = device_private(self);
@@ -1000,7 +996,7 @@ mfii_rescan(device_t self, const char *i
return 0;
}
-void
+static void
mfii_childdetached(device_t self, device_t child)
{
struct mfii_softc *sc = device_private(self);
@@ -1090,7 +1086,7 @@ mfii_write(struct mfii_softc *sc, bus_si
BUS_SPACE_BARRIER_WRITE);
}
-struct mfii_dmamem *
+static struct mfii_dmamem *
mfii_dmamem_alloc(struct mfii_softc *sc, size_t size)
{
struct mfii_dmamem *m;
@@ -1130,7 +1126,7 @@ mdmfree:
return (NULL);
}
-void
+static void
mfii_dmamem_free(struct mfii_softc *sc, struct mfii_dmamem *m)
{
bus_dmamap_unload(sc->sc_dmat, m->mdm_map);
@@ -1140,7 +1136,7 @@ mfii_dmamem_free(struct mfii_softc *sc,
free(m, M_DEVBUF);
}
-void
+static void
mfii_dcmd_start(struct mfii_softc *sc, struct mfii_ccb *ccb)
{
struct mpii_msg_scsi_io *io = ccb->ccb_request;
@@ -1161,7 +1157,7 @@ mfii_dcmd_start(struct mfii_softc *sc, s
mfii_start(sc, ccb);
}
-int
+static int
mfii_aen_register(struct mfii_softc *sc)
{
struct mfi_evt_log_info mel;
@@ -1199,7 +1195,7 @@ mfii_aen_register(struct mfii_softc *sc)
return (0);
}
-void
+static void
mfii_aen_start(struct mfii_softc *sc, struct mfii_ccb *ccb,
struct mfii_dmamem *mdm, uint32_t seq)
{
@@ -1237,7 +1233,7 @@ mfii_aen_start(struct mfii_softc *sc, st
mfii_dcmd_start(sc, ccb);
}
-void
+static void
mfii_aen_done(struct mfii_softc *sc, struct mfii_ccb *ccb)
{
KASSERT(sc->sc_aen_ccb == ccb);
@@ -1251,7 +1247,7 @@ mfii_aen_done(struct mfii_softc *sc, str
workqueue_enqueue(sc->sc_aen_wq, &sc->sc_aen_work, NULL);
}
-void
+static void
mfii_aen(struct work *wk, void *arg)
{
struct mfii_softc *sc = arg;
@@ -1301,7 +1297,7 @@ mfii_aen(struct work *wk, void *arg)
mfii_aen_start(sc, ccb, mdm, le32toh(med->med_seq_num) + 1);
}
-void
+static void
mfii_aen_pd_insert(struct mfii_softc *sc,
const struct mfi_evtarg_pd_address *pd)
{
@@ -1309,7 +1305,7 @@ mfii_aen_pd_insert(struct mfii_softc *sc
le16toh(pd->device_id), le16toh(pd->encl_id));
}
-void
+static void
mfii_aen_pd_remove(struct mfii_softc *sc,
const struct mfi_evtarg_pd_address *pd)
{
@@ -1317,14 +1313,14 @@ mfii_aen_pd_remove(struct mfii_softc *sc
le16toh(pd->device_id), le16toh(pd->encl_id));
}
-void
+static void
mfii_aen_pd_state_change(struct mfii_softc *sc,
const struct mfi_evtarg_pd_state *state)
{
return;
}
-void
+static void
mfii_aen_ld_update(struct mfii_softc *sc)
{
int i, target, old, nld;
@@ -1374,13 +1370,13 @@ mfii_aen_ld_update(struct mfii_softc *sc
memcpy(sc->sc_target_lds, newlds, sizeof(sc->sc_target_lds));
}
-void
+static void
mfii_aen_unregister(struct mfii_softc *sc)
{
/* XXX */
}
-int
+static int
mfii_transition_firmware(struct mfii_softc *sc)
{
int32_t fw_state, cur_state;
@@ -1434,7 +1430,7 @@ mfii_transition_firmware(struct mfii_sof
return (0);
}
-int
+static int
mfii_get_info(struct mfii_softc *sc)
{
int i, rv;
@@ -1589,7 +1585,7 @@ mfii_get_info(struct mfii_softc *sc)
return (0);
}
-int
+static int
mfii_mfa_poll(struct mfii_softc *sc, struct mfii_ccb *ccb)
{
struct mfi_frame_header *hdr = ccb->ccb_request;
@@ -1645,7 +1641,7 @@ mfii_mfa_poll(struct mfii_softc *sc, str
return (rv);
}
-int
+static int
mfii_poll(struct mfii_softc *sc, struct mfii_ccb *ccb)
{
void (*done)(struct mfii_softc *, struct mfii_ccb *);
@@ -1671,7 +1667,7 @@ mfii_poll(struct mfii_softc *sc, struct
return (0);
}
-void
+static void
mfii_poll_done(struct mfii_softc *sc, struct mfii_ccb *ccb)
{
int *rv = ccb->ccb_cookie;
@@ -1679,7 +1675,7 @@ mfii_poll_done(struct mfii_softc *sc, st
*rv = 0;
}
-int
+static int
mfii_exec(struct mfii_softc *sc, struct mfii_ccb *ccb)
{
#ifdef DIAGNOSTIC
@@ -1700,7 +1696,7 @@ mfii_exec(struct mfii_softc *sc, struct
return (0);
}
-void
+static void
mfii_exec_done(struct mfii_softc *sc, struct mfii_ccb *ccb)
{
mutex_enter(&ccb->ccb_mtx);
@@ -1709,7 +1705,7 @@ mfii_exec_done(struct mfii_softc *sc, st
mutex_exit(&ccb->ccb_mtx);
}
-int
+static int
mfii_mgmt(struct mfii_softc *sc, uint32_t opc, const union mfi_mbox *mbox,
void *buf, size_t len, mfii_direction_t dir, bool poll)
{
@@ -1731,7 +1727,7 @@ mfii_mgmt(struct mfii_softc *sc, uint32_
return (rv);
}
-int
+static int
mfii_do_mgmt(struct mfii_softc *sc, struct mfii_ccb *ccb, uint32_t opc,
const union mfi_mbox *mbox, void *buf, size_t len, mfii_direction_t dir,
bool poll)
@@ -1802,13 +1798,13 @@ done:
return (rv);
}
-void
+static void
mfii_empty_done(struct mfii_softc *sc, struct mfii_ccb *ccb)
{
return;
}
-int
+static int
mfii_load_mfa(struct mfii_softc *sc, struct mfii_ccb *ccb,
void *sglp, int nosleep)
{
@@ -1841,7 +1837,7 @@ mfii_load_mfa(struct mfii_softc *sc, str
return (0);
}
-void
+static void
mfii_start(struct mfii_softc *sc, struct mfii_ccb *ccb)
{
u_long *r = (u_long *)&ccb->ccb_req;
@@ -1865,7 +1861,7 @@ mfii_start(struct mfii_softc *sc, struct
#endif
}
-void
+static void
mfii_done(struct mfii_softc *sc, struct mfii_ccb *ccb)
{
bus_dmamap_sync(sc->sc_dmat, MFII_DMA_MAP(sc->sc_requests),
@@ -1898,7 +1894,7 @@ mfii_done(struct mfii_softc *sc, struct
ccb->ccb_done(sc, ccb);
}
-int
+static int
mfii_initialise_firmware(struct mfii_softc *sc)
{
struct mpii_msg_iocinit_request *iiq;
@@ -1974,7 +1970,7 @@ mfii_initialise_firmware(struct mfii_sof
return (rv);
}
-int
+static int
mfii_my_intr(struct mfii_softc *sc)
{
u_int32_t status;
@@ -1990,7 +1986,7 @@ mfii_my_intr(struct mfii_softc *sc)
return (ISSET(status, MFII_OSTS_INTR_VALID) ? 1 : 0);
}
-int
+static int
mfii_intr(void *arg)
{
struct mfii_softc *sc = arg;
@@ -2003,7 +1999,7 @@ mfii_intr(void *arg)
return (1);
}
-void
+static void
mfii_postq(struct mfii_softc *sc)
{
struct mfii_ccb_list ccbs = SIMPLEQ_HEAD_INITIALIZER(ccbs);
@@ -2058,7 +2054,7 @@ mfii_postq(struct mfii_softc *sc)
}
}
-void
+static void
mfii_scsipi_request(struct scsipi_channel *chan, scsipi_adapter_req_t req,
void *arg)
{
@@ -2166,7 +2162,7 @@ stuffup:
mfii_put_ccb(sc, ccb);
}
-void
+static void
mfii_scsi_cmd_done(struct mfii_softc *sc, struct mfii_ccb *ccb)
{
struct scsipi_xfer *xs = ccb->ccb_cookie;
@@ -2200,7 +2196,7 @@ mfii_scsi_cmd_done(struct mfii_softc *sc
mfii_put_ccb(sc, ccb);
}
-int
+static int
mfii_scsi_cmd_io(struct mfii_softc *sc, struct mfii_ccb *ccb,
struct scsipi_xfer *xs)
{
@@ -2260,7 +2256,7 @@ mfii_scsi_cmd_io(struct mfii_softc *sc,
return (0);
}
-int
+static int
mfii_scsi_cmd_cdb(struct mfii_softc *sc, struct mfii_ccb *ccb,
struct scsipi_xfer *xs)
{
@@ -2429,7 +2425,7 @@ mfii_pd_scsi_cmd_cdb(struct mfii_softc *
}
#endif
-int
+static int
mfii_load_ccb(struct mfii_softc *sc, struct mfii_ccb *ccb, void *sglp,
int nosleep)
{
@@ -2497,7 +2493,7 @@ mfii_load_ccb(struct mfii_softc *sc, str
return (0);
}
-void
+static void
mfii_scsi_cmd_tmo(void *p)
{
struct mfii_ccb *ccb = p;
@@ -2514,7 +2510,7 @@ mfii_scsi_cmd_tmo(void *p)
mutex_exit(&sc->sc_abort_mtx);
}
-void
+static void
mfii_abort_task(struct work *wk, void *scp)
{
struct mfii_softc *sc = scp;
@@ -2554,7 +2550,7 @@ mfii_abort_task(struct work *wk, void *s
}
}
-void
+static void
mfii_abort(struct mfii_softc *sc, struct mfii_ccb *accb, uint16_t dev_handle,
uint16_t smid, uint8_t type, uint32_t flags)
{
@@ -2573,7 +2569,7 @@ mfii_abort(struct mfii_softc *sc, struct
accb->ccb_req.smid = le16toh(accb->ccb_smid);
}
-void
+static void
mfii_scsi_cmd_abort_done(struct mfii_softc *sc, struct mfii_ccb *accb)
{
struct mfii_ccb *ccb = accb->ccb_cookie;
@@ -2589,7 +2585,7 @@ mfii_scsi_cmd_abort_done(struct mfii_sof
mfii_put_ccb(sc, ccb);
}
-struct mfii_ccb *
+static struct mfii_ccb *
mfii_get_ccb(struct mfii_softc *sc)
{
struct mfii_ccb *ccb;
@@ -2606,7 +2602,7 @@ mfii_get_ccb(struct mfii_softc *sc)
return (ccb);
}
-void
+static void
mfii_scrub_ccb(struct mfii_ccb *ccb)
{
ccb->ccb_cookie = NULL;
@@ -2622,7 +2618,7 @@ mfii_scrub_ccb(struct mfii_ccb *ccb)
memset(ccb->ccb_mfi, 0, MFI_FRAME_SIZE);
}
-void
+static void
mfii_put_ccb(struct mfii_softc *sc, struct mfii_ccb *ccb)
{
mutex_enter(&sc->sc_ccb_mtx);
@@ -2630,7 +2626,7 @@ mfii_put_ccb(struct mfii_softc *sc, stru
mutex_exit(&sc->sc_ccb_mtx);
}
-int
+static int
mfii_init_ccb(struct mfii_softc *sc)
{
struct mfii_ccb *ccb;
@@ -2717,7 +2713,7 @@ destroy:
}
#if NBIO > 0
-int
+static int
mfii_ioctl(device_t dev, u_long cmd, void *addr)
{
struct mfii_softc *sc = device_private(dev);
@@ -2775,7 +2771,7 @@ mfii_ioctl(device_t dev, u_long cmd, voi
return (error);
}
-int
+static int
mfii_bio_getitall(struct mfii_softc *sc)
{
int i, d, rv = EINVAL;
@@ -2856,7 +2852,7 @@ done:
return (rv);
}
-int
+static int
mfii_ioctl_inq(struct mfii_softc *sc, struct bioc_inq *bi)
{
int rv = EINVAL;
@@ -2889,7 +2885,7 @@ done:
return (rv);
}
-int
+static int
mfii_ioctl_vol(struct mfii_softc *sc, struct bioc_vol *bv)
{
int i, per, rv = EINVAL;
@@ -2977,7 +2973,7 @@ done:
return (rv);
}
-int
+static int
mfii_ioctl_disk(struct mfii_softc *sc, struct bioc_disk *bd)
{
struct mfi_conf *cfg;
@@ -3131,7 +3127,7 @@ freeme:
return (rv);
}
-int
+static int
mfii_ioctl_alarm(struct mfii_softc *sc, struct bioc_alarm *ba)
{
uint32_t opc;
@@ -3178,7 +3174,7 @@ mfii_ioctl_alarm(struct mfii_softc *sc,
return (rv);
}
-int
+static int
mfii_ioctl_blink(struct mfii_softc *sc, struct bioc_blink *bb)
{
int i, found, rv = EINVAL;
@@ -3345,7 +3341,7 @@ done:
return (rv);
}
-int
+static int
mfii_ioctl_setstate(struct mfii_softc *sc, struct bioc_setstate *bs)
{
struct mfi_pd_details *pd;
@@ -3577,7 +3573,7 @@ mfii_ioctl_patrol(struct mfii_softc *sc,
}
#endif
-int
+static int
mfii_bio_hs(struct mfii_softc *sc, int volid, int type, void *bio_hs)
{
struct mfi_conf *cfg;
@@ -3681,7 +3677,7 @@ freeme:
#define MFI_BBU_SENSORS 4
-void
+static void
mfii_bbu(struct mfii_softc *sc, envsys_data_t *edata)
{
struct mfi_bbu_status bbu;
@@ -3739,7 +3735,7 @@ mfii_bbu(struct mfii_softc *sc, envsys_d
}
}
-void
+static void
mfii_refresh_ld_sensor(struct mfii_softc *sc, envsys_data_t *edata)
{
struct bioc_vol bv;
@@ -3755,7 +3751,7 @@ mfii_refresh_ld_sensor(struct mfii_softc
bio_vol_to_envsys(edata, &bv);
}
-void
+static void
mfii_init_ld_sensor(struct mfii_softc *sc, envsys_data_t *sensor, int i)
{
sensor->units = ENVSYS_DRIVE;
@@ -3774,7 +3770,7 @@ mfii_attach_sensor(struct mfii_softc *sc
"failed to attach sensor %s\n", s->desc);
}
-int
+static int
mfii_create_sensors(struct mfii_softc *sc)
{
int i, rv;
@@ -3842,7 +3838,7 @@ mfii_destroy_sensors(struct mfii_softc *
return 0;
}
-void
+static void
mfii_refresh_sensor(struct sysmon_envsys *sme, envsys_data_t *edata)
{
struct mfii_softc *sc = sme->sme_cookie;
