etherlabmaster: devices/e1000/e1000_main-2.6.20-ethercat.c@b6cfd85db58e (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-2.6.20-ethercat.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[] = "ec_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[] = "EtherCAT 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	// do not auto-load driver
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	115	// 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	116
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	117	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	118	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	119	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	120	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	121	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	122	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	123	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	124	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	125	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	126	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	127	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	128	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	129	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	130	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	131	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	132	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	133	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	134	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	135
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	136	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	137	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	138	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	139	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	140	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	141	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	142	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	143	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	144	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	145	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	146	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	147	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	148	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	149	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	150	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	151	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	152	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	153	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	154	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	155	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	156	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	157	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	158	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	159	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	160	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	161	void ec_poll(struct net_device *);
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(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	#ifdef CONFIG_PCI_MSI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	164	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	165	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	166	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	167	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	168	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	169	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	170	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	171	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	172	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	173	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	174	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	175	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	176	#else
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(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	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	180	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	181	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	182	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	183	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	184	int cleaned_count);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	185	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	186	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	187	int cleaned_count);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	188	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	189	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	190	int cmd);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	191	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	192	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	193	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	194	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	195	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	196	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	197	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	198	struct sk_buff *skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	199
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_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	201	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	202	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	203	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	204
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	205	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	206	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	207	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	208	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	209	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	210
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	211	#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	212	/* for netdump / net console */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	213	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	214	#endif
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	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	217
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	218	#define COPYBREAK_DEFAULT 256
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	219	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	220	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	221	MODULE_PARM_DESC(copybreak,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	222	"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	223
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_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	225	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	226	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	227	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	228
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	229	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	230	.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	231	.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	232	.resume = e1000_io_resume,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	233	};
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	234
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	235	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	236	.name = e1000_driver_name,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	237	.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	238	.probe = e1000_probe,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	239	.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	240	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	241	/* Power Managment Hooks */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	242	.suspend = e1000_suspend,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	243	.resume = e1000_resume,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	244	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	245	.shutdown = e1000_shutdown,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	246	.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	247	};
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	248
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	249	MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	250	MODULE_DESCRIPTION("EtherCAT-capable 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	251	MODULE_LICENSE("GPL");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	252	MODULE_VERSION(DRV_VERSION);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	253
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	254	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	255	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	256	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	257
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 - Driver Registration Routine
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	260	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	261	* 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	262	* 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	263	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	264
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	265	static int __init
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	266	e1000_init_module(void)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	267	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	268	int ret;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	269	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	270	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	271
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	272	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	273
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	274	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	275	if (copybreak != COPYBREAK_DEFAULT) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	276	if (copybreak == 0)
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 disabled\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	278	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	279	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	280	"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	281	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	282	return ret;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	283	}
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	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	286
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 - Driver Exit Cleanup Routine
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	289	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	290	* 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	291	* from memory.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	292	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	293
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	294	static void __exit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	295	e1000_exit_module(void)
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	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	298	}
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	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	301
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	302	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	303	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	304	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	305	int flags, err = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	306
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	307	if (adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	308	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	309
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	310	flags = IRQF_SHARED;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	311	#ifdef CONFIG_PCI_MSI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	312	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	313	adapter->have_msi = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	314	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	315	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	316	"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	317	adapter->have_msi = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	318	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	319	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	320	if (adapter->have_msi) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	321	flags &= ~IRQF_SHARED;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	322	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	323	netdev->name, netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	324	if (err)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	325	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	326	"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	327	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	328	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	329	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	330	netdev->name, netdev)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	331	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	332	"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	333
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	334	return err;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	337	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	338	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	339	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	340
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	341	if (adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	342	return;
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	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	345
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	346	#ifdef CONFIG_PCI_MSI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	347	if (adapter->have_msi)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	348	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	349	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	350	}
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	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	353	* 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	354	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	355	**/
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	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	358	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	359	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	360	if (adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	361	return;
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	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	364	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	365	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	366	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	367	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	368
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	* 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	371	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	372	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	373
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	374	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	375	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	376	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	377	if (adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	378	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	379
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	380	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	381	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	382	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	383	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	384	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	385
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	386	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	387	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	388	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	389	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	390	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	391	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	392	if (adapter->vlgrp) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	393	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	394	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	395	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	396	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	397	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	398	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	399	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	400
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	401	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	402	(vid != old_vid) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	403	!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	404	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	405	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	406	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	407	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	408	}
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	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	411	* 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	412	* @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	413	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	414	* 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	415	* 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	416	* 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	417	* 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	418	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	419	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	420
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	421	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	422	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	423	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	424	uint32_t ctrl_ext;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	425	uint32_t swsm;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	426	uint32_t extcnf;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	427
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	428	/* 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	429	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	430	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	431	case e1000_82572:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	432	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	433	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	434	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	435	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	436	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	437	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	438	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	439	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	440	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	441	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	442	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	443	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	444	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	445	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	446	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	447	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	448	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	449	}
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	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	452	* 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	453	* @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	454	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	455	* 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	456	* 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	457	* 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	458	* 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	459	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	460	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	461
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	462	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	463	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	464	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	465	uint32_t ctrl_ext;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	466	uint32_t swsm;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	467	uint32_t extcnf;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	468
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	469	/* 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	470	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	471	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	472	case e1000_82572:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	473	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	474	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	475	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	476	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	477	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	478	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	479	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	480	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	481	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	482	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	483	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	484	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	485	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	486	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	487	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	488	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	489	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	490	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	491	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	492
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	493	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	494	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	495	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	496	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	497	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	498
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	499	/* 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	500	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	501
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	502	/* 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	503	/* 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	504	* 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	505	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	506	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	507
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	508	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	509	#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	510	#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	511	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	512	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	513	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	514	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	515
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	516	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	517	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	518	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	519
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	520	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	521	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	522	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	523	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	524	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	525
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	526	/* 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	527	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	528
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	529	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	530	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	531
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	532	/* 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	533	* 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	534
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	535	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	536	}
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	539	int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	540	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	541	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	542	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	543	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	544
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	545	/* 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	546
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	547	e1000_set_multi(netdev);
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	e1000_restore_vlan(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	550	e1000_init_manageability(adapter);
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	e1000_configure_tx(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	553	e1000_setup_rctl(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	554	e1000_configure_rx(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	555	/* 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	556	* 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	557	* 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	558	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	559	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	560	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	561	E1000_DESC_UNUSED(ring));
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	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	565
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	566	if (!adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	567	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	568	netif_poll_enable(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	569	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	570	e1000_irq_enable(adapter);
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	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	574
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	575	/* 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	576	if (!adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	577	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	578	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	579	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	580
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	581	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	582	* 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	583	* @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	584	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	585	* 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	586	* 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	587	* * 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	588	*
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	591	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	592	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	593	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	594
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	595	/* 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	596	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	597	/* 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	598	* 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	599	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	600	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	601	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	602	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	603	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	604
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	605	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	606	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	607	/* 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	608	* 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	609	* (a) WoL is enabled
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	610	* (b) AMT is active
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	611	* (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	612	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	613	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	614	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	615
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	616	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	617	case e1000_82540:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	618	case e1000_82545:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	619	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	620	case e1000_82546:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	621	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	622	case e1000_82541:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	623	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	624	case e1000_82547:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	625	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	626	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	627	E1000_MANC_SMBUS_EN)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	628	goto out;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	629	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	630	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	631	case e1000_82572:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	632	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	633	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	634	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	635	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	636	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	637	goto out;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	638	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	639	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	640	goto out;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	641	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	642	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	643	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	644	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	645	mdelay(1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	646	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	647	out:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	648	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	649	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	650
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	651	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	652	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	653	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	654	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	655
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	656	/* 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	657	* reschedule our watchdog timer */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	658	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	659
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	660	if (!adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	661	e1000_irq_disable(adapter);
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	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	664	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	665	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	666
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	667	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	668	netif_poll_disable(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	669	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	670	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	671
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	672	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	673	adapter->link_speed = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	674	adapter->link_duplex = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	675	if (!adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	676	netif_carrier_off(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	677	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	678	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	679
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	680	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	681	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	682	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	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	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	686	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	687	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	688	WARN_ON(in_interrupt());
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	689	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	690	msleep(1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	691	e1000_down(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	692	e1000_up(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	693	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	694	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	695
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	696	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	697	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	698	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	699	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	700	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	701	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	702
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	703	/* 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	704	* 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	705	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	706
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	707	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	708	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	709	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	710	case e1000_82543:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	711	case e1000_82544:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	712	case e1000_82540:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	713	case e1000_82541:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	714	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	715	legacy_pba_adjust = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	716	pba = E1000_PBA_48K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	717	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	718	case e1000_82545:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	719	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	720	case e1000_82546:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	721	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	722	pba = E1000_PBA_48K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	723	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	724	case e1000_82547:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	725	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	726	legacy_pba_adjust = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	727	pba = E1000_PBA_30K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	728	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	729	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	730	case e1000_82572:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	731	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	732	pba = E1000_PBA_38K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	733	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	734	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	735	pba = E1000_PBA_20K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	736	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	737	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	738	pba = E1000_PBA_8K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	739	case e1000_undefined:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	740	case e1000_num_macs:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	741	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	742	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	743
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	744	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	745	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	746	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	747
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	748	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	749	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	750	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	751	adapter->tx_fifo_size =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	752	(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	753	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	754	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	755	} 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	756	/* 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	757	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	758
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	759	/* 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	760	* 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	761	* 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	762	* 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	763	* 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	764	* expressed in KB. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	765	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	766	/* 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	767	tx_space = pba >> 16;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	768	/* 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	769	pba &= 0xffff;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	770	/* 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	771	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	772	VLAN_TAG_SIZE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	773	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	774	min_tx_space *= 2;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	775	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	776	min_tx_space >>= 10;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	777	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	778	min_rx_space >>= 10;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	779
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	780	/* 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	781	* 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	782	* 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	783	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	784	((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	785	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	786
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	787	/* 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	788	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	789	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	790	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	791	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	792	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	793	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	794	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	795
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	796	/* 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	797	* 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	798	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	799	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	800	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	801	/* 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	802	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	803	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	804	pba = min_rx_space;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	805	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	806	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	807	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	808	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	809	}
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	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	812
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	813	/* flow control settings */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	814	/* 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	815	* 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	816	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	817	/* 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	818	* 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	819	* 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	820	* mark. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	821	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	822	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	823
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	824	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	825	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	826	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	827	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	828	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	829	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	830	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	831	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	832
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	833	/* 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	834	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	835	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	836	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	837
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	838	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	839	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	840	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	841
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	842	/* 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	843	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	844	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	845	adapter->hw.autoneg == 1 &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	846	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	847	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	848	/* 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	849	* 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	850	* 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	851	ctrl &= ~E1000_CTRL_SWDPIN3;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	852	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	853	}
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	/* 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	856	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	857
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	858	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	859	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	860
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	861	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	862	(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	863	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	864	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	865	/* 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	866	* 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	867	* 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	868	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	869	&phy_data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	870	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	871	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	872	phy_data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	873	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	874
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	875	e1000_release_manageability(adapter);
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	878	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	879	* 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	880	* @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	881	* @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	882	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	883	* 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	884	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	885	* 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	886	* 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	887	* 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	888	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	889
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	890	static int __devinit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	891	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	892	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	893	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	894	struct net_device *netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	895	struct e1000_adapter *adapter;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	896	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	897	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	898
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	899	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	900	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	901	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	902	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	903	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	904	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	905	return err;
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	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	908	!(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	909	pci_using_dac = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	910	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	911	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	912	(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	913	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	914	goto err_dma;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	915	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	916	pci_using_dac = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	917	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	918
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	919	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	920	goto err_pci_reg;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	921
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	922	pci_set_master(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	923
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	924	err = -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	925	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	926	if (!netdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	927	goto err_alloc_etherdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	928
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	929	SET_MODULE_OWNER(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	930	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	931
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	932	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	933	adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	934	adapter->netdev = netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	935	adapter->pdev = pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	936	adapter->hw.back = adapter;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	937	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	938
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	939	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	940	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	941
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	942	err = -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	943	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	944	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	945	goto err_ioremap;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	946
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	947	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	948	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	949	continue;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	950	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	951	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	952	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	953	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	954	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	955
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	956	netdev->open = &e1000_open;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	957	netdev->stop = &e1000_close;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	958	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	959	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	960	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	961	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	962	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	963	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	964	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	965	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	966	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	967	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	968	netdev->poll = &e1000_clean;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	969	netdev->weight = 64;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	970	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	971	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	972	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	973	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	974	#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	975	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	976	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	977	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	978
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	979	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	980	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	981	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	982
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	983	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	984
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	985	/* setup the private structure */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	986
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	987	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	988	goto err_sw_init;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	989
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	990	err = -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	991	/* 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	992	* 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	993	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	994	(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	995	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	996	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	997	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	998	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	999	goto err_flashmap;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1000	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1001
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1002	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	1003	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	1004
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1005	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	1006	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	1007	NETIF_F_HW_CSUM \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1008	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	1009	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	1010	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	1011	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	1012	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	1013	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1014
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1015	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1016	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	1017	(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	1018	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	1019
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1020	#ifdef NETIF_F_TSO6
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1021	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	1022	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	1023	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1024	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1025	if (pci_using_dac)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1026	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	1027
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1028	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	1029
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1030	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	1031
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1032	/* initialize eeprom parameters */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1033
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1034	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	1035	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	1036	goto err_eeprom;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1037	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1038
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1039	/* 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	1040	* 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	1041
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1042	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	1043
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1044	/* 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	1045
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1046	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	1047	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	1048	goto err_eeprom;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1049	}
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	/* 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	1052
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1053	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	1054	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	1055	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	1056	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	1057
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1058	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	1059	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	1060	goto err_eeprom;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1061	}
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	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	1064
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1065	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	1066	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	1067	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	1068
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1069	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	1070	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	1071	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	1072
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1073	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	1074	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	1075	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	1076
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1077	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	1078
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1079	e1000_check_options(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1080
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1081	/* 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	1082	* 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	1083	* 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	1084	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1085
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1086	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	1087	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	1088	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	1089	case e1000_82543:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1090	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1091	case e1000_82544:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1092	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	1093	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	1094	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	1095	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1096	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1097	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	1098	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	1099	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	1100	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1101	case e1000_82546:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1102	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	1103	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1104	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1105	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	1106	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	1107	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	1108	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1109	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1110	/* Fall Through */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1111	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1112	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	1113	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	1114	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1115	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1116	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	1117	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	1118
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1119	/* 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	1120	* 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	1121	* 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	1122	switch (pdev->device) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1123	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	1124	adapter->eeprom_wol = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1125	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1126	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	1127	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	1128	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	1129	/* 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	1130	* regardless of eeprom setting */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1131	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	1132	adapter->eeprom_wol = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1133	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1134	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	1135	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	1136	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	1137	/* 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	1138	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	1139	adapter->eeprom_wol = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1140	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1141	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	1142	/* 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	1143	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	1144	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	1145	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1146	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1147
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1148	/* 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	1149	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	1150
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1151	/* 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	1152	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1153	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	1154	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	1155	((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	1156	(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	1157	((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	1158	(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	1159	(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	1160	(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	1161	(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	1162	((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	1163	(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	1164	(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	1165	"32-bit"));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1166	}
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	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	1169	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	1170
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1171	/* 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	1172	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1173
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1174	/* 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	1175	* 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	1176	* 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	1177	* of the driver. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1178	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	1179	!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	1180	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	1181
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1182	// offer device to EtherCAT master module
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1183	if (ecdev_offer(netdev, ec_poll, THIS_MODULE, &adapter->ecdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1184	DPRINTK(PROBE, ERR, "Failed to offer device.\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1185	goto err_register;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1188	if (adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1189	if (ecdev_open(adapter->ecdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1190	ecdev_withdraw(adapter->ecdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1191	goto err_register;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1192	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1193	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1194	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	1195	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	1196	goto err_register;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1197	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1198
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1199	/* 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	1200	netif_carrier_off(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1201	netif_stop_queue(netdev);
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	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	1205
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1206	cards_found++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1207	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1208
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1209	err_register:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1210	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	1211	err_eeprom:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1212	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	1213	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	1214
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1215	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	1216	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	1217	err_flashmap:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1218	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1219	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	1220	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	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	kfree(adapter->tx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1224	kfree(adapter->rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1225	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1226	kfree(adapter->polling_netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1227	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1228	err_sw_init:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1229	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	1230	err_ioremap:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1231	free_netdev(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1232	err_alloc_etherdev:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1233	pci_release_regions(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1234	err_pci_reg:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1235	err_dma:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1236	pci_disable_device(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1237	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1238	}
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	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1241	* 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	1242	* @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	1243	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1244	* 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	1245	* 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	1246	* 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	1247	* memory.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1248	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1249
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1250	static void __devexit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1251	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	1252	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1253	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	1254	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	1255	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1256	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1257	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1258
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1259	flush_scheduled_work();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1260
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1261	e1000_release_manageability(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1262
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1263	/* 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	1264	* 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	1265	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	1266
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1267	if (adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1268	ecdev_close(adapter->ecdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1269	ecdev_withdraw(adapter->ecdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1270	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1271	unregister_netdev(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1272	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1273	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1274	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	1275	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	1276	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1277
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1278	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	1279	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	1280
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1281	kfree(adapter->tx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1282	kfree(adapter->rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1283	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1284	kfree(adapter->polling_netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1285	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1286
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1287	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	1288	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	1289	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	1290	pci_release_regions(pdev);
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	free_netdev(netdev);
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	pci_disable_device(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1295	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1296
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	* 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	1299	* @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	1300	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1301	* 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	1302	* 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	1303	* 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	1304	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1305
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1306	static int __devinit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1307	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	1308	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1309	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	1310	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	1311	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	1312	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1313	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1314	#endif
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	/* PCI config space info */
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	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	1319	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	1320	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	1321	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	1322
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1323	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	1324
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1325	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	1326
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1327	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	1328	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	1329	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	1330	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	1331	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	1332
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1333	/* identify the MAC */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1334
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1335	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	1336	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	1337	return -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1338	}
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	switch (hw->mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1341	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1342	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1343	case e1000_82541:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1344	case e1000_82547:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1345	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	1346	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	1347	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	1348	break;
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	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	1352
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1353	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	1354	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	1355	hw->adaptive_ifs = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1356
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1357	/* Copper options */
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	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	1360	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	1361	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	1362	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	1363	}
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	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	1366	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	1367
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1368	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	1369	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	1370	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1371	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1372
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1373	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1374	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	1375	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	1376	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	1377	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	1378	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	1379	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	1380	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1381	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	1382	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1383
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1384	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	1385	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	1386
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1387	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	1388
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1389	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1390	}
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	* 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	1394	* @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	1395	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1396	* 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	1397	* 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	1398	* 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	1399	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1400
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1401	static int __devinit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1402	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	1403	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1404	int size;
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	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	1407	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	1408	if (!adapter->tx_ring)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1409	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1410	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	1411
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1412	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	1413	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	1414	if (!adapter->rx_ring) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1415	kfree(adapter->tx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1416	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1417	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1418	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	1419
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1420	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1421	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	1422	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	1423	if (!adapter->polling_netdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1424	kfree(adapter->tx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1425	kfree(adapter->rx_ring);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1426	return -ENOMEM;
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	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	1429	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1430
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1431	return E1000_SUCCESS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1432	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1433
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1434	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1435	* 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	1436	* @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	1437	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1438	* 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	1439	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1440	* 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	1441	* 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	1442	* 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	1443	* 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	1444	* 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	1445	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1446
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1447	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1448	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	1449	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1450	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	1451	int err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1452
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1453	/* disallow open during test */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1454	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	1455	return -EBUSY;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1456
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1457	/* allocate transmit descriptors */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1458	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	1459	goto err_setup_tx;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1460
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1461	/* allocate receive descriptors */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1462	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	1463	goto err_setup_rx;
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	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	1466	if (err)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1467	goto err_req_irq;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1468
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1469	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	1470
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1471	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	1472	goto err_up;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1473	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	1474	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	1475	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	1476	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	1477	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1478
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1479	/* 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	1480	* interface is now open */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1481	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	1482	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	1483	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	1484
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1485	return E1000_SUCCESS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1486
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1487	err_up:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1488	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	1489	e1000_free_irq(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1490	err_req_irq:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1491	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	1492	err_setup_rx:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1493	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	1494	err_setup_tx:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1495	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1496
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1497	return err;
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
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	* 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	1502	* @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	1503	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1504	* 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	1505	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1506	* 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	1507	* 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	1508	* 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	1509	* 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	1510	**/
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	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1513	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	1514	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1515	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	1516
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1517	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	1518	e1000_down(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1519	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	1520	e1000_free_irq(adapter);
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	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	1523	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	1524
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1525	/* 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	1526	* 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	1527	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	1528	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	1529	!(adapter->vlgrp &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1530	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	1531	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	1532	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1533
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1534	/* 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	1535	* interface is now closed */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1536	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	1537	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	1538	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	1539
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1540	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1541	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1542
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1543	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1544	* 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	1545	* @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	1546	* @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	1547	* @len: length of memory
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	static boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1550	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	1551	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	1552	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1553	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	1554	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	1555
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1556	/* 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	1557	* 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	1558	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	1559	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	1560	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	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	return TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1564	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1565
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1566	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1567	* 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	1568	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1569	* @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	1570	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1571	* 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	1572	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1573
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1574	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1575	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	1576	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	1577	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1578	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	1579	int size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1580
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1581	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	1582	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	1583	if (!txdr->buffer_info) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1584	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1585	"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	1586	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1587	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1588	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	1589
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1590	/* 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	1591
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1592	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	1593	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	1594
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1595	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	1596	if (!txdr->desc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1597	setup_tx_desc_die:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1598	vfree(txdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1599	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1600	"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	1601	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1602	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1603
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1604	/* 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	1605	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	1606	void *olddesc = txdr->desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1607	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	1608	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	1609	"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	1610	/* 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	1611	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	1612	/* Failed allocation, critical failure */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1613	if (!txdr->desc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1614	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	1615	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	1616	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1617
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1618	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	1619	/* give up */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1620	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	1621	txdr->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1622	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	1623	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1624	"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	1625	"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	1626	vfree(txdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1627	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1628	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1629	/* 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	1630	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	1631	}
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	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	1634
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1635	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	1636	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	1637	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	1638
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1639	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1640	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1641
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1642	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1643	* 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	1644	* (Descriptors) for all queues
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1645	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1646	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1647	* 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	1648	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1649
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1650	int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1651	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	1652	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1653	int i, err = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1654
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1655	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	1656	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	1657	if (err) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1658	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1659	"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	1660	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	1661	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	1662	&adapter->tx_ring[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1663	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1664	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1665	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1666
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1667	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1668	}
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	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1671	* 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	1672	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1673	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1674	* 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	1675	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1676
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1677	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1678	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	1679	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1680	uint64_t tdba;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1681	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	1682	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	1683	uint32_t ipgr1, ipgr2;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1684
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1685	/* 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	1686
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1687	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	1688	case 1:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1689	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1690	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	1691	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	1692	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	1693	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	1694	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	1695	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	1696	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	1697	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	1698	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	1699	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	1700	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1701	}
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	/* 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	1704	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	1705	(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	1706	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	1707	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	1708	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1709	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	1710
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1711	switch (hw->mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1712	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	1713	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	1714	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	1715	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	1716	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	1717	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1718	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1719	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	1720	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	1721	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1722	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1723	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	1724	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	1725	break;
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	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	1728	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	1729	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	1730
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1731	/* 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	1732
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1733	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	1734	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	1735	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	1736
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1737	/* 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	1738
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1739	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	1740	tctl &= ~E1000_TCTL_CT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1741	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	1742	(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	1743
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1744	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	1745	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	1746	/* 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	1747	* gigabit link later */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1748	tarc \|= (1 << 21);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1749	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	1750	} 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	1751	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	1752	tarc \|= 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1753	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	1754	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	1755	tarc \|= 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1756	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	1757	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1758
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1759	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	1760
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1761	/* 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	1762	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	1763
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1764	/* 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	1765	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	1766	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	1767
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1768	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	1769	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	1770	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1771	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	1772
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1773	/* 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	1774	* 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	1775	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	1776	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	1777	adapter->pcix_82544 = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1778
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1779	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	1780
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1781	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1782
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1783	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1784	* 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	1785	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1786	* @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	1787	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1788	* 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	1789	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1790
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1791	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1792	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	1793	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	1794	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1795	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	1796	int size, desc_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1797
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1798	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	1799	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	1800	if (!rxdr->buffer_info) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1801	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1802	"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	1803	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1804	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1805	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	1806
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1807	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	1808	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	1809	if (!rxdr->ps_page) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1810	vfree(rxdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1811	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1812	"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	1813	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1814	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1815	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	1816
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1817	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	1818	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	1819	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	1820	vfree(rxdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1821	kfree(rxdr->ps_page);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1822	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1823	"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	1824	return -ENOMEM;
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	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	1827
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1828	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	1829	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	1830	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1831	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	1832
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1833	/* 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	1834
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1835	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	1836	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	1837
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1838	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	1839
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1840	if (!rxdr->desc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1841	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1842	"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	1843	setup_rx_desc_die:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1844	vfree(rxdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1845	kfree(rxdr->ps_page);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1846	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	1847	return -ENOMEM;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1850	/* 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	1851	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	1852	void *olddesc = rxdr->desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1853	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	1854	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	1855	"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	1856	/* 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	1857	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	1858	/* Failed allocation, critical failure */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1859	if (!rxdr->desc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1860	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	1861	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1862	"Unable to allocate memory "
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1863	"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	1864	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	1865	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1866
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1867	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	1868	/* give up */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1869	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	1870	rxdr->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1871	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	1872	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1873	"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	1874	"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	1875	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	1876	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1877	/* 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	1878	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	1879	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1880	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1881	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	1882
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1883	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	1884	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	1885
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1886	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1887	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1888
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1889	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1890	* 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	1891	* (Descriptors) for all queues
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1892	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1893	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1894	* 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	1895	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1896
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1897	int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1898	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	1899	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1900	int i, err = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1901
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1902	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	1903	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	1904	if (err) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1905	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1906	"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	1907	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	1908	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	1909	&adapter->rx_ring[i]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1910	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1911	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1912	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1913
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1914	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1915	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1916
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1917	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1918	* 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	1919	* @adapter: Board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1920	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1921	#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	1922	(((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	1923	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1924	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	1925	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1926	uint32_t rctl, rfctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1927	uint32_t psrctl = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1928	#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	1929	uint32_t pages = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1930	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1931
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1932	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	1933
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1934	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	1935
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1936	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	1937	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	1938	(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	1939
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1940	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	1941	rctl \|= E1000_RCTL_SBP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1942	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1943	rctl &= ~E1000_RCTL_SBP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1944
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1945	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	1946	rctl &= ~E1000_RCTL_LPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1947	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1948	rctl \|= E1000_RCTL_LPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1949
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1950	/* Setup buffer sizes */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1951	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	1952	rctl \|= E1000_RCTL_BSEX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1953	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	1954	case E1000_RXBUFFER_256:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1955	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	1956	rctl &= ~E1000_RCTL_BSEX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1957	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1958	case E1000_RXBUFFER_512:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1959	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	1960	rctl &= ~E1000_RCTL_BSEX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1961	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1962	case E1000_RXBUFFER_1024:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1963	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	1964	rctl &= ~E1000_RCTL_BSEX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1965	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1966	case E1000_RXBUFFER_2048:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1967	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1968	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	1969	rctl &= ~E1000_RCTL_BSEX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1970	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1971	case E1000_RXBUFFER_4096:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1972	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	1973	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1974	case E1000_RXBUFFER_8192:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1975	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	1976	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1977	case E1000_RXBUFFER_16384:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1978	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	1979	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1980	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1981
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1982	#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	1983	/* 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	1984	* 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	1985	* 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	1986	* 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	1987	* 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	1988	* 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	1989	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1990	/* 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	1991	* 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	1992	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	1993	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	1994	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	1995	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	1996	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1997	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	1998	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1999	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	2000	/* 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	2001	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	2002	rfctl \|= E1000_RFCTL_EXTEN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2003	/* 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	2004	* 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	2005	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	2006	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	2007
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2008	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	2009
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2010	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	2011
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2012	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	2013	E1000_PSRCTL_BSIZE0_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2014
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2015	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	2016	case 3:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2017	psrctl \|= PAGE_SIZE <<
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2018	E1000_PSRCTL_BSIZE3_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2019	case 2:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2020	psrctl \|= PAGE_SIZE <<
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2021	E1000_PSRCTL_BSIZE2_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2022	case 1:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2023	psrctl \|= PAGE_SIZE >>
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2024	E1000_PSRCTL_BSIZE1_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2025	break;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2028	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	2029	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2030
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2031	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	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	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2035	* 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	2036	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2037	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2038	* 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	2039	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2040
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2041	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2042	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	2043	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2044	uint64_t rdba;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2045	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	2046	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	2047
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2048	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	2049	/* 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	2050	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	2051	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	2052	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	2053	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	2054	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2055	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	2056	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	2057	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	2058	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	2059	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2060
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2061	/* 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	2062	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	2063	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	2064
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2065	/* 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	2066	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	2067
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2068	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	2069	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	2070	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	2071	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	2072	1000000000 / (adapter->itr * 256));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2073	}
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	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	2076	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	2077	/* 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	2078	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	2079	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2080	/* 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	2081	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	2082	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	2083	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2084	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	2085	E1000_WRITE_FLUSH(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2086	}
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	/* 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	2089	* 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	2090	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	2091	case 1:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2092	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2093	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	2094	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	2095	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	2096	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	2097	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	2098	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	2099	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	2100	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	2101	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2102	}
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	/* 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	2105	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	2106	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	2107	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	2108	rxcsum \|= E1000_RXCSUM_TUOFL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2109
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2110	/* 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	2111	* 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	2112	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	2113	(adapter->rx_ps_pages)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2114	rxcsum \|= E1000_RXCSUM_IPPCSE;
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	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2117	rxcsum &= ~E1000_RXCSUM_TUOFL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2118	/* 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	2119	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2120	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	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	/* 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	2124	* 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	2125	#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	2126	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	2127	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	2128
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2129	/* Enable Receives */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2130	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	2131	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2132
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2133	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2134	* 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	2135	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2136	* @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	2137	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2138	* 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	2139	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2140
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2141	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2142	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	2143	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	2144	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2145	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	2146
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2147	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	2148
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2149	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	2150	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	2151
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2152	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	2153
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2154	tx_ring->desc = NULL;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2157	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2158	* 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	2159	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2160	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2161	* 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	2162	**/
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	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2165	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	2166	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2167	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2168
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2169	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	2170	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	2171	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2172
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2173	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2174	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	2175	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	2176	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2177	if (adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2178	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2179
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2180	if (buffer_info->dma) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2181	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	2182	buffer_info->dma,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2183	buffer_info->length,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2184	PCI_DMA_TODEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2185	buffer_info->dma = 0;
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	if (buffer_info->skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2188	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	2189	buffer_info->skb = NULL;
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	/* 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	2192	}
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	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2195	* 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	2196	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2197	* @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	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	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2201	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	2202	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	2203	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2204	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	2205	unsigned long size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2206	unsigned int i;
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	/* 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	2209
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2210	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	2211	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	2212	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	2213	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2214
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2215	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	2216	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	2217
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2218	/* 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	2219
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2220	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	2221
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2222	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	2223	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	2224	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	2225
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2226	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	2227	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	2228	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2229
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2230	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2231	* 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	2232	* @adapter: board private structure
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	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2236	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	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_tx_queues; i++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2241	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	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_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	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 clean the resources 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	* 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	2250	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2251
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2252	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2253	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	2254	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	2255	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2256	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	2257
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2258	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	2259
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2260	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	2261	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	2262	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	2263	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	2264	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	2265	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	2266
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2267	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	2268
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2269	rx_ring->desc = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2270	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2271
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	* 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	2274	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2275	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2276	* 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	2277	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2278
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2279	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2280	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	2281	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2282	int i;
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	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	2285	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	2286	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2287
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2288	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2289	* 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	2290	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2291	* @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	2292	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2293
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2294	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2295	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	2296	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	2297	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2298	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	2299	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	2300	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	2301	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	2302	unsigned long size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2303	unsigned int i, j;
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	/* 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	2306	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	2307	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	2308	if (buffer_info->skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2309	pci_unmap_single(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2310	buffer_info->dma,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2311	buffer_info->length,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2312	PCI_DMA_FROMDEVICE);
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	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	2315	buffer_info->skb = NULL;
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	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	2318	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	2319	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	2320	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	2321	pci_unmap_page(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2322	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	2323	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	2324	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	2325	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	2326	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	2327	}
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2330	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	2331	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	2332	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	2333	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	2334	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	2335	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	2336
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2337	/* 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	2338
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2339	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	2340
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2341	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	2342	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	2343
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2344	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	2345	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	2346	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2347
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2348	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2349	* 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	2350	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2351	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2352
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2353	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2354	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	2355	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2356	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2357
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2358	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	2359	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	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	/* 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	2363	* 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	2364	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2365	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2366	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	2367	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2368	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	2369	uint32_t rctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2370
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2371	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	2372
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2373	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	2374	rctl \|= E1000_RCTL_RST;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2375	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	2376	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	2377	mdelay(5);
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	if (!adapter->ecdev && netif_running(netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2380	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	2381	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2382
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2383	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2384	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	2385	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2386	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	2387	uint32_t rctl;
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	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	2390	rctl &= ~E1000_RCTL_RST;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2391	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	2392	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	2393	mdelay(5);
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	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	2396	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	2397
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2398	if (!adapter->netdev && netif_running(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2399	/* 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	2400	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	2401	e1000_configure_rx(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2402	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	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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2406	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2407	* 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	2408	* @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	2409	* @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	2410	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2411	* 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	2412	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2413
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2414	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2415	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	2416	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2417	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	2418	struct sockaddr *addr = p;
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	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	2421	return -EADDRNOTAVAIL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2422
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2423	/* 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	2424
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2425	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	2426	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	2427
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2428	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	2429	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	2430
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2431	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	2432
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2433	/* 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	2434	* 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	2435	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	2436	/* activate the work around */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2437	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	2438
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2439	/* 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	2440	* 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	2441	* 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	2442	* 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	2443	* 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	2444	* RAR[14] */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2445	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	2446	E1000_RAR_ENTRIES - 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2447	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2448
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2449	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	2450	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	2451
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2452	return 0;
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
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	* 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	2457	* @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	2458	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2459	* 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	2460	* 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	2461	* 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	2462	* 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	2463	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2464
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2465	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2466	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	2467	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2468	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	2469	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	2470	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	2471	uint32_t rctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2472	uint32_t hash_value;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2473	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	2474	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	2475	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	2476	E1000_NUM_MTA_REGISTERS;
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	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	2479	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	2480
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2481	/* 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	2482	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	2483	rar_entries--;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2484
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2485	/* 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	2486
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2487	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	2488
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2489	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	2490	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	2491	} 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	2492	rctl \|= E1000_RCTL_MPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2493	rctl &= ~E1000_RCTL_UPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2494	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2495	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	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	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	2499
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2500	/* 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	2501
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2502	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	2503	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	2504
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2505	/* 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	2506	* 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	2507	* 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	2508	* -- 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	2509	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2510	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	2511
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2512	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	2513	if (mc_ptr) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2514	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	2515	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	2516	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2517	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	2518	E1000_WRITE_FLUSH(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2519	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	2520	E1000_WRITE_FLUSH(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2521	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2522	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2523
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2524	/* 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	2525
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2526	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	2527	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	2528	E1000_WRITE_FLUSH(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2529	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2530
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2531	/* 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	2532
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2533	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	2534	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	2535	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	2536	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2537
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2538	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	2539	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	2540	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2541
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2542	/* 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	2543	* the phy */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2544
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2545	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2546	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	2547	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2548	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	2549	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	2550	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2551
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2552	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2553	* 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	2554	* @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	2555	**/
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	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2558	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	2559	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2560	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	2561	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	2562	uint32_t tctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2563
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2564	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	2565	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	2566	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	2567	(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	2568	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	2569	(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	2570	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	2571	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	2572	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	2573	tctl & ~E1000_TCTL_EN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2574	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	2575	adapter->tx_head_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2576	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	2577	adapter->tx_head_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2578	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	2579	adapter->tx_head_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2580	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	2581	adapter->tx_head_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2582	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	2583	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	2584
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2585	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	2586	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	2587	if (!adapter->ecdev) netif_wake_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2588	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2589	if (!adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2590	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	2591	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2592	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2593	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2594
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	* 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	2597	* @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	2598	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2599	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2600	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	2601	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2602	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	2603	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	2604	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	2605	uint32_t link, tctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2606	int32_t ret_val;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2607
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2608	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	2609	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	2610	(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	2611	(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	2612	/* 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	2613	DPRINTK(LINK, INFO,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2614	"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	2615	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2616
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2617	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	2618	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	2619	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	2620	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	2621	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2622
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2623	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	2624	!(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	2625	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	2626	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2627	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	2628
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2629	if (link) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2630	if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2631	\|\| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2632	boolean_t txb2b = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2633	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	2634	&adapter->link_speed,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2635	&adapter->link_duplex);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2636
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2637	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	2638	adapter->link_speed,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2639	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	2640	"Full Duplex" : "Half Duplex");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2641
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2642	/* 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	2643	* 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	2644	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	2645	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	2646	switch (adapter->link_speed) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2647	case SPEED_10:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2648	txb2b = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2649	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	2650	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	2651	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2652	case SPEED_100:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2653	txb2b = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2654	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	2655	/* 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	2656	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2657	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2658
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2659	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	2660	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	2661	txb2b == 0) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2662	uint32_t tarc0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2663	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	2664	tarc0 &= ~(1 << 21);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2665	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	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	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2669	/* 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	2670	* some hardware issues */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2671	if (!adapter->tso_force &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2672	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	2673	switch (adapter->link_speed) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2674	case SPEED_10:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2675	case SPEED_100:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2676	DPRINTK(PROBE,INFO,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2677	"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	2678	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	2679	#ifdef NETIF_F_TSO6
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2680	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	2681	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2682	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2683	case SPEED_1000:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2684	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	2685	#ifdef NETIF_F_TSO6
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2686	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	2687	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2688	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2689	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2690	/* oops */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2691	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2692	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2693	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2694	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2695
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2696	/* 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	2697	* after setting TARC0 */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2698	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	2699	tctl \|= E1000_TCTL_EN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2700	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	2701
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2702	if (adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2703	ecdev_set_link(adapter->ecdev, 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2704	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2705	netif_carrier_on(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2706	netif_wake_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2707	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	2708	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2709	adapter->smartspeed = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2710	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2711	/* 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	2712	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	2713	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	2714	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	2715	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	2716	}
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	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2719	if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2720	\|\| (!adapter->ecdev && netif_carrier_ok(netdev))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2721	adapter->link_speed = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2722	adapter->link_duplex = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2723	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	2724	if (adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2725	ecdev_set_link(adapter->ecdev, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2726	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2727	netif_carrier_off(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2728	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2729	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	2730	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2731
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2732	/* 80003ES2LAN workaround--
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2733	* 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	2734	* 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	2735	* 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	2736	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2737	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	2738	/* reset device */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2739	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	2740	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2741
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2742	e1000_smartspeed(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2743	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2744
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2745	e1000_update_stats(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2746
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2747	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	2748	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	2749	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	2750	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	2751
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2752	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	2753	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	2754	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	2755	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	2756
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2757	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	2758
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2759	if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2760	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	2761	/* 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	2762	* 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	2763	* 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	2764	* (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	2765	adapter->tx_timeout_count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2766	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	2767	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2768	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2769
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2770	/* 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	2771	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	2772
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2773	/* 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	2774	if (!adapter->ecdev) 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	2775
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2776	/* 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	2777	* 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	2778	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	2779	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	2780
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2781	/* Reset the timer */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2782	if (!adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2783	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	2784	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2785
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2786	enum latency_range {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2787	lowest_latency = 0,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2788	low_latency = 1,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2789	bulk_latency = 2,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2790	latency_invalid = 255
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2791	};
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2792
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2793	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2794	* 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	2795	* 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	2796	* 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	2797	* 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	2798	* 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	2799	* 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	2800	* 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	2801	* while increasing bulk throughput.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2802	* 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	2803	* 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	2804	* @adapter: pointer to adapter
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2805	* @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	2806	* @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	2807	* @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	2808	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2809	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	2810	uint16_t itr_setting,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2811	int packets,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2812	int bytes)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2813	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2814	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	2815	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	2816
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2817	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	2818	goto update_itr_done;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2819
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2820	if (packets == 0)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2821	goto update_itr_done;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2822
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2823	switch (itr_setting) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2824	case lowest_latency:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2825	/* 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	2826	if (bytes/packets > 8000)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2827	retval = bulk_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2828	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	2829	retval = low_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2830	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2831	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	2832	if (bytes > 10000) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2833	/* 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	2834	if (bytes/packets > 8000)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2835	retval = bulk_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2836	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	2837	retval = bulk_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2838	else if ((packets > 35))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2839	retval = lowest_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2840	} 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	2841	retval = bulk_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2842	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	2843	retval = lowest_latency;
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: /* 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	2846	if (bytes > 25000) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2847	if (packets > 35)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2848	retval = low_latency;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2849	} else if (bytes < 6000) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2850	retval = low_latency;
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	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2853	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2854
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2855	update_itr_done:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2856	return retval;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2857	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2858
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2859	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	2860	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2861	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	2862	uint16_t current_itr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2863	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	2864
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2865	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	2866	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2867
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2868	/* 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	2869	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	2870	current_itr = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2871	new_itr = 4000;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2872	goto set_itr_now;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2875	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	2876	adapter->tx_itr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2877	adapter->total_tx_packets,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2878	adapter->total_tx_bytes);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2879	/* 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	2880	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	2881	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	2882
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2883	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	2884	adapter->rx_itr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2885	adapter->total_rx_packets,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2886	adapter->total_rx_bytes);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2887	/* 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	2888	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	2889	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	2890
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2891	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	2892
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2893	switch (current_itr) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2894	/* 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	2895	case lowest_latency:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2896	new_itr = 70000;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2897	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2898	case low_latency:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2899	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	2900	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2901	case bulk_latency:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2902	new_itr = 4000;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2903	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2904	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2905	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2906	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2907
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2908	set_itr_now:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2909	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	2910	/* 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	2911	* 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	2912	* increasing */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2913	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	2914	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	2915	new_itr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2916	adapter->itr = new_itr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2917	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	2918	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2919
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2920	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2921	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2922
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2923	#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	2924	#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	2925	#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	2926	#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	2927	#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	2928	#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	2929
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2930	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2931	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	2932	struct sk_buff *skb)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2933	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2934	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2935	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	2936	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	2937	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2938	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	2939	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	2940	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	2941	int err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2942
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2943	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	2944	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	2945	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	2946	if (err)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2947	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2948	}
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	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	2951	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	2952	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	2953	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	2954	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	2955	skb->h.th->check =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2956	~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	2957	skb->nh.iph->daddr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2958	0,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2959	IPPROTO_TCP,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2960	0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2961	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	2962	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	2963	#ifdef NETIF_F_TSO6
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2964	} 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	2965	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	2966	skb->h.th->check =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2967	~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	2968	&skb->nh.ipv6h->daddr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2969	0,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2970	IPPROTO_TCP,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2971	0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2972	ipcse = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2973	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2974	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2975	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	2976	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	2977	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	2978	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	2979	tucse = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2980
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2981	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	2982	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	2983
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2984	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	2985	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	2986	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	2987
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2988	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	2989	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	2990	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	2991	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	2992	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	2993	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	2994	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	2995	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	2996	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	2997
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2998	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	2999	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	3000
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3001	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	3002	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	3003
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3004	return TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3005	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3006	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3007
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3008	return FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3009	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3010
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3011	static boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3012	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	3013	struct sk_buff *skb)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3014	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3015	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	3016	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	3017	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3018	uint8_t css;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3019
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3020	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	3021	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	3022
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3023	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	3024	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	3025	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	3026
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3027	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	3028	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	3029	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	3030	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	3031	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	3032
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3033	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	3034	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	3035
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3036	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	3037	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	3038
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3039	return TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3040	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3041
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3042	return FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3043	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3044
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3045	#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	3046	#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	3047
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3048	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3049	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	3050	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	3051	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	3052	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3053	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	3054	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	3055	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	3056	unsigned int f;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3057	len -= skb->data_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3058
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3059	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	3060
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3061	while (len) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3062	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	3063	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	3064	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3065	/* Workaround for Controller erratum --
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3066	* 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	3067	* 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	3068	* 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	3069	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	3070	!skb_is_gso(skb)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3071	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	3072	size -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3073	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3074
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3075	/* 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	3076	* 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	3077	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	3078	size -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3079	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3080	/* 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	3081	* 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	3082	* 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	3083	* 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	3084	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3085	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	3086	(size > 2015) && count == 0))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3087	size = 2015;
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	/* 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	3090	* 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	3091	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	3092	!((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	3093	size > 4))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3094	size -= 4;
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	buffer_info->length = size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3097	buffer_info->dma =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3098	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	3099	skb->data + offset,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3100	size,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3101	PCI_DMA_TODEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3102	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	3103	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	3104
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3105	len -= size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3106	offset += size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3107	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3108	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	3109	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3110
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3111	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	3112	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	3113
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3114	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	3115	len = frag->size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3116	offset = frag->page_offset;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3117
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3118	while (len) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3119	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	3120	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	3121	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3122	/* 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	3123	* 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	3124	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	3125	size -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3126	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3127	/* 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	3128	* 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	3129	* dwords. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3130	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	3131	!((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	3132	size > 4))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3133	size -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3134
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3135	buffer_info->length = size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3136	buffer_info->dma =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3137	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	3138	frag->page,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3139	offset,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3140	size,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3141	PCI_DMA_TODEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3142	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	3143	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	3144
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3145	len -= size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3146	offset += size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3147	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3148	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	3149	}
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3152	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	3153	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	3154	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	3155
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3156	return count;
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	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3160	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	3161	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	3162	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3163	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	3164	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	3165	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	3166	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3167
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3168	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	3169	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	3170	E1000_TXD_CMD_TSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3171	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	3172
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3173	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	3174	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	3175	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3176
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3177	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	3178	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	3179	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	3180	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3181
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3182	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	3183	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	3184	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	3185	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3186
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3187	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	3188
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3189	while (count--) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3190	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	3191	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	3192	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	3193	tx_desc->lower.data =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3194	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	3195	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	3196	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	3197	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3198
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3199	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	3200
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3201	/* 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	3202	* 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	3203	* 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	3204	* such as IA-64). */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3205	wmb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3206
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3207	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	3208	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	3209	/* 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	3210	* 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	3211	mmiowb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3212	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3213
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3214	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3215	* 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	3216	* 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	3217	* 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	3218	* 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	3219	* 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	3220	* 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	3221	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3222
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3223	#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	3224	#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	3225
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3226	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3227	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	3228	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3229	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	3230	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	3231
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3232	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	3233
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3234	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	3235	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	3236
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3237	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	3238	return 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3239
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3240	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	3241	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	3242	return 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3243	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3244
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3245	no_fifo_stall_required:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3246	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	3247	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	3248	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	3249	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3250	}
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	#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	3253	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3254	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	3255	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3256	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	3257	uint16_t length, offset;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3258	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	3259	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	3260	( 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	3261	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	3262	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3263	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3264	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	3265	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	3266	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	3267	const struct iphdr *ip =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3268	(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	3269	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	3270	struct udphdr *udp =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3271	(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	3272	(ip->ihl << 2));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3273	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	3274	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	3275	length = skb->len - offset;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3276
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3277	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	3278	(uint8_t *)udp + 8,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3279	length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3280	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3281	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3282	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3283	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3284	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3285	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3286
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3287	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	3288	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3289	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	3290	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	3291
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3292	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3293	/* 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	3294	* 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	3295	* 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	3296	smp_mb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3297
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3298	/* 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	3299	* made room available. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3300	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	3301	return -EBUSY;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3302
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3303	/* A reprieve! */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3304	netif_start_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3305	++adapter->restart_queue;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3306	return 0;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3309	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	3310	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	3311	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3312	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	3313	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3314	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	3315	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3316
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3317	#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	3318	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3319	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	3320	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3321	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	3322	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	3323	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	3324	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	3325	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	3326	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	3327	unsigned long flags = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3328	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	3329	unsigned int mss = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3330	int count = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3331	int tso;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3332	unsigned int f;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3333	len -= skb->data_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3334
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3335	/* 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	3336	* 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	3337	* 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	3338	* 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	3339	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	3340
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3341	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	3342	if (!adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3343	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	3344	return NETDEV_TX_OK;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3345	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3346
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3347	/* 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	3348	* length to 4kB */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3349	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	3350	max_per_txd = 8192;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3351
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3352	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3353	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	3354	/* 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	3355	* 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	3356	* 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	3357	* 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	3358	* 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	3359	* drops. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3360	if (mss) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3361	uint8_t hdr_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3362	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	3363	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	3364
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3365	/* 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	3366	* 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	3367	* frags into skb->data */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3368	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	3369	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	3370	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	3371	unsigned int pull_size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3372	case e1000_82544:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3373	/* 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	3374	* 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	3375	* this hardware's requirements
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3376	* 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	3377	* 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	3378	* into the next dword */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3379	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	3380	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3381	/* fall through */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3382	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3383	case e1000_82572:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3384	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3385	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3386	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	3387	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	3388	DPRINTK(DRV, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3389	"__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	3390	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	3391	return NETDEV_TX_OK;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3392	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3393	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	3394	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3395	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3396	/* do nothing */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3397	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3398	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3399	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3400	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3401
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3402	/* 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	3403	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	3404	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3405	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3406	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3407	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	3408	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3409	#endif
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	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3412	/* Controller Erratum workaround */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3413	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	3414	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3415	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3416
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3417	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	3418
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3419	if (adapter->pcix_82544)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3420	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3421
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3422	/* 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	3423	* 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	3424	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3425	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	3426	(len > 2015)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3427	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3428
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3429	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	3430	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	3431	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	3432	max_txd_pwr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3433	if (adapter->pcix_82544)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3434	count += nr_frags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3435
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	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	3438	(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	3439	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	3440
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3441	if (!adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3442	local_irq_save(flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3443	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	3444	/* 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	3445	local_irq_restore(flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3446	return NETDEV_TX_LOCKED;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3447	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3448	}
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	/* 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	3451	* 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	3452	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	3453	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	3454	return NETDEV_TX_BUSY;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3457	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	3458	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	3459	if (!adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3460	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3461	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	3462	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	3463	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3464	return NETDEV_TX_BUSY;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3465	}
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3468	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	3469	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	3470	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	3471	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3472
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3473	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	3474
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3475	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	3476	if (tso < 0) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3477	if (!adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3478	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	3479	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	3480	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3481	return NETDEV_TX_OK;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3484	if (likely(tso)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3485	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	3486	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	3487	} 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	3488	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	3489
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3490	/* 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	3491	* 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	3492	* 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	3493	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	3494	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	3495
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3496	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	3497	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	3498	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	3499
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3500	netdev->trans_start = jiffies;
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 (!adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3503	/* 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	3504	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	3505
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3506	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	3507	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3508	return NETDEV_TX_OK;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3509	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3510
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3511	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3512	* 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	3513	* @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	3514	**/
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	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3517	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	3518	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3519	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	3520
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3521	/* 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	3522	adapter->tx_timeout_count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3523	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	3524	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3525
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3526	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3527	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	3528	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3529	struct e1000_adapter *adapter =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3530	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	3531
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3532	e1000_reinit_locked(adapter);
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3535	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3536	* 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	3537	* @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	3538	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3539	* 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	3540	* 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	3541	**/
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	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	3544	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	3545	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3546	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	3547
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3548	/* 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	3549	return &adapter->net_stats;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3550	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3551
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3552	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3553	* 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	3554	* @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	3555	* @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	3556	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3557	* 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	3558	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3559
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3560	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3561	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	3562	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3563	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	3564	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	3565	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	3566
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3567	if (adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3568	return -EBUSY;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3569
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3570	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	3571	(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	3572	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	3573	return -EINVAL;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3576	/* 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	3577	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	3578	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	3579	case e1000_ich8lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3580	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	3581	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	3582	return -EINVAL;
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	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3585	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3586	/* 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	3587	* - 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	3588	* - 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	3589	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	3590	&eeprom_data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3591	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	3592	(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	3593	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	3594	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3595	"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	3596	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3597	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3598	break;
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	/* 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	3601
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3602	/* 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	3603	case e1000_82571:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3604	case e1000_82572:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3605	case e1000_80003es2lan:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3606	#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	3607	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	3608	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	3609	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3610	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3611	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3612	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3613	/* 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	3614	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3615	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3616
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3617	/* 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	3618	* 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	3619	* larger slab size
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3620	* 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	3621
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3622	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	3623	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	3624	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	3625	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	3626	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	3627	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	3628	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	3629	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	3630	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	3631	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	3632	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	3633	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	3634	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	3635	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	3636
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3637	/* 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	3638	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	3639	((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	3640	(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	3641	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	3642
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3643	netdev->mtu = new_mtu;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3644	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	3645
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3646	if (netif_running(netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3647	e1000_reinit_locked(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3648
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3649	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3650	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3651
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3652	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3653	* 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	3654	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3655	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3656
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3657	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3658	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	3659	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3660	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	3661	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	3662	unsigned long flags = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3663	uint16_t phy_tmp;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3664
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3665	#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	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	* 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	3669	* connection is down.
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	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	3672	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3673	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	3674	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3675
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3676	if (!adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3677	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	3678
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3679	/* 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	3680	* 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	3681	* 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	3682	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3683
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3684	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	3685	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	3686	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	3687	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	3688	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	3689	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	3690	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	3691
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3692	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	3693	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	3694	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	3695	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	3696	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	3697	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	3698	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	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	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	3702	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	3703	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	3704	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	3705	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	3706	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	3707	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	3708	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	3709	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	3710	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	3711	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	3712	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	3713	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	3714	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	3715	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	3716	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	3717	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	3718	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	3719	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	3720	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	3721	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	3722	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	3723	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	3724	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	3725	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	3726	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	3727
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3728	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	3729	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	3730	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	3731	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	3732	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	3733	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	3734	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	3735	}
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	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	3738	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	3739
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3740	/* used for adaptive IFS */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3741
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3742	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	3743	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	3744	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	3745	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	3746
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3747	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	3748	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	3749	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	3750	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	3751	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	3752	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	3753	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	3754	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3755	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	3756	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	3757	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	3758
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3759	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	3760	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	3761	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	3762	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	3763	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	3764	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	3765	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	3766	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	3767	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3768	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3769
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3770	/* 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	3771	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	3772	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	3773	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	3774	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	3775	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	3776	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	3777
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3778	/* Rx Errors */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3779
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3780	/* 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	3781	* 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	3782	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	3783	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	3784	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	3785	adapter->stats.cexterr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3786	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	3787	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	3788	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	3789	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	3790	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	3791
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3792	/* Tx Errors */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3793	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	3794	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	3795	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	3796	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	3797	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	3798	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	3799	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	3800	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	3801	adapter->stats.tncrs = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3802	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3803
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3804	/* 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	3805
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3806	/* Phy Stats */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3807	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	3808	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	3809	(!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	3810	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	3811	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	3812	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3813
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3814	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	3815	(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	3816	!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	3817	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	3818	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3819
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3820	/* Management Stats */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3821	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	3822	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	3823	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	3824	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	3825	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3826
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3827	if (!adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3828	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	3829	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3830
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3831	void ec_poll(struct net_device *netdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3832	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3833	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	3834
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3835	if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3836	e1000_watchdog((unsigned long) adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3837	adapter->ec_watchdog_jiffies = jiffies;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3838	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3839
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3840	#ifdef CONFIG_PCI_MSI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3841	e1000_intr_msi(0, netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3842	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3843	e1000_intr(0, netdev);
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3847	#ifdef CONFIG_PCI_MSI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3848	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3849	* 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	3850	* @irq: interrupt number
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3851	* @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	3852	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3853
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3854	static
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3855	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	3856	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3857	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	3858	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	3859	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	3860	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3861	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3862	int ec_work_done = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3863	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3864
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3865	if (adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3866	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	3867	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3868	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	3869	&ec_work_done, 100) &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3870	!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	3871	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3872	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	3873	!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	3874	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3875	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3876	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3877	/* 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	3878	* 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	3879	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	3880	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	3881	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3882	/* 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	3883	* enable/disable accounting */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3884	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	3885	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3886	adapter->detect_link = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3887	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	3888	(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	3889	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	3890	/* 80003ES2LAN workaround--
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3891	* 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	3892	* 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	3893	* reset adapter in watchdog
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3894	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3895	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	3896	(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	3897	/* disable receives */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3898	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	3899	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	3900	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3901	/* 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	3902	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	3903	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	3904	jiffies + 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3905	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3906	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3907	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	3908	E1000_ICR_LSC)));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3909	/* 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	3910	* 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	3911	* 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	3912	E1000_WRITE_FLUSH(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3913	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3914	/* 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	3915	* 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	3916	* 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	3917	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	3918	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3919	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3920
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3921	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3922	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	3923	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	3924	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	3925	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	3926	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	3927	__netif_rx_schedule(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3928	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3929	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3930	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3931	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	3932	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	3933	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	3934	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	3935
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3936	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	3937	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	3938	!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	3939	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3940
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3941	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	3942	e1000_set_itr(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3943	#endif
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3946	return IRQ_HANDLED;
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	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3949
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	* e1000_intr - Interrupt Handler
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3952	* @irq: interrupt number
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3953	* @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	3954	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3955
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3956	static irqreturn_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3957	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	3958	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3959	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	3960	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	3961	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	3962	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	3963	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3964	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3965	int ec_work_done = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3966	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3967	if (unlikely(!icr))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3968	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	3969
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3970	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3971	/* 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	3972	* 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	3973	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	3974	!(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	3975	return IRQ_NONE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3976
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3977	/* 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	3978	* 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	3979	* 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	3980	* account for it ASAP. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3981	if (!adapter->ecdev && 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	3982	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	3983	#endif
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	if (!adapter->ecdev && 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	3986	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	3987	/* 80003ES2LAN workaround--
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3988	* 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	3989	* 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	3990	* reset adapter in watchdog
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3991	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3992	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	3993	(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	3994	/* disable receives */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3995	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	3996	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	3997	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3998	/* 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	3999	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	4000	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	4001	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4002
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4003	if (adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4004	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	4005	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4006	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	4007	&ec_work_done, 100) &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4008	!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	4009	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4010	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	4011	!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	4012	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4013	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4014	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4015	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4016	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	4017	/* 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	4018	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	4019	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	4020	E1000_WRITE_FLUSH(hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4021	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4022	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	4023	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	4024	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	4025	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	4026	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	4027	__netif_rx_schedule(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4028	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4029	/* 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	4030	* 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	4031	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4032	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4033	/* 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	4034	* 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	4035	* 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	4036	* 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	4037	* 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	4038	* 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	4039	* 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	4040	* 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	4041	* de-assertion state.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4042	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4043	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	4044	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	4045	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	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	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	4049	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	4050	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	4051	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	4052
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4053	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	4054	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	4055	!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	4056	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4057
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4058	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	4059	e1000_set_itr(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4060
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4061	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	4062	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4063
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4064	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4065	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4066	return IRQ_HANDLED;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4067	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4068
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4069	#ifdef CONFIG_E1000_NAPI
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	* 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	4072	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4073	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4074
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4075	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4076	e1000_clean(struct net_device poll_dev, int budget) // EtherCAT: never called
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4077	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4078	struct e1000_adapter *adapter;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4079	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	4080	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	4081
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4082	/* 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	4083	adapter = poll_dev->priv;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4084
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4085	/* 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	4086	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	4087	goto quit_polling;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4088
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4089	/* 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	4090	* 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	4091	* 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	4092	* 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	4093	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	4094	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	4095	&adapter->tx_ring[0]);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4096	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	4097	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4098
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4099	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	4100	&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	4101
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4102	*budget -= work_done;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4103	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	4104
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4105	/* 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	4106	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	4107	!netif_running(poll_dev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4108	quit_polling:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4109	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	4110	e1000_set_itr(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4111	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	4112	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4113	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4114	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4115
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4116	return 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4117	}
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	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4120	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4121	* 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	4122	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4123	**/
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	static boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4126	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	4127	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	4128	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4129	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	4130	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	4131	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	4132	unsigned int i, eop;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4133	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4134	unsigned int count = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4135	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4136	boolean_t cleaned = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4137	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	4138
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4139	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	4140	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	4141	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	4142
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4143	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	4144	for (cleaned = FALSE; !cleaned; ) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4145	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	4146	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	4147	cleaned = (i == eop);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4148
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4149	if (cleaned) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4150	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	4151	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	4152	total_tx_packets += segs;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4153	total_tx_packets++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4154	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	4155	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4156	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	4157	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	4158
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4159	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	4160	}
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	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	4163	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	4164	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4165	#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	4166	/* 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	4167	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	4168	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4169	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4170
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4171	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	4172
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4173	#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	4174	if (!adapter->ecdev && 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	4175	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	4176	/* 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	4177	* 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	4178	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4179	smp_mb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4180	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	4181	netif_wake_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4182	++adapter->restart_queue;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4183	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4184	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4185
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4186	if (!adapter->ecdev && adapter->detect_tx_hung) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4187	/* 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	4188	* 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	4189	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	4190	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	4191	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	4192	(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	4193	&& !(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	4194	E1000_STATUS_TXOFF)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4195
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4196	/* detected Tx unit hang */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4197	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	4198	" Tx Queue <%lu>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4199	" TDH <%x>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4200	" TDT <%x>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4201	" 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	4202	" 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	4203	"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	4204	" time_stamp <%lx>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4205	" 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	4206	" jiffies <%lx>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4207	" 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	4208	(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	4209	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	4210	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	4211	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	4212	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	4213	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	4214	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	4215	eop,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4216	jiffies,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4217	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	4218	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4219	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4220	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4221	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	4222	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	4223	return cleaned;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4224	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4225
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4226	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4227	* 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	4228	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4229	* @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	4230	* @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	4231	* @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	4232	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4233
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4234	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4235	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	4236	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	4237	struct sk_buff *skb)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4238	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4239	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	4240	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	4241	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	4242
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4243	/* 82543 or newer only */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4244	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	4245	/* 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	4246	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	4247	/* 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	4248	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	4249	/* 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	4250	adapter->hw_csum_err++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4251	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4252	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4253	/* 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	4254	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	4255	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	4256	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4257	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4258	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	4259	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4260	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4261	/* 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	4262	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	4263	/* TCP checksum is good */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4264	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	4265	} 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	4266	/* 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	4267	/* 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	4268	* 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	4269	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4270	csum = ntohl(csum ^ 0xFFFF);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4271	skb->csum = csum;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4272	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	4273	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4274	adapter->hw_csum_good++;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4277	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4278	* 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	4279	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4280	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4281
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4282	static boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4283	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4284	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	4285	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	4286	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	4287	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4288	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	4289	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	4290	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4291	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4292	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	4293	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	4294	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	4295	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	4296	unsigned long flags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4297	uint32_t length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4298	uint8_t last_byte;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4299	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4300	int cleaned_count = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4301	boolean_t cleaned = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4302	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	4303
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4304	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	4305	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	4306	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	4307
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4308	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	4309	struct sk_buff *skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4310	u8 status;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4311
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4312	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4313	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	4314	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4315	(*work_done)++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4316	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4317	status = rx_desc->status;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4318	skb = buffer_info->skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4319	if (!adapter->ecdev) buffer_info->skb = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4320
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4321	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	4322
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4323	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	4324	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	4325	prefetch(next_rxd);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4326
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4327	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	4328
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4329	cleaned = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4330	cleaned_count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4331	pci_unmap_single(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4332	buffer_info->dma,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4333	buffer_info->length,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4334	PCI_DMA_FROMDEVICE);
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	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	4337
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4338	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	4339	/* 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	4340	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	4341	" buffers\n", netdev->name);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4342	/* recycle */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4343	buffer_info->skb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4344	goto next_desc;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4347	if (!adapter->ecdev &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4348	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	4349	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	4350	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	4351	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	4352	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	4353	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	4354	&adapter->stats,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4355	length, skb->data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4356	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	4357	flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4358	length--;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4359	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4360	/* recycle */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4361	buffer_info->skb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4362	goto next_desc;
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	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4365
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4366	/* 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	4367	* 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	4368	length -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4369
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4370	/* 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	4371	total_rx_bytes += length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4372	total_rx_packets++;
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	/* 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	4375	* 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	4376	* 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	4377	if (!adapter->ecdev && length < copybreak) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4378	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	4379	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	4380	if (new_skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4381	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	4382	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	4383	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	4384	length + NET_IP_ALIGN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4385	/* 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	4386	buffer_info->skb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4387	skb = new_skb;
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	/* 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	4390	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4391	/* end copybreak code */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4392	skb_put(skb, length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4393
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4394	/* Receive Checksum Offload */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4395	e1000_rx_checksum(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4396	(uint32_t)(status) \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4397	((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	4398	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	4399
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4400	if (adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4401	ecdev_receive(adapter->ecdev, skb->data, length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4402	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4403	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	4404	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4405	if (unlikely(adapter->vlgrp &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4406	(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	4407	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	4408	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	4409	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	4410	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4411	netif_receive_skb(skb);
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	#else /* CONFIG_E1000_NAPI */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4414	if (unlikely(adapter->vlgrp &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4415	(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	4416	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	4417	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	4418	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	4419	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4420	netif_rx(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4421	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4422	#endif /* CONFIG_E1000_NAPI */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4423	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4424	netdev->last_rx = jiffies;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4425
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4426	next_desc:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4427	rx_desc->status = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4428
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4429	/* 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	4430	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	4431	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	4432	cleaned_count = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4433	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4434
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4435	/* use prefetched values */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4436	rx_desc = next_rxd;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4437	buffer_info = next_buffer;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4438	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4439	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	4440
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4441	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	4442	if (cleaned_count)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4443	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	4444
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4445	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	4446	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	4447	return cleaned;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4448	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4449
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4450	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4451	* 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	4452	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4453	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4454
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4455	static boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4456	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4457	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	4458	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	4459	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	4460	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4461	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	4462	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	4463	#endif
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	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	4466	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	4467	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	4468	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	4469	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	4470	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	4471	struct sk_buff *skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4472	unsigned int i, j;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4473	uint32_t length, staterr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4474	int cleaned_count = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4475	boolean_t cleaned = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4476	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	4477
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4478	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	4479	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	4480	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	4481	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	4482
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4483	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	4484	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	4485	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	4486	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4487	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	4488	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4489	(*work_done)++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4490	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4491	skb = buffer_info->skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4492
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4493	/* 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	4494	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	4495
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4496	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	4497	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	4498	prefetch(next_rxd);
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	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	4501
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4502	cleaned = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4503	cleaned_count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4504	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	4505	buffer_info->length,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4506	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4507
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4508	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	4509	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	4510	" 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	4511	if (!adapter->ecdev) 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	4512	goto next_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4513	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4514
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4515	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	4516	if (!adapter->ecdev) 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	4517	goto next_desc;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4520	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	4521
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4522	if (unlikely(!length)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4523	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	4524	" 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	4525	if (!adapter->ecdev) 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	4526	goto next_desc;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4529	/* Good Receive */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4530	skb_put(skb, length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4531
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4532	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4533	/* 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	4534	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	4535	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	4536
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4537	/* 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	4538	* 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	4539	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	4540	u8 *vaddr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4541	/* 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	4542	* 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	4543	* very long */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4544	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	4545	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	4546	PAGE_SIZE,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4547	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4548	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	4549	KM_SKB_DATA_SOFTIRQ);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4550	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	4551	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	4552	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	4553	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	4554	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	4555	/* remove the CRC */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4556	l1 -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4557	skb_put(skb, l1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4558	goto copydone;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4559	} /* if */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4560	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4561
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4562	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	4563	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	4564	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4565	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	4566	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	4567	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	4568	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	4569	length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4570	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	4571	skb->len += length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4572	skb->data_len += length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4573	skb->truesize += length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4574	}
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	/* 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	4577	* 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	4578	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	4579
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4580	copydone:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4581	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	4582	total_rx_packets++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4583
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4584	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	4585	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	4586
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4587	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	4588	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	4589	adapter->rx_hdr_split++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4590	if (adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4591	ecdev_receive(adapter->ecdev, skb->data, length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4592	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4593	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	4594	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4595	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	4596	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	4597	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	4598	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	4599	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4600	netif_receive_skb(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4601	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4602	#else /* CONFIG_E1000_NAPI */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4603	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	4604	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	4605	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	4606	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	4607	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4608	netif_rx(skb);
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	#endif /* CONFIG_E1000_NAPI */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4611	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4612	netdev->last_rx = jiffies;
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	next_desc:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4615	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	4616	if (!adapter->ecdev) buffer_info->skb = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4617
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4618	/* 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	4619	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	4620	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	4621	cleaned_count = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4622	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4623
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4624	/* use prefetched values */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4625	rx_desc = next_rxd;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4626	buffer_info = next_buffer;
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	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	4629	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4630	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	4631
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4632	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	4633	if (cleaned_count)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4634	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	4635
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4636	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	4637	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	4638	return cleaned;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4639	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4640
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4641	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4642	* 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	4643	* @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	4644	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4645
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4646	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4647	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	4648	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	4649	int cleaned_count)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4650	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4651	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	4652	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	4653	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	4654	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	4655	struct sk_buff *skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4656	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4657	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	4658
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4659	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	4660	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	4661
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4662	while (cleaned_count--) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4663	skb = buffer_info->skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4664	if (skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4665	skb_trim(skb, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4666	goto map_skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4667	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4668
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4669	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	4670	if (unlikely(!skb)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4671	/* Better luck next round */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4672	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	4673	break;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4676	/* 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	4677	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	4678	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	4679	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	4680	"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	4681	/* 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	4682	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	4683	/* Failed allocation, critical failure */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4684	if (!skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4685	dev_kfree_skb(oldskb);
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	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	4690	/* give up */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4691	dev_kfree_skb(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4692	dev_kfree_skb(oldskb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4693	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	4694	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4695
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4696	/* Use new allocation */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4697	dev_kfree_skb(oldskb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4698	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4699	/* 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	4700	* 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	4701	* 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	4702	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4703	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	4704
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4705	buffer_info->skb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4706	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	4707	map_skb:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4708	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	4709	skb->data,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4710	adapter->rx_buffer_len,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4711	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4712
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4713	/* 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	4714	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	4715	(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	4716	adapter->rx_buffer_len)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4717	DPRINTK(RX_ERR, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4718	"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	4719	adapter->rx_buffer_len,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4720	(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	4721	if (!adapter->ecdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4722	dev_kfree_skb(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4723	buffer_info->skb = NULL;
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	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	4727	adapter->rx_buffer_len,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4728	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4729
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4730	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	4731	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4732	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	4733	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	4734
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4735	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	4736	i = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4737	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	4738	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4739
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4740	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	4741	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	4742	if (unlikely(i-- == 0))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4743	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	4744
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4745	/* 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	4746	* 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	4747	* 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	4748	* such as IA-64). */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4749	wmb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4750	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	4751	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4752	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4753
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4754	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4755	* 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	4756	* @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	4757	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4758
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4759	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4760	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	4761	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	4762	int cleaned_count)
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	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	4765	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	4766	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	4767	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	4768	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	4769	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	4770	struct sk_buff *skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4771	unsigned int i, j;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4772
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4773	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	4774	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	4775	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	4776	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	4777
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4778	while (cleaned_count--) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4779	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	4780
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4781	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	4782	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	4783	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	4784	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	4785	alloc_page(GFP_ATOMIC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4786	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	4787	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	4788	goto no_buffers;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4789	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4790	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	4791	pci_map_page(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4792	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	4793	0, PAGE_SIZE,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4794	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4795	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4796	/* 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	4797	* 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	4798	* this info.
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	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	4801	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	4802	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4803	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	4804	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4805
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4806	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	4807	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	4808
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4809	if (unlikely(!skb)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4810	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	4811	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4812	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4813
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4814	/* 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	4815	* 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	4816	* 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	4817	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4818	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	4819
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4820	buffer_info->skb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4821	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	4822	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	4823	adapter->rx_ps_bsize0,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4824	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4825
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4826	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	4827
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4828	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	4829	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	4830	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	4831	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	4832	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4833
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4834	no_buffers:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4835	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	4836	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	4837	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	4838
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4839	/* 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	4840	* 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	4841	* 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	4842	* such as IA-64). */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4843	wmb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4844	/* 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	4845	* 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	4846	* twice as much.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4847	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4848	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	4849	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4850	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4851
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4852	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4853	* 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	4854	* @adapter:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4855	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4856
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4857	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4858	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	4859	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4860	uint16_t phy_status;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4861	uint16_t phy_ctrl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4862
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4863	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	4864	!(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	4865	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4866
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4867	if (adapter->smartspeed == 0) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4868	/* 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	4869	* 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	4870	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	4871	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	4872	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	4873	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	4874	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	4875	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	4876	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	4877	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	4878	phy_ctrl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4879	adapter->smartspeed++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4880	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	4881	!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	4882	&phy_ctrl)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4883	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	4884	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	4885	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	4886	phy_ctrl);
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	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4889	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4890	} 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	4891	/* 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	4892	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	4893	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	4894	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	4895	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	4896	!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	4897	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	4898	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	4899	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	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	/* 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	4903	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	4904	adapter->smartspeed = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4905	}
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	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4908	* e1000_ioctl -
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4909	* @netdev:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4910	* @ifreq:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4911	* @cmd:
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4914	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4915	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	4916	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4917	switch (cmd) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4918	case SIOCGMIIPHY:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4919	case SIOCGMIIREG:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4920	case SIOCSMIIREG:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4921	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	4922	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4923	return -EOPNOTSUPP;
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	}
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	* e1000_mii_ioctl -
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4929	* @netdev:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4930	* @ifreq:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4931	* @cmd:
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4934	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4935	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	4936	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4937	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	4938	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	4939	int retval;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4940	uint16_t mii_reg;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4941	uint16_t spddplx;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4942	unsigned long flags;
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	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	4945	return -EOPNOTSUPP;
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	switch (cmd) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4948	case SIOCGMIIPHY:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4949	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	4950	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4951	case SIOCGMIIREG:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4952	if (adapter->ecdev \|\| !capable(CAP_NET_ADMIN))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4953	return -EPERM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4954	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	4955	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	4956	&data->val_out)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4957	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	4958	return -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4959	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4960	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	4961	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4962	case SIOCSMIIREG:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4963	if (adapter->ecdev \|\| !capable(CAP_NET_ADMIN))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4964	return -EPERM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4965	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	4966	return -EFAULT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4967	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	4968	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	4969	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	4970	mii_reg)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4971	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	4972	return -EIO;
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 (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	4975	switch (data->reg_num) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4976	case PHY_CTRL:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4977	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	4978	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4979	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	4980	adapter->hw.autoneg = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4981	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	4982	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4983	if (mii_reg & 0x40)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4984	spddplx = SPEED_1000;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4985	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	4986	spddplx = SPEED_100;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4987	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4988	spddplx = SPEED_10;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4989	spddplx += (mii_reg & 0x100)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4990	? DUPLEX_FULL :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4991	DUPLEX_HALF;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4992	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	4993	spddplx);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4994	if (retval) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4995	spin_unlock_irqrestore(
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4996	&adapter->stats_lock,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4997	flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4998	return retval;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4999	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5000	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5001	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	5002	e1000_reinit_locked(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5003	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5004	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5005	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5006	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	5007	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	5008	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	5009	spin_unlock_irqrestore(
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5010	&adapter->stats_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5011	return -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5012	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5013	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5014	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5015	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5016	switch (data->reg_num) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5017	case PHY_CTRL:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5018	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	5019	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5020	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	5021	e1000_reinit_locked(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5022	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5023	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5024	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5025	}
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	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	5028	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5029	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5030	return -EOPNOTSUPP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5031	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5032	return E1000_SUCCESS;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5035	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5036	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	5037	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5038	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	5039	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	5040
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5041	if (ret_val)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5042	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	5043	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5044
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5045	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5046	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	5047	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5048	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	5049
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5050	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	5051	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5052
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5053	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5054	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	5055	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5056	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	5057
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5058	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	5059	}
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	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5062	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	5063	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5064	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	5065
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5066	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	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	int32_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5070	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	5071	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5072	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	5073	uint16_t cap_offset;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5074
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5075	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	5076	if (!cap_offset)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5077	return -E1000_ERR_CONFIG;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5078
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5079	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	5080
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5081	return E1000_SUCCESS;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5084	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5085	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	5086	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5087	outl(value, port);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5088	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5089
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5090	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5091	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	5092	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5093	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	5094	uint32_t ctrl, rctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5095
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5096	e1000_irq_disable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5097	adapter->vlgrp = grp;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5098
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5099	if (grp) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5100	/* 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	5101	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	5102	ctrl \|= E1000_CTRL_VME;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5103	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	5104
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5105	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	5106	/* enable VLAN receive filtering */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5107	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	5108	rctl \|= E1000_RCTL_VFE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5109	rctl &= ~E1000_RCTL_CFIEN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5110	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	5111	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	5112	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5113	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5114	/* 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	5115	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	5116	ctrl &= ~E1000_CTRL_VME;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5117	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	5118
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5119	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	5120	/* disable VLAN filtering */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5121	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	5122	rctl &= ~E1000_RCTL_VFE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5123	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	5124	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	5125	(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	5126	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	5127	adapter->mng_vlan_id);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5128	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	5129	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5130	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5131	}
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	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5134	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5135
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5136	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5137	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	5138	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5139	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	5140	uint32_t vfta, index;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5141
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5142	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	5143	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	5144	(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	5145	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5146	/* 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	5147	index = (vid >> 5) & 0x7F;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5148	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	5149	vfta \|= (1 << (vid & 0x1F));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5150	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	5151	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5152
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5153	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5154	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	5155	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5156	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	5157	uint32_t vfta, index;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5158
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5159	e1000_irq_disable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5160
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5161	if (adapter->vlgrp)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5162	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	5163
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5164	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5165
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5166	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	5167	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	5168	(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	5169	/* 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	5170	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	5171	return;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5174	/* 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	5175	index = (vid >> 5) & 0x7F;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5176	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	5177	vfta &= ~(1 << (vid & 0x1F));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5178	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	5179	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5180
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5181	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5182	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	5183	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5184	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	5185
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5186	if (adapter->vlgrp) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5187	uint16_t vid;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5188	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	5189	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	5190	continue;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5191	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	5192	}
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	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5195
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5196	int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5197	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	5198	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5199	adapter->hw.autoneg = 0;
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	/* 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	5202	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	5203	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	5204	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	5205	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5206	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5207
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5208	switch (spddplx) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5209	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	5210	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	5211	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5212	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	5213	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	5214	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5215	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	5216	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	5217	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5218	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	5219	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	5220	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5221	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	5222	adapter->hw.autoneg = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5223	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	5224	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5225	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	5226	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5227	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	5228	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5229	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5230	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5231	}
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	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5234	/* 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	5235	* 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	5236	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5237	#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	5238	#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	5239	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5240	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	5241	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5242	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	5243	int size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5244	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5245
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5246	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	5247	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	5248	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5249	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	5250
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5251	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	5252
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5253	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	5254	if (!adapter->config_space) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5255	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	5256	return -ENOMEM;
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	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	5259	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	5260	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5261	}
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	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5264	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	5265	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5266	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	5267	int size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5268	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5269
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5270	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	5271	return;
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	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	5274	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	5275	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5276	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	5277	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	5278	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	5279	kfree(adapter->config_space);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5280	adapter->config_space = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5281	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5282	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5283	#endif /* CONFIG_PM */
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	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5286	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	5287	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5288	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	5289	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	5290	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	5291	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	5292	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5293	int retval = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5294	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5295
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5296	if (adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5297	return -EBUSY;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5298
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5299	netif_device_detach(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5300
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5301	if (netif_running(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5302	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	5303	e1000_down(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5304	}
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	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5307	/* 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	5308	* 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	5309	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	5310	if (retval)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5311	return retval;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5312	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5313
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5314	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	5315	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	5316	wufc &= ~E1000_WUFC_LNKC;
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	if (wufc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5319	e1000_setup_rctl(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5320	e1000_set_multi(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5321
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5322	/* 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	5323	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	5324	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	5325	rctl \|= E1000_RCTL_MPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5326	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	5327	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5328
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5329	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	5330	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	5331	/* advertise wake from D3Cold */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5332	#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	5333	/* phy power management enable */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5334	#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	5335	ctrl \|= E1000_CTRL_ADVD3WUC \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5336	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	5337	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	5338	}
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	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	5341	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	5342	/* 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	5343	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	5344	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	5345	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	5346	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5347
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5348	/* 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	5349	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	5350
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5351	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	5352	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	5353	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	5354	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	5355	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5356	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	5357	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	5358	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	5359	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	5360	}
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	e1000_release_manageability(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5363
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5364	/* 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	5365	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	5366	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	5367	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	5368	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5369
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5370	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	5371	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	5372
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5373	if (netif_running(netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5374	e1000_free_irq(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5375
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5376	/* 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	5377	* 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	5378	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	5379
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5380	pci_disable_device(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5381
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5382	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	5383
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5384	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5385	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5386
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5387	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5388	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5389	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	5390	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5391	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	5392	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	5393	uint32_t err;
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 (adapter->ecdev)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5396	return -EBUSY;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5397
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5398	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	5399	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	5400	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	5401	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	5402	return err;
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	pci_set_master(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5405
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5406	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	5407	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	5408
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5409	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	5410	return err;
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	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	5413	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5414	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	5415
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5416	e1000_init_manageability(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5417
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5418	if (netif_running(netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5419	e1000_up(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5420
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5421	if (!adapter->ecdev) netif_device_attach(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5422
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5423	/* 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	5424	* 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	5425	* 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	5426	* of the driver. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5427	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	5428	!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	5429	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	5430
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5431	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5432	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5433	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5434
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5435	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	5436	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5437	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	5438	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5439
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5440	#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	5441	/*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5442	* 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	5443	* 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	5444	* 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	5445	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5446	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5447	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	5448	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5449	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	5450
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5451	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	5452	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	5453	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	5454	#ifndef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5455	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	5456	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5457	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	5458	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5459	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5460
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5461	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5462	* 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	5463	* @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	5464	* @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	5465	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5466	* 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	5467	* 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	5468	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5469	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	5470	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5471	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	5472	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	5473
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5474	netif_device_detach(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5475
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5476	if (netif_running(netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5477	e1000_down(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5478	pci_disable_device(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5479
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5480	/* 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	5481	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	5482	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5483
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5484	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5485	* 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	5486	* @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	5487	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5488	* 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	5489	* 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	5490	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5491	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	5492	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5493	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	5494	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	5495
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5496	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	5497	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	5498	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	5499	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5500	pci_set_master(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5501
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5502	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	5503	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	5504
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5505	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5506	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	5507
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5508	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	5509	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5510
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5511	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5512	* 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	5513	* @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	5514	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5515	* 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	5516	* 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	5517	* 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	5518	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5519	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	5520	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5521	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	5522	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	5523
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5524	e1000_init_manageability(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5525
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5526	if (netif_running(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5527	if (e1000_up(adapter)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5528	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	5529	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5530	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5531	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5532
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5533	netif_device_attach(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5534
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5535	/* 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	5536	* 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	5537	* 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	5538	* of the driver. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5539	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	5540	!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	5541	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	5542
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5543	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5544
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	5545	/* e1000_main.c */

author	Florian Pose <fp@igh-essen.com>
	Fri, 05 Oct 2007 08:16:43 +0000
branch	stable-1.3
changeset 1751	b6cfd85db58e
parent 1744	7bc131b92039
child 1756	dbe4a4219aa5
permissions	-rw-r--r--