svn commit: r257260 - in projects/ifnet: . lib/libnetgraph lib/libproc share/man/man4 sys/amd64/conf sys/arm/at91 sys/arm/econa sys/arm/lpc sys/arm/ti/cpsw sys/arm/versatile sys/arm/xscale/pxa sys/...
Gleb Smirnoff
glebius at FreeBSD.org
Mon Oct 28 15:38:57 UTC 2013
Author: glebius
Date: Mon Oct 28 15:38:52 2013
New Revision: 257260
URL: http://svnweb.freebsd.org/changeset/base/257260
Log:
Merge head r256150 through r257258.
Added:
projects/ifnet/sys/x86/iommu/
- copied from r257258, head/sys/x86/iommu/
Deleted:
projects/ifnet/share/man/man4/ng_fec.4
projects/ifnet/sys/modules/netgraph/fec/
projects/ifnet/sys/netgraph/ng_fec.c
projects/ifnet/sys/netgraph/ng_fec.h
Modified:
projects/ifnet/ObsoleteFiles.inc
projects/ifnet/lib/libnetgraph/debug.c
projects/ifnet/lib/libproc/proc_util.c
projects/ifnet/share/man/man4/Makefile
projects/ifnet/sys/amd64/conf/GENERIC
projects/ifnet/sys/arm/at91/if_ate.c
projects/ifnet/sys/arm/econa/if_ece.c
projects/ifnet/sys/arm/lpc/if_lpe.c
projects/ifnet/sys/arm/ti/cpsw/if_cpsw.c
projects/ifnet/sys/arm/versatile/if_smc_fdt.c
projects/ifnet/sys/arm/xscale/pxa/if_smc_smi.c
projects/ifnet/sys/conf/NOTES
projects/ifnet/sys/conf/files
projects/ifnet/sys/conf/files.amd64
projects/ifnet/sys/conf/files.i386
projects/ifnet/sys/conf/options
projects/ifnet/sys/contrib/ipfilter/netinet/radix_ipf.c
projects/ifnet/sys/dev/acpica/acpi_pci.c
projects/ifnet/sys/i386/conf/NOTES
projects/ifnet/sys/modules/netgraph/Makefile
Directory Properties:
projects/ifnet/ (props changed)
projects/ifnet/share/man/man4/ (props changed)
projects/ifnet/sys/ (props changed)
projects/ifnet/sys/conf/ (props changed)
projects/ifnet/sys/contrib/ipfilter/ (props changed)
Modified: projects/ifnet/ObsoleteFiles.inc
==============================================================================
--- projects/ifnet/ObsoleteFiles.inc Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/ObsoleteFiles.inc Mon Oct 28 15:38:52 2013 (r257260)
@@ -38,6 +38,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20131028: ng_fec(4) removed
+OLD_FILES+=usr/include/netgraph/ng_fec.h
+OLD_FILES+=usr/share/man/man4/ng_fec.4.gz
# 20131023: remove never used iscsi directory
OLD_DIRS+=usr/share/examples/iscsi
# 20131014: libbsdyml becomes private
Modified: projects/ifnet/lib/libnetgraph/debug.c
==============================================================================
--- projects/ifnet/lib/libnetgraph/debug.c Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/lib/libnetgraph/debug.c Mon Oct 28 15:38:52 2013 (r257260)
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
#include <netgraph/ng_eiface.h>
#include <netgraph/ng_etf.h>
#include <netgraph/ng_ether.h>
-#include <netgraph/ng_fec.h>
#include <netgraph/ng_frame_relay.h>
#include <netgraph/ng_gif.h>
#include <netgraph/ng_gif_demux.h>
@@ -136,7 +135,6 @@ static const struct ng_cookie cookies[]
COOKIE(EIFACE),
COOKIE(ETF),
COOKIE(ETHER),
- COOKIE(FEC),
COOKIE(FRAMERELAY),
COOKIE(GIF),
COOKIE(GIF_DEMUX),
Modified: projects/ifnet/lib/libproc/proc_util.c
==============================================================================
--- projects/ifnet/lib/libproc/proc_util.c Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/lib/libproc/proc_util.c Mon Oct 28 15:38:52 2013 (r257260)
@@ -145,8 +145,9 @@ proc_wstatus(struct proc_handle *phdl)
if (phdl == NULL)
return (-1);
if (waitpid(phdl->pid, &status, WUNTRACED) < 0) {
- if (errno != EINTR)
+ if (errno != EINTR) {
DPRINTF("waitpid");
+ }
return (-1);
}
if (WIFSTOPPED(status))
Modified: projects/ifnet/share/man/man4/Makefile
==============================================================================
--- projects/ifnet/share/man/man4/Makefile Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/share/man/man4/Makefile Mon Oct 28 15:38:52 2013 (r257260)
@@ -295,7 +295,6 @@ MAN= aac.4 \
ng_etf.4 \
ng_ether.4 \
ng_ether_echo.4 \
- ng_fec.4 \
ng_frame_relay.4 \
ng_gif.4 \
ng_gif_demux.4 \
Modified: projects/ifnet/sys/amd64/conf/GENERIC
==============================================================================
--- projects/ifnet/sys/amd64/conf/GENERIC Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/amd64/conf/GENERIC Mon Oct 28 15:38:52 2013 (r257260)
@@ -94,6 +94,7 @@ device cpufreq
# Bus support.
device acpi
+options ACPI_DMAR
device pci
# Floppy drives
Modified: projects/ifnet/sys/arm/at91/if_ate.c
==============================================================================
--- projects/ifnet/sys/arm/at91/if_ate.c Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/arm/at91/if_ate.c Mon Oct 28 15:38:52 2013 (r257260)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_media.h>
#include <net/if_mib.h>
#include <net/if_types.h>
+#include <net/if_var.h>
#ifdef INET
#include <netinet/in.h>
Modified: projects/ifnet/sys/arm/econa/if_ece.c
==============================================================================
--- projects/ifnet/sys/arm/econa/if_ece.c Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/arm/econa/if_ece.c Mon Oct 28 15:38:52 2013 (r257260)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_dl.h>
#include <net/if_media.h>
#include <net/if_types.h>
+#include <net/if_var.h>
#include <net/if_vlan_var.h>
#ifdef INET
Modified: projects/ifnet/sys/arm/lpc/if_lpe.c
==============================================================================
--- projects/ifnet/sys/arm/lpc/if_lpe.c Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/arm/lpc/if_lpe.c Mon Oct 28 15:38:52 2013 (r257260)
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_dl.h>
#include <net/if_media.h>
#include <net/if_types.h>
+#include <net/if_var.h>
#include <net/bpf.h>
Modified: projects/ifnet/sys/arm/ti/cpsw/if_cpsw.c
==============================================================================
--- projects/ifnet/sys/arm/ti/cpsw/if_cpsw.c Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/arm/ti/cpsw/if_cpsw.c Mon Oct 28 15:38:52 2013 (r257260)
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_dl.h>
#include <net/if_media.h>
#include <net/if_types.h>
+#include <net/if_var.h>
#include <net/if_vlan_var.h>
#include <netinet/in_systm.h>
Modified: projects/ifnet/sys/arm/versatile/if_smc_fdt.c
==============================================================================
--- projects/ifnet/sys/arm/versatile/if_smc_fdt.c Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/arm/versatile/if_smc_fdt.c Mon Oct 28 15:38:52 2013 (r257260)
@@ -28,11 +28,12 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/bus.h>
#include <sys/kernel.h>
-#include <sys/socket.h>
-
#include <sys/module.h>
-#include <sys/bus.h>
+#include <sys/socket.h>
+#include <sys/systm.h>
+#include <sys/taskqueue.h>
#include <machine/bus.h>
#include <machine/resource.h>
Modified: projects/ifnet/sys/arm/xscale/pxa/if_smc_smi.c
==============================================================================
--- projects/ifnet/sys/arm/xscale/pxa/if_smc_smi.c Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/arm/xscale/pxa/if_smc_smi.c Mon Oct 28 15:38:52 2013 (r257260)
@@ -28,11 +28,12 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/bus.h>
#include <sys/kernel.h>
-#include <sys/socket.h>
-
#include <sys/module.h>
-#include <sys/bus.h>
+#include <sys/socket.h>
+#include <sys/systm.h>
+#include <sys/taskqueue.h>
#include <machine/bus.h>
#include <machine/resource.h>
Modified: projects/ifnet/sys/conf/NOTES
==============================================================================
--- projects/ifnet/sys/conf/NOTES Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/conf/NOTES Mon Oct 28 15:38:52 2013 (r257260)
@@ -728,7 +728,6 @@ options NETGRAPH_DEVICE
options NETGRAPH_ECHO
options NETGRAPH_EIFACE
options NETGRAPH_ETHER
-options NETGRAPH_FEC
options NETGRAPH_FRAME_RELAY
options NETGRAPH_GIF
options NETGRAPH_GIF_DEMUX
Modified: projects/ifnet/sys/conf/files
==============================================================================
--- projects/ifnet/sys/conf/files Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/conf/files Mon Oct 28 15:38:52 2013 (r257260)
@@ -3205,7 +3205,6 @@ netgraph/ng_echo.c optional netgraph_ec
netgraph/ng_eiface.c optional netgraph_eiface
netgraph/ng_ether.c optional netgraph_ether
netgraph/ng_ether_echo.c optional netgraph_ether_echo
-netgraph/ng_fec.c optional netgraph_fec
netgraph/ng_frame_relay.c optional netgraph_frame_relay
netgraph/ng_gif.c optional netgraph_gif
netgraph/ng_gif_demux.c optional netgraph_gif_demux
Modified: projects/ifnet/sys/conf/files.amd64
==============================================================================
--- projects/ifnet/sys/conf/files.amd64 Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/conf/files.amd64 Mon Oct 28 15:38:52 2013 (r257260)
@@ -531,6 +531,14 @@ x86/cpufreq/powernow.c optional cpufreq
x86/cpufreq/est.c optional cpufreq
x86/cpufreq/hwpstate.c optional cpufreq
x86/cpufreq/p4tcc.c optional cpufreq
+x86/iommu/busdma_dmar.c optional acpi acpi_dmar pci
+x86/iommu/intel_ctx.c optional acpi acpi_dmar pci
+x86/iommu/intel_drv.c optional acpi acpi_dmar pci
+x86/iommu/intel_fault.c optional acpi acpi_dmar pci
+x86/iommu/intel_gas.c optional acpi acpi_dmar pci
+x86/iommu/intel_idpgtbl.c optional acpi acpi_dmar pci
+x86/iommu/intel_quirks.c optional acpi acpi_dmar pci
+x86/iommu/intel_utils.c optional acpi acpi_dmar pci
x86/isa/atpic.c optional atpic isa
x86/isa/atrtc.c standard
x86/isa/clock.c standard
Modified: projects/ifnet/sys/conf/files.i386
==============================================================================
--- projects/ifnet/sys/conf/files.i386 Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/conf/files.i386 Mon Oct 28 15:38:52 2013 (r257260)
@@ -554,6 +554,14 @@ x86/cpufreq/hwpstate.c optional cpufreq
x86/cpufreq/p4tcc.c optional cpufreq
x86/cpufreq/powernow.c optional cpufreq
x86/cpufreq/smist.c optional cpufreq
+x86/iommu/busdma_dmar.c optional acpi acpi_dmar pci
+x86/iommu/intel_ctx.c optional acpi acpi_dmar pci
+x86/iommu/intel_drv.c optional acpi acpi_dmar pci
+x86/iommu/intel_fault.c optional acpi acpi_dmar pci
+x86/iommu/intel_gas.c optional acpi acpi_dmar pci
+x86/iommu/intel_idpgtbl.c optional acpi acpi_dmar pci
+x86/iommu/intel_quirks.c optional acpi acpi_dmar pci
+x86/iommu/intel_utils.c optional acpi acpi_dmar pci
x86/isa/atpic.c optional atpic
x86/isa/atrtc.c optional native
x86/isa/clock.c optional native
Modified: projects/ifnet/sys/conf/options
==============================================================================
--- projects/ifnet/sys/conf/options Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/conf/options Mon Oct 28 15:38:52 2013 (r257260)
@@ -688,6 +688,7 @@ OPENSOLARIS_WITNESS opt_global.h
ACPI_DEBUG opt_acpi.h
ACPI_MAX_TASKS opt_acpi.h
ACPI_MAX_THREADS opt_acpi.h
+ACPI_DMAR opt_acpi.h
# ISA support
DEV_ISA opt_isa.h
Modified: projects/ifnet/sys/contrib/ipfilter/netinet/radix_ipf.c
==============================================================================
--- projects/ifnet/sys/contrib/ipfilter/netinet/radix_ipf.c Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/contrib/ipfilter/netinet/radix_ipf.c Mon Oct 28 15:38:52 2013 (r257260)
@@ -9,12 +9,14 @@
#include <sys/param.h>
#include <netinet/in.h>
#include <net/if.h>
-#if !defined(_KERNEL)
+#ifdef _KERNEL
+#include <sys/systm.h>
+#else
# include <stddef.h>
# include <stdlib.h>
# include <strings.h>
# include <string.h>
-#endif
+#endif /* !_KERNEL */
#include "netinet/ip_compat.h"
#include "netinet/ip_fil.h"
#ifdef RDX_DEBUG
Modified: projects/ifnet/sys/dev/acpica/acpi_pci.c
==============================================================================
--- projects/ifnet/sys/dev/acpica/acpi_pci.c Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/dev/acpica/acpi_pci.c Mon Oct 28 15:38:52 2013 (r257260)
@@ -29,6 +29,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_acpi.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
@@ -80,6 +82,7 @@ static ACPI_STATUS acpi_pci_save_handle(
static int acpi_pci_set_powerstate_method(device_t dev, device_t child,
int state);
static void acpi_pci_update_device(ACPI_HANDLE handle, device_t pci_child);
+static bus_dma_tag_t acpi_pci_get_dma_tag(device_t bus, device_t child);
static device_method_t acpi_pci_methods[] = {
/* Device interface */
@@ -90,6 +93,7 @@ static device_method_t acpi_pci_methods[
DEVMETHOD(bus_read_ivar, acpi_pci_read_ivar),
DEVMETHOD(bus_write_ivar, acpi_pci_write_ivar),
DEVMETHOD(bus_child_location_str, acpi_pci_child_location_str_method),
+ DEVMETHOD(bus_get_dma_tag, acpi_pci_get_dma_tag),
/* PCI interface */
DEVMETHOD(pci_set_powerstate, acpi_pci_set_powerstate_method),
@@ -308,3 +312,28 @@ acpi_pci_attach(device_t dev)
return (bus_generic_attach(dev));
}
+
+#ifdef ACPI_DMAR
+bus_dma_tag_t dmar_get_dma_tag(device_t dev, device_t child);
+static bus_dma_tag_t
+acpi_pci_get_dma_tag(device_t bus, device_t child)
+{
+ bus_dma_tag_t tag;
+
+ if (device_get_parent(child) == bus) {
+ /* try dmar and return if it works */
+ tag = dmar_get_dma_tag(bus, child);
+ } else
+ tag = NULL;
+ if (tag == NULL)
+ tag = pci_get_dma_tag(bus, child);
+ return (tag);
+}
+#else
+static bus_dma_tag_t
+acpi_pci_get_dma_tag(device_t bus, device_t child)
+{
+
+ return (pci_get_dma_tag(bus, child));
+}
+#endif
Modified: projects/ifnet/sys/i386/conf/NOTES
==============================================================================
--- projects/ifnet/sys/i386/conf/NOTES Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/i386/conf/NOTES Mon Oct 28 15:38:52 2013 (r257260)
@@ -491,6 +491,7 @@ device tdfx_linux # Enable Linuxulator
device acpi
options ACPI_DEBUG
+options ACPI_DMAR
# ACPI WMI Mapping driver
device acpi_wmi
Modified: projects/ifnet/sys/modules/netgraph/Makefile
==============================================================================
--- projects/ifnet/sys/modules/netgraph/Makefile Mon Oct 28 15:38:26 2013 (r257259)
+++ projects/ifnet/sys/modules/netgraph/Makefile Mon Oct 28 15:38:52 2013 (r257260)
@@ -18,7 +18,6 @@ SUBDIR= async \
etf \
ether \
ether_echo \
- fec \
frame_relay \
gif \
gif_demux \
More information about the svn-src-projects
mailing list