From butcher@butcher.heavennet.ru  Wed Jul  9 06:19:45 2008
Return-Path: <butcher@butcher.heavennet.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6062A1065672
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Jul 2008 06:19:45 +0000 (UTC)
	(envelope-from butcher@butcher.heavennet.ru)
Received: from insysnet.ru (ns.insysnet.ru [77.72.140.26])
	by mx1.freebsd.org (Postfix) with SMTP id 87CF48FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Jul 2008 06:19:44 +0000 (UTC)
	(envelope-from butcher@butcher.heavennet.ru)
Received: (qmail 64209 invoked from network); 9 Jul 2008 09:53:01 +0400
Received: from qmail by qscan (mail filter); 9 Jul 2008 05:53:01 +0000
Received: from unknown (HELO butcher.heavennet.ru) (77.72.136.194)
  by mail.insysnet.ru with SMTP; 9 Jul 2008 09:53:01 +0400
Received: by butcher.heavennet.ru (Postfix, from userid 1001)
	id EB7CC4AC57; Wed,  9 Jul 2008 09:54:30 +0400 (MSD)
Message-Id: <20080709055430.EB7CC4AC57@butcher.heavennet.ru>
Date: Wed,  9 Jul 2008 09:54:30 +0400 (MSD)
From: Andrey V. Elsukov <bu7cher@yandex.ru>
Reply-To: Andrey V. Elsukov <bu7cher@yandex.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: <jfv@freebsd.org>
Subject: [patch][em] add new device id for quad port card
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         125419
>Category:       kern
>Synopsis:       [patch][em] add new device id for quad port card
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    remko
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 09 06:20:01 UTC 2008
>Closed-Date:    Thu Jul 10 09:40:55 UTC 2008
>Last-Modified:  Thu Jul 10 09:40:55 UTC 2008
>Originator:     Andrey V. Elsukov
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
	FreeBSD
>Description:
	FreeBSD 7.0 doesn't detect new intel's quad port adapter.
	none1@pci0:5:0:0:       class=0x020000 card=0x10a08086 chip=0x10a08086 rev=0x06 hdr=0x00
	none2@pci0:5:0:1:       class=0x020000 card=0x10a08086 chip=0x10a08086 rev=0x06 hdr=0x00
	none3@pci0:6:0:0:       class=0x020000 card=0x10a08086 chip=0x10a08086 rev=0x06 hdr=0x00
	none4@pci0:6:0:1:       class=0x020000 card=0x10a08086 chip=0x10a08086 rev=0x06 hdr=0x00

	Attached patch adds support for this adapter (tested by: galucinogen at gmail dot com). 
>How-To-Repeat:
	
>Fix:

	

--- intel_em_quad_port_devid_10a0.diff begins here ---
Index: src/sys/dev/em/e1000_api.c
===================================================================
RCS file: /ncvs/src/sys/dev/em/e1000_api.c,v
retrieving revision 1.7
diff -u -b -p -r1.7 e1000_api.c
--- src/sys/dev/em/e1000_api.c	25 Apr 2008 21:19:39 -0000	1.7
+++ src/sys/dev/em/e1000_api.c	2 Jul 2008 09:31:06 -0000
@@ -200,6 +200,7 @@ s32 e1000_set_mac_type(struct e1000_hw *
 	case E1000_DEV_ID_82571EB_SERDES_DUAL:
 	case E1000_DEV_ID_82571EB_SERDES_QUAD:
 	case E1000_DEV_ID_82571EB_QUAD_COPPER:
+	case E1000_DEV_ID_82571EB_QUAD_COPPER_A0:
 	case E1000_DEV_ID_82571PT_QUAD_COPPER:
 	case E1000_DEV_ID_82571EB_QUAD_FIBER:
 	case E1000_DEV_ID_82571EB_QUAD_COPPER_LP:
Index: src/sys/dev/em/e1000_hw.h
===================================================================
RCS file: /ncvs/src/sys/dev/em/e1000_hw.h,v
retrieving revision 1.7
diff -u -b -p -r1.7 e1000_hw.h
--- src/sys/dev/em/e1000_hw.h	25 Apr 2008 21:19:40 -0000	1.7
+++ src/sys/dev/em/e1000_hw.h	2 Jul 2008 09:31:06 -0000
@@ -85,6 +85,7 @@ struct e1000_hw;
 #define E1000_DEV_ID_82571EB_SERDES_DUAL      0x10D9
 #define E1000_DEV_ID_82571EB_SERDES_QUAD      0x10DA
 #define E1000_DEV_ID_82571EB_QUAD_COPPER      0x10A4
+#define E1000_DEV_ID_82571EB_QUAD_COPPER_A0   0x10A0
 #define E1000_DEV_ID_82571PT_QUAD_COPPER      0x10D5
 #define E1000_DEV_ID_82571EB_QUAD_FIBER       0x10A5
 #define E1000_DEV_ID_82571EB_QUAD_COPPER_LP   0x10BC
Index: src/sys/dev/em/if_em.c
===================================================================
RCS file: /ncvs/src/sys/dev/em/if_em.c,v
retrieving revision 1.194
diff -u -b -p -r1.194 if_em.c
--- src/sys/dev/em/if_em.c	21 May 2008 21:06:17 -0000	1.194
+++ src/sys/dev/em/if_em.c	2 Jul 2008 09:31:06 -0000
@@ -161,6 +161,8 @@ static em_vendor_info_t em_vendor_info_a
 						PCI_ANY_ID, PCI_ANY_ID, 0},
 	{ 0x8086, E1000_DEV_ID_82571EB_QUAD_COPPER,
 						PCI_ANY_ID, PCI_ANY_ID, 0},
+	{ 0x8086, E1000_DEV_ID_82571EB_QUAD_COPPER_A0,
+						PCI_ANY_ID, PCI_ANY_ID, 0},
 	{ 0x8086, E1000_DEV_ID_82571EB_QUAD_COPPER_LP,
 						PCI_ANY_ID, PCI_ANY_ID, 0},
 	{ 0x8086, E1000_DEV_ID_82571EB_QUAD_FIBER,
@@ -765,6 +767,7 @@ em_attach(device_t dev)
 		break;
 	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
 	case E1000_DEV_ID_82571EB_QUAD_COPPER:
+	case E1000_DEV_ID_82571EB_QUAD_COPPER_A0:
 	case E1000_DEV_ID_82571EB_QUAD_FIBER:
 	case E1000_DEV_ID_82571EB_QUAD_COPPER_LP:
                 /* if quad port adapter, disable WoL on all but port A */
--- intel_em_quad_port_devid_10a0.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->remko 
Responsible-Changed-By: remko 
Responsible-Changed-When: Wed Jul 9 11:01:57 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125419 
State-Changed-From-To: open->closed 
State-Changed-By: remko 
State-Changed-When: Wed Jul 9 18:44:28 UTC 2008 
State-Changed-Why:  
Jack reported that this is a pre-release board which Jack has to look 
into before we will hit the source code with this. Close the ticket. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125419 

Date: Wed, 9 Jul 2008 10:08:35 -0700
From: "Jack Vogel" <jfvogel@gmail.com>
To: "Andrey V. Elsukov" <bu7cher@yandex.ru>

 This is not a bug, anything designed A0 is an engineering prerelease
 adapter and will not be supported in this driver.
 
Date: Wed, 09 Jul 2008 21:55:13 +0400
From: "Andrey V. Elsukov" <bu7cher@yandex.ru>
To: jfvogel@gmail.com

 > This is not a bug, anything designed A0 is an engineering prerelease
 > adapter and will not be supported in this driver.
 
 Is it means that this adapter is counterfeit and shouldn't been sold?
 -- 
 WBR, Andrey V. Elsukov

Date: Wed, 9 Jul 2008 12:23:10 -0700
From: "Jack Vogel" <jfvogel@gmail.com>

 Not necessarily a counterfeit, although I suppose thats possible.
 When they have A0 in the ID that means its a board that we produce
 internally during development, sort of an alpha test or beta test of
 hardware, but we never ship a board with such an ID.
 
 Now, sometimes we have business partners that are given these
 boards early so that they can do some testing, but they also, as
 part of their agreement, are NEVER to ship these boards.
 
 The 82571 series adapters shipped at a hardware revision of
 'D', so A0 is absolutely guaranteed to be a problem :)
 
 Jack
State-Changed-From-To: closed->feedback 
State-Changed-By: linimon 
State-Changed-When: Thu Jul 10 09:35:23 UTC 2008 
State-Changed-Why:  
remko: I have refiled all the followups here. 

Was this code actually committed?  If so, jfv has requested a backout. 
If not, please just close this PR.  Thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125419 
State-Changed-From-To: feedback->closed 
State-Changed-By: remko 
State-Changed-When: Thu Jul 10 09:39:33 UTC 2008 
State-Changed-Why:  
I closed this ticket because we will not be fixing this or importing this anytime soon in the FreeBSD tree. 
The card used is a development board which should not live outside of some defined entities. Close it again :) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125419 
>Unformatted:
