head	1.5;
access;
symbols
	RELENG_8_4:1.5.0.2
	RELENG_9_1_0_RELEASE:1.2.4.2.2.2
	RELENG_9_1:1.2.4.2.0.2
	RELENG_9_1_BP:1.2.4.2
	RELENG_8_3_0_RELEASE:1.2.2.1.8.1
	RELENG_8_3:1.2.2.1.0.8
	RELENG_8_3_BP:1.2.2.1
	RELENG_9_0_0_RELEASE:1.2.4.1.2.1
	RELENG_9_0:1.2.4.1.0.2
	RELENG_9_0_BP:1.2.4.1
	RELENG_9:1.2.0.4
	RELENG_9_BP:1.2
	RELENG_7_4_0_RELEASE:1.1.2.1.10.1
	RELENG_8_2_0_RELEASE:1.2.2.1.6.1
	RELENG_7_4:1.1.2.1.0.10
	RELENG_7_4_BP:1.1.2.1
	RELENG_8_2:1.2.2.1.0.6
	RELENG_8_2_BP:1.2.2.1
	RELENG_8_1_0_RELEASE:1.2.2.1.4.1
	RELENG_8_1:1.2.2.1.0.4
	RELENG_8_1_BP:1.2.2.1
	RELENG_7_3_0_RELEASE:1.1.2.1.8.1
	RELENG_7_3:1.1.2.1.0.8
	RELENG_7_3_BP:1.1.2.1
	RELENG_8_0_0_RELEASE:1.2.2.1.2.1
	RELENG_8_0:1.2.2.1.0.2
	RELENG_8_0_BP:1.2.2.1
	RELENG_8:1.2.0.2
	RELENG_8_BP:1.2
	RELENG_7_2_0_RELEASE:1.1.2.1.6.1
	RELENG_7_2:1.1.2.1.0.6
	RELENG_7_2_BP:1.1.2.1
	RELENG_7_1_0_RELEASE:1.1.2.1.4.1
	RELENG_7_1:1.1.2.1.0.4
	RELENG_7_1_BP:1.1.2.1
	RELENG_7_0_0_RELEASE:1.1.2.1
	RELENG_7_0:1.1.2.1.0.2
	RELENG_7_0_BP:1.1.2.1
	RELENG_7:1.1.0.2
	RELENG_7_BP:1.1;
locks; strict;
comment	@# @;


1.5
date	2012.11.17.01.52.59;	author svnexp;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2012.11.08.01.35.02;	author kevlo;	state Exp;
branches;
next	1.3;

1.3
date	2011.12.30.13.16.59;	author dim;	state Exp;
branches;
next	1.2;

1.2
date	2007.10.29.14.19.32;	author rwatson;	state Exp;
branches
	1.2.2.1
	1.2.4.1;
next	1.1;

1.1
date	2007.06.29.22.47.18;	author sam;	state Exp;
branches
	1.1.2.1;
next	;

1.5.2.1
date	2012.11.17.01.52.59;	author svnexp;	state dead;
branches;
next	1.5.2.2;

1.5.2.2
date	2013.03.28.13.05.22;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.2.2.1.2.1
	1.2.2.1.4.1
	1.2.2.1.6.1
	1.2.2.1.8.1;
next	1.2.2.2;

1.2.2.2
date	2012.11.17.10.36.58;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.2.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.2.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.2.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.2.1.8.2;

1.2.2.1.8.2
date	2012.11.17.08.25.33;	author svnexp;	state Exp;
branches;
next	;

1.2.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.2.4.1.2.1;
next	1.2.4.2;

1.2.4.2
date	2012.01.06.21.23.00;	author dim;	state Exp;
branches
	1.2.4.2.2.1;
next	1.2.4.3;

1.2.4.3
date	2012.11.17.11.37.18;	author svnexp;	state Exp;
branches;
next	;

1.2.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.2.4.1.2.2;

1.2.4.1.2.2
date	2012.11.17.08.37.14;	author svnexp;	state Exp;
branches;
next	;

1.2.4.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.2.4.2.2.2;

1.2.4.2.2.2
date	2012.11.17.08.48.05;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2007.11.02.00.52.34;	author rwatson;	state Exp;
branches
	1.1.2.1.4.1
	1.1.2.1.6.1
	1.1.2.1.8.1
	1.1.2.1.10.1;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.08.06.54;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.4.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.1.2.1.6.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.1.2.1.8.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.1.2.1.10.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.1.2.1.10.2;

1.1.2.1.10.2
date	2012.11.17.08.17.27;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/modules/nxge/Makefile 242731 2012-11-08 01:35:02Z kevlo $

.PATH: ${.CURDIR}/../../dev/nxge
.PATH: ${.CURDIR}/../../dev/nxge/xgehal

CFLAGS_NXGE = 

# Debugging/Tracing:
# XGE_COMPONENT_HAL_CONFIG      0x1
# XGE_COMPONENT_HAL_FIFO        0x2
# XGE_COMPONENT_HAL_RING        0x4
# XGE_COMPONENT_HAL_CHANNEL     0x8
# XGE_COMPONENT_HAL_DEVICE      0x10
# XGE_COMPONENT_HAL_MM          0x20
# XGE_COMPONENT_HAL_QUEUE       0x40
# XGE_COMPONENT_HAL_STATS       0x100
# XGE_COMPONENT_OSDEP           0x10000000
# XGE_COMPONENT_LL              0x20000000
# XGE_COMPONENT_ALL             0xffffffff

CFLAGS_NXGE  += -DXGE_DEBUG_MODULE_MASK=XGE_COMPONENT_LL
CFLAGS_NXGE  += -DXGE_DEBUG_ERR_MASK=XGE_COMPONENT_LL
#CFLAGS_NXGE  += -DXGE_DEBUG_TRACE_MASK=XGE_COMPONENT_LL

# Check Memory
#CFLAGS_NXGE += -DXGE_OS_MEMORY_CHECK

# 2-Buffer Mode
#CFLAGS_NXGE += -DXGE_FEATURE_BUFFER_MODE_2

CFLAGS += $(CFLAGS_NXGE)

KMOD=   if_nxge
SRCS=   if_nxge.c
SRCS+=  xgehal-device.c xgehal-mm.c xge-queue.c
SRCS+=  xgehal-driver.c xgehal-ring.c xgehal-channel.c
SRCS+=  xgehal-fifo.c xgehal-stats.c xgehal-config.c
SRCS+=  xgehal-mgmt.c
SRCS+=  device_if.h bus_if.h pci_if.h

.include <bsd.kmod.mk>

CWARNFLAGS.if_nxge.c=		${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-device.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-driver.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-ring.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-channel.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-fifo.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-stats.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-mgmt.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}
@


1.5.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:22 +0000
@
text
@d1 51
@


1.5.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 41
# $FreeBSD: releng/8.4/sys/modules/nxge/Makefile 173139 2007-10-29 14:19:32Z rwatson $

.PATH: ${.CURDIR}/../../dev/nxge
VPATH = ${.CURDIR}/../../dev/nxge/xgehal

CFLAGS_NXGE = 

# Debugging/Tracing:
# XGE_COMPONENT_HAL_CONFIG      0x1
# XGE_COMPONENT_HAL_FIFO        0x2
# XGE_COMPONENT_HAL_RING        0x4
# XGE_COMPONENT_HAL_CHANNEL     0x8
# XGE_COMPONENT_HAL_DEVICE      0x10
# XGE_COMPONENT_HAL_MM          0x20
# XGE_COMPONENT_HAL_QUEUE       0x40
# XGE_COMPONENT_HAL_STATS       0x100
# XGE_COMPONENT_OSDEP           0x10000000
# XGE_COMPONENT_LL              0x20000000
# XGE_COMPONENT_ALL             0xffffffff

CFLAGS_NXGE  += -DXGE_DEBUG_MODULE_MASK=XGE_COMPONENT_LL
CFLAGS_NXGE  += -DXGE_DEBUG_ERR_MASK=XGE_COMPONENT_LL
#CFLAGS_NXGE  += -DXGE_DEBUG_TRACE_MASK=XGE_COMPONENT_LL

# Check Memory
#CFLAGS_NXGE += -DXGE_OS_MEMORY_CHECK

# 2-Buffer Mode
#CFLAGS_NXGE += -DXGE_FEATURE_BUFFER_MODE_2

CFLAGS += $(CFLAGS_NXGE)

KMOD=   if_nxge
SRCS=   if_nxge.c
SRCS+=  xgehal-device.c xgehal-mm.c xge-queue.c
SRCS+=  xgehal-driver.c xgehal-ring.c xgehal-channel.c
SRCS+=  xgehal-fifo.c xgehal-stats.c xgehal-config.c
SRCS+=  xgehal-mgmt.c
SRCS+=  device_if.h bus_if.h pci_if.h

.include <bsd.kmod.mk>
@


1.4
log
@SVN rev 242731 on 2012-11-08 01:35:02Z by kevlo

Use .PATH instead of VPATH.

Reviewed by:	gnn,rwatson
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.3
log
@SVN rev 228994 on 2011-12-30 13:16:59Z by dim

Disable several instances instances of clang's -Wself-assign warning.
All of these are harmless, and are in fact used to shut up warnings from
lint.

While here, remove -Wno-missing-prototypes from the xfs module
Makefile, as I could not reproduce those warnings either with gcc or
clang.

MFC after:	1 week
@
text
@d4 1
a4 1
VPATH = ${.CURDIR}/../../dev/nxge/xgehal
@


1.2
log
@Merge Neterion if_nxge driver version 2.0.9.11230 with the following
changes:

  01 -  Enhanced LRO:
  LRO feature is extended to support multi-buffer mode. Previously,
  Ethernet frames received in contiguous buffers were offloaded.
  Now, frames received in multiple non-contiguous buffers can be
  offloaded, as well. The driver now supports LRO for jumbo frames.

  02 - Locks Optimization:
  The driver code was re-organized to limit the use of locks.
  Moreover, lock contention was reduced by replacing wait locks
  with try locks.

  03 - Code Optimization:
  The driver code was re-factored  to eliminate some memcpy
  operations.  Fast path loops were optimized.

  04 - Tag Creations:
  Physical Buffer Tags are now optimized based upon frame size.
  For better performance, Physical Memory Maps are now re-used.

  05 - Configuration:
  Features such as TSO, LRO, and Interrupt Mode can be configured
  either at load or at run time. Rx buffer mode (mode 1 or mode 2)
  can be configured at load time through kenv.

  06 - Driver Statistics:
  Run time statistics are enhanced to provide better visibility
  into the driver performance.

  07 - Bug Fixes:
  The driver contains fixes for the problems discovered and
  reported since last submission.

  08 - MSI support:
  Added Message Signaled Interrupt feature which currently uses 1
  message.

  09  Removed feature:
  Rx 3 buffer mode feature has been removed. Driver now supports 1,
  2 and 5 buffer modes of which 2 and 5 buffer modes can be used
  for header separation.

  10  Compiler warning:
  Fixed compiler warning when compiled for 32 bit system.

  11 Copyright notice:
  Source files are updated with the proper copyright notice.

MFC after:	3 days
Submitted by:	Alicia Pena <Alicia dot Pena at neterion dot com>,
		Muhammad Shafiq <Muhammad dot Shafiq at neterion dot com>
@
text
@d42 10
@


1.2.4.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.4.2
log
@SVN rev 229734 on 2012-01-06 21:23:00Z by dim

MFC r228994:

Disable several instances instances of clang's -Wself-assign warning.
All of these are harmless, and are in fact used to shut up warnings from
lint.

While here, remove -Wno-missing-prototypes from the xfs module
Makefile, as I could not reproduce those warnings either with gcc or
clang.
@
text
@a41 10

CWARNFLAGS.if_nxge.c=		${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-device.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-driver.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-ring.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-channel.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-fifo.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-stats.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-mgmt.c=	${NO_WSELF_ASSIGN}
CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}
@


1.2.4.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/nxge/Makefile 229734 2012-01-06 21:23:00Z dim $
@


1.2.4.2.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.2.4.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/nxge/Makefile 229734 2012-01-06 21:23:00Z dim $
@


1.2.4.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.2.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/nxge/Makefile 173139 2007-10-29 14:19:32Z rwatson $
@


1.2.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.2.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/nxge/Makefile 173139 2007-10-29 14:19:32Z rwatson $
@


1.2.2.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/nxge/Makefile 173139 2007-10-29 14:19:32Z rwatson $
@


1.2.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.1
log
@Neterion Xframe 10GbE Server/Storage adapter driver.

The nxge driver provides support for Neterion Xframe-I and Xframe-II
adapters. The driver supports TCP Segmentation Offload (TSO/LSO),
Jumbo frames (5 buffer mode), Header separation (2 and 3 Receive
buffer modes), VLAN, and Promiscuous mode.

Submitted by:	Neterion
Reviewed by:	rwatson
Approved by:	re (kensmith)
@
text
@d25 3
d29 1
a29 7
#CFLAGS_NXGE += -DXGE_BUFFER_MODE_2

# 3-Buffer Mode
#CFLAGS_NXGE += -DXGE_BUFFER_MODE_3

# TSO (TCP Segmentation Offload)
CFLAGS_NXGE  += -DXGE_FEATURE_TSO
@


1.1.2.1
log
@Merge Neterion if_nxge driver version 2.0.9.11230 from HEAD to RELENG_7:

    01 -  Enhanced LRO:
    LRO feature is extended to support multi-buffer mode. Previously,
    Ethernet frames received in contiguous buffers were offloaded.
    Now, frames received in multiple non-contiguous buffers can be
    offloaded, as well. The driver now supports LRO for jumbo frames.

    02 - Locks Optimization:
    The driver code was re-organized to limit the use of locks.
    Moreover, lock contention was reduced by replacing wait locks
    with try locks.

    03 - Code Optimization:
    The driver code was re-factored  to eliminate some memcpy
    operations.  Fast path loops were optimized.

    04 - Tag Creations:
    Physical Buffer Tags are now optimized based upon frame size.
    For better performance, Physical Memory Maps are now re-used.

    05 - Configuration:
    Features such as TSO, LRO, and Interrupt Mode can be configured
    either at load or at run time. Rx buffer mode (mode 1 or mode 2)
    can be configured at load time through kenv.

    06 - Driver Statistics:
    Run time statistics are enhanced to provide better visibility
    into the driver performance.

    07 - Bug Fixes:
    The driver contains fixes for the problems discovered and
    reported since last submission.

    08 - MSI support:
    Added Message Signaled Interrupt feature which currently uses 1
    message.
    message.

    09  Removed feature:
    Rx 3 buffer mode feature has been removed. Driver now supports 1,
    2 and 5 buffer modes of which 2 and 5 buffer modes can be used
    for header separation.

    10  Compiler warning:
    Fixed compiler warning when compiled for 32 bit system.

    11 Copyright notice:
    Source files are updated with the proper copyright notice.

  Submitted by:   Alicia Pena <Alicia dot Pena at neterion dot com>,
                  Muhammad Shafiq <Muhammad dot Shafiq at neterion dot com>

Approved by:	re (gnn, kensmith)
@
text
@d25 5
a29 2
# Check Memory
#CFLAGS_NXGE += -DXGE_OS_MEMORY_CHECK
d31 2
a32 2
# 2-Buffer Mode
#CFLAGS_NXGE += -DXGE_FEATURE_BUFFER_MODE_2
@


1.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/modules/nxge/Makefile 173269 2007-11-02 00:52:34Z rwatson $
@


1.1.2.1.10.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.10.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/modules/nxge/Makefile 173269 2007-11-02 00:52:34Z rwatson $
@


1.1.2.1.8.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.6.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.4.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


