etherlabmaster: devices/e1000/e1000_main-2.6.20-orig.c@18141b8631be (annotated)

1744 7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1	/*******************************************************************************
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3	Intel PRO/1000 Linux driver
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4	Copyright(c) 1999 - 2006 Intel Corporation.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	6	This program is free software; you can redistribute it and/or modify it
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	7	under the terms and conditions of the GNU General Public License,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	8	version 2, as published by the Free Software Foundation.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	9
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	10	This program is distributed in the hope it will be useful, but WITHOUT
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	11	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	12	FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	13	more details.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	14
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	15	You should have received a copy of the GNU General Public License along with
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	16	this program; if not, write to the Free Software Foundation, Inc.,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	17	51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	18
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	19	The full GNU General Public License is included in this distribution in
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	20	the file called "COPYING".
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	21
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	22	Contact Information:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	23	Linux NICS <linux.nics@intel.com>
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	24	e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	25	Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	26
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	27	*******************************************************************************/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	28
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	29	#include "e1000.h"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	30	#include <net/ip6_checksum.h>
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	31
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	32	char e1000_driver_name[] = "e1000";
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	33	static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	34	#ifndef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	35	#define DRIVERNAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	36	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	37	#define DRIVERNAPI "-NAPI"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	38	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	39	#define DRV_VERSION "7.3.15-k2"DRIVERNAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	40	char e1000_driver_version[] = DRV_VERSION;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	41	static char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	42
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	43	/* e1000_pci_tbl - PCI Device ID Table
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	44	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	45	* Last entry must be all 0s
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	46	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	47	* Macro expands to...
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	48	* {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	49	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	50	static struct pci_device_id e1000_pci_tbl[] = {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	51	INTEL_E1000_ETHERNET_DEVICE(0x1000),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	52	INTEL_E1000_ETHERNET_DEVICE(0x1001),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	53	INTEL_E1000_ETHERNET_DEVICE(0x1004),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	54	INTEL_E1000_ETHERNET_DEVICE(0x1008),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	55	INTEL_E1000_ETHERNET_DEVICE(0x1009),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	56	INTEL_E1000_ETHERNET_DEVICE(0x100C),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	57	INTEL_E1000_ETHERNET_DEVICE(0x100D),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	58	INTEL_E1000_ETHERNET_DEVICE(0x100E),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	59	INTEL_E1000_ETHERNET_DEVICE(0x100F),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	60	INTEL_E1000_ETHERNET_DEVICE(0x1010),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	61	INTEL_E1000_ETHERNET_DEVICE(0x1011),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	62	INTEL_E1000_ETHERNET_DEVICE(0x1012),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	63	INTEL_E1000_ETHERNET_DEVICE(0x1013),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	64	INTEL_E1000_ETHERNET_DEVICE(0x1014),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	65	INTEL_E1000_ETHERNET_DEVICE(0x1015),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	66	INTEL_E1000_ETHERNET_DEVICE(0x1016),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	67	INTEL_E1000_ETHERNET_DEVICE(0x1017),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	68	INTEL_E1000_ETHERNET_DEVICE(0x1018),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	69	INTEL_E1000_ETHERNET_DEVICE(0x1019),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	70	INTEL_E1000_ETHERNET_DEVICE(0x101A),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	71	INTEL_E1000_ETHERNET_DEVICE(0x101D),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	72	INTEL_E1000_ETHERNET_DEVICE(0x101E),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	73	INTEL_E1000_ETHERNET_DEVICE(0x1026),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	74	INTEL_E1000_ETHERNET_DEVICE(0x1027),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	75	INTEL_E1000_ETHERNET_DEVICE(0x1028),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	76	INTEL_E1000_ETHERNET_DEVICE(0x1049),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	77	INTEL_E1000_ETHERNET_DEVICE(0x104A),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	78	INTEL_E1000_ETHERNET_DEVICE(0x104B),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	79	INTEL_E1000_ETHERNET_DEVICE(0x104C),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	80	INTEL_E1000_ETHERNET_DEVICE(0x104D),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	81	INTEL_E1000_ETHERNET_DEVICE(0x105E),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	82	INTEL_E1000_ETHERNET_DEVICE(0x105F),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	83	INTEL_E1000_ETHERNET_DEVICE(0x1060),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	84	INTEL_E1000_ETHERNET_DEVICE(0x1075),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	85	INTEL_E1000_ETHERNET_DEVICE(0x1076),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	86	INTEL_E1000_ETHERNET_DEVICE(0x1077),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	87	INTEL_E1000_ETHERNET_DEVICE(0x1078),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	88	INTEL_E1000_ETHERNET_DEVICE(0x1079),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	89	INTEL_E1000_ETHERNET_DEVICE(0x107A),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	90	INTEL_E1000_ETHERNET_DEVICE(0x107B),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	91	INTEL_E1000_ETHERNET_DEVICE(0x107C),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	92	INTEL_E1000_ETHERNET_DEVICE(0x107D),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	93	INTEL_E1000_ETHERNET_DEVICE(0x107E),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	94	INTEL_E1000_ETHERNET_DEVICE(0x107F),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	95	INTEL_E1000_ETHERNET_DEVICE(0x108A),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	96	INTEL_E1000_ETHERNET_DEVICE(0x108B),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	97	INTEL_E1000_ETHERNET_DEVICE(0x108C),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	98	INTEL_E1000_ETHERNET_DEVICE(0x1096),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	99	INTEL_E1000_ETHERNET_DEVICE(0x1098),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	100	INTEL_E1000_ETHERNET_DEVICE(0x1099),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	101	INTEL_E1000_ETHERNET_DEVICE(0x109A),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	102	INTEL_E1000_ETHERNET_DEVICE(0x10A4),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	103	INTEL_E1000_ETHERNET_DEVICE(0x10B5),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	104	INTEL_E1000_ETHERNET_DEVICE(0x10B9),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	105	INTEL_E1000_ETHERNET_DEVICE(0x10BA),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	106	INTEL_E1000_ETHERNET_DEVICE(0x10BB),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	107	INTEL_E1000_ETHERNET_DEVICE(0x10BC),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	108	INTEL_E1000_ETHERNET_DEVICE(0x10C4),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	109	INTEL_E1000_ETHERNET_DEVICE(0x10C5),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	110	/* required last entry */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	111	{0,}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	112	};
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	113
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	114	MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	115
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	116	int e1000_up(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	117	void e1000_down(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	118	void e1000_reinit_locked(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	119	void e1000_reset(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	120	int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	121	int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	122	int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	123	void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	124	void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	125	static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	126	struct e1000_tx_ring *txdr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	127	static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	128	struct e1000_rx_ring *rxdr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	129	static void e1000_free_tx_resources(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	130	struct e1000_tx_ring *tx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	131	static void e1000_free_rx_resources(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	132	struct e1000_rx_ring *rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	133	void e1000_update_stats(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	134
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	135	static int e1000_init_module(void);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	136	static void e1000_exit_module(void);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	137	static int e1000_probe(struct pci_dev pdev, const struct pci_device_id ent);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	138	static void __devexit e1000_remove(struct pci_dev *pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	139	static int e1000_alloc_queues(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	140	static int e1000_sw_init(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	141	static int e1000_open(struct net_device *netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	142	static int e1000_close(struct net_device *netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	143	static void e1000_configure_tx(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	144	static void e1000_configure_rx(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	145	static void e1000_setup_rctl(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	146	static void e1000_clean_all_tx_rings(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	147	static void e1000_clean_all_rx_rings(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	148	static void e1000_clean_tx_ring(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	149	struct e1000_tx_ring *tx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	150	static void e1000_clean_rx_ring(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	151	struct e1000_rx_ring *rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	152	static void e1000_set_multi(struct net_device *netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	153	static void e1000_update_phy_info(unsigned long data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	154	static void e1000_watchdog(unsigned long data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	155	static void e1000_82547_tx_fifo_stall(unsigned long data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	156	static int e1000_xmit_frame(struct sk_buff skb, struct net_device netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	157	static struct net_device_stats * e1000_get_stats(struct net_device *netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	158	static int e1000_change_mtu(struct net_device *netdev, int new_mtu);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	159	static int e1000_set_mac(struct net_device netdev, void p);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	160	static irqreturn_t e1000_intr(int irq, void *data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	161	#ifdef CONFIG_PCI_MSI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	162	static irqreturn_t e1000_intr_msi(int irq, void *data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	163	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	164	static boolean_t e1000_clean_tx_irq(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	165	struct e1000_tx_ring *tx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	166	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	167	static int e1000_clean(struct net_device poll_dev, int budget);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	168	static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	169	struct e1000_rx_ring *rx_ring,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	170	int *work_done, int work_to_do);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	171	static boolean_t e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	172	struct e1000_rx_ring *rx_ring,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	173	int *work_done, int work_to_do);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	174	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	175	static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	176	struct e1000_rx_ring *rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	177	static boolean_t e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	178	struct e1000_rx_ring *rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	179	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	180	static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	181	struct e1000_rx_ring *rx_ring,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	182	int cleaned_count);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	183	static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	184	struct e1000_rx_ring *rx_ring,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	185	int cleaned_count);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	186	static int e1000_ioctl(struct net_device netdev, struct ifreq ifr, int cmd);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	187	static int e1000_mii_ioctl(struct net_device netdev, struct ifreq ifr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	188	int cmd);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	189	void e1000_set_ethtool_ops(struct net_device *netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	190	static void e1000_enter_82542_rst(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	191	static void e1000_leave_82542_rst(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	192	static void e1000_tx_timeout(struct net_device *dev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	193	static void e1000_reset_task(struct work_struct *work);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	194	static void e1000_smartspeed(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	195	static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	196	struct sk_buff *skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	197
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	198	static void e1000_vlan_rx_register(struct net_device netdev, struct vlan_group grp);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	199	static void e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	200	static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	201	static void e1000_restore_vlan(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	202
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	203	static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	204	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	205	static int e1000_resume(struct pci_dev *pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	206	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	207	static void e1000_shutdown(struct pci_dev *pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	208
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	209	#ifdef CONFIG_NET_POLL_CONTROLLER
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	210	/* for netdump / net console */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	211	static void e1000_netpoll (struct net_device *netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	212	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	213
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	214	extern void e1000_check_options(struct e1000_adapter *adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	215
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	216	#define COPYBREAK_DEFAULT 256
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	217	static unsigned int copybreak __read_mostly = COPYBREAK_DEFAULT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	218	module_param(copybreak, uint, 0644);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	219	MODULE_PARM_DESC(copybreak,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	220	"Maximum size of packet that is copied to a new buffer on receive");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	221
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	222	static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	223	pci_channel_state_t state);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	224	static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	225	static void e1000_io_resume(struct pci_dev *pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	226
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	227	static struct pci_error_handlers e1000_err_handler = {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	228	.error_detected = e1000_io_error_detected,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	229	.slot_reset = e1000_io_slot_reset,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	230	.resume = e1000_io_resume,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	231	};
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	232
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	233	static struct pci_driver e1000_driver = {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	234	.name = e1000_driver_name,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	235	.id_table = e1000_pci_tbl,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	236	.probe = e1000_probe,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	237	.remove = __devexit_p(e1000_remove),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	238	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	239	/* Power Managment Hooks */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	240	.suspend = e1000_suspend,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	241	.resume = e1000_resume,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	242	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	243	.shutdown = e1000_shutdown,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	244	.err_handler = &e1000_err_handler
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	245	};
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	246
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	247	MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	248	MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	249	MODULE_LICENSE("GPL");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	250	MODULE_VERSION(DRV_VERSION);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	251
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	252	static int debug = NETIF_MSG_DRV \| NETIF_MSG_PROBE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	253	module_param(debug, int, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	254	MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	255
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	256	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	257	* e1000_init_module - Driver Registration Routine
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	258	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	259	* e1000_init_module is the first routine called when the driver is
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	260	* loaded. All it does is register with the PCI subsystem.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	261	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	262
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	263	static int __init
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	264	e1000_init_module(void)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	265	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	266	int ret;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	267	printk(KERN_INFO "%s - version %s\n",
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	268	e1000_driver_string, e1000_driver_version);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	269
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	270	printk(KERN_INFO "%s\n", e1000_copyright);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	271
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	272	ret = pci_register_driver(&e1000_driver);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	273	if (copybreak != COPYBREAK_DEFAULT) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	274	if (copybreak == 0)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	275	printk(KERN_INFO "e1000: copybreak disabled\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	276	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	277	printk(KERN_INFO "e1000: copybreak enabled for "
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	278	"packets <= %u bytes\n", copybreak);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	279	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	280	return ret;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	281	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	282
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	283	module_init(e1000_init_module);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	284
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	285	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	286	* e1000_exit_module - Driver Exit Cleanup Routine
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	287	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	288	* e1000_exit_module is called just before the driver is removed
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	289	* from memory.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	290	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	291
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	292	static void __exit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	293	e1000_exit_module(void)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	294	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	295	pci_unregister_driver(&e1000_driver);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	296	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	297
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	298	module_exit(e1000_exit_module);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	299
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	300	static int e1000_request_irq(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	301	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	302	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	303	int flags, err = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	304
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	305	flags = IRQF_SHARED;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	306	#ifdef CONFIG_PCI_MSI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	307	if (adapter->hw.mac_type >= e1000_82571) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	308	adapter->have_msi = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	309	if ((err = pci_enable_msi(adapter->pdev))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	310	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	311	"Unable to allocate MSI interrupt Error: %d\n", err);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	312	adapter->have_msi = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	313	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	314	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	315	if (adapter->have_msi) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	316	flags &= ~IRQF_SHARED;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	317	err = request_irq(adapter->pdev->irq, &e1000_intr_msi, flags,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	318	netdev->name, netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	319	if (err)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	320	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	321	"Unable to allocate interrupt Error: %d\n", err);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	322	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	323	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	324	if ((err = request_irq(adapter->pdev->irq, &e1000_intr, flags,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	325	netdev->name, netdev)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	326	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	327	"Unable to allocate interrupt Error: %d\n", err);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	328
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	329	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	330	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	331
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	332	static void e1000_free_irq(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	333	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	334	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	335
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	336	free_irq(adapter->pdev->irq, netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	337
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	338	#ifdef CONFIG_PCI_MSI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	339	if (adapter->have_msi)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	340	pci_disable_msi(adapter->pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	341	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	342	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	343
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	344	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	345	* e1000_irq_disable - Mask off interrupt generation on the NIC
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	346	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	347	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	348
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	349	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	350	e1000_irq_disable(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	351	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	352	atomic_inc(&adapter->irq_sem);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	353	E1000_WRITE_REG(&adapter->hw, IMC, ~0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	354	E1000_WRITE_FLUSH(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	355	synchronize_irq(adapter->pdev->irq);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	356	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	357
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	358	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	359	* e1000_irq_enable - Enable default interrupt generation settings
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	360	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	361	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	362
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	363	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	364	e1000_irq_enable(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	365	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	366	if (likely(atomic_dec_and_test(&adapter->irq_sem))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	367	E1000_WRITE_REG(&adapter->hw, IMS, IMS_ENABLE_MASK);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	368	E1000_WRITE_FLUSH(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	369	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	370	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	371
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	372	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	373	e1000_update_mng_vlan(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	374	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	375	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	376	uint16_t vid = adapter->hw.mng_cookie.vlan_id;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	377	uint16_t old_vid = adapter->mng_vlan_id;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	378	if (adapter->vlgrp) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	379	if (!adapter->vlgrp->vlan_devices[vid]) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	380	if (adapter->hw.mng_cookie.status &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	381	E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	382	e1000_vlan_rx_add_vid(netdev, vid);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	383	adapter->mng_vlan_id = vid;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	384	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	385	adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	386
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	387	if ((old_vid != (uint16_t)E1000_MNG_VLAN_NONE) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	388	(vid != old_vid) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	389	!adapter->vlgrp->vlan_devices[old_vid])
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	390	e1000_vlan_rx_kill_vid(netdev, old_vid);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	391	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	392	adapter->mng_vlan_id = vid;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	393	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	394	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	395
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	396	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	397	* e1000_release_hw_control - release control of the h/w to f/w
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	398	* @adapter: address of board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	399	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	400	* e1000_release_hw_control resets {CTRL_EXT\|FWSM}:DRV_LOAD bit.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	401	* For ASF and Pass Through versions of f/w this means that the
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	402	* driver is no longer loaded. For AMT version (only with 82573) i
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	403	* of the f/w this means that the network i/f is closed.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	404	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	405	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	406
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	407	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	408	e1000_release_hw_control(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	409	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	410	uint32_t ctrl_ext;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	411	uint32_t swsm;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	412	uint32_t extcnf;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	413
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	414	/* Let firmware taken over control of h/w */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	415	switch (adapter->hw.mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	416	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	417	case e1000_82572:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	418	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	419	ctrl_ext = E1000_READ_REG(&adapter->hw, CTRL_EXT);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	420	E1000_WRITE_REG(&adapter->hw, CTRL_EXT,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	421	ctrl_ext & ~E1000_CTRL_EXT_DRV_LOAD);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	422	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	423	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	424	swsm = E1000_READ_REG(&adapter->hw, SWSM);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	425	E1000_WRITE_REG(&adapter->hw, SWSM,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	426	swsm & ~E1000_SWSM_DRV_LOAD);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	427	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	428	extcnf = E1000_READ_REG(&adapter->hw, CTRL_EXT);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	429	E1000_WRITE_REG(&adapter->hw, CTRL_EXT,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	430	extcnf & ~E1000_CTRL_EXT_DRV_LOAD);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	431	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	432	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	433	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	434	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	435	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	436
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	437	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	438	* e1000_get_hw_control - get control of the h/w from f/w
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	439	* @adapter: address of board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	440	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	441	* e1000_get_hw_control sets {CTRL_EXT\|FWSM}:DRV_LOAD bit.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	442	* For ASF and Pass Through versions of f/w this means that
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	443	* the driver is loaded. For AMT version (only with 82573)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	444	* of the f/w this means that the network i/f is open.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	445	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	446	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	447
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	448	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	449	e1000_get_hw_control(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	450	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	451	uint32_t ctrl_ext;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	452	uint32_t swsm;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	453	uint32_t extcnf;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	454
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	455	/* Let firmware know the driver has taken over */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	456	switch (adapter->hw.mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	457	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	458	case e1000_82572:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	459	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	460	ctrl_ext = E1000_READ_REG(&adapter->hw, CTRL_EXT);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	461	E1000_WRITE_REG(&adapter->hw, CTRL_EXT,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	462	ctrl_ext \| E1000_CTRL_EXT_DRV_LOAD);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	463	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	464	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	465	swsm = E1000_READ_REG(&adapter->hw, SWSM);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	466	E1000_WRITE_REG(&adapter->hw, SWSM,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	467	swsm \| E1000_SWSM_DRV_LOAD);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	468	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	469	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	470	extcnf = E1000_READ_REG(&adapter->hw, EXTCNF_CTRL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	471	E1000_WRITE_REG(&adapter->hw, EXTCNF_CTRL,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	472	extcnf \| E1000_EXTCNF_CTRL_SWFLAG);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	473	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	474	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	475	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	476	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	477	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	478
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	479	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	480	e1000_init_manageability(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	481	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	482	if (adapter->en_mng_pt) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	483	uint32_t manc = E1000_READ_REG(&adapter->hw, MANC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	484
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	485	/* disable hardware interception of ARP */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	486	manc &= ~(E1000_MANC_ARP_EN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	487
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	488	/* enable receiving management packets to the host */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	489	/* this will probably generate destination unreachable messages
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	490	* from the host OS, but the packets will be handled on SMBUS */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	491	if (adapter->hw.has_manc2h) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	492	uint32_t manc2h = E1000_READ_REG(&adapter->hw, MANC2H);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	493
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	494	manc \|= E1000_MANC_EN_MNG2HOST;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	495	#define E1000_MNG2HOST_PORT_623 (1 << 5)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	496	#define E1000_MNG2HOST_PORT_664 (1 << 6)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	497	manc2h \|= E1000_MNG2HOST_PORT_623;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	498	manc2h \|= E1000_MNG2HOST_PORT_664;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	499	E1000_WRITE_REG(&adapter->hw, MANC2H, manc2h);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	500	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	501
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	502	E1000_WRITE_REG(&adapter->hw, MANC, manc);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	503	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	504	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	505
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	506	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	507	e1000_release_manageability(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	508	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	509	if (adapter->en_mng_pt) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	510	uint32_t manc = E1000_READ_REG(&adapter->hw, MANC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	511
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	512	/* re-enable hardware interception of ARP */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	513	manc \|= E1000_MANC_ARP_EN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	514
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	515	if (adapter->hw.has_manc2h)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	516	manc &= ~E1000_MANC_EN_MNG2HOST;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	517
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	518	/* don't explicitly have to mess with MANC2H since
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	519	* MANC has an enable disable that gates MANC2H */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	520
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	521	E1000_WRITE_REG(&adapter->hw, MANC, manc);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	522	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	523	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	524
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	525	int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	526	e1000_up(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	527	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	528	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	529	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	530
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	531	/* hardware has been reset, we need to reload some things */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	532
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	533	e1000_set_multi(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	534
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	535	e1000_restore_vlan(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	536	e1000_init_manageability(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	537
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	538	e1000_configure_tx(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	539	e1000_setup_rctl(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	540	e1000_configure_rx(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	541	/* call E1000_DESC_UNUSED which always leaves
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	542	* at least 1 descriptor unused to make sure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	543	* next_to_use != next_to_clean */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	544	for (i = 0; i < adapter->num_rx_queues; i++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	545	struct e1000_rx_ring *ring = &adapter->rx_ring[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	546	adapter->alloc_rx_buf(adapter, ring,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	547	E1000_DESC_UNUSED(ring));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	548	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	549
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	550	adapter->tx_queue_len = netdev->tx_queue_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	551
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	552	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	553	netif_poll_enable(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	554	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	555	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	556
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	557	clear_bit(__E1000_DOWN, &adapter->flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	558
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	559	/* fire a link change interrupt to start the watchdog */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	560	E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_LSC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	561	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	562	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	563
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	564	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	565	* e1000_power_up_phy - restore link in case the phy was powered down
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	566	* @adapter: address of board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	567	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	568	* The phy may be powered down to save power and turn off link when the
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	569	* driver is unloaded and wake on lan is not enabled (among others)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	570	* * this routine MUST be followed by a call to e1000_reset *
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	571	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	572	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	573
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	574	void e1000_power_up_phy(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	575	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	576	uint16_t mii_reg = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	577
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	578	/* Just clear the power down bit to wake the phy back up */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	579	if (adapter->hw.media_type == e1000_media_type_copper) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	580	/* according to the manual, the phy will retain its
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	581	* settings across a power-down/up cycle */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	582	e1000_read_phy_reg(&adapter->hw, PHY_CTRL, &mii_reg);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	583	mii_reg &= ~MII_CR_POWER_DOWN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	584	e1000_write_phy_reg(&adapter->hw, PHY_CTRL, mii_reg);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	585	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	586	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	587
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	588	static void e1000_power_down_phy(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	589	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	590	/* Power down the PHY so no link is implied when interface is down *
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	591	* The PHY cannot be powered down if any of the following is TRUE *
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	592	* (a) WoL is enabled
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	593	* (b) AMT is active
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	594	* (c) SoL/IDER session is active */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	595	if (!adapter->wol && adapter->hw.mac_type >= e1000_82540 &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	596	adapter->hw.media_type == e1000_media_type_copper) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	597	uint16_t mii_reg = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	598
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	599	switch (adapter->hw.mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	600	case e1000_82540:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	601	case e1000_82545:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	602	case e1000_82545_rev_3:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	603	case e1000_82546:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	604	case e1000_82546_rev_3:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	605	case e1000_82541:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	606	case e1000_82541_rev_2:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	607	case e1000_82547:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	608	case e1000_82547_rev_2:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	609	if (E1000_READ_REG(&adapter->hw, MANC) &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	610	E1000_MANC_SMBUS_EN)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	611	goto out;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	612	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	613	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	614	case e1000_82572:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	615	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	616	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	617	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	618	if (e1000_check_mng_mode(&adapter->hw) \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	619	e1000_check_phy_reset_block(&adapter->hw))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	620	goto out;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	621	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	622	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	623	goto out;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	624	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	625	e1000_read_phy_reg(&adapter->hw, PHY_CTRL, &mii_reg);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	626	mii_reg \|= MII_CR_POWER_DOWN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	627	e1000_write_phy_reg(&adapter->hw, PHY_CTRL, mii_reg);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	628	mdelay(1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	629	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	630	out:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	631	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	632	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	633
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	634	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	635	e1000_down(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	636	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	637	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	638
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	639	/* signal that we're down so the interrupt handler does not
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	640	* reschedule our watchdog timer */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	641	set_bit(__E1000_DOWN, &adapter->flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	642
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	643	e1000_irq_disable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	644
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	645	del_timer_sync(&adapter->tx_fifo_stall_timer);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	646	del_timer_sync(&adapter->watchdog_timer);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	647	del_timer_sync(&adapter->phy_info_timer);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	648
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	649	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	650	netif_poll_disable(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	651	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	652	netdev->tx_queue_len = adapter->tx_queue_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	653	adapter->link_speed = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	654	adapter->link_duplex = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	655	netif_carrier_off(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	656	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	657
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	658	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	659	e1000_clean_all_tx_rings(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	660	e1000_clean_all_rx_rings(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	661	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	662
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	663	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	664	e1000_reinit_locked(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	665	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	666	WARN_ON(in_interrupt());
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	667	while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	668	msleep(1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	669	e1000_down(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	670	e1000_up(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	671	clear_bit(__E1000_RESETTING, &adapter->flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	672	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	673
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	674	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	675	e1000_reset(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	676	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	677	uint32_t pba = 0, tx_space, min_tx_space, min_rx_space;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	678	uint16_t fc_high_water_mark = E1000_FC_HIGH_DIFF;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	679	boolean_t legacy_pba_adjust = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	680
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	681	/* Repartition Pba for greater than 9k mtu
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	682	* To take effect CTRL.RST is required.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	683	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	684
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	685	switch (adapter->hw.mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	686	case e1000_82542_rev2_0:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	687	case e1000_82542_rev2_1:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	688	case e1000_82543:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	689	case e1000_82544:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	690	case e1000_82540:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	691	case e1000_82541:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	692	case e1000_82541_rev_2:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	693	legacy_pba_adjust = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	694	pba = E1000_PBA_48K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	695	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	696	case e1000_82545:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	697	case e1000_82545_rev_3:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	698	case e1000_82546:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	699	case e1000_82546_rev_3:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	700	pba = E1000_PBA_48K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	701	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	702	case e1000_82547:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	703	case e1000_82547_rev_2:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	704	legacy_pba_adjust = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	705	pba = E1000_PBA_30K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	706	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	707	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	708	case e1000_82572:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	709	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	710	pba = E1000_PBA_38K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	711	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	712	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	713	pba = E1000_PBA_20K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	714	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	715	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	716	pba = E1000_PBA_8K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	717	case e1000_undefined:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	718	case e1000_num_macs:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	719	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	720	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	721
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	722	if (legacy_pba_adjust == TRUE) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	723	if (adapter->netdev->mtu > E1000_RXBUFFER_8192)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	724	pba -= 8; /* allocate more FIFO for Tx */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	725
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	726	if (adapter->hw.mac_type == e1000_82547) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	727	adapter->tx_fifo_head = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	728	adapter->tx_head_addr = pba << E1000_TX_HEAD_ADDR_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	729	adapter->tx_fifo_size =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	730	(E1000_PBA_40K - pba) << E1000_PBA_BYTES_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	731	atomic_set(&adapter->tx_fifo_stall, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	732	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	733	} else if (adapter->hw.max_frame_size > MAXIMUM_ETHERNET_FRAME_SIZE) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	734	/* adjust PBA for jumbo frames */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	735	E1000_WRITE_REG(&adapter->hw, PBA, pba);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	736
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	737	/* To maintain wire speed transmits, the Tx FIFO should be
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	738	* large enough to accomodate two full transmit packets,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	739	* rounded up to the next 1KB and expressed in KB. Likewise,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	740	* the Rx FIFO should be large enough to accomodate at least
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	741	* one full receive packet and is similarly rounded up and
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	742	* expressed in KB. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	743	pba = E1000_READ_REG(&adapter->hw, PBA);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	744	/* upper 16 bits has Tx packet buffer allocation size in KB */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	745	tx_space = pba >> 16;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	746	/* lower 16 bits has Rx packet buffer allocation size in KB */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	747	pba &= 0xffff;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	748	/* don't include ethernet FCS because hardware appends/strips */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	749	min_rx_space = adapter->netdev->mtu + ENET_HEADER_SIZE +
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	750	VLAN_TAG_SIZE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	751	min_tx_space = min_rx_space;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	752	min_tx_space *= 2;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	753	E1000_ROUNDUP(min_tx_space, 1024);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	754	min_tx_space >>= 10;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	755	E1000_ROUNDUP(min_rx_space, 1024);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	756	min_rx_space >>= 10;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	757
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	758	/* If current Tx allocation is less than the min Tx FIFO size,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	759	* and the min Tx FIFO size is less than the current Rx FIFO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	760	* allocation, take space away from current Rx allocation */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	761	if (tx_space < min_tx_space &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	762	((min_tx_space - tx_space) < pba)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	763	pba = pba - (min_tx_space - tx_space);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	764
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	765	/* PCI/PCIx hardware has PBA alignment constraints */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	766	switch (adapter->hw.mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	767	case e1000_82545 ... e1000_82546_rev_3:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	768	pba &= ~(E1000_PBA_8K - 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	769	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	770	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	771	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	772	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	773
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	774	/* if short on rx space, rx wins and must trump tx
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	775	* adjustment or use Early Receive if available */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	776	if (pba < min_rx_space) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	777	switch (adapter->hw.mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	778	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	779	/* ERT enabled in e1000_configure_rx */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	780	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	781	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	782	pba = min_rx_space;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	783	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	784	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	785	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	786	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	787	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	788
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	789	E1000_WRITE_REG(&adapter->hw, PBA, pba);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	790
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	791	/* flow control settings */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	792	/* Set the FC high water mark to 90% of the FIFO size.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	793	* Required to clear last 3 LSB */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	794	fc_high_water_mark = ((pba * 9216)/10) & 0xFFF8;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	795	/* We can't use 90% on small FIFOs because the remainder
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	796	* would be less than 1 full frame. In this case, we size
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	797	* it to allow at least a full frame above the high water
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	798	* mark. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	799	if (pba < E1000_PBA_16K)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	800	fc_high_water_mark = (pba * 1024) - 1600;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	801
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	802	adapter->hw.fc_high_water = fc_high_water_mark;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	803	adapter->hw.fc_low_water = fc_high_water_mark - 8;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	804	if (adapter->hw.mac_type == e1000_80003es2lan)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	805	adapter->hw.fc_pause_time = 0xFFFF;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	806	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	807	adapter->hw.fc_pause_time = E1000_FC_PAUSE_TIME;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	808	adapter->hw.fc_send_xon = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	809	adapter->hw.fc = adapter->hw.original_fc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	810
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	811	/* Allow time for pending master requests to run */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	812	e1000_reset_hw(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	813	if (adapter->hw.mac_type >= e1000_82544)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	814	E1000_WRITE_REG(&adapter->hw, WUC, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	815
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	816	if (e1000_init_hw(&adapter->hw))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	817	DPRINTK(PROBE, ERR, "Hardware Error\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	818	e1000_update_mng_vlan(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	819
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	820	/* if (adapter->hwflags & HWFLAGS_PHY_PWR_BIT) { */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	821	if (adapter->hw.mac_type >= e1000_82544 &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	822	adapter->hw.mac_type <= e1000_82547_rev_2 &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	823	adapter->hw.autoneg == 1 &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	824	adapter->hw.autoneg_advertised == ADVERTISE_1000_FULL) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	825	uint32_t ctrl = E1000_READ_REG(&adapter->hw, CTRL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	826	/* clear phy power management bit if we are in gig only mode,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	827	* which if enabled will attempt negotiation to 100Mb, which
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	828	* can cause a loss of link at power off or driver unload */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	829	ctrl &= ~E1000_CTRL_SWDPIN3;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	830	E1000_WRITE_REG(&adapter->hw, CTRL, ctrl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	831	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	832
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	833	/* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	834	E1000_WRITE_REG(&adapter->hw, VET, ETHERNET_IEEE_VLAN_TYPE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	835
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	836	e1000_reset_adaptive(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	837	e1000_phy_get_info(&adapter->hw, &adapter->phy_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	838
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	839	if (!adapter->smart_power_down &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	840	(adapter->hw.mac_type == e1000_82571 \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	841	adapter->hw.mac_type == e1000_82572)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	842	uint16_t phy_data = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	843	/* speed up time to link by disabling smart power down, ignore
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	844	* the return value of this function because there is nothing
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	845	* different we would do if it failed */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	846	e1000_read_phy_reg(&adapter->hw, IGP02E1000_PHY_POWER_MGMT,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	847	&phy_data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	848	phy_data &= ~IGP02E1000_PM_SPD;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	849	e1000_write_phy_reg(&adapter->hw, IGP02E1000_PHY_POWER_MGMT,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	850	phy_data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	851	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	852
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	853	e1000_release_manageability(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	854	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	855
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	856	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	857	* e1000_probe - Device Initialization Routine
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	858	* @pdev: PCI device information struct
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	859	* @ent: entry in e1000_pci_tbl
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	860	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	861	* Returns 0 on success, negative on failure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	862	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	863	* e1000_probe initializes an adapter identified by a pci_dev structure.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	864	* The OS initialization, configuring of the adapter private structure,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	865	* and a hardware reset occur.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	866	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	867
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	868	static int __devinit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	869	e1000_probe(struct pci_dev *pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	870	const struct pci_device_id *ent)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	871	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	872	struct net_device *netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	873	struct e1000_adapter *adapter;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	874	unsigned long mmio_start, mmio_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	875	unsigned long flash_start, flash_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	876
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	877	static int cards_found = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	878	static int global_quad_port_a = 0; /* global ksp3 port a indication */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	879	int i, err, pci_using_dac;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	880	uint16_t eeprom_data = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	881	uint16_t eeprom_apme_mask = E1000_EEPROM_APME;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	882	if ((err = pci_enable_device(pdev)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	883	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	884
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	885	if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	886	!(err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	887	pci_using_dac = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	888	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	889	if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	890	(err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	891	E1000_ERR("No usable DMA configuration, aborting\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	892	goto err_dma;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	893	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	894	pci_using_dac = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	895	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	896
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	897	if ((err = pci_request_regions(pdev, e1000_driver_name)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	898	goto err_pci_reg;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	899
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	900	pci_set_master(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	901
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	902	err = -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	903	netdev = alloc_etherdev(sizeof(struct e1000_adapter));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	904	if (!netdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	905	goto err_alloc_etherdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	906
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	907	SET_MODULE_OWNER(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	908	SET_NETDEV_DEV(netdev, &pdev->dev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	909
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	910	pci_set_drvdata(pdev, netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	911	adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	912	adapter->netdev = netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	913	adapter->pdev = pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	914	adapter->hw.back = adapter;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	915	adapter->msg_enable = (1 << debug) - 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	916
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	917	mmio_start = pci_resource_start(pdev, BAR_0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	918	mmio_len = pci_resource_len(pdev, BAR_0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	919
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	920	err = -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	921	adapter->hw.hw_addr = ioremap(mmio_start, mmio_len);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	922	if (!adapter->hw.hw_addr)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	923	goto err_ioremap;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	924
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	925	for (i = BAR_1; i <= BAR_5; i++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	926	if (pci_resource_len(pdev, i) == 0)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	927	continue;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	928	if (pci_resource_flags(pdev, i) & IORESOURCE_IO) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	929	adapter->hw.io_base = pci_resource_start(pdev, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	930	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	931	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	932	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	933
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	934	netdev->open = &e1000_open;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	935	netdev->stop = &e1000_close;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	936	netdev->hard_start_xmit = &e1000_xmit_frame;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	937	netdev->get_stats = &e1000_get_stats;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	938	netdev->set_multicast_list = &e1000_set_multi;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	939	netdev->set_mac_address = &e1000_set_mac;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	940	netdev->change_mtu = &e1000_change_mtu;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	941	netdev->do_ioctl = &e1000_ioctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	942	e1000_set_ethtool_ops(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	943	netdev->tx_timeout = &e1000_tx_timeout;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	944	netdev->watchdog_timeo = 5 * HZ;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	945	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	946	netdev->poll = &e1000_clean;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	947	netdev->weight = 64;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	948	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	949	netdev->vlan_rx_register = e1000_vlan_rx_register;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	950	netdev->vlan_rx_add_vid = e1000_vlan_rx_add_vid;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	951	netdev->vlan_rx_kill_vid = e1000_vlan_rx_kill_vid;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	952	#ifdef CONFIG_NET_POLL_CONTROLLER
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	953	netdev->poll_controller = e1000_netpoll;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	954	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	955	strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	956
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	957	netdev->mem_start = mmio_start;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	958	netdev->mem_end = mmio_start + mmio_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	959	netdev->base_addr = adapter->hw.io_base;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	960
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	961	adapter->bd_number = cards_found;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	962
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	963	/* setup the private structure */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	964
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	965	if ((err = e1000_sw_init(adapter)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	966	goto err_sw_init;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	967
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	968	err = -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	969	/* Flash BAR mapping must happen after e1000_sw_init
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	970	* because it depends on mac_type */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	971	if ((adapter->hw.mac_type == e1000_ich8lan) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	972	(pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	973	flash_start = pci_resource_start(pdev, 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	974	flash_len = pci_resource_len(pdev, 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	975	adapter->hw.flash_address = ioremap(flash_start, flash_len);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	976	if (!adapter->hw.flash_address)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	977	goto err_flashmap;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	978	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	979
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	980	if (e1000_check_phy_reset_block(&adapter->hw))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	981	DPRINTK(PROBE, INFO, "PHY reset is blocked due to SOL/IDER session.\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	982
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	983	if (adapter->hw.mac_type >= e1000_82543) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	984	netdev->features = NETIF_F_SG \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	985	NETIF_F_HW_CSUM \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	986	NETIF_F_HW_VLAN_TX \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	987	NETIF_F_HW_VLAN_RX \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	988	NETIF_F_HW_VLAN_FILTER;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	989	if (adapter->hw.mac_type == e1000_ich8lan)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	990	netdev->features &= ~NETIF_F_HW_VLAN_FILTER;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	991	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	992
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	993	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	994	if ((adapter->hw.mac_type >= e1000_82544) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	995	(adapter->hw.mac_type != e1000_82547))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	996	netdev->features \|= NETIF_F_TSO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	997
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	998	#ifdef NETIF_F_TSO6
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	999	if (adapter->hw.mac_type > e1000_82547_rev_2)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1000	netdev->features \|= NETIF_F_TSO6;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1001	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1002	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1003	if (pci_using_dac)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1004	netdev->features \|= NETIF_F_HIGHDMA;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1005
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1006	netdev->features \|= NETIF_F_LLTX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1007
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1008	adapter->en_mng_pt = e1000_enable_mng_pass_thru(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1009
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1010	/* initialize eeprom parameters */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1011
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1012	if (e1000_init_eeprom_params(&adapter->hw)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1013	E1000_ERR("EEPROM initialization failed\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1014	goto err_eeprom;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1015	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1016
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1017	/* before reading the EEPROM, reset the controller to
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1018	* put the device in a known good starting state */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1019
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1020	e1000_reset_hw(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1021
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1022	/* make sure the EEPROM is good */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1023
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1024	if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1025	DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1026	goto err_eeprom;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1027	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1028
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1029	/* copy the MAC address out of the EEPROM */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1030
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1031	if (e1000_read_mac_addr(&adapter->hw))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1032	DPRINTK(PROBE, ERR, "EEPROM Read Error\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1033	memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1034	memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1035
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1036	if (!is_valid_ether_addr(netdev->perm_addr)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1037	DPRINTK(PROBE, ERR, "Invalid MAC Address\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1038	goto err_eeprom;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1039	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1040
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1041	e1000_get_bus_info(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1042
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1043	init_timer(&adapter->tx_fifo_stall_timer);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1044	adapter->tx_fifo_stall_timer.function = &e1000_82547_tx_fifo_stall;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1045	adapter->tx_fifo_stall_timer.data = (unsigned long) adapter;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1046
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1047	init_timer(&adapter->watchdog_timer);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1048	adapter->watchdog_timer.function = &e1000_watchdog;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1049	adapter->watchdog_timer.data = (unsigned long) adapter;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1050
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1051	init_timer(&adapter->phy_info_timer);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1052	adapter->phy_info_timer.function = &e1000_update_phy_info;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1053	adapter->phy_info_timer.data = (unsigned long) adapter;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1054
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1055	INIT_WORK(&adapter->reset_task, e1000_reset_task);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1056
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1057	e1000_check_options(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1058
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1059	/* Initial Wake on LAN setting
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1060	* If APM wake is enabled in the EEPROM,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1061	* enable the ACPI Magic Packet filter
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1062	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1063
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1064	switch (adapter->hw.mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1065	case e1000_82542_rev2_0:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1066	case e1000_82542_rev2_1:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1067	case e1000_82543:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1068	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1069	case e1000_82544:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1070	e1000_read_eeprom(&adapter->hw,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1071	EEPROM_INIT_CONTROL2_REG, 1, &eeprom_data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1072	eeprom_apme_mask = E1000_EEPROM_82544_APM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1073	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1074	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1075	e1000_read_eeprom(&adapter->hw,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1076	EEPROM_INIT_CONTROL1_REG, 1, &eeprom_data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1077	eeprom_apme_mask = E1000_EEPROM_ICH8_APME;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1078	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1079	case e1000_82546:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1080	case e1000_82546_rev_3:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1081	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1082	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1083	if (E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_FUNC_1){
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1084	e1000_read_eeprom(&adapter->hw,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1085	EEPROM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1086	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1087	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1088	/* Fall Through */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1089	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1090	e1000_read_eeprom(&adapter->hw,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1091	EEPROM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1092	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1093	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1094	if (eeprom_data & eeprom_apme_mask)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1095	adapter->eeprom_wol \|= E1000_WUFC_MAG;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1096
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1097	/* now that we have the eeprom settings, apply the special cases
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1098	* where the eeprom may be wrong or the board simply won't support
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1099	* wake on lan on a particular port */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1100	switch (pdev->device) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1101	case E1000_DEV_ID_82546GB_PCIE:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1102	adapter->eeprom_wol = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1103	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1104	case E1000_DEV_ID_82546EB_FIBER:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1105	case E1000_DEV_ID_82546GB_FIBER:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1106	case E1000_DEV_ID_82571EB_FIBER:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1107	/* Wake events only supported on port A for dual fiber
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1108	* regardless of eeprom setting */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1109	if (E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_FUNC_1)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1110	adapter->eeprom_wol = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1111	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1112	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1113	case E1000_DEV_ID_82571EB_QUAD_COPPER:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1114	case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1115	/* if quad port adapter, disable WoL on all but port A */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1116	if (global_quad_port_a != 0)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1117	adapter->eeprom_wol = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1118	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1119	adapter->quad_port_a = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1120	/* Reset for multiple quad port adapters */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1121	if (++global_quad_port_a == 4)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1122	global_quad_port_a = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1123	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1124	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1125
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1126	/* initialize the wol settings based on the eeprom settings */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1127	adapter->wol = adapter->eeprom_wol;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1128
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1129	/* print bus type/speed/width info */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1130	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1131	struct e1000_hw *hw = &adapter->hw;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1132	DPRINTK(PROBE, INFO, "(PCI%s:%s:%s) ",
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1133	((hw->bus_type == e1000_bus_type_pcix) ? "-X" :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1134	(hw->bus_type == e1000_bus_type_pci_express ? " Express":"")),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1135	((hw->bus_speed == e1000_bus_speed_2500) ? "2.5Gb/s" :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1136	(hw->bus_speed == e1000_bus_speed_133) ? "133MHz" :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1137	(hw->bus_speed == e1000_bus_speed_120) ? "120MHz" :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1138	(hw->bus_speed == e1000_bus_speed_100) ? "100MHz" :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1139	(hw->bus_speed == e1000_bus_speed_66) ? "66MHz" : "33MHz"),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1140	((hw->bus_width == e1000_bus_width_64) ? "64-bit" :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1141	(hw->bus_width == e1000_bus_width_pciex_4) ? "Width x4" :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1142	(hw->bus_width == e1000_bus_width_pciex_1) ? "Width x1" :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1143	"32-bit"));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1144	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1145
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1146	for (i = 0; i < 6; i++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1147	printk("%2.2x%c", netdev->dev_addr[i], i == 5 ? '\n' : ':');
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1148
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1149	/* reset the hardware with the new settings */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1150	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1151
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1152	/* If the controller is 82573 and f/w is AMT, do not set
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1153	* DRV_LOAD until the interface is up. For all other cases,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1154	* let the f/w know that the h/w is now under the control
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1155	* of the driver. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1156	if (adapter->hw.mac_type != e1000_82573 \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1157	!e1000_check_mng_mode(&adapter->hw))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1158	e1000_get_hw_control(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1159
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1160	strcpy(netdev->name, "eth%d");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1161	if ((err = register_netdev(netdev)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1162	goto err_register;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1163
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1164	/* tell the stack to leave us alone until e1000_open() is called */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1165	netif_carrier_off(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1166	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1167
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1168	DPRINTK(PROBE, INFO, "Intel(R) PRO/1000 Network Connection\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1169
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1170	cards_found++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1171	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1172
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1173	err_register:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1174	e1000_release_hw_control(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1175	err_eeprom:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1176	if (!e1000_check_phy_reset_block(&adapter->hw))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1177	e1000_phy_hw_reset(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1178
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1179	if (adapter->hw.flash_address)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1180	iounmap(adapter->hw.flash_address);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1181	err_flashmap:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1182	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1183	for (i = 0; i < adapter->num_rx_queues; i++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1184	dev_put(&adapter->polling_netdev[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1185	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1186
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1187	kfree(adapter->tx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1188	kfree(adapter->rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1189	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1190	kfree(adapter->polling_netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1191	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1192	err_sw_init:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1193	iounmap(adapter->hw.hw_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1194	err_ioremap:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1195	free_netdev(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1196	err_alloc_etherdev:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1197	pci_release_regions(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1198	err_pci_reg:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1199	err_dma:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1200	pci_disable_device(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1201	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1202	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1203
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1204	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1205	* e1000_remove - Device Removal Routine
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1206	* @pdev: PCI device information struct
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1207	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1208	* e1000_remove is called by the PCI subsystem to alert the driver
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1209	* that it should release a PCI device. The could be caused by a
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1210	* Hot-Plug event, or because the driver is going to be removed from
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1211	* memory.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1212	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1213
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1214	static void __devexit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1215	e1000_remove(struct pci_dev *pdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1216	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1217	struct net_device *netdev = pci_get_drvdata(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1218	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1219	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1220	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1221	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1222
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1223	flush_scheduled_work();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1224
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1225	e1000_release_manageability(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1226
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1227	/* Release control of h/w to f/w. If f/w is AMT enabled, this
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1228	* would have already happened in close and is redundant. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1229	e1000_release_hw_control(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1230
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1231	unregister_netdev(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1232	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1233	for (i = 0; i < adapter->num_rx_queues; i++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1234	dev_put(&adapter->polling_netdev[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1235	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1236
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1237	if (!e1000_check_phy_reset_block(&adapter->hw))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1238	e1000_phy_hw_reset(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1239
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1240	kfree(adapter->tx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1241	kfree(adapter->rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1242	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1243	kfree(adapter->polling_netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1244	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1245
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1246	iounmap(adapter->hw.hw_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1247	if (adapter->hw.flash_address)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1248	iounmap(adapter->hw.flash_address);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1249	pci_release_regions(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1250
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1251	free_netdev(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1252
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1253	pci_disable_device(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1254	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1255
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1256	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1257	* e1000_sw_init - Initialize general software structures (struct e1000_adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1258	* @adapter: board private structure to initialize
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1259	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1260	* e1000_sw_init initializes the Adapter private data structure.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1261	* Fields are initialized based on PCI device information and
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1262	* OS network device settings (MTU size).
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1263	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1264
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1265	static int __devinit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1266	e1000_sw_init(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1267	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1268	struct e1000_hw *hw = &adapter->hw;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1269	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1270	struct pci_dev *pdev = adapter->pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1271	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1272	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1273	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1274
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1275	/* PCI config space info */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1276
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1277	hw->vendor_id = pdev->vendor;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1278	hw->device_id = pdev->device;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1279	hw->subsystem_vendor_id = pdev->subsystem_vendor;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1280	hw->subsystem_id = pdev->subsystem_device;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1281
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1282	pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1283
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1284	pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1285
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1286	adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1287	adapter->rx_ps_bsize0 = E1000_RXBUFFER_128;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1288	hw->max_frame_size = netdev->mtu +
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1289	ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1290	hw->min_frame_size = MINIMUM_ETHERNET_FRAME_SIZE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1291
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1292	/* identify the MAC */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1293
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1294	if (e1000_set_mac_type(hw)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1295	DPRINTK(PROBE, ERR, "Unknown MAC Type\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1296	return -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1297	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1298
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1299	switch (hw->mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1300	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1301	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1302	case e1000_82541:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1303	case e1000_82547:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1304	case e1000_82541_rev_2:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1305	case e1000_82547_rev_2:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1306	hw->phy_init_script = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1307	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1308	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1309
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1310	e1000_set_media_type(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1311
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1312	hw->wait_autoneg_complete = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1313	hw->tbi_compatibility_en = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1314	hw->adaptive_ifs = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1315
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1316	/* Copper options */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1317
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1318	if (hw->media_type == e1000_media_type_copper) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1319	hw->mdix = AUTO_ALL_MODES;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1320	hw->disable_polarity_correction = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1321	hw->master_slave = E1000_MASTER_SLAVE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1322	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1323
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1324	adapter->num_tx_queues = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1325	adapter->num_rx_queues = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1326
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1327	if (e1000_alloc_queues(adapter)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1328	DPRINTK(PROBE, ERR, "Unable to allocate memory for queues\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1329	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1330	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1331
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1332	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1333	for (i = 0; i < adapter->num_rx_queues; i++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1334	adapter->polling_netdev[i].priv = adapter;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1335	adapter->polling_netdev[i].poll = &e1000_clean;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1336	adapter->polling_netdev[i].weight = 64;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1337	dev_hold(&adapter->polling_netdev[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1338	set_bit(__LINK_STATE_START, &adapter->polling_netdev[i].state);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1339	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1340	spin_lock_init(&adapter->tx_queue_lock);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1341	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1342
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1343	atomic_set(&adapter->irq_sem, 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1344	spin_lock_init(&adapter->stats_lock);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1345
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1346	set_bit(__E1000_DOWN, &adapter->flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1347
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1348	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1349	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1350
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1351	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1352	* e1000_alloc_queues - Allocate memory for all rings
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1353	* @adapter: board private structure to initialize
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1354	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1355	* We allocate one ring per queue at run-time since we don't know the
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1356	* number of queues at compile-time. The polling_netdev array is
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1357	* intended for Multiqueue, but should work fine with a single queue.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1358	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1359
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1360	static int __devinit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1361	e1000_alloc_queues(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1362	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1363	int size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1364
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1365	size = sizeof(struct e1000_tx_ring) * adapter->num_tx_queues;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1366	adapter->tx_ring = kmalloc(size, GFP_KERNEL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1367	if (!adapter->tx_ring)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1368	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1369	memset(adapter->tx_ring, 0, size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1370
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1371	size = sizeof(struct e1000_rx_ring) * adapter->num_rx_queues;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1372	adapter->rx_ring = kmalloc(size, GFP_KERNEL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1373	if (!adapter->rx_ring) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1374	kfree(adapter->tx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1375	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1376	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1377	memset(adapter->rx_ring, 0, size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1378
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1379	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1380	size = sizeof(struct net_device) * adapter->num_rx_queues;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1381	adapter->polling_netdev = kmalloc(size, GFP_KERNEL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1382	if (!adapter->polling_netdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1383	kfree(adapter->tx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1384	kfree(adapter->rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1385	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1386	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1387	memset(adapter->polling_netdev, 0, size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1388	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1389
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1390	return E1000_SUCCESS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1391	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1392
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1393	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1394	* e1000_open - Called when a network interface is made active
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1395	* @netdev: network interface device structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1396	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1397	* Returns 0 on success, negative value on failure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1398	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1399	* The open entry point is called when a network interface is made
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1400	* active by the system (IFF_UP). At this point all resources needed
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1401	* for transmit and receive operations are allocated, the interrupt
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1402	* handler is registered with the OS, the watchdog timer is started,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1403	* and the stack is notified that the interface is ready.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1404	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1405
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1406	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1407	e1000_open(struct net_device *netdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1408	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1409	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1410	int err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1411
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1412	/* disallow open during test */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1413	if (test_bit(__E1000_TESTING, &adapter->flags))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1414	return -EBUSY;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1415
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1416	/* allocate transmit descriptors */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1417	if ((err = e1000_setup_all_tx_resources(adapter)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1418	goto err_setup_tx;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1419
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1420	/* allocate receive descriptors */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1421	if ((err = e1000_setup_all_rx_resources(adapter)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1422	goto err_setup_rx;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1423
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1424	err = e1000_request_irq(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1425	if (err)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1426	goto err_req_irq;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1427
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1428	e1000_power_up_phy(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1429
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1430	if ((err = e1000_up(adapter)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1431	goto err_up;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1432	adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1433	if ((adapter->hw.mng_cookie.status &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1434	E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1435	e1000_update_mng_vlan(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1436	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1437
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1438	/* If AMT is enabled, let the firmware know that the network
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1439	* interface is now open */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1440	if (adapter->hw.mac_type == e1000_82573 &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1441	e1000_check_mng_mode(&adapter->hw))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1442	e1000_get_hw_control(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1443
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1444	return E1000_SUCCESS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1445
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1446	err_up:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1447	e1000_power_down_phy(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1448	e1000_free_irq(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1449	err_req_irq:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1450	e1000_free_all_rx_resources(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1451	err_setup_rx:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1452	e1000_free_all_tx_resources(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1453	err_setup_tx:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1454	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1455
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1456	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1457	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1458
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1459	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1460	* e1000_close - Disables a network interface
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1461	* @netdev: network interface device structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1462	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1463	* Returns 0, this is not allowed to fail
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1464	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1465	* The close entry point is called when an interface is de-activated
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1466	* by the OS. The hardware is still under the drivers control, but
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1467	* needs to be disabled. A global MAC reset is issued to stop the
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1468	* hardware, and all transmit and receive resources are freed.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1469	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1470
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1471	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1472	e1000_close(struct net_device *netdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1473	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1474	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1475
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1476	WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1477	e1000_down(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1478	e1000_power_down_phy(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1479	e1000_free_irq(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1480
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1481	e1000_free_all_tx_resources(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1482	e1000_free_all_rx_resources(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1483
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1484	/* kill manageability vlan ID if supported, but not if a vlan with
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1485	* the same ID is registered on the host OS (let 8021q kill it) */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1486	if ((adapter->hw.mng_cookie.status &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1487	E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1488	!(adapter->vlgrp &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1489	adapter->vlgrp->vlan_devices[adapter->mng_vlan_id])) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1490	e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1491	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1492
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1493	/* If AMT is enabled, let the firmware know that the network
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1494	* interface is now closed */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1495	if (adapter->hw.mac_type == e1000_82573 &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1496	e1000_check_mng_mode(&adapter->hw))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1497	e1000_release_hw_control(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1498
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1499	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1500	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1501
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1502	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1503	* e1000_check_64k_bound - check that memory doesn't cross 64kB boundary
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1504	* @adapter: address of board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1505	* @start: address of beginning of memory
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1506	* @len: length of memory
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1507	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1508	static boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1509	e1000_check_64k_bound(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1510	void *start, unsigned long len)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1511	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1512	unsigned long begin = (unsigned long) start;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1513	unsigned long end = begin + len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1514
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1515	/* First rev 82545 and 82546 need to not allow any memory
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1516	* write location to cross 64k boundary due to errata 23 */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1517	if (adapter->hw.mac_type == e1000_82545 \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1518	adapter->hw.mac_type == e1000_82546) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1519	return ((begin ^ (end - 1)) >> 16) != 0 ? FALSE : TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1520	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1521
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1522	return TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1523	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1524
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1525	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1526	* e1000_setup_tx_resources - allocate Tx resources (Descriptors)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1527	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1528	* @txdr: tx descriptor ring (for a specific queue) to setup
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1529	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1530	* Return 0 on success, negative on failure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1531	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1532
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1533	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1534	e1000_setup_tx_resources(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1535	struct e1000_tx_ring *txdr)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1536	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1537	struct pci_dev *pdev = adapter->pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1538	int size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1539
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1540	size = sizeof(struct e1000_buffer) * txdr->count;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1541	txdr->buffer_info = vmalloc(size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1542	if (!txdr->buffer_info) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1543	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1544	"Unable to allocate memory for the transmit descriptor ring\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1545	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1546	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1547	memset(txdr->buffer_info, 0, size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1548
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1549	/* round up to nearest 4K */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1550
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1551	txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1552	E1000_ROUNDUP(txdr->size, 4096);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1553
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1554	txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1555	if (!txdr->desc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1556	setup_tx_desc_die:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1557	vfree(txdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1558	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1559	"Unable to allocate memory for the transmit descriptor ring\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1560	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1561	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1562
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1563	/* Fix for errata 23, can't cross 64kB boundary */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1564	if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1565	void *olddesc = txdr->desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1566	dma_addr_t olddma = txdr->dma;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1567	DPRINTK(TX_ERR, ERR, "txdr align check failed: %u bytes "
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1568	"at %p\n", txdr->size, txdr->desc);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1569	/* Try again, without freeing the previous */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1570	txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1571	/* Failed allocation, critical failure */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1572	if (!txdr->desc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1573	pci_free_consistent(pdev, txdr->size, olddesc, olddma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1574	goto setup_tx_desc_die;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1575	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1576
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1577	if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1578	/* give up */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1579	pci_free_consistent(pdev, txdr->size, txdr->desc,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1580	txdr->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1581	pci_free_consistent(pdev, txdr->size, olddesc, olddma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1582	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1583	"Unable to allocate aligned memory "
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1584	"for the transmit descriptor ring\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1585	vfree(txdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1586	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1587	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1588	/* Free old allocation, new allocation was successful */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1589	pci_free_consistent(pdev, txdr->size, olddesc, olddma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1590	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1591	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1592	memset(txdr->desc, 0, txdr->size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1593
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1594	txdr->next_to_use = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1595	txdr->next_to_clean = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1596	spin_lock_init(&txdr->tx_lock);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1597
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1598	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1599	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1600
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1601	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1602	* e1000_setup_all_tx_resources - wrapper to allocate Tx resources
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1603	* (Descriptors) for all queues
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1604	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1605	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1606	* Return 0 on success, negative on failure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1607	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1608
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1609	int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1610	e1000_setup_all_tx_resources(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1611	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1612	int i, err = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1613
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1614	for (i = 0; i < adapter->num_tx_queues; i++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1615	err = e1000_setup_tx_resources(adapter, &adapter->tx_ring[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1616	if (err) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1617	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1618	"Allocation for Tx Queue %u failed\n", i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1619	for (i-- ; i >= 0; i--)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1620	e1000_free_tx_resources(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1621	&adapter->tx_ring[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1622	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1623	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1624	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1625
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1626	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1627	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1628
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1629	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1630	* e1000_configure_tx - Configure 8254x Transmit Unit after Reset
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1631	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1632	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1633	* Configure the Tx unit of the MAC after a reset.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1634	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1635
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1636	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1637	e1000_configure_tx(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1638	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1639	uint64_t tdba;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1640	struct e1000_hw *hw = &adapter->hw;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1641	uint32_t tdlen, tctl, tipg, tarc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1642	uint32_t ipgr1, ipgr2;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1643
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1644	/* Setup the HW Tx Head and Tail descriptor pointers */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1645
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1646	switch (adapter->num_tx_queues) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1647	case 1:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1648	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1649	tdba = adapter->tx_ring[0].dma;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1650	tdlen = adapter->tx_ring[0].count *
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1651	sizeof(struct e1000_tx_desc);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1652	E1000_WRITE_REG(hw, TDLEN, tdlen);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1653	E1000_WRITE_REG(hw, TDBAH, (tdba >> 32));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1654	E1000_WRITE_REG(hw, TDBAL, (tdba & 0x00000000ffffffffULL));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1655	E1000_WRITE_REG(hw, TDT, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1656	E1000_WRITE_REG(hw, TDH, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1657	adapter->tx_ring[0].tdh = ((hw->mac_type >= e1000_82543) ? E1000_TDH : E1000_82542_TDH);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1658	adapter->tx_ring[0].tdt = ((hw->mac_type >= e1000_82543) ? E1000_TDT : E1000_82542_TDT);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1659	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1660	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1661
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1662	/* Set the default values for the Tx Inter Packet Gap timer */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1663	if (adapter->hw.mac_type <= e1000_82547_rev_2 &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1664	(hw->media_type == e1000_media_type_fiber \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1665	hw->media_type == e1000_media_type_internal_serdes))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1666	tipg = DEFAULT_82543_TIPG_IPGT_FIBER;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1667	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1668	tipg = DEFAULT_82543_TIPG_IPGT_COPPER;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1669
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1670	switch (hw->mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1671	case e1000_82542_rev2_0:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1672	case e1000_82542_rev2_1:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1673	tipg = DEFAULT_82542_TIPG_IPGT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1674	ipgr1 = DEFAULT_82542_TIPG_IPGR1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1675	ipgr2 = DEFAULT_82542_TIPG_IPGR2;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1676	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1677	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1678	ipgr1 = DEFAULT_82543_TIPG_IPGR1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1679	ipgr2 = DEFAULT_80003ES2LAN_TIPG_IPGR2;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1680	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1681	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1682	ipgr1 = DEFAULT_82543_TIPG_IPGR1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1683	ipgr2 = DEFAULT_82543_TIPG_IPGR2;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1684	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1685	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1686	tipg \|= ipgr1 << E1000_TIPG_IPGR1_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1687	tipg \|= ipgr2 << E1000_TIPG_IPGR2_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1688	E1000_WRITE_REG(hw, TIPG, tipg);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1689
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1690	/* Set the Tx Interrupt Delay register */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1691
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1692	E1000_WRITE_REG(hw, TIDV, adapter->tx_int_delay);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1693	if (hw->mac_type >= e1000_82540)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1694	E1000_WRITE_REG(hw, TADV, adapter->tx_abs_int_delay);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1695
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1696	/* Program the Transmit Control Register */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1697
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1698	tctl = E1000_READ_REG(hw, TCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1699	tctl &= ~E1000_TCTL_CT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1700	tctl \|= E1000_TCTL_PSP \| E1000_TCTL_RTLC \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1701	(E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1702
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1703	if (hw->mac_type == e1000_82571 \|\| hw->mac_type == e1000_82572) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1704	tarc = E1000_READ_REG(hw, TARC0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1705	/* set the speed mode bit, we'll clear it if we're not at
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1706	* gigabit link later */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1707	tarc \|= (1 << 21);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1708	E1000_WRITE_REG(hw, TARC0, tarc);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1709	} else if (hw->mac_type == e1000_80003es2lan) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1710	tarc = E1000_READ_REG(hw, TARC0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1711	tarc \|= 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1712	E1000_WRITE_REG(hw, TARC0, tarc);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1713	tarc = E1000_READ_REG(hw, TARC1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1714	tarc \|= 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1715	E1000_WRITE_REG(hw, TARC1, tarc);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1716	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1717
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1718	e1000_config_collision_dist(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1719
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1720	/* Setup Transmit Descriptor Settings for eop descriptor */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1721	adapter->txd_cmd = E1000_TXD_CMD_EOP \| E1000_TXD_CMD_IFCS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1722
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1723	/* only set IDE if we are delaying interrupts using the timers */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1724	if (adapter->tx_int_delay)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1725	adapter->txd_cmd \|= E1000_TXD_CMD_IDE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1726
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1727	if (hw->mac_type < e1000_82543)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1728	adapter->txd_cmd \|= E1000_TXD_CMD_RPS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1729	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1730	adapter->txd_cmd \|= E1000_TXD_CMD_RS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1731
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1732	/* Cache if we're 82544 running in PCI-X because we'll
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1733	* need this to apply a workaround later in the send path. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1734	if (hw->mac_type == e1000_82544 &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1735	hw->bus_type == e1000_bus_type_pcix)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1736	adapter->pcix_82544 = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1737
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1738	E1000_WRITE_REG(hw, TCTL, tctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1739
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1740	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1741
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1742	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1743	* e1000_setup_rx_resources - allocate Rx resources (Descriptors)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1744	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1745	* @rxdr: rx descriptor ring (for a specific queue) to setup
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1746	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1747	* Returns 0 on success, negative on failure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1748	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1749
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1750	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1751	e1000_setup_rx_resources(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1752	struct e1000_rx_ring *rxdr)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1753	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1754	struct pci_dev *pdev = adapter->pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1755	int size, desc_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1756
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1757	size = sizeof(struct e1000_buffer) * rxdr->count;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1758	rxdr->buffer_info = vmalloc(size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1759	if (!rxdr->buffer_info) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1760	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1761	"Unable to allocate memory for the receive descriptor ring\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1762	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1763	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1764	memset(rxdr->buffer_info, 0, size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1765
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1766	size = sizeof(struct e1000_ps_page) * rxdr->count;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1767	rxdr->ps_page = kmalloc(size, GFP_KERNEL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1768	if (!rxdr->ps_page) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1769	vfree(rxdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1770	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1771	"Unable to allocate memory for the receive descriptor ring\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1772	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1773	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1774	memset(rxdr->ps_page, 0, size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1775
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1776	size = sizeof(struct e1000_ps_page_dma) * rxdr->count;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1777	rxdr->ps_page_dma = kmalloc(size, GFP_KERNEL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1778	if (!rxdr->ps_page_dma) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1779	vfree(rxdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1780	kfree(rxdr->ps_page);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1781	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1782	"Unable to allocate memory for the receive descriptor ring\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1783	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1784	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1785	memset(rxdr->ps_page_dma, 0, size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1786
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1787	if (adapter->hw.mac_type <= e1000_82547_rev_2)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1788	desc_len = sizeof(struct e1000_rx_desc);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1789	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1790	desc_len = sizeof(union e1000_rx_desc_packet_split);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1791
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1792	/* Round up to nearest 4K */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1793
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1794	rxdr->size = rxdr->count * desc_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1795	E1000_ROUNDUP(rxdr->size, 4096);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1796
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1797	rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1798
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1799	if (!rxdr->desc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1800	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1801	"Unable to allocate memory for the receive descriptor ring\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1802	setup_rx_desc_die:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1803	vfree(rxdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1804	kfree(rxdr->ps_page);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1805	kfree(rxdr->ps_page_dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1806	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1807	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1808
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1809	/* Fix for errata 23, can't cross 64kB boundary */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1810	if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1811	void *olddesc = rxdr->desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1812	dma_addr_t olddma = rxdr->dma;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1813	DPRINTK(RX_ERR, ERR, "rxdr align check failed: %u bytes "
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1814	"at %p\n", rxdr->size, rxdr->desc);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1815	/* Try again, without freeing the previous */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1816	rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1817	/* Failed allocation, critical failure */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1818	if (!rxdr->desc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1819	pci_free_consistent(pdev, rxdr->size, olddesc, olddma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1820	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1821	"Unable to allocate memory "
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1822	"for the receive descriptor ring\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1823	goto setup_rx_desc_die;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1824	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1825
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1826	if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1827	/* give up */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1828	pci_free_consistent(pdev, rxdr->size, rxdr->desc,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1829	rxdr->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1830	pci_free_consistent(pdev, rxdr->size, olddesc, olddma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1831	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1832	"Unable to allocate aligned memory "
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1833	"for the receive descriptor ring\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1834	goto setup_rx_desc_die;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1835	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1836	/* Free old allocation, new allocation was successful */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1837	pci_free_consistent(pdev, rxdr->size, olddesc, olddma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1838	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1839	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1840	memset(rxdr->desc, 0, rxdr->size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1841
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1842	rxdr->next_to_clean = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1843	rxdr->next_to_use = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1844
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1845	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1846	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1847
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1848	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1849	* e1000_setup_all_rx_resources - wrapper to allocate Rx resources
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1850	* (Descriptors) for all queues
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1851	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1852	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1853	* Return 0 on success, negative on failure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1854	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1855
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1856	int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1857	e1000_setup_all_rx_resources(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1858	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1859	int i, err = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1860
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1861	for (i = 0; i < adapter->num_rx_queues; i++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1862	err = e1000_setup_rx_resources(adapter, &adapter->rx_ring[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1863	if (err) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1864	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1865	"Allocation for Rx Queue %u failed\n", i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1866	for (i-- ; i >= 0; i--)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1867	e1000_free_rx_resources(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1868	&adapter->rx_ring[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1869	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1870	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1871	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1872
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1873	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1874	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1875
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1876	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1877	* e1000_setup_rctl - configure the receive control registers
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1878	* @adapter: Board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1879	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1880	#define PAGE_USE_COUNT(S) (((S) >> PAGE_SHIFT) + \
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1881	(((S) & (PAGE_SIZE - 1)) ? 1 : 0))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1882	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1883	e1000_setup_rctl(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1884	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1885	uint32_t rctl, rfctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1886	uint32_t psrctl = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1887	#ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1888	uint32_t pages = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1889	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1890
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1891	rctl = E1000_READ_REG(&adapter->hw, RCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1892
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1893	rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1894
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1895	rctl \|= E1000_RCTL_EN \| E1000_RCTL_BAM \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1896	E1000_RCTL_LBM_NO \| E1000_RCTL_RDMTS_HALF \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1897	(adapter->hw.mc_filter_type << E1000_RCTL_MO_SHIFT);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1898
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1899	if (adapter->hw.tbi_compatibility_on == 1)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1900	rctl \|= E1000_RCTL_SBP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1901	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1902	rctl &= ~E1000_RCTL_SBP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1903
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1904	if (adapter->netdev->mtu <= ETH_DATA_LEN)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1905	rctl &= ~E1000_RCTL_LPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1906	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1907	rctl \|= E1000_RCTL_LPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1908
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1909	/* Setup buffer sizes */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1910	rctl &= ~E1000_RCTL_SZ_4096;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1911	rctl \|= E1000_RCTL_BSEX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1912	switch (adapter->rx_buffer_len) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1913	case E1000_RXBUFFER_256:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1914	rctl \|= E1000_RCTL_SZ_256;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1915	rctl &= ~E1000_RCTL_BSEX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1916	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1917	case E1000_RXBUFFER_512:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1918	rctl \|= E1000_RCTL_SZ_512;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1919	rctl &= ~E1000_RCTL_BSEX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1920	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1921	case E1000_RXBUFFER_1024:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1922	rctl \|= E1000_RCTL_SZ_1024;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1923	rctl &= ~E1000_RCTL_BSEX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1924	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1925	case E1000_RXBUFFER_2048:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1926	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1927	rctl \|= E1000_RCTL_SZ_2048;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1928	rctl &= ~E1000_RCTL_BSEX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1929	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1930	case E1000_RXBUFFER_4096:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1931	rctl \|= E1000_RCTL_SZ_4096;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1932	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1933	case E1000_RXBUFFER_8192:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1934	rctl \|= E1000_RCTL_SZ_8192;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1935	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1936	case E1000_RXBUFFER_16384:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1937	rctl \|= E1000_RCTL_SZ_16384;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1938	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1939	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1940
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1941	#ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1942	/* 82571 and greater support packet-split where the protocol
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1943	* header is placed in skb->data and the packet data is
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1944	* placed in pages hanging off of skb_shinfo(skb)->nr_frags.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1945	* In the case of a non-split, skb->data is linearly filled,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1946	* followed by the page buffers. Therefore, skb->data is
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1947	* sized to hold the largest protocol header.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1948	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1949	/* allocations using alloc_page take too long for regular MTU
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1950	* so only enable packet split for jumbo frames */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1951	pages = PAGE_USE_COUNT(adapter->netdev->mtu);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1952	if ((adapter->hw.mac_type >= e1000_82571) && (pages <= 3) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1953	PAGE_SIZE <= 16384 && (rctl & E1000_RCTL_LPE))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1954	adapter->rx_ps_pages = pages;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1955	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1956	adapter->rx_ps_pages = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1957	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1958	if (adapter->rx_ps_pages) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1959	/* Configure extra packet-split registers */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1960	rfctl = E1000_READ_REG(&adapter->hw, RFCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1961	rfctl \|= E1000_RFCTL_EXTEN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1962	/* disable packet split support for IPv6 extension headers,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1963	* because some malformed IPv6 headers can hang the RX */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1964	rfctl \|= (E1000_RFCTL_IPV6_EX_DIS \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1965	E1000_RFCTL_NEW_IPV6_EXT_DIS);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1966
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1967	E1000_WRITE_REG(&adapter->hw, RFCTL, rfctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1968
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1969	rctl \|= E1000_RCTL_DTYP_PS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1970
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1971	psrctl \|= adapter->rx_ps_bsize0 >>
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1972	E1000_PSRCTL_BSIZE0_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1973
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1974	switch (adapter->rx_ps_pages) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1975	case 3:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1976	psrctl \|= PAGE_SIZE <<
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1977	E1000_PSRCTL_BSIZE3_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1978	case 2:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1979	psrctl \|= PAGE_SIZE <<
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1980	E1000_PSRCTL_BSIZE2_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1981	case 1:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1982	psrctl \|= PAGE_SIZE >>
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1983	E1000_PSRCTL_BSIZE1_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1984	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1985	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1986
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1987	E1000_WRITE_REG(&adapter->hw, PSRCTL, psrctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1988	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1989
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1990	E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1991	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1992
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1993	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1994	* e1000_configure_rx - Configure 8254x Receive Unit after Reset
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1995	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1996	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1997	* Configure the Rx unit of the MAC after a reset.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1998	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1999
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2000	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2001	e1000_configure_rx(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2002	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2003	uint64_t rdba;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2004	struct e1000_hw *hw = &adapter->hw;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2005	uint32_t rdlen, rctl, rxcsum, ctrl_ext;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2006
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2007	if (adapter->rx_ps_pages) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2008	/* this is a 32 byte descriptor */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2009	rdlen = adapter->rx_ring[0].count *
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2010	sizeof(union e1000_rx_desc_packet_split);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2011	adapter->clean_rx = e1000_clean_rx_irq_ps;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2012	adapter->alloc_rx_buf = e1000_alloc_rx_buffers_ps;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2013	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2014	rdlen = adapter->rx_ring[0].count *
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2015	sizeof(struct e1000_rx_desc);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2016	adapter->clean_rx = e1000_clean_rx_irq;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2017	adapter->alloc_rx_buf = e1000_alloc_rx_buffers;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2018	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2019
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2020	/* disable receives while setting up the descriptors */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2021	rctl = E1000_READ_REG(hw, RCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2022	E1000_WRITE_REG(hw, RCTL, rctl & ~E1000_RCTL_EN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2023
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2024	/* set the Receive Delay Timer Register */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2025	E1000_WRITE_REG(hw, RDTR, adapter->rx_int_delay);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2026
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2027	if (hw->mac_type >= e1000_82540) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2028	E1000_WRITE_REG(hw, RADV, adapter->rx_abs_int_delay);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2029	if (adapter->itr_setting != 0)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2030	E1000_WRITE_REG(hw, ITR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2031	1000000000 / (adapter->itr * 256));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2032	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2033
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2034	if (hw->mac_type >= e1000_82571) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2035	ctrl_ext = E1000_READ_REG(hw, CTRL_EXT);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2036	/* Reset delay timers after every interrupt */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2037	ctrl_ext \|= E1000_CTRL_EXT_INT_TIMER_CLR;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2038	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2039	/* Auto-Mask interrupts upon ICR access */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2040	ctrl_ext \|= E1000_CTRL_EXT_IAME;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2041	E1000_WRITE_REG(hw, IAM, 0xffffffff);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2042	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2043	E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2044	E1000_WRITE_FLUSH(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2045	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2046
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2047	/* Setup the HW Rx Head and Tail Descriptor Pointers and
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2048	* the Base and Length of the Rx Descriptor Ring */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2049	switch (adapter->num_rx_queues) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2050	case 1:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2051	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2052	rdba = adapter->rx_ring[0].dma;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2053	E1000_WRITE_REG(hw, RDLEN, rdlen);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2054	E1000_WRITE_REG(hw, RDBAH, (rdba >> 32));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2055	E1000_WRITE_REG(hw, RDBAL, (rdba & 0x00000000ffffffffULL));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2056	E1000_WRITE_REG(hw, RDT, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2057	E1000_WRITE_REG(hw, RDH, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2058	adapter->rx_ring[0].rdh = ((hw->mac_type >= e1000_82543) ? E1000_RDH : E1000_82542_RDH);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2059	adapter->rx_ring[0].rdt = ((hw->mac_type >= e1000_82543) ? E1000_RDT : E1000_82542_RDT);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2060	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2061	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2062
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2063	/* Enable 82543 Receive Checksum Offload for TCP and UDP */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2064	if (hw->mac_type >= e1000_82543) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2065	rxcsum = E1000_READ_REG(hw, RXCSUM);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2066	if (adapter->rx_csum == TRUE) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2067	rxcsum \|= E1000_RXCSUM_TUOFL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2068
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2069	/* Enable 82571 IPv4 payload checksum for UDP fragments
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2070	* Must be used in conjunction with packet-split. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2071	if ((hw->mac_type >= e1000_82571) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2072	(adapter->rx_ps_pages)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2073	rxcsum \|= E1000_RXCSUM_IPPCSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2074	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2075	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2076	rxcsum &= ~E1000_RXCSUM_TUOFL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2077	/* don't need to clear IPPCSE as it defaults to 0 */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2078	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2079	E1000_WRITE_REG(hw, RXCSUM, rxcsum);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2080	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2081
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2082	/* enable early receives on 82573, only takes effect if using > 2048
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2083	* byte total frame size. for example only for jumbo frames */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2084	#define E1000_ERT_2048 0x100
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2085	if (hw->mac_type == e1000_82573)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2086	E1000_WRITE_REG(hw, ERT, E1000_ERT_2048);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2087
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2088	/* Enable Receives */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2089	E1000_WRITE_REG(hw, RCTL, rctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2090	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2091
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2092	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2093	* e1000_free_tx_resources - Free Tx Resources per Queue
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2094	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2095	* @tx_ring: Tx descriptor ring for a specific queue
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2096	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2097	* Free all transmit software resources
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2098	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2099
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2100	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2101	e1000_free_tx_resources(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2102	struct e1000_tx_ring *tx_ring)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2103	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2104	struct pci_dev *pdev = adapter->pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2105
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2106	e1000_clean_tx_ring(adapter, tx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2107
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2108	vfree(tx_ring->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2109	tx_ring->buffer_info = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2110
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2111	pci_free_consistent(pdev, tx_ring->size, tx_ring->desc, tx_ring->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2112
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2113	tx_ring->desc = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2114	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2115
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2116	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2117	* e1000_free_all_tx_resources - Free Tx Resources for All Queues
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2118	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2119	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2120	* Free all transmit software resources
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2121	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2122
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2123	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2124	e1000_free_all_tx_resources(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2125	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2126	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2127
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2128	for (i = 0; i < adapter->num_tx_queues; i++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2129	e1000_free_tx_resources(adapter, &adapter->tx_ring[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2130	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2131
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2132	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2133	e1000_unmap_and_free_tx_resource(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2134	struct e1000_buffer *buffer_info)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2135	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2136	if (buffer_info->dma) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2137	pci_unmap_page(adapter->pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2138	buffer_info->dma,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2139	buffer_info->length,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2140	PCI_DMA_TODEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2141	buffer_info->dma = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2142	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2143	if (buffer_info->skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2144	dev_kfree_skb_any(buffer_info->skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2145	buffer_info->skb = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2146	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2147	/* buffer_info must be completely set up in the transmit path */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2148	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2149
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2150	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2151	* e1000_clean_tx_ring - Free Tx Buffers
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2152	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2153	* @tx_ring: ring to be cleaned
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2154	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2155
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2156	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2157	e1000_clean_tx_ring(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2158	struct e1000_tx_ring *tx_ring)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2159	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2160	struct e1000_buffer *buffer_info;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2161	unsigned long size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2162	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2163
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2164	/* Free all the Tx ring sk_buffs */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2165
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2166	for (i = 0; i < tx_ring->count; i++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2167	buffer_info = &tx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2168	e1000_unmap_and_free_tx_resource(adapter, buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2169	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2170
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2171	size = sizeof(struct e1000_buffer) * tx_ring->count;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2172	memset(tx_ring->buffer_info, 0, size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2173
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2174	/* Zero out the descriptor ring */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2175
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2176	memset(tx_ring->desc, 0, tx_ring->size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2177
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2178	tx_ring->next_to_use = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2179	tx_ring->next_to_clean = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2180	tx_ring->last_tx_tso = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2181
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2182	writel(0, adapter->hw.hw_addr + tx_ring->tdh);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2183	writel(0, adapter->hw.hw_addr + tx_ring->tdt);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2184	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2185
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2186	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2187	* e1000_clean_all_tx_rings - Free Tx Buffers for all queues
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2188	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2189	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2190
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2191	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2192	e1000_clean_all_tx_rings(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2193	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2194	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2195
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2196	for (i = 0; i < adapter->num_tx_queues; i++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2197	e1000_clean_tx_ring(adapter, &adapter->tx_ring[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2198	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2199
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2200	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2201	* e1000_free_rx_resources - Free Rx Resources
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2202	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2203	* @rx_ring: ring to clean the resources from
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2204	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2205	* Free all receive software resources
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2206	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2207
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2208	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2209	e1000_free_rx_resources(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2210	struct e1000_rx_ring *rx_ring)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2211	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2212	struct pci_dev *pdev = adapter->pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2213
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2214	e1000_clean_rx_ring(adapter, rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2215
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2216	vfree(rx_ring->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2217	rx_ring->buffer_info = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2218	kfree(rx_ring->ps_page);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2219	rx_ring->ps_page = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2220	kfree(rx_ring->ps_page_dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2221	rx_ring->ps_page_dma = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2222
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2223	pci_free_consistent(pdev, rx_ring->size, rx_ring->desc, rx_ring->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2224
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2225	rx_ring->desc = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2226	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2227
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2228	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2229	* e1000_free_all_rx_resources - Free Rx Resources for All Queues
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2230	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2231	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2232	* Free all receive software resources
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2233	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2234
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2235	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2236	e1000_free_all_rx_resources(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2237	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2238	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2239
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2240	for (i = 0; i < adapter->num_rx_queues; i++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2241	e1000_free_rx_resources(adapter, &adapter->rx_ring[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2242	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2243
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2244	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2245	* e1000_clean_rx_ring - Free Rx Buffers per Queue
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2246	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2247	* @rx_ring: ring to free buffers from
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2248	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2249
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2250	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2251	e1000_clean_rx_ring(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2252	struct e1000_rx_ring *rx_ring)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2253	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2254	struct e1000_buffer *buffer_info;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2255	struct e1000_ps_page *ps_page;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2256	struct e1000_ps_page_dma *ps_page_dma;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2257	struct pci_dev *pdev = adapter->pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2258	unsigned long size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2259	unsigned int i, j;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2260
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2261	/* Free all the Rx ring sk_buffs */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2262	for (i = 0; i < rx_ring->count; i++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2263	buffer_info = &rx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2264	if (buffer_info->skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2265	pci_unmap_single(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2266	buffer_info->dma,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2267	buffer_info->length,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2268	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2269
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2270	dev_kfree_skb(buffer_info->skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2271	buffer_info->skb = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2272	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2273	ps_page = &rx_ring->ps_page[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2274	ps_page_dma = &rx_ring->ps_page_dma[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2275	for (j = 0; j < adapter->rx_ps_pages; j++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2276	if (!ps_page->ps_page[j]) break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2277	pci_unmap_page(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2278	ps_page_dma->ps_page_dma[j],
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2279	PAGE_SIZE, PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2280	ps_page_dma->ps_page_dma[j] = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2281	put_page(ps_page->ps_page[j]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2282	ps_page->ps_page[j] = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2283	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2284	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2285
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2286	size = sizeof(struct e1000_buffer) * rx_ring->count;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2287	memset(rx_ring->buffer_info, 0, size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2288	size = sizeof(struct e1000_ps_page) * rx_ring->count;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2289	memset(rx_ring->ps_page, 0, size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2290	size = sizeof(struct e1000_ps_page_dma) * rx_ring->count;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2291	memset(rx_ring->ps_page_dma, 0, size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2292
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2293	/* Zero out the descriptor ring */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2294
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2295	memset(rx_ring->desc, 0, rx_ring->size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2296
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2297	rx_ring->next_to_clean = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2298	rx_ring->next_to_use = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2299
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2300	writel(0, adapter->hw.hw_addr + rx_ring->rdh);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2301	writel(0, adapter->hw.hw_addr + rx_ring->rdt);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2302	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2303
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2304	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2305	* e1000_clean_all_rx_rings - Free Rx Buffers for all queues
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2306	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2307	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2308
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2309	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2310	e1000_clean_all_rx_rings(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2311	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2312	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2313
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2314	for (i = 0; i < adapter->num_rx_queues; i++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2315	e1000_clean_rx_ring(adapter, &adapter->rx_ring[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2316	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2317
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2318	/* The 82542 2.0 (revision 2) needs to have the receive unit in reset
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2319	* and memory write and invalidate disabled for certain operations
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2320	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2321	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2322	e1000_enter_82542_rst(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2323	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2324	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2325	uint32_t rctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2326
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2327	e1000_pci_clear_mwi(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2328
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2329	rctl = E1000_READ_REG(&adapter->hw, RCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2330	rctl \|= E1000_RCTL_RST;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2331	E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2332	E1000_WRITE_FLUSH(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2333	mdelay(5);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2334
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2335	if (netif_running(netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2336	e1000_clean_all_rx_rings(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2337	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2338
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2339	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2340	e1000_leave_82542_rst(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2341	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2342	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2343	uint32_t rctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2344
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2345	rctl = E1000_READ_REG(&adapter->hw, RCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2346	rctl &= ~E1000_RCTL_RST;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2347	E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2348	E1000_WRITE_FLUSH(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2349	mdelay(5);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2350
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2351	if (adapter->hw.pci_cmd_word & PCI_COMMAND_INVALIDATE)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2352	e1000_pci_set_mwi(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2353
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2354	if (netif_running(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2355	/* No need to loop, because 82542 supports only 1 queue */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2356	struct e1000_rx_ring *ring = &adapter->rx_ring[0];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2357	e1000_configure_rx(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2358	adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2359	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2360	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2361
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2362	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2363	* e1000_set_mac - Change the Ethernet Address of the NIC
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2364	* @netdev: network interface device structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2365	* @p: pointer to an address structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2366	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2367	* Returns 0 on success, negative on failure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2368	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2369
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2370	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2371	e1000_set_mac(struct net_device netdev, void p)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2372	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2373	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2374	struct sockaddr *addr = p;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2375
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2376	if (!is_valid_ether_addr(addr->sa_data))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2377	return -EADDRNOTAVAIL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2378
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2379	/* 82542 2.0 needs to be in reset to write receive address registers */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2380
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2381	if (adapter->hw.mac_type == e1000_82542_rev2_0)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2382	e1000_enter_82542_rst(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2383
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2384	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2385	memcpy(adapter->hw.mac_addr, addr->sa_data, netdev->addr_len);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2386
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2387	e1000_rar_set(&adapter->hw, adapter->hw.mac_addr, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2388
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2389	/* With 82571 controllers, LAA may be overwritten (with the default)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2390	* due to controller reset from the other port. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2391	if (adapter->hw.mac_type == e1000_82571) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2392	/* activate the work around */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2393	adapter->hw.laa_is_present = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2394
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2395	/* Hold a copy of the LAA in RAR[14] This is done so that
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2396	* between the time RAR[0] gets clobbered and the time it
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2397	* gets fixed (in e1000_watchdog), the actual LAA is in one
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2398	* of the RARs and no incoming packets directed to this port
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2399	* are dropped. Eventaully the LAA will be in RAR[0] and
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2400	* RAR[14] */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2401	e1000_rar_set(&adapter->hw, adapter->hw.mac_addr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2402	E1000_RAR_ENTRIES - 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2403	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2404
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2405	if (adapter->hw.mac_type == e1000_82542_rev2_0)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2406	e1000_leave_82542_rst(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2407
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2408	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2409	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2410
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2411	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2412	* e1000_set_multi - Multicast and Promiscuous mode set
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2413	* @netdev: network interface device structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2414	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2415	* The set_multi entry point is called whenever the multicast address
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2416	* list or the network interface flags are updated. This routine is
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2417	* responsible for configuring the hardware for proper multicast,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2418	* promiscuous mode, and all-multi behavior.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2419	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2420
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2421	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2422	e1000_set_multi(struct net_device *netdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2423	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2424	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2425	struct e1000_hw *hw = &adapter->hw;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2426	struct dev_mc_list *mc_ptr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2427	uint32_t rctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2428	uint32_t hash_value;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2429	int i, rar_entries = E1000_RAR_ENTRIES;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2430	int mta_reg_count = (hw->mac_type == e1000_ich8lan) ?
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2431	E1000_NUM_MTA_REGISTERS_ICH8LAN :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2432	E1000_NUM_MTA_REGISTERS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2433
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2434	if (adapter->hw.mac_type == e1000_ich8lan)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2435	rar_entries = E1000_RAR_ENTRIES_ICH8LAN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2436
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2437	/* reserve RAR[14] for LAA over-write work-around */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2438	if (adapter->hw.mac_type == e1000_82571)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2439	rar_entries--;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2440
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2441	/* Check for Promiscuous and All Multicast modes */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2442
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2443	rctl = E1000_READ_REG(hw, RCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2444
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2445	if (netdev->flags & IFF_PROMISC) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2446	rctl \|= (E1000_RCTL_UPE \| E1000_RCTL_MPE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2447	} else if (netdev->flags & IFF_ALLMULTI) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2448	rctl \|= E1000_RCTL_MPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2449	rctl &= ~E1000_RCTL_UPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2450	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2451	rctl &= ~(E1000_RCTL_UPE \| E1000_RCTL_MPE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2452	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2453
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2454	E1000_WRITE_REG(hw, RCTL, rctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2455
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2456	/* 82542 2.0 needs to be in reset to write receive address registers */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2457
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2458	if (hw->mac_type == e1000_82542_rev2_0)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2459	e1000_enter_82542_rst(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2460
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2461	/* load the first 14 multicast address into the exact filters 1-14
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2462	* RAR 0 is used for the station MAC adddress
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2463	* if there are not 14 addresses, go ahead and clear the filters
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2464	* -- with 82571 controllers only 0-13 entries are filled here
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2465	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2466	mc_ptr = netdev->mc_list;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2467
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2468	for (i = 1; i < rar_entries; i++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2469	if (mc_ptr) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2470	e1000_rar_set(hw, mc_ptr->dmi_addr, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2471	mc_ptr = mc_ptr->next;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2472	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2473	E1000_WRITE_REG_ARRAY(hw, RA, i << 1, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2474	E1000_WRITE_FLUSH(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2475	E1000_WRITE_REG_ARRAY(hw, RA, (i << 1) + 1, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2476	E1000_WRITE_FLUSH(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2477	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2478	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2479
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2480	/* clear the old settings from the multicast hash table */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2481
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2482	for (i = 0; i < mta_reg_count; i++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2483	E1000_WRITE_REG_ARRAY(hw, MTA, i, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2484	E1000_WRITE_FLUSH(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2485	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2486
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2487	/* load any remaining addresses into the hash table */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2488
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2489	for (; mc_ptr; mc_ptr = mc_ptr->next) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2490	hash_value = e1000_hash_mc_addr(hw, mc_ptr->dmi_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2491	e1000_mta_set(hw, hash_value);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2492	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2493
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2494	if (hw->mac_type == e1000_82542_rev2_0)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2495	e1000_leave_82542_rst(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2496	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2497
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2498	/* Need to wait a few seconds after link up to get diagnostic information from
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2499	* the phy */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2500
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2501	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2502	e1000_update_phy_info(unsigned long data)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2503	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2504	struct e1000_adapter adapter = (struct e1000_adapter ) data;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2505	e1000_phy_get_info(&adapter->hw, &adapter->phy_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2506	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2507
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2508	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2509	* e1000_82547_tx_fifo_stall - Timer Call-back
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2510	* @data: pointer to adapter cast into an unsigned long
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2511	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2512
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2513	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2514	e1000_82547_tx_fifo_stall(unsigned long data)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2515	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2516	struct e1000_adapter adapter = (struct e1000_adapter ) data;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2517	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2518	uint32_t tctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2519
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2520	if (atomic_read(&adapter->tx_fifo_stall)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2521	if ((E1000_READ_REG(&adapter->hw, TDT) ==
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2522	E1000_READ_REG(&adapter->hw, TDH)) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2523	(E1000_READ_REG(&adapter->hw, TDFT) ==
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2524	E1000_READ_REG(&adapter->hw, TDFH)) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2525	(E1000_READ_REG(&adapter->hw, TDFTS) ==
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2526	E1000_READ_REG(&adapter->hw, TDFHS))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2527	tctl = E1000_READ_REG(&adapter->hw, TCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2528	E1000_WRITE_REG(&adapter->hw, TCTL,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2529	tctl & ~E1000_TCTL_EN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2530	E1000_WRITE_REG(&adapter->hw, TDFT,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2531	adapter->tx_head_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2532	E1000_WRITE_REG(&adapter->hw, TDFH,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2533	adapter->tx_head_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2534	E1000_WRITE_REG(&adapter->hw, TDFTS,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2535	adapter->tx_head_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2536	E1000_WRITE_REG(&adapter->hw, TDFHS,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2537	adapter->tx_head_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2538	E1000_WRITE_REG(&adapter->hw, TCTL, tctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2539	E1000_WRITE_FLUSH(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2540
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2541	adapter->tx_fifo_head = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2542	atomic_set(&adapter->tx_fifo_stall, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2543	netif_wake_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2544	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2545	mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2546	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2547	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2548	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2549
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2550	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2551	* e1000_watchdog - Timer Call-back
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2552	* @data: pointer to adapter cast into an unsigned long
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2553	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2554	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2555	e1000_watchdog(unsigned long data)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2556	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2557	struct e1000_adapter adapter = (struct e1000_adapter ) data;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2558	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2559	struct e1000_tx_ring *txdr = adapter->tx_ring;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2560	uint32_t link, tctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2561	int32_t ret_val;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2562
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2563	ret_val = e1000_check_for_link(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2564	if ((ret_val == E1000_ERR_PHY) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2565	(adapter->hw.phy_type == e1000_phy_igp_3) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2566	(E1000_READ_REG(&adapter->hw, CTRL) & E1000_PHY_CTRL_GBE_DISABLE)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2567	/* See e1000_kumeran_lock_loss_workaround() */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2568	DPRINTK(LINK, INFO,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2569	"Gigabit has been disabled, downgrading speed\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2570	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2571
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2572	if (adapter->hw.mac_type == e1000_82573) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2573	e1000_enable_tx_pkt_filtering(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2574	if (adapter->mng_vlan_id != adapter->hw.mng_cookie.vlan_id)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2575	e1000_update_mng_vlan(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2576	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2577
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2578	if ((adapter->hw.media_type == e1000_media_type_internal_serdes) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2579	!(E1000_READ_REG(&adapter->hw, TXCW) & E1000_TXCW_ANE))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2580	link = !adapter->hw.serdes_link_down;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2581	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2582	link = E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_LU;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2583
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2584	if (link) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2585	if (!netif_carrier_ok(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2586	boolean_t txb2b = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2587	e1000_get_speed_and_duplex(&adapter->hw,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2588	&adapter->link_speed,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2589	&adapter->link_duplex);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2590
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2591	DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s\n",
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2592	adapter->link_speed,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2593	adapter->link_duplex == FULL_DUPLEX ?
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2594	"Full Duplex" : "Half Duplex");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2595
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2596	/* tweak tx_queue_len according to speed/duplex
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2597	* and adjust the timeout factor */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2598	netdev->tx_queue_len = adapter->tx_queue_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2599	adapter->tx_timeout_factor = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2600	switch (adapter->link_speed) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2601	case SPEED_10:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2602	txb2b = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2603	netdev->tx_queue_len = 10;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2604	adapter->tx_timeout_factor = 8;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2605	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2606	case SPEED_100:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2607	txb2b = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2608	netdev->tx_queue_len = 100;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2609	/* maybe add some timeout factor ? */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2610	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2611	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2612
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2613	if ((adapter->hw.mac_type == e1000_82571 \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2614	adapter->hw.mac_type == e1000_82572) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2615	txb2b == 0) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2616	uint32_t tarc0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2617	tarc0 = E1000_READ_REG(&adapter->hw, TARC0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2618	tarc0 &= ~(1 << 21);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2619	E1000_WRITE_REG(&adapter->hw, TARC0, tarc0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2620	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2621
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2622	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2623	/* disable TSO for pcie and 10/100 speeds, to avoid
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2624	* some hardware issues */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2625	if (!adapter->tso_force &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2626	adapter->hw.bus_type == e1000_bus_type_pci_express){
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2627	switch (adapter->link_speed) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2628	case SPEED_10:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2629	case SPEED_100:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2630	DPRINTK(PROBE,INFO,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2631	"10/100 speed: disabling TSO\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2632	netdev->features &= ~NETIF_F_TSO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2633	#ifdef NETIF_F_TSO6
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2634	netdev->features &= ~NETIF_F_TSO6;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2635	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2636	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2637	case SPEED_1000:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2638	netdev->features \|= NETIF_F_TSO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2639	#ifdef NETIF_F_TSO6
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2640	netdev->features \|= NETIF_F_TSO6;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2641	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2642	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2643	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2644	/* oops */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2645	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2646	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2647	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2648	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2649
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2650	/* enable transmits in the hardware, need to do this
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2651	* after setting TARC0 */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2652	tctl = E1000_READ_REG(&adapter->hw, TCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2653	tctl \|= E1000_TCTL_EN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2654	E1000_WRITE_REG(&adapter->hw, TCTL, tctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2655
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2656	netif_carrier_on(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2657	netif_wake_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2658	mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2659	adapter->smartspeed = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2660	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2661	/* make sure the receive unit is started */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2662	if (adapter->hw.rx_needs_kicking) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2663	struct e1000_hw *hw = &adapter->hw;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2664	uint32_t rctl = E1000_READ_REG(hw, RCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2665	E1000_WRITE_REG(hw, RCTL, rctl \| E1000_RCTL_EN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2666	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2667	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2668	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2669	if (netif_carrier_ok(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2670	adapter->link_speed = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2671	adapter->link_duplex = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2672	DPRINTK(LINK, INFO, "NIC Link is Down\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2673	netif_carrier_off(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2674	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2675	mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2676
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2677	/* 80003ES2LAN workaround--
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2678	* For packet buffer work-around on link down event;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2679	* disable receives in the ISR and
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2680	* reset device here in the watchdog
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2681	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2682	if (adapter->hw.mac_type == e1000_80003es2lan)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2683	/* reset device */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2684	schedule_work(&adapter->reset_task);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2685	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2686
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2687	e1000_smartspeed(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2688	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2689
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2690	e1000_update_stats(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2691
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2692	adapter->hw.tx_packet_delta = adapter->stats.tpt - adapter->tpt_old;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2693	adapter->tpt_old = adapter->stats.tpt;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2694	adapter->hw.collision_delta = adapter->stats.colc - adapter->colc_old;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2695	adapter->colc_old = adapter->stats.colc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2696
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2697	adapter->gorcl = adapter->stats.gorcl - adapter->gorcl_old;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2698	adapter->gorcl_old = adapter->stats.gorcl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2699	adapter->gotcl = adapter->stats.gotcl - adapter->gotcl_old;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2700	adapter->gotcl_old = adapter->stats.gotcl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2701
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2702	e1000_update_adaptive(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2703
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2704	if (!netif_carrier_ok(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2705	if (E1000_DESC_UNUSED(txdr) + 1 < txdr->count) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2706	/* We've lost link, so the controller stops DMA,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2707	* but we've got queued Tx work that's never going
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2708	* to get done, so reset controller to flush Tx.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2709	* (Do the reset outside of interrupt context). */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2710	adapter->tx_timeout_count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2711	schedule_work(&adapter->reset_task);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2712	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2713	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2714
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2715	/* Cause software interrupt to ensure rx ring is cleaned */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2716	E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_RXDMT0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2717
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2718	/* Force detection of hung controller every watchdog period */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2719	adapter->detect_tx_hung = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2720
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2721	/* With 82571 controllers, LAA may be overwritten due to controller
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2722	* reset from the other port. Set the appropriate LAA in RAR[0] */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2723	if (adapter->hw.mac_type == e1000_82571 && adapter->hw.laa_is_present)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2724	e1000_rar_set(&adapter->hw, adapter->hw.mac_addr, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2725
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2726	/* Reset the timer */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2727	mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2728	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2729
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2730	enum latency_range {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2731	lowest_latency = 0,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2732	low_latency = 1,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2733	bulk_latency = 2,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2734	latency_invalid = 255
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2735	};
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2736
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2737	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2738	* e1000_update_itr - update the dynamic ITR value based on statistics
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2739	* Stores a new ITR value based on packets and byte
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2740	* counts during the last interrupt. The advantage of per interrupt
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2741	* computation is faster updates and more accurate ITR for the current
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2742	* traffic pattern. Constants in this function were computed
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2743	* based on theoretical maximum wire speed and thresholds were set based
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2744	* on testing data as well as attempting to minimize response time
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2745	* while increasing bulk throughput.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2746	* this functionality is controlled by the InterruptThrottleRate module
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2747	* parameter (see e1000_param.c)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2748	* @adapter: pointer to adapter
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2749	* @itr_setting: current adapter->itr
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2750	* @packets: the number of packets during this measurement interval
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2751	* @bytes: the number of bytes during this measurement interval
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2752	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2753	static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2754	uint16_t itr_setting,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2755	int packets,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2756	int bytes)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2757	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2758	unsigned int retval = itr_setting;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2759	struct e1000_hw *hw = &adapter->hw;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2760
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2761	if (unlikely(hw->mac_type < e1000_82540))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2762	goto update_itr_done;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2763
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2764	if (packets == 0)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2765	goto update_itr_done;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2766
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2767	switch (itr_setting) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2768	case lowest_latency:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2769	/* jumbo frames get bulk treatment*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2770	if (bytes/packets > 8000)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2771	retval = bulk_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2772	else if ((packets < 5) && (bytes > 512))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2773	retval = low_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2774	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2775	case low_latency: /* 50 usec aka 20000 ints/s */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2776	if (bytes > 10000) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2777	/* jumbo frames need bulk latency setting */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2778	if (bytes/packets > 8000)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2779	retval = bulk_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2780	else if ((packets < 10) \|\| ((bytes/packets) > 1200))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2781	retval = bulk_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2782	else if ((packets > 35))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2783	retval = lowest_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2784	} else if (bytes/packets > 2000)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2785	retval = bulk_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2786	else if (packets <= 2 && bytes < 512)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2787	retval = lowest_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2788	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2789	case bulk_latency: /* 250 usec aka 4000 ints/s */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2790	if (bytes > 25000) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2791	if (packets > 35)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2792	retval = low_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2793	} else if (bytes < 6000) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2794	retval = low_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2795	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2796	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2797	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2798
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2799	update_itr_done:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2800	return retval;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2801	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2802
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2803	static void e1000_set_itr(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2804	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2805	struct e1000_hw *hw = &adapter->hw;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2806	uint16_t current_itr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2807	uint32_t new_itr = adapter->itr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2808
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2809	if (unlikely(hw->mac_type < e1000_82540))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2810	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2811
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2812	/* for non-gigabit speeds, just fix the interrupt rate at 4000 */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2813	if (unlikely(adapter->link_speed != SPEED_1000)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2814	current_itr = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2815	new_itr = 4000;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2816	goto set_itr_now;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2817	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2818
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2819	adapter->tx_itr = e1000_update_itr(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2820	adapter->tx_itr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2821	adapter->total_tx_packets,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2822	adapter->total_tx_bytes);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2823	/* conservative mode (itr 3) eliminates the lowest_latency setting */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2824	if (adapter->itr_setting == 3 && adapter->tx_itr == lowest_latency)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2825	adapter->tx_itr = low_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2826
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2827	adapter->rx_itr = e1000_update_itr(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2828	adapter->rx_itr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2829	adapter->total_rx_packets,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2830	adapter->total_rx_bytes);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2831	/* conservative mode (itr 3) eliminates the lowest_latency setting */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2832	if (adapter->itr_setting == 3 && adapter->rx_itr == lowest_latency)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2833	adapter->rx_itr = low_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2834
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2835	current_itr = max(adapter->rx_itr, adapter->tx_itr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2836
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2837	switch (current_itr) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2838	/* counts and packets in update_itr are dependent on these numbers */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2839	case lowest_latency:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2840	new_itr = 70000;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2841	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2842	case low_latency:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2843	new_itr = 20000; /* aka hwitr = ~200 */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2844	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2845	case bulk_latency:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2846	new_itr = 4000;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2847	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2848	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2849	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2850	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2851
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2852	set_itr_now:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2853	if (new_itr != adapter->itr) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2854	/* this attempts to bias the interrupt rate towards Bulk
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2855	* by adding intermediate steps when interrupt rate is
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2856	* increasing */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2857	new_itr = new_itr > adapter->itr ?
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2858	min(adapter->itr + (new_itr >> 2), new_itr) :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2859	new_itr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2860	adapter->itr = new_itr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2861	E1000_WRITE_REG(hw, ITR, 1000000000 / (new_itr * 256));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2862	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2863
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2864	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2865	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2866
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2867	#define E1000_TX_FLAGS_CSUM 0x00000001
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2868	#define E1000_TX_FLAGS_VLAN 0x00000002
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2869	#define E1000_TX_FLAGS_TSO 0x00000004
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2870	#define E1000_TX_FLAGS_IPV4 0x00000008
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2871	#define E1000_TX_FLAGS_VLAN_MASK 0xffff0000
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2872	#define E1000_TX_FLAGS_VLAN_SHIFT 16
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2873
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2874	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2875	e1000_tso(struct e1000_adapter adapter, struct e1000_tx_ring tx_ring,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2876	struct sk_buff *skb)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2877	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2878	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2879	struct e1000_context_desc *context_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2880	struct e1000_buffer *buffer_info;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2881	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2882	uint32_t cmd_length = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2883	uint16_t ipcse = 0, tucse, mss;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2884	uint8_t ipcss, ipcso, tucss, tucso, hdr_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2885	int err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2886
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2887	if (skb_is_gso(skb)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2888	if (skb_header_cloned(skb)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2889	err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2890	if (err)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2891	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2892	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2893
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2894	hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2895	mss = skb_shinfo(skb)->gso_size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2896	if (skb->protocol == htons(ETH_P_IP)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2897	skb->nh.iph->tot_len = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2898	skb->nh.iph->check = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2899	skb->h.th->check =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2900	~csum_tcpudp_magic(skb->nh.iph->saddr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2901	skb->nh.iph->daddr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2902	0,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2903	IPPROTO_TCP,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2904	0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2905	cmd_length = E1000_TXD_CMD_IP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2906	ipcse = skb->h.raw - skb->data - 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2907	#ifdef NETIF_F_TSO6
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2908	} else if (skb->protocol == htons(ETH_P_IPV6)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2909	skb->nh.ipv6h->payload_len = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2910	skb->h.th->check =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2911	~csum_ipv6_magic(&skb->nh.ipv6h->saddr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2912	&skb->nh.ipv6h->daddr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2913	0,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2914	IPPROTO_TCP,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2915	0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2916	ipcse = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2917	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2918	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2919	ipcss = skb->nh.raw - skb->data;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2920	ipcso = (void )&(skb->nh.iph->check) - (void )skb->data;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2921	tucss = skb->h.raw - skb->data;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2922	tucso = (void )&(skb->h.th->check) - (void )skb->data;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2923	tucse = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2924
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2925	cmd_length \|= (E1000_TXD_CMD_DEXT \| E1000_TXD_CMD_TSE \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2926	E1000_TXD_CMD_TCP \| (skb->len - (hdr_len)));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2927
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2928	i = tx_ring->next_to_use;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2929	context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2930	buffer_info = &tx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2931
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2932	context_desc->lower_setup.ip_fields.ipcss = ipcss;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2933	context_desc->lower_setup.ip_fields.ipcso = ipcso;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2934	context_desc->lower_setup.ip_fields.ipcse = cpu_to_le16(ipcse);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2935	context_desc->upper_setup.tcp_fields.tucss = tucss;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2936	context_desc->upper_setup.tcp_fields.tucso = tucso;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2937	context_desc->upper_setup.tcp_fields.tucse = cpu_to_le16(tucse);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2938	context_desc->tcp_seg_setup.fields.mss = cpu_to_le16(mss);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2939	context_desc->tcp_seg_setup.fields.hdr_len = hdr_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2940	context_desc->cmd_and_length = cpu_to_le32(cmd_length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2941
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2942	buffer_info->time_stamp = jiffies;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2943	buffer_info->next_to_watch = i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2944
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2945	if (++i == tx_ring->count) i = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2946	tx_ring->next_to_use = i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2947
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2948	return TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2949	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2950	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2951
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2952	return FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2953	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2954
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2955	static boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2956	e1000_tx_csum(struct e1000_adapter adapter, struct e1000_tx_ring tx_ring,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2957	struct sk_buff *skb)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2958	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2959	struct e1000_context_desc *context_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2960	struct e1000_buffer *buffer_info;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2961	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2962	uint8_t css;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2963
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2964	if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2965	css = skb->h.raw - skb->data;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2966
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2967	i = tx_ring->next_to_use;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2968	buffer_info = &tx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2969	context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2970
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2971	context_desc->upper_setup.tcp_fields.tucss = css;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2972	context_desc->upper_setup.tcp_fields.tucso = css + skb->csum_offset;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2973	context_desc->upper_setup.tcp_fields.tucse = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2974	context_desc->tcp_seg_setup.data = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2975	context_desc->cmd_and_length = cpu_to_le32(E1000_TXD_CMD_DEXT);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2976
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2977	buffer_info->time_stamp = jiffies;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2978	buffer_info->next_to_watch = i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2979
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2980	if (unlikely(++i == tx_ring->count)) i = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2981	tx_ring->next_to_use = i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2982
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2983	return TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2984	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2985
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2986	return FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2987	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2988
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2989	#define E1000_MAX_TXD_PWR 12
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2990	#define E1000_MAX_DATA_PER_TXD (1<<E1000_MAX_TXD_PWR)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2991
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2992	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2993	e1000_tx_map(struct e1000_adapter adapter, struct e1000_tx_ring tx_ring,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2994	struct sk_buff *skb, unsigned int first, unsigned int max_per_txd,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2995	unsigned int nr_frags, unsigned int mss)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2996	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2997	struct e1000_buffer *buffer_info;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2998	unsigned int len = skb->len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2999	unsigned int offset = 0, size, count = 0, i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3000	unsigned int f;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3001	len -= skb->data_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3002
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3003	i = tx_ring->next_to_use;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3004
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3005	while (len) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3006	buffer_info = &tx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3007	size = min(len, max_per_txd);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3008	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3009	/* Workaround for Controller erratum --
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3010	* descriptor for non-tso packet in a linear SKB that follows a
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3011	* tso gets written back prematurely before the data is fully
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3012	* DMA'd to the controller */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3013	if (!skb->data_len && tx_ring->last_tx_tso &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3014	!skb_is_gso(skb)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3015	tx_ring->last_tx_tso = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3016	size -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3017	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3018
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3019	/* Workaround for premature desc write-backs
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3020	* in TSO mode. Append 4-byte sentinel desc */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3021	if (unlikely(mss && !nr_frags && size == len && size > 8))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3022	size -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3023	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3024	/* work-around for errata 10 and it applies
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3025	* to all controllers in PCI-X mode
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3026	* The fix is to make sure that the first descriptor of a
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3027	* packet is smaller than 2048 - 16 - 16 (or 2016) bytes
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3028	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3029	if (unlikely((adapter->hw.bus_type == e1000_bus_type_pcix) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3030	(size > 2015) && count == 0))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3031	size = 2015;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3032
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3033	/* Workaround for potential 82544 hang in PCI-X. Avoid
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3034	* terminating buffers within evenly-aligned dwords. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3035	if (unlikely(adapter->pcix_82544 &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3036	!((unsigned long)(skb->data + offset + size - 1) & 4) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3037	size > 4))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3038	size -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3039
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3040	buffer_info->length = size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3041	buffer_info->dma =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3042	pci_map_single(adapter->pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3043	skb->data + offset,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3044	size,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3045	PCI_DMA_TODEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3046	buffer_info->time_stamp = jiffies;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3047	buffer_info->next_to_watch = i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3048
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3049	len -= size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3050	offset += size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3051	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3052	if (unlikely(++i == tx_ring->count)) i = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3053	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3054
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3055	for (f = 0; f < nr_frags; f++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3056	struct skb_frag_struct *frag;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3057
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3058	frag = &skb_shinfo(skb)->frags[f];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3059	len = frag->size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3060	offset = frag->page_offset;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3061
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3062	while (len) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3063	buffer_info = &tx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3064	size = min(len, max_per_txd);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3065	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3066	/* Workaround for premature desc write-backs
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3067	* in TSO mode. Append 4-byte sentinel desc */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3068	if (unlikely(mss && f == (nr_frags-1) && size == len && size > 8))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3069	size -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3070	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3071	/* Workaround for potential 82544 hang in PCI-X.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3072	* Avoid terminating buffers within evenly-aligned
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3073	* dwords. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3074	if (unlikely(adapter->pcix_82544 &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3075	!((unsigned long)(frag->page+offset+size-1) & 4) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3076	size > 4))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3077	size -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3078
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3079	buffer_info->length = size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3080	buffer_info->dma =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3081	pci_map_page(adapter->pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3082	frag->page,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3083	offset,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3084	size,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3085	PCI_DMA_TODEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3086	buffer_info->time_stamp = jiffies;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3087	buffer_info->next_to_watch = i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3088
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3089	len -= size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3090	offset += size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3091	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3092	if (unlikely(++i == tx_ring->count)) i = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3093	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3094	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3095
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3096	i = (i == 0) ? tx_ring->count - 1 : i - 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3097	tx_ring->buffer_info[i].skb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3098	tx_ring->buffer_info[first].next_to_watch = i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3099
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3100	return count;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3101	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3102
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3103	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3104	e1000_tx_queue(struct e1000_adapter adapter, struct e1000_tx_ring tx_ring,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3105	int tx_flags, int count)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3106	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3107	struct e1000_tx_desc *tx_desc = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3108	struct e1000_buffer *buffer_info;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3109	uint32_t txd_upper = 0, txd_lower = E1000_TXD_CMD_IFCS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3110	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3111
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3112	if (likely(tx_flags & E1000_TX_FLAGS_TSO)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3113	txd_lower \|= E1000_TXD_CMD_DEXT \| E1000_TXD_DTYP_D \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3114	E1000_TXD_CMD_TSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3115	txd_upper \|= E1000_TXD_POPTS_TXSM << 8;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3116
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3117	if (likely(tx_flags & E1000_TX_FLAGS_IPV4))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3118	txd_upper \|= E1000_TXD_POPTS_IXSM << 8;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3119	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3120
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3121	if (likely(tx_flags & E1000_TX_FLAGS_CSUM)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3122	txd_lower \|= E1000_TXD_CMD_DEXT \| E1000_TXD_DTYP_D;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3123	txd_upper \|= E1000_TXD_POPTS_TXSM << 8;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3124	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3125
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3126	if (unlikely(tx_flags & E1000_TX_FLAGS_VLAN)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3127	txd_lower \|= E1000_TXD_CMD_VLE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3128	txd_upper \|= (tx_flags & E1000_TX_FLAGS_VLAN_MASK);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3129	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3130
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3131	i = tx_ring->next_to_use;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3132
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3133	while (count--) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3134	buffer_info = &tx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3135	tx_desc = E1000_TX_DESC(*tx_ring, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3136	tx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3137	tx_desc->lower.data =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3138	cpu_to_le32(txd_lower \| buffer_info->length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3139	tx_desc->upper.data = cpu_to_le32(txd_upper);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3140	if (unlikely(++i == tx_ring->count)) i = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3141	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3142
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3143	tx_desc->lower.data \|= cpu_to_le32(adapter->txd_cmd);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3144
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3145	/* Force memory writes to complete before letting h/w
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3146	* know there are new descriptors to fetch. (Only
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3147	* applicable for weak-ordered memory model archs,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3148	* such as IA-64). */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3149	wmb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3150
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3151	tx_ring->next_to_use = i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3152	writel(i, adapter->hw.hw_addr + tx_ring->tdt);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3153	/* we need this if more than one processor can write to our tail
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3154	* at a time, it syncronizes IO on IA64/Altix systems */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3155	mmiowb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3156	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3157
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3158	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3159	* 82547 workaround to avoid controller hang in half-duplex environment.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3160	* The workaround is to avoid queuing a large packet that would span
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3161	* the internal Tx FIFO ring boundary by notifying the stack to resend
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3162	* the packet at a later time. This gives the Tx FIFO an opportunity to
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3163	* flush all packets. When that occurs, we reset the Tx FIFO pointers
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3164	* to the beginning of the Tx FIFO.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3165	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3166
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3167	#define E1000_FIFO_HDR 0x10
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3168	#define E1000_82547_PAD_LEN 0x3E0
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3169
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3170	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3171	e1000_82547_fifo_workaround(struct e1000_adapter adapter, struct sk_buff skb)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3172	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3173	uint32_t fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3174	uint32_t skb_fifo_len = skb->len + E1000_FIFO_HDR;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3175
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3176	E1000_ROUNDUP(skb_fifo_len, E1000_FIFO_HDR);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3177
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3178	if (adapter->link_duplex != HALF_DUPLEX)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3179	goto no_fifo_stall_required;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3180
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3181	if (atomic_read(&adapter->tx_fifo_stall))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3182	return 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3183
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3184	if (skb_fifo_len >= (E1000_82547_PAD_LEN + fifo_space)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3185	atomic_set(&adapter->tx_fifo_stall, 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3186	return 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3187	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3188
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3189	no_fifo_stall_required:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3190	adapter->tx_fifo_head += skb_fifo_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3191	if (adapter->tx_fifo_head >= adapter->tx_fifo_size)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3192	adapter->tx_fifo_head -= adapter->tx_fifo_size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3193	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3194	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3195
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3196	#define MINIMUM_DHCP_PACKET_SIZE 282
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3197	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3198	e1000_transfer_dhcp_info(struct e1000_adapter adapter, struct sk_buff skb)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3199	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3200	struct e1000_hw *hw = &adapter->hw;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3201	uint16_t length, offset;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3202	if (vlan_tx_tag_present(skb)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3203	if (!((vlan_tx_tag_get(skb) == adapter->hw.mng_cookie.vlan_id) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3204	( adapter->hw.mng_cookie.status &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3205	E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) )
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3206	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3207	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3208	if (skb->len > MINIMUM_DHCP_PACKET_SIZE) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3209	struct ethhdr eth = (struct ethhdr ) skb->data;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3210	if ((htons(ETH_P_IP) == eth->h_proto)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3211	const struct iphdr *ip =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3212	(struct iphdr )((uint8_t )skb->data+14);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3213	if (IPPROTO_UDP == ip->protocol) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3214	struct udphdr *udp =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3215	(struct udphdr )((uint8_t )ip +
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3216	(ip->ihl << 2));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3217	if (ntohs(udp->dest) == 67) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3218	offset = (uint8_t *)udp + 8 - skb->data;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3219	length = skb->len - offset;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3220
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3221	return e1000_mng_write_dhcp_info(hw,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3222	(uint8_t *)udp + 8,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3223	length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3224	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3225	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3226	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3227	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3228	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3229	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3230
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3231	static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3232	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3233	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3234	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3235
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3236	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3237	/* Herbert's original patch had:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3238	* smp_mb__after_netif_stop_queue();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3239	* but since that doesn't exist yet, just open code it. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3240	smp_mb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3241
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3242	/* We need to check again in a case another CPU has just
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3243	* made room available. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3244	if (likely(E1000_DESC_UNUSED(tx_ring) < size))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3245	return -EBUSY;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3246
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3247	/* A reprieve! */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3248	netif_start_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3249	++adapter->restart_queue;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3250	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3251	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3252
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3253	static int e1000_maybe_stop_tx(struct net_device *netdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3254	struct e1000_tx_ring *tx_ring, int size)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3255	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3256	if (likely(E1000_DESC_UNUSED(tx_ring) >= size))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3257	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3258	return __e1000_maybe_stop_tx(netdev, size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3259	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3260
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3261	#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 )
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3262	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3263	e1000_xmit_frame(struct sk_buff skb, struct net_device netdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3264	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3265	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3266	struct e1000_tx_ring *tx_ring;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3267	unsigned int first, max_per_txd = E1000_MAX_DATA_PER_TXD;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3268	unsigned int max_txd_pwr = E1000_MAX_TXD_PWR;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3269	unsigned int tx_flags = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3270	unsigned int len = skb->len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3271	unsigned long flags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3272	unsigned int nr_frags = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3273	unsigned int mss = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3274	int count = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3275	int tso;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3276	unsigned int f;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3277	len -= skb->data_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3278
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3279	/* This goes back to the question of how to logically map a tx queue
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3280	* to a flow. Right now, performance is impacted slightly negatively
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3281	* if using multiple tx queues. If the stack breaks away from a
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3282	* single qdisc implementation, we can look at this again. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3283	tx_ring = adapter->tx_ring;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3284
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3285	if (unlikely(skb->len <= 0)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3286	dev_kfree_skb_any(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3287	return NETDEV_TX_OK;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3288	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3289
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3290	/* 82571 and newer doesn't need the workaround that limited descriptor
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3291	* length to 4kB */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3292	if (adapter->hw.mac_type >= e1000_82571)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3293	max_per_txd = 8192;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3294
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3295	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3296	mss = skb_shinfo(skb)->gso_size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3297	/* The controller does a simple calculation to
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3298	* make sure there is enough room in the FIFO before
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3299	* initiating the DMA for each buffer. The calc is:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3300	* 4 = ceil(buffer len/mss). To make sure we don't
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3301	* overrun the FIFO, adjust the max buffer len if mss
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3302	* drops. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3303	if (mss) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3304	uint8_t hdr_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3305	max_per_txd = min(mss << 2, max_per_txd);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3306	max_txd_pwr = fls(max_per_txd) - 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3307
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3308	/* TSO Workaround for 82571/2/3 Controllers -- if skb->data
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3309	* points to just header, pull a few bytes of payload from
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3310	* frags into skb->data */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3311	hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3312	if (skb->data_len && (hdr_len == (skb->len - skb->data_len))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3313	switch (adapter->hw.mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3314	unsigned int pull_size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3315	case e1000_82544:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3316	/* Make sure we have room to chop off 4 bytes,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3317	* and that the end alignment will work out to
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3318	* this hardware's requirements
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3319	* NOTE: this is a TSO only workaround
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3320	* if end byte alignment not correct move us
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3321	* into the next dword */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3322	if ((unsigned long)(skb->tail - 1) & 4)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3323	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3324	/* fall through */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3325	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3326	case e1000_82572:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3327	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3328	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3329	pull_size = min((unsigned int)4, skb->data_len);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3330	if (!__pskb_pull_tail(skb, pull_size)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3331	DPRINTK(DRV, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3332	"__pskb_pull_tail failed.\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3333	dev_kfree_skb_any(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3334	return NETDEV_TX_OK;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3335	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3336	len = skb->len - skb->data_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3337	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3338	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3339	/* do nothing */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3340	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3341	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3342	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3343	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3344
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3345	/* reserve a descriptor for the offload context */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3346	if ((mss) \|\| (skb->ip_summed == CHECKSUM_PARTIAL))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3347	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3348	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3349	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3350	if (skb->ip_summed == CHECKSUM_PARTIAL)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3351	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3352	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3353
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3354	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3355	/* Controller Erratum workaround */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3356	if (!skb->data_len && tx_ring->last_tx_tso && !skb_is_gso(skb))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3357	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3358	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3359
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3360	count += TXD_USE_COUNT(len, max_txd_pwr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3361
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3362	if (adapter->pcix_82544)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3363	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3364
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3365	/* work-around for errata 10 and it applies to all controllers
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3366	* in PCI-X mode, so add one more descriptor to the count
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3367	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3368	if (unlikely((adapter->hw.bus_type == e1000_bus_type_pcix) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3369	(len > 2015)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3370	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3371
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3372	nr_frags = skb_shinfo(skb)->nr_frags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3373	for (f = 0; f < nr_frags; f++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3374	count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3375	max_txd_pwr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3376	if (adapter->pcix_82544)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3377	count += nr_frags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3378
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3379
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3380	if (adapter->hw.tx_pkt_filtering &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3381	(adapter->hw.mac_type == e1000_82573))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3382	e1000_transfer_dhcp_info(adapter, skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3383
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3384	local_irq_save(flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3385	if (!spin_trylock(&tx_ring->tx_lock)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3386	/* Collision - tell upper layer to requeue */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3387	local_irq_restore(flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3388	return NETDEV_TX_LOCKED;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3389	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3390
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3391	/* need: count + 2 desc gap to keep tail from touching
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3392	* head, otherwise try next time */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3393	if (unlikely(e1000_maybe_stop_tx(netdev, tx_ring, count + 2))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3394	spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3395	return NETDEV_TX_BUSY;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3396	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3397
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3398	if (unlikely(adapter->hw.mac_type == e1000_82547)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3399	if (unlikely(e1000_82547_fifo_workaround(adapter, skb))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3400	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3401	mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3402	spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3403	return NETDEV_TX_BUSY;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3404	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3405	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3406
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3407	if (unlikely(adapter->vlgrp && vlan_tx_tag_present(skb))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3408	tx_flags \|= E1000_TX_FLAGS_VLAN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3409	tx_flags \|= (vlan_tx_tag_get(skb) << E1000_TX_FLAGS_VLAN_SHIFT);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3410	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3411
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3412	first = tx_ring->next_to_use;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3413
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3414	tso = e1000_tso(adapter, tx_ring, skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3415	if (tso < 0) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3416	dev_kfree_skb_any(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3417	spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3418	return NETDEV_TX_OK;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3419	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3420
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3421	if (likely(tso)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3422	tx_ring->last_tx_tso = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3423	tx_flags \|= E1000_TX_FLAGS_TSO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3424	} else if (likely(e1000_tx_csum(adapter, tx_ring, skb)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3425	tx_flags \|= E1000_TX_FLAGS_CSUM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3426
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3427	/* Old method was to assume IPv4 packet by default if TSO was enabled.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3428	* 82571 hardware supports TSO capabilities for IPv6 as well...
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3429	* no longer assume, we must. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3430	if (likely(skb->protocol == htons(ETH_P_IP)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3431	tx_flags \|= E1000_TX_FLAGS_IPV4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3432
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3433	e1000_tx_queue(adapter, tx_ring, tx_flags,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3434	e1000_tx_map(adapter, tx_ring, skb, first,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3435	max_per_txd, nr_frags, mss));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3436
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3437	netdev->trans_start = jiffies;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3438
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3439	/* Make sure there is space in the ring for the next send. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3440	e1000_maybe_stop_tx(netdev, tx_ring, MAX_SKB_FRAGS + 2);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3441
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3442	spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3443	return NETDEV_TX_OK;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3444	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3445
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3446	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3447	* e1000_tx_timeout - Respond to a Tx Hang
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3448	* @netdev: network interface device structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3449	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3450
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3451	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3452	e1000_tx_timeout(struct net_device *netdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3453	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3454	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3455
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3456	/* Do the reset outside of interrupt context */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3457	adapter->tx_timeout_count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3458	schedule_work(&adapter->reset_task);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3459	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3460
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3461	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3462	e1000_reset_task(struct work_struct *work)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3463	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3464	struct e1000_adapter *adapter =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3465	container_of(work, struct e1000_adapter, reset_task);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3466
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3467	e1000_reinit_locked(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3468	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3469
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3470	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3471	* e1000_get_stats - Get System Network Statistics
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3472	* @netdev: network interface device structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3473	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3474	* Returns the address of the device statistics structure.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3475	* The statistics are actually updated from the timer callback.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3476	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3477
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3478	static struct net_device_stats *
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3479	e1000_get_stats(struct net_device *netdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3480	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3481	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3482
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3483	/* only return the current stats */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3484	return &adapter->net_stats;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3485	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3486
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3487	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3488	* e1000_change_mtu - Change the Maximum Transfer Unit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3489	* @netdev: network interface device structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3490	* @new_mtu: new value for maximum frame size
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3491	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3492	* Returns 0 on success, negative on failure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3493	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3494
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3495	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3496	e1000_change_mtu(struct net_device *netdev, int new_mtu)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3497	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3498	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3499	int max_frame = new_mtu + ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3500	uint16_t eeprom_data = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3501
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3502	if ((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3503	(max_frame > MAX_JUMBO_FRAME_SIZE)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3504	DPRINTK(PROBE, ERR, "Invalid MTU setting\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3505	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3506	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3507
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3508	/* Adapter-specific max frame size limits. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3509	switch (adapter->hw.mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3510	case e1000_undefined ... e1000_82542_rev2_1:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3511	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3512	if (max_frame > MAXIMUM_ETHERNET_FRAME_SIZE) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3513	DPRINTK(PROBE, ERR, "Jumbo Frames not supported.\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3514	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3515	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3516	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3517	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3518	/* Jumbo Frames not supported if:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3519	* - this is not an 82573L device
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3520	* - ASPM is enabled in any way (0x1A bits 3:2) */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3521	e1000_read_eeprom(&adapter->hw, EEPROM_INIT_3GIO_3, 1,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3522	&eeprom_data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3523	if ((adapter->hw.device_id != E1000_DEV_ID_82573L) \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3524	(eeprom_data & EEPROM_WORD1A_ASPM_MASK)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3525	if (max_frame > MAXIMUM_ETHERNET_FRAME_SIZE) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3526	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3527	"Jumbo Frames not supported.\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3528	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3529	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3530	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3531	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3532	/* ERT will be enabled later to enable wire speed receives */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3533
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3534	/* fall through to get support */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3535	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3536	case e1000_82572:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3537	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3538	#define MAX_STD_JUMBO_FRAME_SIZE 9234
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3539	if (max_frame > MAX_STD_JUMBO_FRAME_SIZE) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3540	DPRINTK(PROBE, ERR, "MTU > 9216 not supported.\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3541	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3542	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3543	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3544	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3545	/* Capable of supporting up to MAX_JUMBO_FRAME_SIZE limit. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3546	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3547	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3548
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3549	/* NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3550	* means we reserve 2 more, this pushes us to allocate from the next
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3551	* larger slab size
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3552	* i.e. RXBUFFER_2048 --> size-4096 slab */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3553
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3554	if (max_frame <= E1000_RXBUFFER_256)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3555	adapter->rx_buffer_len = E1000_RXBUFFER_256;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3556	else if (max_frame <= E1000_RXBUFFER_512)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3557	adapter->rx_buffer_len = E1000_RXBUFFER_512;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3558	else if (max_frame <= E1000_RXBUFFER_1024)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3559	adapter->rx_buffer_len = E1000_RXBUFFER_1024;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3560	else if (max_frame <= E1000_RXBUFFER_2048)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3561	adapter->rx_buffer_len = E1000_RXBUFFER_2048;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3562	else if (max_frame <= E1000_RXBUFFER_4096)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3563	adapter->rx_buffer_len = E1000_RXBUFFER_4096;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3564	else if (max_frame <= E1000_RXBUFFER_8192)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3565	adapter->rx_buffer_len = E1000_RXBUFFER_8192;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3566	else if (max_frame <= E1000_RXBUFFER_16384)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3567	adapter->rx_buffer_len = E1000_RXBUFFER_16384;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3568
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3569	/* adjust allocation if LPE protects us, and we aren't using SBP */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3570	if (!adapter->hw.tbi_compatibility_on &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3571	((max_frame == MAXIMUM_ETHERNET_FRAME_SIZE) \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3572	(max_frame == MAXIMUM_ETHERNET_VLAN_SIZE)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3573	adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3574
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3575	netdev->mtu = new_mtu;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3576	adapter->hw.max_frame_size = max_frame;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3577
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3578	if (netif_running(netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3579	e1000_reinit_locked(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3580
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3581	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3582	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3583
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3584	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3585	* e1000_update_stats - Update the board statistics counters
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3586	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3587	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3588
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3589	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3590	e1000_update_stats(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3591	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3592	struct e1000_hw *hw = &adapter->hw;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3593	struct pci_dev *pdev = adapter->pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3594	unsigned long flags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3595	uint16_t phy_tmp;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3596
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3597	#define PHY_IDLE_ERROR_COUNT_MASK 0x00FF
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3598
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3599	/*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3600	* Prevent stats update while adapter is being reset, or if the pci
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3601	* connection is down.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3602	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3603	if (adapter->link_speed == 0)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3604	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3605	if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3606	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3607
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3608	spin_lock_irqsave(&adapter->stats_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3609
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3610	/* these counters are modified from e1000_adjust_tbi_stats,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3611	* called from the interrupt context, so they must only
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3612	* be written while holding adapter->stats_lock
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3613	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3614
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3615	adapter->stats.crcerrs += E1000_READ_REG(hw, CRCERRS);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3616	adapter->stats.gprc += E1000_READ_REG(hw, GPRC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3617	adapter->stats.gorcl += E1000_READ_REG(hw, GORCL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3618	adapter->stats.gorch += E1000_READ_REG(hw, GORCH);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3619	adapter->stats.bprc += E1000_READ_REG(hw, BPRC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3620	adapter->stats.mprc += E1000_READ_REG(hw, MPRC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3621	adapter->stats.roc += E1000_READ_REG(hw, ROC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3622
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3623	if (adapter->hw.mac_type != e1000_ich8lan) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3624	adapter->stats.prc64 += E1000_READ_REG(hw, PRC64);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3625	adapter->stats.prc127 += E1000_READ_REG(hw, PRC127);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3626	adapter->stats.prc255 += E1000_READ_REG(hw, PRC255);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3627	adapter->stats.prc511 += E1000_READ_REG(hw, PRC511);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3628	adapter->stats.prc1023 += E1000_READ_REG(hw, PRC1023);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3629	adapter->stats.prc1522 += E1000_READ_REG(hw, PRC1522);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3630	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3631
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3632	adapter->stats.symerrs += E1000_READ_REG(hw, SYMERRS);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3633	adapter->stats.mpc += E1000_READ_REG(hw, MPC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3634	adapter->stats.scc += E1000_READ_REG(hw, SCC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3635	adapter->stats.ecol += E1000_READ_REG(hw, ECOL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3636	adapter->stats.mcc += E1000_READ_REG(hw, MCC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3637	adapter->stats.latecol += E1000_READ_REG(hw, LATECOL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3638	adapter->stats.dc += E1000_READ_REG(hw, DC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3639	adapter->stats.sec += E1000_READ_REG(hw, SEC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3640	adapter->stats.rlec += E1000_READ_REG(hw, RLEC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3641	adapter->stats.xonrxc += E1000_READ_REG(hw, XONRXC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3642	adapter->stats.xontxc += E1000_READ_REG(hw, XONTXC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3643	adapter->stats.xoffrxc += E1000_READ_REG(hw, XOFFRXC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3644	adapter->stats.xofftxc += E1000_READ_REG(hw, XOFFTXC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3645	adapter->stats.fcruc += E1000_READ_REG(hw, FCRUC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3646	adapter->stats.gptc += E1000_READ_REG(hw, GPTC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3647	adapter->stats.gotcl += E1000_READ_REG(hw, GOTCL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3648	adapter->stats.gotch += E1000_READ_REG(hw, GOTCH);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3649	adapter->stats.rnbc += E1000_READ_REG(hw, RNBC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3650	adapter->stats.ruc += E1000_READ_REG(hw, RUC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3651	adapter->stats.rfc += E1000_READ_REG(hw, RFC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3652	adapter->stats.rjc += E1000_READ_REG(hw, RJC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3653	adapter->stats.torl += E1000_READ_REG(hw, TORL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3654	adapter->stats.torh += E1000_READ_REG(hw, TORH);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3655	adapter->stats.totl += E1000_READ_REG(hw, TOTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3656	adapter->stats.toth += E1000_READ_REG(hw, TOTH);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3657	adapter->stats.tpr += E1000_READ_REG(hw, TPR);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3658
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3659	if (adapter->hw.mac_type != e1000_ich8lan) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3660	adapter->stats.ptc64 += E1000_READ_REG(hw, PTC64);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3661	adapter->stats.ptc127 += E1000_READ_REG(hw, PTC127);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3662	adapter->stats.ptc255 += E1000_READ_REG(hw, PTC255);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3663	adapter->stats.ptc511 += E1000_READ_REG(hw, PTC511);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3664	adapter->stats.ptc1023 += E1000_READ_REG(hw, PTC1023);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3665	adapter->stats.ptc1522 += E1000_READ_REG(hw, PTC1522);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3666	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3667
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3668	adapter->stats.mptc += E1000_READ_REG(hw, MPTC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3669	adapter->stats.bptc += E1000_READ_REG(hw, BPTC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3670
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3671	/* used for adaptive IFS */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3672
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3673	hw->tx_packet_delta = E1000_READ_REG(hw, TPT);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3674	adapter->stats.tpt += hw->tx_packet_delta;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3675	hw->collision_delta = E1000_READ_REG(hw, COLC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3676	adapter->stats.colc += hw->collision_delta;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3677
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3678	if (hw->mac_type >= e1000_82543) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3679	adapter->stats.algnerrc += E1000_READ_REG(hw, ALGNERRC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3680	adapter->stats.rxerrc += E1000_READ_REG(hw, RXERRC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3681	adapter->stats.tncrs += E1000_READ_REG(hw, TNCRS);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3682	adapter->stats.cexterr += E1000_READ_REG(hw, CEXTERR);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3683	adapter->stats.tsctc += E1000_READ_REG(hw, TSCTC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3684	adapter->stats.tsctfc += E1000_READ_REG(hw, TSCTFC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3685	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3686	if (hw->mac_type > e1000_82547_rev_2) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3687	adapter->stats.iac += E1000_READ_REG(hw, IAC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3688	adapter->stats.icrxoc += E1000_READ_REG(hw, ICRXOC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3689
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3690	if (adapter->hw.mac_type != e1000_ich8lan) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3691	adapter->stats.icrxptc += E1000_READ_REG(hw, ICRXPTC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3692	adapter->stats.icrxatc += E1000_READ_REG(hw, ICRXATC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3693	adapter->stats.ictxptc += E1000_READ_REG(hw, ICTXPTC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3694	adapter->stats.ictxatc += E1000_READ_REG(hw, ICTXATC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3695	adapter->stats.ictxqec += E1000_READ_REG(hw, ICTXQEC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3696	adapter->stats.ictxqmtc += E1000_READ_REG(hw, ICTXQMTC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3697	adapter->stats.icrxdmtc += E1000_READ_REG(hw, ICRXDMTC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3698	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3699	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3700
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3701	/* Fill out the OS statistics structure */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3702	adapter->net_stats.rx_packets = adapter->stats.gprc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3703	adapter->net_stats.tx_packets = adapter->stats.gptc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3704	adapter->net_stats.rx_bytes = adapter->stats.gorcl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3705	adapter->net_stats.tx_bytes = adapter->stats.gotcl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3706	adapter->net_stats.multicast = adapter->stats.mprc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3707	adapter->net_stats.collisions = adapter->stats.colc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3708
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3709	/* Rx Errors */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3710
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3711	/* RLEC on some newer hardware can be incorrect so build
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3712	* our own version based on RUC and ROC */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3713	adapter->net_stats.rx_errors = adapter->stats.rxerrc +
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3714	adapter->stats.crcerrs + adapter->stats.algnerrc +
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3715	adapter->stats.ruc + adapter->stats.roc +
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3716	adapter->stats.cexterr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3717	adapter->stats.rlerrc = adapter->stats.ruc + adapter->stats.roc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3718	adapter->net_stats.rx_length_errors = adapter->stats.rlerrc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3719	adapter->net_stats.rx_crc_errors = adapter->stats.crcerrs;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3720	adapter->net_stats.rx_frame_errors = adapter->stats.algnerrc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3721	adapter->net_stats.rx_missed_errors = adapter->stats.mpc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3722
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3723	/* Tx Errors */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3724	adapter->stats.txerrc = adapter->stats.ecol + adapter->stats.latecol;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3725	adapter->net_stats.tx_errors = adapter->stats.txerrc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3726	adapter->net_stats.tx_aborted_errors = adapter->stats.ecol;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3727	adapter->net_stats.tx_window_errors = adapter->stats.latecol;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3728	adapter->net_stats.tx_carrier_errors = adapter->stats.tncrs;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3729	if (adapter->hw.bad_tx_carr_stats_fd &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3730	adapter->link_duplex == FULL_DUPLEX) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3731	adapter->net_stats.tx_carrier_errors = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3732	adapter->stats.tncrs = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3733	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3734
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3735	/* Tx Dropped needs to be maintained elsewhere */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3736
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3737	/* Phy Stats */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3738	if (hw->media_type == e1000_media_type_copper) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3739	if ((adapter->link_speed == SPEED_1000) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3740	(!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3741	phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3742	adapter->phy_stats.idle_errors += phy_tmp;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3743	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3744
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3745	if ((hw->mac_type <= e1000_82546) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3746	(hw->phy_type == e1000_phy_m88) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3747	!e1000_read_phy_reg(hw, M88E1000_RX_ERR_CNTR, &phy_tmp))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3748	adapter->phy_stats.receive_errors += phy_tmp;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3749	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3750
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3751	/* Management Stats */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3752	if (adapter->hw.has_smbus) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3753	adapter->stats.mgptc += E1000_READ_REG(hw, MGTPTC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3754	adapter->stats.mgprc += E1000_READ_REG(hw, MGTPRC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3755	adapter->stats.mgpdc += E1000_READ_REG(hw, MGTPDC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3756	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3757
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3758	spin_unlock_irqrestore(&adapter->stats_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3759	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3760	#ifdef CONFIG_PCI_MSI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3761
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3762	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3763	* e1000_intr_msi - Interrupt Handler
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3764	* @irq: interrupt number
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3765	* @data: pointer to a network interface device structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3766	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3767
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3768	static
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3769	irqreturn_t e1000_intr_msi(int irq, void *data)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3770	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3771	struct net_device *netdev = data;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3772	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3773	struct e1000_hw *hw = &adapter->hw;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3774	#ifndef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3775	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3776	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3777
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3778	/* this code avoids the read of ICR but has to get 1000 interrupts
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3779	* at every link change event before it will notice the change */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3780	if (++adapter->detect_link >= 1000) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3781	uint32_t icr = E1000_READ_REG(hw, ICR);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3782	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3783	/* read ICR disables interrupts using IAM, so keep up with our
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3784	* enable/disable accounting */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3785	atomic_inc(&adapter->irq_sem);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3786	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3787	adapter->detect_link = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3788	if ((icr & (E1000_ICR_RXSEQ \| E1000_ICR_LSC)) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3789	(icr & E1000_ICR_INT_ASSERTED)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3790	hw->get_link_status = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3791	/* 80003ES2LAN workaround--
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3792	* For packet buffer work-around on link down event;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3793	* disable receives here in the ISR and
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3794	* reset adapter in watchdog
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3795	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3796	if (netif_carrier_ok(netdev) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3797	(adapter->hw.mac_type == e1000_80003es2lan)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3798	/* disable receives */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3799	uint32_t rctl = E1000_READ_REG(hw, RCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3800	E1000_WRITE_REG(hw, RCTL, rctl & ~E1000_RCTL_EN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3801	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3802	/* guard against interrupt when we're going down */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3803	if (!test_bit(__E1000_DOWN, &adapter->flags))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3804	mod_timer(&adapter->watchdog_timer,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3805	jiffies + 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3806	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3807	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3808	E1000_WRITE_REG(hw, ICR, (0xffffffff & ~(E1000_ICR_RXSEQ \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3809	E1000_ICR_LSC)));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3810	/* bummer we have to flush here, but things break otherwise as
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3811	* some event appears to be lost or delayed and throughput
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3812	* drops. In almost all tests this flush is un-necessary */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3813	E1000_WRITE_FLUSH(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3814	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3815	/* Interrupt Auto-Mask (IAM)...upon writing ICR, interrupts are
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3816	* masked. No need for the IMC write, but it does mean we
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3817	* should account for it ASAP. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3818	atomic_inc(&adapter->irq_sem);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3819	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3820	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3821
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3822	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3823	if (likely(netif_rx_schedule_prep(netdev))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3824	adapter->total_tx_bytes = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3825	adapter->total_tx_packets = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3826	adapter->total_rx_bytes = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3827	adapter->total_rx_packets = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3828	__netif_rx_schedule(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3829	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3830	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3831	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3832	adapter->total_tx_bytes = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3833	adapter->total_rx_bytes = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3834	adapter->total_tx_packets = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3835	adapter->total_rx_packets = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3836
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3837	for (i = 0; i < E1000_MAX_INTR; i++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3838	if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3839	!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3840	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3841
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3842	if (likely(adapter->itr_setting & 3))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3843	e1000_set_itr(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3844	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3845
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3846	return IRQ_HANDLED;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3847	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3848	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3849
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3850	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3851	* e1000_intr - Interrupt Handler
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3852	* @irq: interrupt number
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3853	* @data: pointer to a network interface device structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3854	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3855
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3856	static irqreturn_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3857	e1000_intr(int irq, void *data)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3858	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3859	struct net_device *netdev = data;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3860	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3861	struct e1000_hw *hw = &adapter->hw;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3862	uint32_t rctl, icr = E1000_READ_REG(hw, ICR);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3863	#ifndef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3864	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3865	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3866	if (unlikely(!icr))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3867	return IRQ_NONE; /* Not our interrupt */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3868
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3869	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3870	/* IMS will not auto-mask if INT_ASSERTED is not set, and if it is
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3871	* not set, then the adapter didn't send an interrupt */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3872	if (unlikely(hw->mac_type >= e1000_82571 &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3873	!(icr & E1000_ICR_INT_ASSERTED)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3874	return IRQ_NONE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3875
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3876	/* Interrupt Auto-Mask...upon reading ICR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3877	* interrupts are masked. No need for the
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3878	* IMC write, but it does mean we should
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3879	* account for it ASAP. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3880	if (likely(hw->mac_type >= e1000_82571))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3881	atomic_inc(&adapter->irq_sem);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3882	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3883
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3884	if (unlikely(icr & (E1000_ICR_RXSEQ \| E1000_ICR_LSC))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3885	hw->get_link_status = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3886	/* 80003ES2LAN workaround--
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3887	* For packet buffer work-around on link down event;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3888	* disable receives here in the ISR and
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3889	* reset adapter in watchdog
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3890	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3891	if (netif_carrier_ok(netdev) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3892	(adapter->hw.mac_type == e1000_80003es2lan)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3893	/* disable receives */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3894	rctl = E1000_READ_REG(hw, RCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3895	E1000_WRITE_REG(hw, RCTL, rctl & ~E1000_RCTL_EN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3896	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3897	/* guard against interrupt when we're going down */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3898	if (!test_bit(__E1000_DOWN, &adapter->flags))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3899	mod_timer(&adapter->watchdog_timer, jiffies + 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3900	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3901
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3902	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3903	if (unlikely(hw->mac_type < e1000_82571)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3904	/* disable interrupts, without the synchronize_irq bit */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3905	atomic_inc(&adapter->irq_sem);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3906	E1000_WRITE_REG(hw, IMC, ~0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3907	E1000_WRITE_FLUSH(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3908	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3909	if (likely(netif_rx_schedule_prep(netdev))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3910	adapter->total_tx_bytes = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3911	adapter->total_tx_packets = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3912	adapter->total_rx_bytes = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3913	adapter->total_rx_packets = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3914	__netif_rx_schedule(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3915	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3916	/* this really should not happen! if it does it is basically a
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3917	* bug, but not a hard error, so enable ints and continue */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3918	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3919	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3920	/* Writing IMC and IMS is needed for 82547.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3921	* Due to Hub Link bus being occupied, an interrupt
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3922	* de-assertion message is not able to be sent.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3923	* When an interrupt assertion message is generated later,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3924	* two messages are re-ordered and sent out.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3925	* That causes APIC to think 82547 is in de-assertion
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3926	* state, while 82547 is in assertion state, resulting
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3927	* in dead lock. Writing IMC forces 82547 into
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3928	* de-assertion state.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3929	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3930	if (hw->mac_type == e1000_82547 \|\| hw->mac_type == e1000_82547_rev_2) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3931	atomic_inc(&adapter->irq_sem);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3932	E1000_WRITE_REG(hw, IMC, ~0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3933	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3934
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3935	adapter->total_tx_bytes = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3936	adapter->total_rx_bytes = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3937	adapter->total_tx_packets = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3938	adapter->total_rx_packets = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3939
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3940	for (i = 0; i < E1000_MAX_INTR; i++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3941	if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3942	!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3943	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3944
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3945	if (likely(adapter->itr_setting & 3))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3946	e1000_set_itr(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3947
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3948	if (hw->mac_type == e1000_82547 \|\| hw->mac_type == e1000_82547_rev_2)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3949	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3950
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3951	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3952	return IRQ_HANDLED;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3953	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3954
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3955	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3956	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3957	* e1000_clean - NAPI Rx polling callback
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3958	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3959	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3960
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3961	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3962	e1000_clean(struct net_device poll_dev, int budget)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3963	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3964	struct e1000_adapter *adapter;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3965	int work_to_do = min(*budget, poll_dev->quota);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3966	int tx_cleaned = 0, work_done = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3967
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3968	/* Must NOT use netdev_priv macro here. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3969	adapter = poll_dev->priv;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3970
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3971	/* Keep link state information with original netdev */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3972	if (!netif_carrier_ok(poll_dev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3973	goto quit_polling;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3974
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3975	/* e1000_clean is called per-cpu. This lock protects
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3976	* tx_ring[0] from being cleaned by multiple cpus
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3977	* simultaneously. A failure obtaining the lock means
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3978	* tx_ring[0] is currently being cleaned anyway. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3979	if (spin_trylock(&adapter->tx_queue_lock)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3980	tx_cleaned = e1000_clean_tx_irq(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3981	&adapter->tx_ring[0]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3982	spin_unlock(&adapter->tx_queue_lock);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3983	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3984
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3985	adapter->clean_rx(adapter, &adapter->rx_ring[0],
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3986	&work_done, work_to_do);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3987
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3988	*budget -= work_done;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3989	poll_dev->quota -= work_done;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3990
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3991	/* If no Tx and not enough Rx work done, exit the polling mode */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3992	if ((!tx_cleaned && (work_done == 0)) \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3993	!netif_running(poll_dev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3994	quit_polling:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3995	if (likely(adapter->itr_setting & 3))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3996	e1000_set_itr(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3997	netif_rx_complete(poll_dev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3998	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3999	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4000	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4001
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4002	return 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4003	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4004
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4005	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4006	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4007	* e1000_clean_tx_irq - Reclaim resources after transmit completes
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4008	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4009	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4010
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4011	static boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4012	e1000_clean_tx_irq(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4013	struct e1000_tx_ring *tx_ring)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4014	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4015	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4016	struct e1000_tx_desc tx_desc, eop_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4017	struct e1000_buffer *buffer_info;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4018	unsigned int i, eop;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4019	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4020	unsigned int count = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4021	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4022	boolean_t cleaned = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4023	unsigned int total_tx_bytes=0, total_tx_packets=0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4024
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4025	i = tx_ring->next_to_clean;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4026	eop = tx_ring->buffer_info[i].next_to_watch;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4027	eop_desc = E1000_TX_DESC(*tx_ring, eop);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4028
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4029	while (eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4030	for (cleaned = FALSE; !cleaned; ) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4031	tx_desc = E1000_TX_DESC(*tx_ring, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4032	buffer_info = &tx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4033	cleaned = (i == eop);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4034
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4035	if (cleaned) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4036	struct sk_buff *skb = buffer_info->skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4037	unsigned int segs = skb_shinfo(skb)->gso_segs;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4038	total_tx_packets += segs;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4039	total_tx_packets++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4040	total_tx_bytes += skb->len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4041	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4042	e1000_unmap_and_free_tx_resource(adapter, buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4043	tx_desc->upper.data = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4044
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4045	if (unlikely(++i == tx_ring->count)) i = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4046	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4047
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4048	eop = tx_ring->buffer_info[i].next_to_watch;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4049	eop_desc = E1000_TX_DESC(*tx_ring, eop);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4050	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4051	#define E1000_TX_WEIGHT 64
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4052	/* weight of a sort for tx, to avoid endless transmit cleanup */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4053	if (count++ == E1000_TX_WEIGHT) break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4054	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4055	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4056
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4057	tx_ring->next_to_clean = i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4058
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4059	#define TX_WAKE_THRESHOLD 32
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4060	if (unlikely(cleaned && netif_carrier_ok(netdev) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4061	E1000_DESC_UNUSED(tx_ring) >= TX_WAKE_THRESHOLD)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4062	/* Make sure that anybody stopping the queue after this
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4063	* sees the new next_to_clean.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4064	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4065	smp_mb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4066	if (netif_queue_stopped(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4067	netif_wake_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4068	++adapter->restart_queue;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4069	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4070	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4071
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4072	if (adapter->detect_tx_hung) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4073	/* Detect a transmit hang in hardware, this serializes the
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4074	* check with the clearing of time_stamp and movement of i */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4075	adapter->detect_tx_hung = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4076	if (tx_ring->buffer_info[eop].dma &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4077	time_after(jiffies, tx_ring->buffer_info[eop].time_stamp +
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4078	(adapter->tx_timeout_factor * HZ))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4079	&& !(E1000_READ_REG(&adapter->hw, STATUS) &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4080	E1000_STATUS_TXOFF)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4081
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4082	/* detected Tx unit hang */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4083	DPRINTK(DRV, ERR, "Detected Tx Unit Hang\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4084	" Tx Queue <%lu>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4085	" TDH <%x>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4086	" TDT <%x>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4087	" next_to_use <%x>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4088	" next_to_clean <%x>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4089	"buffer_info[next_to_clean]\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4090	" time_stamp <%lx>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4091	" next_to_watch <%x>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4092	" jiffies <%lx>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4093	" next_to_watch.status <%x>\n",
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4094	(unsigned long)((tx_ring - adapter->tx_ring) /
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4095	sizeof(struct e1000_tx_ring)),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4096	readl(adapter->hw.hw_addr + tx_ring->tdh),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4097	readl(adapter->hw.hw_addr + tx_ring->tdt),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4098	tx_ring->next_to_use,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4099	tx_ring->next_to_clean,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4100	tx_ring->buffer_info[eop].time_stamp,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4101	eop,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4102	jiffies,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4103	eop_desc->upper.fields.status);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4104	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4105	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4106	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4107	adapter->total_tx_bytes += total_tx_bytes;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4108	adapter->total_tx_packets += total_tx_packets;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4109	return cleaned;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4110	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4111
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4112	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4113	* e1000_rx_checksum - Receive Checksum Offload for 82543
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4114	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4115	* @status_err: receive descriptor status and error fields
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4116	* @csum: receive descriptor csum field
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4117	* @sk_buff: socket buffer with received data
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4118	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4119
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4120	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4121	e1000_rx_checksum(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4122	uint32_t status_err, uint32_t csum,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4123	struct sk_buff *skb)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4124	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4125	uint16_t status = (uint16_t)status_err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4126	uint8_t errors = (uint8_t)(status_err >> 24);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4127	skb->ip_summed = CHECKSUM_NONE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4128
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4129	/* 82543 or newer only */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4130	if (unlikely(adapter->hw.mac_type < e1000_82543)) return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4131	/* Ignore Checksum bit is set */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4132	if (unlikely(status & E1000_RXD_STAT_IXSM)) return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4133	/* TCP/UDP checksum error bit is set */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4134	if (unlikely(errors & E1000_RXD_ERR_TCPE)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4135	/* let the stack verify checksum errors */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4136	adapter->hw_csum_err++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4137	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4138	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4139	/* TCP/UDP Checksum has not been calculated */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4140	if (adapter->hw.mac_type <= e1000_82547_rev_2) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4141	if (!(status & E1000_RXD_STAT_TCPCS))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4142	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4143	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4144	if (!(status & (E1000_RXD_STAT_TCPCS \| E1000_RXD_STAT_UDPCS)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4145	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4146	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4147	/* It must be a TCP or UDP packet with a valid checksum */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4148	if (likely(status & E1000_RXD_STAT_TCPCS)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4149	/* TCP checksum is good */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4150	skb->ip_summed = CHECKSUM_UNNECESSARY;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4151	} else if (adapter->hw.mac_type > e1000_82547_rev_2) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4152	/* IP fragment with UDP payload */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4153	/* Hardware complements the payload checksum, so we undo it
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4154	* and then put the value in host order for further stack use.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4155	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4156	csum = ntohl(csum ^ 0xFFFF);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4157	skb->csum = csum;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4158	skb->ip_summed = CHECKSUM_COMPLETE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4159	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4160	adapter->hw_csum_good++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4161	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4162
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4163	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4164	* e1000_clean_rx_irq - Send received data up the network stack; legacy
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4165	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4166	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4167
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4168	static boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4169	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4170	e1000_clean_rx_irq(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4171	struct e1000_rx_ring *rx_ring,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4172	int *work_done, int work_to_do)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4173	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4174	e1000_clean_rx_irq(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4175	struct e1000_rx_ring *rx_ring)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4176	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4177	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4178	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4179	struct pci_dev *pdev = adapter->pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4180	struct e1000_rx_desc rx_desc, next_rxd;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4181	struct e1000_buffer buffer_info, next_buffer;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4182	unsigned long flags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4183	uint32_t length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4184	uint8_t last_byte;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4185	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4186	int cleaned_count = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4187	boolean_t cleaned = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4188	unsigned int total_rx_bytes=0, total_rx_packets=0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4189
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4190	i = rx_ring->next_to_clean;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4191	rx_desc = E1000_RX_DESC(*rx_ring, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4192	buffer_info = &rx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4193
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4194	while (rx_desc->status & E1000_RXD_STAT_DD) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4195	struct sk_buff *skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4196	u8 status;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4197
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4198	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4199	if (*work_done >= work_to_do)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4200	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4201	(*work_done)++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4202	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4203	status = rx_desc->status;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4204	skb = buffer_info->skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4205	buffer_info->skb = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4206
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4207	prefetch(skb->data - NET_IP_ALIGN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4208
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4209	if (++i == rx_ring->count) i = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4210	next_rxd = E1000_RX_DESC(*rx_ring, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4211	prefetch(next_rxd);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4212
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4213	next_buffer = &rx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4214
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4215	cleaned = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4216	cleaned_count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4217	pci_unmap_single(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4218	buffer_info->dma,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4219	buffer_info->length,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4220	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4221
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4222	length = le16_to_cpu(rx_desc->length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4223
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4224	if (unlikely(!(status & E1000_RXD_STAT_EOP))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4225	/* All receives must fit into a single buffer */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4226	E1000_DBG("%s: Receive packet consumed multiple"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4227	" buffers\n", netdev->name);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4228	/* recycle */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4229	buffer_info->skb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4230	goto next_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4231	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4232
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4233	if (unlikely(rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4234	last_byte = *(skb->data + length - 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4235	if (TBI_ACCEPT(&adapter->hw, status,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4236	rx_desc->errors, length, last_byte)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4237	spin_lock_irqsave(&adapter->stats_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4238	e1000_tbi_adjust_stats(&adapter->hw,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4239	&adapter->stats,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4240	length, skb->data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4241	spin_unlock_irqrestore(&adapter->stats_lock,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4242	flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4243	length--;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4244	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4245	/* recycle */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4246	buffer_info->skb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4247	goto next_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4248	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4249	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4250
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4251	/* adjust length to remove Ethernet CRC, this must be
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4252	* done after the TBI_ACCEPT workaround above */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4253	length -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4254
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4255	/* probably a little skewed due to removing CRC */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4256	total_rx_bytes += length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4257	total_rx_packets++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4258
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4259	/* code added for copybreak, this should improve
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4260	* performance for small packets with large amounts
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4261	* of reassembly being done in the stack */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4262	if (length < copybreak) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4263	struct sk_buff *new_skb =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4264	netdev_alloc_skb(netdev, length + NET_IP_ALIGN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4265	if (new_skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4266	skb_reserve(new_skb, NET_IP_ALIGN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4267	memcpy(new_skb->data - NET_IP_ALIGN,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4268	skb->data - NET_IP_ALIGN,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4269	length + NET_IP_ALIGN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4270	/* save the skb in buffer_info as good */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4271	buffer_info->skb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4272	skb = new_skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4273	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4274	/* else just continue with the old one */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4275	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4276	/* end copybreak code */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4277	skb_put(skb, length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4278
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4279	/* Receive Checksum Offload */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4280	e1000_rx_checksum(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4281	(uint32_t)(status) \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4282	((uint32_t)(rx_desc->errors) << 24),
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4283	le16_to_cpu(rx_desc->csum), skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4284
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4285	skb->protocol = eth_type_trans(skb, netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4286	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4287	if (unlikely(adapter->vlgrp &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4288	(status & E1000_RXD_STAT_VP))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4289	vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4290	le16_to_cpu(rx_desc->special) &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4291	E1000_RXD_SPC_VLAN_MASK);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4292	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4293	netif_receive_skb(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4294	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4295	#else /* CONFIG_E1000_NAPI */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4296	if (unlikely(adapter->vlgrp &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4297	(status & E1000_RXD_STAT_VP))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4298	vlan_hwaccel_rx(skb, adapter->vlgrp,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4299	le16_to_cpu(rx_desc->special) &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4300	E1000_RXD_SPC_VLAN_MASK);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4301	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4302	netif_rx(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4303	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4304	#endif /* CONFIG_E1000_NAPI */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4305	netdev->last_rx = jiffies;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4306
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4307	next_desc:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4308	rx_desc->status = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4309
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4310	/* return some buffers to hardware, one at a time is too slow */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4311	if (unlikely(cleaned_count >= E1000_RX_BUFFER_WRITE)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4312	adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4313	cleaned_count = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4314	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4315
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4316	/* use prefetched values */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4317	rx_desc = next_rxd;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4318	buffer_info = next_buffer;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4319	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4320	rx_ring->next_to_clean = i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4321
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4322	cleaned_count = E1000_DESC_UNUSED(rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4323	if (cleaned_count)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4324	adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4325
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4326	adapter->total_rx_packets += total_rx_packets;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4327	adapter->total_rx_bytes += total_rx_bytes;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4328	return cleaned;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4329	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4330
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4331	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4332	* e1000_clean_rx_irq_ps - Send received data up the network stack; packet split
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4333	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4334	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4335
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4336	static boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4337	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4338	e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4339	struct e1000_rx_ring *rx_ring,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4340	int *work_done, int work_to_do)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4341	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4342	e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4343	struct e1000_rx_ring *rx_ring)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4344	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4345	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4346	union e1000_rx_desc_packet_split rx_desc, next_rxd;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4347	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4348	struct pci_dev *pdev = adapter->pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4349	struct e1000_buffer buffer_info, next_buffer;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4350	struct e1000_ps_page *ps_page;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4351	struct e1000_ps_page_dma *ps_page_dma;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4352	struct sk_buff *skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4353	unsigned int i, j;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4354	uint32_t length, staterr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4355	int cleaned_count = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4356	boolean_t cleaned = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4357	unsigned int total_rx_bytes=0, total_rx_packets=0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4358
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4359	i = rx_ring->next_to_clean;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4360	rx_desc = E1000_RX_DESC_PS(*rx_ring, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4361	staterr = le32_to_cpu(rx_desc->wb.middle.status_error);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4362	buffer_info = &rx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4363
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4364	while (staterr & E1000_RXD_STAT_DD) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4365	ps_page = &rx_ring->ps_page[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4366	ps_page_dma = &rx_ring->ps_page_dma[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4367	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4368	if (unlikely(*work_done >= work_to_do))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4369	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4370	(*work_done)++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4371	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4372	skb = buffer_info->skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4373
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4374	/* in the packet split case this is header only */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4375	prefetch(skb->data - NET_IP_ALIGN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4376
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4377	if (++i == rx_ring->count) i = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4378	next_rxd = E1000_RX_DESC_PS(*rx_ring, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4379	prefetch(next_rxd);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4380
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4381	next_buffer = &rx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4382
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4383	cleaned = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4384	cleaned_count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4385	pci_unmap_single(pdev, buffer_info->dma,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4386	buffer_info->length,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4387	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4388
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4389	if (unlikely(!(staterr & E1000_RXD_STAT_EOP))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4390	E1000_DBG("%s: Packet Split buffers didn't pick up"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4391	" the full packet\n", netdev->name);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4392	dev_kfree_skb_irq(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4393	goto next_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4394	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4395
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4396	if (unlikely(staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4397	dev_kfree_skb_irq(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4398	goto next_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4399	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4400
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4401	length = le16_to_cpu(rx_desc->wb.middle.length0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4402
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4403	if (unlikely(!length)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4404	E1000_DBG("%s: Last part of the packet spanning"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4405	" multiple descriptors\n", netdev->name);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4406	dev_kfree_skb_irq(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4407	goto next_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4408	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4409
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4410	/* Good Receive */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4411	skb_put(skb, length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4412
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4413	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4414	/* this looks ugly, but it seems compiler issues make it
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4415	more efficient than reusing j */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4416	int l1 = le16_to_cpu(rx_desc->wb.upper.length[0]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4417
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4418	/* page alloc/put takes too long and effects small packet
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4419	* throughput, so unsplit small packets and save the alloc/put*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4420	if (l1 && (l1 <= copybreak) && ((length + l1) <= adapter->rx_ps_bsize0)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4421	u8 *vaddr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4422	/* there is no documentation about how to call
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4423	* kmap_atomic, so we can't hold the mapping
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4424	* very long */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4425	pci_dma_sync_single_for_cpu(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4426	ps_page_dma->ps_page_dma[0],
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4427	PAGE_SIZE,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4428	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4429	vaddr = kmap_atomic(ps_page->ps_page[0],
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4430	KM_SKB_DATA_SOFTIRQ);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4431	memcpy(skb->tail, vaddr, l1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4432	kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4433	pci_dma_sync_single_for_device(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4434	ps_page_dma->ps_page_dma[0],
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4435	PAGE_SIZE, PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4436	/* remove the CRC */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4437	l1 -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4438	skb_put(skb, l1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4439	goto copydone;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4440	} /* if */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4441	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4442
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4443	for (j = 0; j < adapter->rx_ps_pages; j++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4444	if (!(length= le16_to_cpu(rx_desc->wb.upper.length[j])))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4445	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4446	pci_unmap_page(pdev, ps_page_dma->ps_page_dma[j],
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4447	PAGE_SIZE, PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4448	ps_page_dma->ps_page_dma[j] = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4449	skb_fill_page_desc(skb, j, ps_page->ps_page[j], 0,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4450	length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4451	ps_page->ps_page[j] = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4452	skb->len += length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4453	skb->data_len += length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4454	skb->truesize += length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4455	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4456
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4457	/* strip the ethernet crc, problem is we're using pages now so
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4458	* this whole operation can get a little cpu intensive */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4459	pskb_trim(skb, skb->len - 4);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4460
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4461	copydone:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4462	total_rx_bytes += skb->len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4463	total_rx_packets++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4464
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4465	e1000_rx_checksum(adapter, staterr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4466	le16_to_cpu(rx_desc->wb.lower.hi_dword.csum_ip.csum), skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4467	skb->protocol = eth_type_trans(skb, netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4468
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4469	if (likely(rx_desc->wb.upper.header_status &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4470	cpu_to_le16(E1000_RXDPS_HDRSTAT_HDRSP)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4471	adapter->rx_hdr_split++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4472	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4473	if (unlikely(adapter->vlgrp && (staterr & E1000_RXD_STAT_VP))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4474	vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4475	le16_to_cpu(rx_desc->wb.middle.vlan) &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4476	E1000_RXD_SPC_VLAN_MASK);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4477	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4478	netif_receive_skb(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4479	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4480	#else /* CONFIG_E1000_NAPI */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4481	if (unlikely(adapter->vlgrp && (staterr & E1000_RXD_STAT_VP))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4482	vlan_hwaccel_rx(skb, adapter->vlgrp,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4483	le16_to_cpu(rx_desc->wb.middle.vlan) &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4484	E1000_RXD_SPC_VLAN_MASK);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4485	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4486	netif_rx(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4487	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4488	#endif /* CONFIG_E1000_NAPI */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4489	netdev->last_rx = jiffies;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4490
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4491	next_desc:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4492	rx_desc->wb.middle.status_error &= cpu_to_le32(~0xFF);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4493	buffer_info->skb = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4494
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4495	/* return some buffers to hardware, one at a time is too slow */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4496	if (unlikely(cleaned_count >= E1000_RX_BUFFER_WRITE)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4497	adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4498	cleaned_count = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4499	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4500
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4501	/* use prefetched values */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4502	rx_desc = next_rxd;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4503	buffer_info = next_buffer;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4504
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4505	staterr = le32_to_cpu(rx_desc->wb.middle.status_error);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4506	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4507	rx_ring->next_to_clean = i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4508
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4509	cleaned_count = E1000_DESC_UNUSED(rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4510	if (cleaned_count)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4511	adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4512
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4513	adapter->total_rx_packets += total_rx_packets;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4514	adapter->total_rx_bytes += total_rx_bytes;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4515	return cleaned;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4516	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4517
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4518	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4519	* e1000_alloc_rx_buffers - Replace used receive buffers; legacy & extended
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4520	* @adapter: address of board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4521	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4522
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4523	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4524	e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4525	struct e1000_rx_ring *rx_ring,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4526	int cleaned_count)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4527	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4528	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4529	struct pci_dev *pdev = adapter->pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4530	struct e1000_rx_desc *rx_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4531	struct e1000_buffer *buffer_info;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4532	struct sk_buff *skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4533	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4534	unsigned int bufsz = adapter->rx_buffer_len + NET_IP_ALIGN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4535
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4536	i = rx_ring->next_to_use;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4537	buffer_info = &rx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4538
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4539	while (cleaned_count--) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4540	skb = buffer_info->skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4541	if (skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4542	skb_trim(skb, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4543	goto map_skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4544	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4545
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4546	skb = netdev_alloc_skb(netdev, bufsz);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4547	if (unlikely(!skb)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4548	/* Better luck next round */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4549	adapter->alloc_rx_buff_failed++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4550	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4551	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4552
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4553	/* Fix for errata 23, can't cross 64kB boundary */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4554	if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4555	struct sk_buff *oldskb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4556	DPRINTK(RX_ERR, ERR, "skb align check failed: %u bytes "
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4557	"at %p\n", bufsz, skb->data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4558	/* Try again, without freeing the previous */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4559	skb = netdev_alloc_skb(netdev, bufsz);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4560	/* Failed allocation, critical failure */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4561	if (!skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4562	dev_kfree_skb(oldskb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4563	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4564	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4565
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4566	if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4567	/* give up */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4568	dev_kfree_skb(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4569	dev_kfree_skb(oldskb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4570	break; /* while !buffer_info->skb */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4571	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4572
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4573	/* Use new allocation */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4574	dev_kfree_skb(oldskb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4575	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4576	/* Make buffer alignment 2 beyond a 16 byte boundary
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4577	* this will result in a 16 byte aligned IP header after
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4578	* the 14 byte MAC header is removed
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4579	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4580	skb_reserve(skb, NET_IP_ALIGN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4581
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4582	buffer_info->skb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4583	buffer_info->length = adapter->rx_buffer_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4584	map_skb:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4585	buffer_info->dma = pci_map_single(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4586	skb->data,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4587	adapter->rx_buffer_len,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4588	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4589
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4590	/* Fix for errata 23, can't cross 64kB boundary */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4591	if (!e1000_check_64k_bound(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4592	(void *)(unsigned long)buffer_info->dma,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4593	adapter->rx_buffer_len)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4594	DPRINTK(RX_ERR, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4595	"dma align check failed: %u bytes at %p\n",
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4596	adapter->rx_buffer_len,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4597	(void *)(unsigned long)buffer_info->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4598	dev_kfree_skb(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4599	buffer_info->skb = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4600
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4601	pci_unmap_single(pdev, buffer_info->dma,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4602	adapter->rx_buffer_len,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4603	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4604
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4605	break; /* while !buffer_info->skb */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4606	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4607	rx_desc = E1000_RX_DESC(*rx_ring, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4608	rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4609
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4610	if (unlikely(++i == rx_ring->count))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4611	i = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4612	buffer_info = &rx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4613	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4614
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4615	if (likely(rx_ring->next_to_use != i)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4616	rx_ring->next_to_use = i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4617	if (unlikely(i-- == 0))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4618	i = (rx_ring->count - 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4619
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4620	/* Force memory writes to complete before letting h/w
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4621	* know there are new descriptors to fetch. (Only
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4622	* applicable for weak-ordered memory model archs,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4623	* such as IA-64). */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4624	wmb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4625	writel(i, adapter->hw.hw_addr + rx_ring->rdt);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4626	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4627	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4628
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4629	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4630	* e1000_alloc_rx_buffers_ps - Replace used receive buffers; packet split
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4631	* @adapter: address of board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4632	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4633
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4634	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4635	e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4636	struct e1000_rx_ring *rx_ring,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4637	int cleaned_count)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4638	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4639	struct net_device *netdev = adapter->netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4640	struct pci_dev *pdev = adapter->pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4641	union e1000_rx_desc_packet_split *rx_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4642	struct e1000_buffer *buffer_info;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4643	struct e1000_ps_page *ps_page;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4644	struct e1000_ps_page_dma *ps_page_dma;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4645	struct sk_buff *skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4646	unsigned int i, j;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4647
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4648	i = rx_ring->next_to_use;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4649	buffer_info = &rx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4650	ps_page = &rx_ring->ps_page[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4651	ps_page_dma = &rx_ring->ps_page_dma[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4652
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4653	while (cleaned_count--) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4654	rx_desc = E1000_RX_DESC_PS(*rx_ring, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4655
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4656	for (j = 0; j < PS_PAGE_BUFFERS; j++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4657	if (j < adapter->rx_ps_pages) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4658	if (likely(!ps_page->ps_page[j])) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4659	ps_page->ps_page[j] =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4660	alloc_page(GFP_ATOMIC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4661	if (unlikely(!ps_page->ps_page[j])) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4662	adapter->alloc_rx_buff_failed++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4663	goto no_buffers;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4664	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4665	ps_page_dma->ps_page_dma[j] =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4666	pci_map_page(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4667	ps_page->ps_page[j],
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4668	0, PAGE_SIZE,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4669	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4670	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4671	/* Refresh the desc even if buffer_addrs didn't
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4672	* change because each write-back erases
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4673	* this info.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4674	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4675	rx_desc->read.buffer_addr[j+1] =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4676	cpu_to_le64(ps_page_dma->ps_page_dma[j]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4677	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4678	rx_desc->read.buffer_addr[j+1] = ~0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4679	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4680
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4681	skb = netdev_alloc_skb(netdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4682	adapter->rx_ps_bsize0 + NET_IP_ALIGN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4683
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4684	if (unlikely(!skb)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4685	adapter->alloc_rx_buff_failed++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4686	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4687	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4688
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4689	/* Make buffer alignment 2 beyond a 16 byte boundary
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4690	* this will result in a 16 byte aligned IP header after
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4691	* the 14 byte MAC header is removed
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4692	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4693	skb_reserve(skb, NET_IP_ALIGN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4694
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4695	buffer_info->skb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4696	buffer_info->length = adapter->rx_ps_bsize0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4697	buffer_info->dma = pci_map_single(pdev, skb->data,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4698	adapter->rx_ps_bsize0,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4699	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4700
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4701	rx_desc->read.buffer_addr[0] = cpu_to_le64(buffer_info->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4702
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4703	if (unlikely(++i == rx_ring->count)) i = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4704	buffer_info = &rx_ring->buffer_info[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4705	ps_page = &rx_ring->ps_page[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4706	ps_page_dma = &rx_ring->ps_page_dma[i];
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4707	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4708
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4709	no_buffers:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4710	if (likely(rx_ring->next_to_use != i)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4711	rx_ring->next_to_use = i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4712	if (unlikely(i-- == 0)) i = (rx_ring->count - 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4713
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4714	/* Force memory writes to complete before letting h/w
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4715	* know there are new descriptors to fetch. (Only
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4716	* applicable for weak-ordered memory model archs,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4717	* such as IA-64). */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4718	wmb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4719	/* Hardware increments by 16 bytes, but packet split
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4720	* descriptors are 32 bytes...so we increment tail
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4721	* twice as much.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4722	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4723	writel(i<<1, adapter->hw.hw_addr + rx_ring->rdt);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4724	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4725	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4726
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4727	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4728	* e1000_smartspeed - Workaround for SmartSpeed on 82541 and 82547 controllers.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4729	* @adapter:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4730	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4731
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4732	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4733	e1000_smartspeed(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4734	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4735	uint16_t phy_status;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4736	uint16_t phy_ctrl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4737
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4738	if ((adapter->hw.phy_type != e1000_phy_igp) \|\| !adapter->hw.autoneg \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4739	!(adapter->hw.autoneg_advertised & ADVERTISE_1000_FULL))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4740	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4741
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4742	if (adapter->smartspeed == 0) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4743	/* If Master/Slave config fault is asserted twice,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4744	* we assume back-to-back */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4745	e1000_read_phy_reg(&adapter->hw, PHY_1000T_STATUS, &phy_status);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4746	if (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4747	e1000_read_phy_reg(&adapter->hw, PHY_1000T_STATUS, &phy_status);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4748	if (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4749	e1000_read_phy_reg(&adapter->hw, PHY_1000T_CTRL, &phy_ctrl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4750	if (phy_ctrl & CR_1000T_MS_ENABLE) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4751	phy_ctrl &= ~CR_1000T_MS_ENABLE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4752	e1000_write_phy_reg(&adapter->hw, PHY_1000T_CTRL,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4753	phy_ctrl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4754	adapter->smartspeed++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4755	if (!e1000_phy_setup_autoneg(&adapter->hw) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4756	!e1000_read_phy_reg(&adapter->hw, PHY_CTRL,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4757	&phy_ctrl)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4758	phy_ctrl \|= (MII_CR_AUTO_NEG_EN \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4759	MII_CR_RESTART_AUTO_NEG);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4760	e1000_write_phy_reg(&adapter->hw, PHY_CTRL,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4761	phy_ctrl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4762	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4763	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4764	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4765	} else if (adapter->smartspeed == E1000_SMARTSPEED_DOWNSHIFT) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4766	/* If still no link, perhaps using 2/3 pair cable */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4767	e1000_read_phy_reg(&adapter->hw, PHY_1000T_CTRL, &phy_ctrl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4768	phy_ctrl \|= CR_1000T_MS_ENABLE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4769	e1000_write_phy_reg(&adapter->hw, PHY_1000T_CTRL, phy_ctrl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4770	if (!e1000_phy_setup_autoneg(&adapter->hw) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4771	!e1000_read_phy_reg(&adapter->hw, PHY_CTRL, &phy_ctrl)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4772	phy_ctrl \|= (MII_CR_AUTO_NEG_EN \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4773	MII_CR_RESTART_AUTO_NEG);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4774	e1000_write_phy_reg(&adapter->hw, PHY_CTRL, phy_ctrl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4775	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4776	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4777	/* Restart process after E1000_SMARTSPEED_MAX iterations */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4778	if (adapter->smartspeed++ == E1000_SMARTSPEED_MAX)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4779	adapter->smartspeed = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4780	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4781
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4782	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4783	* e1000_ioctl -
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4784	* @netdev:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4785	* @ifreq:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4786	* @cmd:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4787	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4788
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4789	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4790	e1000_ioctl(struct net_device netdev, struct ifreq ifr, int cmd)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4791	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4792	switch (cmd) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4793	case SIOCGMIIPHY:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4794	case SIOCGMIIREG:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4795	case SIOCSMIIREG:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4796	return e1000_mii_ioctl(netdev, ifr, cmd);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4797	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4798	return -EOPNOTSUPP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4799	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4800	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4801
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4802	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4803	* e1000_mii_ioctl -
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4804	* @netdev:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4805	* @ifreq:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4806	* @cmd:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4807	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4808
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4809	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4810	e1000_mii_ioctl(struct net_device netdev, struct ifreq ifr, int cmd)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4811	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4812	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4813	struct mii_ioctl_data *data = if_mii(ifr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4814	int retval;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4815	uint16_t mii_reg;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4816	uint16_t spddplx;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4817	unsigned long flags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4818
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4819	if (adapter->hw.media_type != e1000_media_type_copper)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4820	return -EOPNOTSUPP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4821
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4822	switch (cmd) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4823	case SIOCGMIIPHY:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4824	data->phy_id = adapter->hw.phy_addr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4825	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4826	case SIOCGMIIREG:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4827	if (!capable(CAP_NET_ADMIN))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4828	return -EPERM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4829	spin_lock_irqsave(&adapter->stats_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4830	if (e1000_read_phy_reg(&adapter->hw, data->reg_num & 0x1F,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4831	&data->val_out)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4832	spin_unlock_irqrestore(&adapter->stats_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4833	return -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4834	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4835	spin_unlock_irqrestore(&adapter->stats_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4836	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4837	case SIOCSMIIREG:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4838	if (!capable(CAP_NET_ADMIN))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4839	return -EPERM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4840	if (data->reg_num & ~(0x1F))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4841	return -EFAULT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4842	mii_reg = data->val_in;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4843	spin_lock_irqsave(&adapter->stats_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4844	if (e1000_write_phy_reg(&adapter->hw, data->reg_num,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4845	mii_reg)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4846	spin_unlock_irqrestore(&adapter->stats_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4847	return -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4848	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4849	if (adapter->hw.media_type == e1000_media_type_copper) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4850	switch (data->reg_num) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4851	case PHY_CTRL:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4852	if (mii_reg & MII_CR_POWER_DOWN)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4853	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4854	if (mii_reg & MII_CR_AUTO_NEG_EN) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4855	adapter->hw.autoneg = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4856	adapter->hw.autoneg_advertised = 0x2F;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4857	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4858	if (mii_reg & 0x40)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4859	spddplx = SPEED_1000;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4860	else if (mii_reg & 0x2000)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4861	spddplx = SPEED_100;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4862	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4863	spddplx = SPEED_10;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4864	spddplx += (mii_reg & 0x100)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4865	? DUPLEX_FULL :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4866	DUPLEX_HALF;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4867	retval = e1000_set_spd_dplx(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4868	spddplx);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4869	if (retval) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4870	spin_unlock_irqrestore(
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4871	&adapter->stats_lock,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4872	flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4873	return retval;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4874	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4875	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4876	if (netif_running(adapter->netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4877	e1000_reinit_locked(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4878	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4879	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4880	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4881	case M88E1000_PHY_SPEC_CTRL:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4882	case M88E1000_EXT_PHY_SPEC_CTRL:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4883	if (e1000_phy_reset(&adapter->hw)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4884	spin_unlock_irqrestore(
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4885	&adapter->stats_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4886	return -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4887	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4888	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4889	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4890	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4891	switch (data->reg_num) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4892	case PHY_CTRL:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4893	if (mii_reg & MII_CR_POWER_DOWN)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4894	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4895	if (netif_running(adapter->netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4896	e1000_reinit_locked(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4897	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4898	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4899	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4900	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4901	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4902	spin_unlock_irqrestore(&adapter->stats_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4903	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4904	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4905	return -EOPNOTSUPP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4906	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4907	return E1000_SUCCESS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4908	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4909
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4910	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4911	e1000_pci_set_mwi(struct e1000_hw *hw)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4912	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4913	struct e1000_adapter *adapter = hw->back;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4914	int ret_val = pci_set_mwi(adapter->pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4915
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4916	if (ret_val)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4917	DPRINTK(PROBE, ERR, "Error in setting MWI\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4918	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4919
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4920	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4921	e1000_pci_clear_mwi(struct e1000_hw *hw)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4922	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4923	struct e1000_adapter *adapter = hw->back;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4924
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4925	pci_clear_mwi(adapter->pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4926	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4927
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4928	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4929	e1000_read_pci_cfg(struct e1000_hw hw, uint32_t reg, uint16_t value)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4930	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4931	struct e1000_adapter *adapter = hw->back;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4932
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4933	pci_read_config_word(adapter->pdev, reg, value);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4934	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4935
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4936	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4937	e1000_write_pci_cfg(struct e1000_hw hw, uint32_t reg, uint16_t value)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4938	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4939	struct e1000_adapter *adapter = hw->back;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4940
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4941	pci_write_config_word(adapter->pdev, reg, *value);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4942	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4943
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4944	int32_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4945	e1000_read_pcie_cap_reg(struct e1000_hw hw, uint32_t reg, uint16_t value)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4946	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4947	struct e1000_adapter *adapter = hw->back;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4948	uint16_t cap_offset;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4949
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4950	cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4951	if (!cap_offset)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4952	return -E1000_ERR_CONFIG;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4953
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4954	pci_read_config_word(adapter->pdev, cap_offset + reg, value);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4955
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4956	return E1000_SUCCESS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4957	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4958
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4959	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4960	e1000_io_write(struct e1000_hw *hw, unsigned long port, uint32_t value)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4961	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4962	outl(value, port);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4963	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4964
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4965	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4966	e1000_vlan_rx_register(struct net_device netdev, struct vlan_group grp)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4967	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4968	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4969	uint32_t ctrl, rctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4970
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4971	e1000_irq_disable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4972	adapter->vlgrp = grp;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4973
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4974	if (grp) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4975	/* enable VLAN tag insert/strip */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4976	ctrl = E1000_READ_REG(&adapter->hw, CTRL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4977	ctrl \|= E1000_CTRL_VME;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4978	E1000_WRITE_REG(&adapter->hw, CTRL, ctrl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4979
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4980	if (adapter->hw.mac_type != e1000_ich8lan) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4981	/* enable VLAN receive filtering */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4982	rctl = E1000_READ_REG(&adapter->hw, RCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4983	rctl \|= E1000_RCTL_VFE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4984	rctl &= ~E1000_RCTL_CFIEN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4985	E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4986	e1000_update_mng_vlan(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4987	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4988	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4989	/* disable VLAN tag insert/strip */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4990	ctrl = E1000_READ_REG(&adapter->hw, CTRL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4991	ctrl &= ~E1000_CTRL_VME;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4992	E1000_WRITE_REG(&adapter->hw, CTRL, ctrl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4993
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4994	if (adapter->hw.mac_type != e1000_ich8lan) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4995	/* disable VLAN filtering */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4996	rctl = E1000_READ_REG(&adapter->hw, RCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4997	rctl &= ~E1000_RCTL_VFE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4998	E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4999	if (adapter->mng_vlan_id !=
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5000	(uint16_t)E1000_MNG_VLAN_NONE) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5001	e1000_vlan_rx_kill_vid(netdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5002	adapter->mng_vlan_id);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5003	adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5004	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5005	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5006	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5007
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5008	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5009	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5010
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5011	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5012	e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5013	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5014	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5015	uint32_t vfta, index;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5016
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5017	if ((adapter->hw.mng_cookie.status &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5018	E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5019	(vid == adapter->mng_vlan_id))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5020	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5021	/* add VID to filter table */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5022	index = (vid >> 5) & 0x7F;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5023	vfta = E1000_READ_REG_ARRAY(&adapter->hw, VFTA, index);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5024	vfta \|= (1 << (vid & 0x1F));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5025	e1000_write_vfta(&adapter->hw, index, vfta);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5026	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5027
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5028	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5029	e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5030	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5031	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5032	uint32_t vfta, index;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5033
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5034	e1000_irq_disable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5035
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5036	if (adapter->vlgrp)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5037	adapter->vlgrp->vlan_devices[vid] = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5038
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5039	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5040
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5041	if ((adapter->hw.mng_cookie.status &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5042	E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5043	(vid == adapter->mng_vlan_id)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5044	/* release control to f/w */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5045	e1000_release_hw_control(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5046	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5047	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5048
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5049	/* remove VID from filter table */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5050	index = (vid >> 5) & 0x7F;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5051	vfta = E1000_READ_REG_ARRAY(&adapter->hw, VFTA, index);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5052	vfta &= ~(1 << (vid & 0x1F));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5053	e1000_write_vfta(&adapter->hw, index, vfta);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5054	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5055
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5056	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5057	e1000_restore_vlan(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5058	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5059	e1000_vlan_rx_register(adapter->netdev, adapter->vlgrp);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5060
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5061	if (adapter->vlgrp) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5062	uint16_t vid;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5063	for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5064	if (!adapter->vlgrp->vlan_devices[vid])
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5065	continue;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5066	e1000_vlan_rx_add_vid(adapter->netdev, vid);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5067	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5068	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5069	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5070
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5071	int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5072	e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5073	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5074	adapter->hw.autoneg = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5075
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5076	/* Fiber NICs only allow 1000 gbps Full duplex */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5077	if ((adapter->hw.media_type == e1000_media_type_fiber) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5078	spddplx != (SPEED_1000 + DUPLEX_FULL)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5079	DPRINTK(PROBE, ERR, "Unsupported Speed/Duplex configuration\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5080	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5081	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5082
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5083	switch (spddplx) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5084	case SPEED_10 + DUPLEX_HALF:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5085	adapter->hw.forced_speed_duplex = e1000_10_half;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5086	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5087	case SPEED_10 + DUPLEX_FULL:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5088	adapter->hw.forced_speed_duplex = e1000_10_full;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5089	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5090	case SPEED_100 + DUPLEX_HALF:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5091	adapter->hw.forced_speed_duplex = e1000_100_half;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5092	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5093	case SPEED_100 + DUPLEX_FULL:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5094	adapter->hw.forced_speed_duplex = e1000_100_full;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5095	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5096	case SPEED_1000 + DUPLEX_FULL:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5097	adapter->hw.autoneg = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5098	adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5099	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5100	case SPEED_1000 + DUPLEX_HALF: /* not supported */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5101	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5102	DPRINTK(PROBE, ERR, "Unsupported Speed/Duplex configuration\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5103	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5104	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5105	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5106	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5107
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5108	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5109	/* Save/restore 16 or 64 dwords of PCI config space depending on which
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5110	* bus we're on (PCI(X) vs. PCI-E)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5111	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5112	#define PCIE_CONFIG_SPACE_LEN 256
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5113	#define PCI_CONFIG_SPACE_LEN 64
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5114	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5115	e1000_pci_save_state(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5116	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5117	struct pci_dev *dev = adapter->pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5118	int size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5119	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5120
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5121	if (adapter->hw.mac_type >= e1000_82571)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5122	size = PCIE_CONFIG_SPACE_LEN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5123	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5124	size = PCI_CONFIG_SPACE_LEN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5125
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5126	WARN_ON(adapter->config_space != NULL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5127
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5128	adapter->config_space = kmalloc(size, GFP_KERNEL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5129	if (!adapter->config_space) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5130	DPRINTK(PROBE, ERR, "unable to allocate %d bytes\n", size);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5131	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5132	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5133	for (i = 0; i < (size / 4); i++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5134	pci_read_config_dword(dev, i * 4, &adapter->config_space[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5135	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5136	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5137
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5138	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5139	e1000_pci_restore_state(struct e1000_adapter *adapter)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5140	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5141	struct pci_dev *dev = adapter->pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5142	int size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5143	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5144
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5145	if (adapter->config_space == NULL)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5146	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5147
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5148	if (adapter->hw.mac_type >= e1000_82571)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5149	size = PCIE_CONFIG_SPACE_LEN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5150	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5151	size = PCI_CONFIG_SPACE_LEN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5152	for (i = 0; i < (size / 4); i++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5153	pci_write_config_dword(dev, i * 4, adapter->config_space[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5154	kfree(adapter->config_space);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5155	adapter->config_space = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5156	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5157	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5158	#endif /* CONFIG_PM */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5159
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5160	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5161	e1000_suspend(struct pci_dev *pdev, pm_message_t state)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5162	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5163	struct net_device *netdev = pci_get_drvdata(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5164	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5165	uint32_t ctrl, ctrl_ext, rctl, status;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5166	uint32_t wufc = adapter->wol;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5167	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5168	int retval = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5169	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5170
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5171	netif_device_detach(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5172
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5173	if (netif_running(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5174	WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5175	e1000_down(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5176	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5177
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5178	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5179	/* Implement our own version of pci_save_state(pdev) because pci-
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5180	* express adapters have 256-byte config spaces. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5181	retval = e1000_pci_save_state(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5182	if (retval)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5183	return retval;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5184	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5185
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5186	status = E1000_READ_REG(&adapter->hw, STATUS);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5187	if (status & E1000_STATUS_LU)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5188	wufc &= ~E1000_WUFC_LNKC;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5189
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5190	if (wufc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5191	e1000_setup_rctl(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5192	e1000_set_multi(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5193
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5194	/* turn on all-multi mode if wake on multicast is enabled */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5195	if (wufc & E1000_WUFC_MC) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5196	rctl = E1000_READ_REG(&adapter->hw, RCTL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5197	rctl \|= E1000_RCTL_MPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5198	E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5199	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5200
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5201	if (adapter->hw.mac_type >= e1000_82540) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5202	ctrl = E1000_READ_REG(&adapter->hw, CTRL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5203	/* advertise wake from D3Cold */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5204	#define E1000_CTRL_ADVD3WUC 0x00100000
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5205	/* phy power management enable */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5206	#define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5207	ctrl \|= E1000_CTRL_ADVD3WUC \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5208	E1000_CTRL_EN_PHY_PWR_MGMT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5209	E1000_WRITE_REG(&adapter->hw, CTRL, ctrl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5210	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5211
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5212	if (adapter->hw.media_type == e1000_media_type_fiber \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5213	adapter->hw.media_type == e1000_media_type_internal_serdes) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5214	/* keep the laser running in D3 */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5215	ctrl_ext = E1000_READ_REG(&adapter->hw, CTRL_EXT);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5216	ctrl_ext \|= E1000_CTRL_EXT_SDP7_DATA;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5217	E1000_WRITE_REG(&adapter->hw, CTRL_EXT, ctrl_ext);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5218	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5219
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5220	/* Allow time for pending master requests to run */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5221	e1000_disable_pciex_master(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5222
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5223	E1000_WRITE_REG(&adapter->hw, WUC, E1000_WUC_PME_EN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5224	E1000_WRITE_REG(&adapter->hw, WUFC, wufc);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5225	pci_enable_wake(pdev, PCI_D3hot, 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5226	pci_enable_wake(pdev, PCI_D3cold, 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5227	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5228	E1000_WRITE_REG(&adapter->hw, WUC, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5229	E1000_WRITE_REG(&adapter->hw, WUFC, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5230	pci_enable_wake(pdev, PCI_D3hot, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5231	pci_enable_wake(pdev, PCI_D3cold, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5232	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5233
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5234	e1000_release_manageability(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5235
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5236	/* make sure adapter isn't asleep if manageability is enabled */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5237	if (adapter->en_mng_pt) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5238	pci_enable_wake(pdev, PCI_D3hot, 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5239	pci_enable_wake(pdev, PCI_D3cold, 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5240	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5241
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5242	if (adapter->hw.phy_type == e1000_phy_igp_3)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5243	e1000_phy_powerdown_workaround(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5244
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5245	if (netif_running(netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5246	e1000_free_irq(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5247
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5248	/* Release control of h/w to f/w. If f/w is AMT enabled, this
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5249	* would have already happened in close and is redundant. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5250	e1000_release_hw_control(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5251
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5252	pci_disable_device(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5253
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5254	pci_set_power_state(pdev, pci_choose_state(pdev, state));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5255
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5256	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5257	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5258
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5259	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5260	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5261	e1000_resume(struct pci_dev *pdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5262	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5263	struct net_device *netdev = pci_get_drvdata(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5264	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5265	uint32_t err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5266
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5267	pci_set_power_state(pdev, PCI_D0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5268	e1000_pci_restore_state(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5269	if ((err = pci_enable_device(pdev))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5270	printk(KERN_ERR "e1000: Cannot enable PCI device from suspend\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5271	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5272	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5273	pci_set_master(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5274
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5275	pci_enable_wake(pdev, PCI_D3hot, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5276	pci_enable_wake(pdev, PCI_D3cold, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5277
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5278	if (netif_running(netdev) && (err = e1000_request_irq(adapter)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5279	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5280
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5281	e1000_power_up_phy(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5282	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5283	E1000_WRITE_REG(&adapter->hw, WUS, ~0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5284
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5285	e1000_init_manageability(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5286
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5287	if (netif_running(netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5288	e1000_up(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5289
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5290	netif_device_attach(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5291
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5292	/* If the controller is 82573 and f/w is AMT, do not set
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5293	* DRV_LOAD until the interface is up. For all other cases,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5294	* let the f/w know that the h/w is now under the control
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5295	* of the driver. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5296	if (adapter->hw.mac_type != e1000_82573 \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5297	!e1000_check_mng_mode(&adapter->hw))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5298	e1000_get_hw_control(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5299
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5300	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5301	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5302	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5303
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5304	static void e1000_shutdown(struct pci_dev *pdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5305	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5306	e1000_suspend(pdev, PMSG_SUSPEND);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5307	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5308
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5309	#ifdef CONFIG_NET_POLL_CONTROLLER
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5310	/*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5311	* Polling 'interrupt' - used by things like netconsole to send skbs
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5312	* without having to re-enable interrupts. It's not called while
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5313	* the interrupt routine is executing.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5314	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5315	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5316	e1000_netpoll(struct net_device *netdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5317	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5318	struct e1000_adapter *adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5319
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5320	disable_irq(adapter->pdev->irq);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5321	e1000_intr(adapter->pdev->irq, netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5322	e1000_clean_tx_irq(adapter, adapter->tx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5323	#ifndef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5324	adapter->clean_rx(adapter, adapter->rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5325	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5326	enable_irq(adapter->pdev->irq);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5327	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5328	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5329
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5330	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5331	* e1000_io_error_detected - called when PCI error is detected
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5332	* @pdev: Pointer to PCI device
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5333	* @state: The current pci conneection state
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5334	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5335	* This function is called after a PCI bus error affecting
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5336	* this device has been detected.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5337	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5338	static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5339	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5340	struct net_device *netdev = pci_get_drvdata(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5341	struct e1000_adapter *adapter = netdev->priv;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5342
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5343	netif_device_detach(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5344
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5345	if (netif_running(netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5346	e1000_down(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5347	pci_disable_device(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5348
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5349	/* Request a slot slot reset. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5350	return PCI_ERS_RESULT_NEED_RESET;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5351	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5352
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5353	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5354	* e1000_io_slot_reset - called after the pci bus has been reset.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5355	* @pdev: Pointer to PCI device
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5356	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5357	* Restart the card from scratch, as if from a cold-boot. Implementation
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5358	* resembles the first-half of the e1000_resume routine.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5359	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5360	static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5361	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5362	struct net_device *netdev = pci_get_drvdata(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5363	struct e1000_adapter *adapter = netdev->priv;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5364
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5365	if (pci_enable_device(pdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5366	printk(KERN_ERR "e1000: Cannot re-enable PCI device after reset.\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5367	return PCI_ERS_RESULT_DISCONNECT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5368	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5369	pci_set_master(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5370
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5371	pci_enable_wake(pdev, PCI_D3hot, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5372	pci_enable_wake(pdev, PCI_D3cold, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5373
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5374	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5375	E1000_WRITE_REG(&adapter->hw, WUS, ~0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5376
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5377	return PCI_ERS_RESULT_RECOVERED;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5378	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5379
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5380	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5381	* e1000_io_resume - called when traffic can start flowing again.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5382	* @pdev: Pointer to PCI device
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5383	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5384	* This callback is called when the error recovery driver tells us that
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5385	* its OK to resume normal operation. Implementation resembles the
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5386	* second-half of the e1000_resume routine.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5387	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5388	static void e1000_io_resume(struct pci_dev *pdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5389	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5390	struct net_device *netdev = pci_get_drvdata(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5391	struct e1000_adapter *adapter = netdev->priv;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5392
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5393	e1000_init_manageability(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5394
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5395	if (netif_running(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5396	if (e1000_up(adapter)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5397	printk("e1000: can't bring device back up after reset\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5398	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5399	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5400	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5401
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5402	netif_device_attach(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5403
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5404	/* If the controller is 82573 and f/w is AMT, do not set
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5405	* DRV_LOAD until the interface is up. For all other cases,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5406	* let the f/w know that the h/w is now under the control
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5407	* of the driver. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5408	if (adapter->hw.mac_type != e1000_82573 \|\|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5409	!e1000_check_mng_mode(&adapter->hw))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5410	e1000_get_hw_control(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5411
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5412	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5413
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5414	/* e1000_main.c */

author	Florian Pose <fp@igh-essen.com>
	Wed, 30 Apr 2008 09:55:58 +0000
branch	stable-1.3
changeset 1755	18141b8631be
parent 1744	7bc131b92039
permissions	-rw-r--r--