etherlabmaster: devices/e1000/e1000_main-2.6.13-orig.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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	4	Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
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 of the GNU General Public License as published by the Free
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	8	Software Foundation; either version 2 of the License, or (at your option)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	9	any later version.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	10
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	11	This program is distributed in the hope that 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	12	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	13	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	14	more details.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	15
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	16	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	17	this program; if not, write to the Free Software Foundation, Inc., 59
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	18	Temple Place - Suite 330, Boston, MA 02111-1307, USA.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	19
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	20	The full GNU General Public License is included in this distribution in the
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	21	file called LICENSE.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	22
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	23	Contact Information:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	24	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	25	Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	26
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	27	*******************************************************************************/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	28
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	29	#include "e1000.h"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	30
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	31	/* Change Log
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	32	* 6.0.58 4/20/05
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	33	* o Accepted ethtool cleanup patch from Stephen Hemminger
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	34	* 6.0.44+ 2/15/05
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	35	* o applied Anton's patch to resolve tx hang in hardware
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	36	* o Applied Andrew Mortons patch - e1000 stops working after resume
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	37	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	38
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	39	char e1000_driver_name[] = "e1000";
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	40	char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	41	#ifndef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	42	#define DRIVERNAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	43	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	44	#define DRIVERNAPI "-NAPI"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	45	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	46	#define DRV_VERSION "6.0.60-k2"DRIVERNAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	47	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	48	char e1000_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";
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	/* 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	51	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	52	* 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	53	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	54	* Macro expands to...
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	55	* {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	56	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	57	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	58	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	59	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	60	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	61	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	62	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	63	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	64	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	65	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	66	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	67	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	68	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	69	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	70	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	71	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	72	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	73	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	74	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	75	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	76	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	77	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	78	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	79	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	80	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	81	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	82	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	83	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	84	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	85	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	86	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	87	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	88	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	89	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	90	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	91	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	92	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	93	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	94	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	95	/* required last entry */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	96	{0,}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	97	};
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	98
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	99	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	100
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	101	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	102	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	103	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	104	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	105	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	106	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	107	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	108	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	109	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	110
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	111	/* Local Function Prototypes */
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	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	114	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	115	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	116	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	117	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	118	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	119	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	120	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	121	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	122	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	123	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	124	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	125	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	126	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	127	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	128	static void e1000_watchdog_task(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	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	130	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	131	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	132	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	133	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	134	static irqreturn_t e1000_intr(int irq, void data, struct pt_regs regs);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	135	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	136	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	137	static int e1000_clean(struct net_device netdev, int budget);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	138	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	139	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	140	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	141	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	142	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	143	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	144	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	145	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	146	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	147	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	148	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	149	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	150	int cmd);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	151	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	152	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	153	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	154	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	155	static void e1000_tx_timeout_task(struct net_device *dev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	156	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	157	static inline 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	158	struct sk_buff *skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	159
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	160	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	161	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	162	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	163	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	164
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	165	static int e1000_suspend(struct pci_dev *pdev, uint32_t state);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	166	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	167	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	168	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	169
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	170	#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	171	/* for netdump / net console */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	172	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	173	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	174
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	175	/* Exported from other modules */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	176
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	177	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	178
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	179	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	180	.name = e1000_driver_name,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	181	.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	182	.probe = e1000_probe,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	183	.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	184	/* Power Managment Hooks */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	185	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	186	.suspend = e1000_suspend,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	187	.resume = e1000_resume
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	188	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	189	};
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	190
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	191	MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	192	MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	193	MODULE_LICENSE("GPL");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	194	MODULE_VERSION(DRV_VERSION);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	195
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	196	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	197	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	198	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	199
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	200	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	201	* 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	202	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	203	* 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	204	* 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	205	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	206
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	207	static int __init
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	208	e1000_init_module(void)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	209	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	210	int ret;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	211	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	212	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	213
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	214	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	215
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	216	ret = pci_module_init(&e1000_driver);
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	return ret;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	219	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	220
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	221	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	222
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	* 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	225	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	226	* 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	227	* from memory.
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	230	static void __exit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	231	e1000_exit_module(void)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	232	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	233	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	234	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	235
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	236	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	237
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	238	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	239	* 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	240	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	241	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	242
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	243	static inline void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	244	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	245	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	246	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	247	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	248	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	249	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	250	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	251
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	252	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	253	* 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	254	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	255	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	256
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	257	static inline void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	258	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	259	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	260	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	261	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	262	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	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	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	266	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	267	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	268	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	269	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	270	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	271	if(adapter->vlgrp) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	272	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	273	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	274	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	275	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	276	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	277	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	278	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	279
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	280	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	281	(vid != old_vid) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	282	!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	283	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	284	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	285	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	286	}
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	int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	289	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	290	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	291	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	292	int err;
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	/* 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	295
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	296	/* Reset the PHY if it was previously powered down */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	297	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	298	uint16_t mii_reg;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	299	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	300	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	301	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	302	}
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	e1000_set_multi(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	305
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	306	e1000_restore_vlan(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	307
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	308	e1000_configure_tx(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	309	e1000_setup_rctl(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	310	e1000_configure_rx(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	311	adapter->alloc_rx_buf(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	312
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	313	#ifdef CONFIG_PCI_MSI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	314	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	315	adapter->have_msi = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	316	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	317	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	318	"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	319	adapter->have_msi = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	320	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	321	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	322	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	323	if((err = request_irq(adapter->pdev->irq, &e1000_intr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	324	SA_SHIRQ \| SA_SAMPLE_RANDOM,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	325	netdev->name, netdev))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	326	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	327	"Unable to allocate interrupt Error: %d\n", err);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	328	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	329	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	330
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	331	mod_timer(&adapter->watchdog_timer, jiffies);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	332
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	333	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	334	netif_poll_enable(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	335	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	336	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	337
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	338	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	339	}
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	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	342	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	343	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	344	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	345
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	346	e1000_irq_disable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	347	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	348	#ifdef CONFIG_PCI_MSI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	349	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	350	adapter->have_msi == TRUE)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	351	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	352	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	353	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	354	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	355	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	356
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	357	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	358	netif_poll_disable(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	359	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	360	adapter->link_speed = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	361	adapter->link_duplex = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	362	netif_carrier_off(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	363	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	364
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	365	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	366	e1000_clean_tx_ring(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	367	e1000_clean_rx_ring(adapter);
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	/* If WoL is not enabled
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	370	* and management mode is not IAMT
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	371	* 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	372	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	373	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	374	!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	375	!(E1000_READ_REG(&adapter->hw, MANC) & E1000_MANC_SMBUS_EN)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	376	uint16_t mii_reg;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	377	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	378	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	379	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	380	mdelay(1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	381	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	382	}
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	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	385	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	386	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	387	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	388	uint32_t pba, manc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	389	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	390	uint16_t fc_low_water_mark = E1000_FC_LOW_DIFF;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	391
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	392	/* 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	393	* 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	394	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	395
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	396	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	397	case e1000_82547:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	398	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	399	pba = E1000_PBA_30K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	400	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	401	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	402	pba = E1000_PBA_12K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	403	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	404	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	405	pba = E1000_PBA_48K;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	406	break;
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	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	410	(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	411	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	412	/* send an XOFF when there is enough space in the
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	413	* Rx FIFO to hold one extra full size Rx packet
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	414	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	415	fc_high_water_mark = 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	416	ETHERNET_FCS_SIZE + 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	417	fc_low_water_mark = 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	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	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	422	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	423	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	424	adapter->tx_fifo_size =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	425	(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	426	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	427	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	428
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	429	E1000_WRITE_REG(&adapter->hw, PBA, pba);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	430
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	431	/* flow control settings */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	432	adapter->hw.fc_high_water = (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	433	fc_high_water_mark;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	434	adapter->hw.fc_low_water = (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	435	fc_low_water_mark;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	436	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	437	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	438	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	439
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	440	/* 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	441	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	442	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	443	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	444	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	445	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	446	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	447	/* 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	448	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	449
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	450	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	451	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	452	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	453	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	454	manc \|= (E1000_MANC_ARP_EN \| E1000_MANC_EN_MNG2HOST);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	455	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	456	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	457	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	458
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	* 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	461	* @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	462	* @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	463	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	464	* 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	465	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	466	* 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	467	* 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	468	* 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	469	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	470
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	471	static int __devinit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	472	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	473	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	474	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	475	struct net_device *netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	476	struct e1000_adapter *adapter;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	477	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	478	uint32_t swsm;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	479
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	480	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	481	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	482	uint16_t eeprom_data;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	483	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	484	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	485	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	486
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	487	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	488	pci_using_dac = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	489	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	490	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	491	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	492	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	493	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	494	pci_using_dac = 0;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	497	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	498	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	499
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	500	pci_set_master(pdev);
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	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	503	if(!netdev) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	504	err = -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	505	goto err_alloc_etherdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	506	}
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	SET_MODULE_OWNER(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	509	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	510
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	511	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	512	adapter = netdev_priv(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	513	adapter->netdev = netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	514	adapter->pdev = pdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	515	adapter->hw.back = adapter;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	516	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	517
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	518	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	519	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	520
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	521	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	522	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	523	err = -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	524	goto err_ioremap;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	527	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	528	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	529	continue;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	530	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	531	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	532	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	533	}
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	536	netdev->open = &e1000_open;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	537	netdev->stop = &e1000_close;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	538	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	539	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	540	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	541	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	542	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	543	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	544	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	545	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	546	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	547	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	548	netdev->poll = &e1000_clean;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	549	netdev->weight = 64;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	550	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	551	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	552	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	553	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	554	#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	555	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	556	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	557	strcpy(netdev->name, pci_name(pdev));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	558
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	559	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	560	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	561	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	562
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	563	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	564
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	565	/* setup the private structure */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	566
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	567	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	568	goto err_sw_init;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	569
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	570	if((err = 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	571	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	572
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	573	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	574	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	575	NETIF_F_HW_CSUM \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	576	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	577	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	578	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	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	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	582	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	583	(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	584	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	585
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	586	#ifdef NETIF_F_TSO_IPV6
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	587	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	588	netdev->features \|= NETIF_F_TSO_IPV6;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	589	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	590	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	591	if(pci_using_dac)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	592	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	593
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	594	/* hard_start_xmit is safe against parallel locking */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	595	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	596
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	597	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	598
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	599	/* 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	600	* 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	601
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	602	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	603
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	604	/* 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	605
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	606	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	607	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	608	err = -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	609	goto err_eeprom;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	610	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	611
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	612	/* 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	613
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	614	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	615	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	616	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	617
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	618	if(!is_valid_ether_addr(netdev->dev_addr)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	619	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	620	err = -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	621	goto err_eeprom;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	622	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	623
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	624	e1000_read_part_num(&adapter->hw, &(adapter->part_num));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	625
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	626	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	627
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	628	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	629	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	630	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	631
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	632	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	633	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	634	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	635
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	636	INIT_WORK(&adapter->watchdog_task,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	637	(void ()(void ))e1000_watchdog_task, adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	638
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	639	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	640	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	641	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	642
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	643	INIT_WORK(&adapter->tx_timeout_task,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	644	(void ()(void ))e1000_tx_timeout_task, netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	645
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	646	/* we're going to reset, so assume we have no link for now */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	647
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	648	netif_carrier_off(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	649	netif_stop_queue(netdev);
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	e1000_check_options(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	652
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	653	/* 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	654	* 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	655	* 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	656	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	657
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	658	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	659	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	660	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	661	case e1000_82543:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	662	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	663	case e1000_82544:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	664	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	665	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	666	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	667	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	668	case e1000_82546:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	669	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	670	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	671	&& (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	672	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	673	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	674	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	675	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	676	/* Fall Through */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	677	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	678	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	679	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	680	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	681	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	682	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	683	adapter->wol \|= E1000_WUFC_MAG;
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	/* 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	686	e1000_reset(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	/* 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	689	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	690	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	691	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	692	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	693	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	694	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	695	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	696	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	697	}
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	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	700	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	701	goto err_register;
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	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	704
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	705	cards_found++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	706	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	707
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	708	err_register:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	709	err_sw_init:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	710	err_eeprom:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	711	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	712	err_ioremap:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	713	free_netdev(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	714	err_alloc_etherdev:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	715	pci_release_regions(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	716	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	717	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	718
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	719	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	720	* 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	721	* @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	722	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	723	* 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	724	* 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	725	* 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	726	* memory.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	727	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	728
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	729	static void __devexit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	730	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	731	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	732	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	733	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	734	uint32_t manc, swsm;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	735
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	736	flush_scheduled_work();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	737
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	738	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	739	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	740	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	741	if(manc & E1000_MANC_SMBUS_EN) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	742	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	743	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	744	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	745	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	746
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	747	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	748	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	749	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	750	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	751	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	752	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	753
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	754	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	755	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	756	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	757
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	758	unregister_netdev(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	759
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	760	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	761	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	762
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	763	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	764	pci_release_regions(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	765
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	766	free_netdev(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	767
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	768	pci_disable_device(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	769	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	770
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	771	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	772	* 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	773	* @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	774	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	775	* 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	776	* 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	777	* 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	778	**/
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	static int __devinit
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	781	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	782	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	783	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	784	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	785	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	786
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	787	/* PCI config space info */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	788
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	789	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	790	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	791	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	792	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	793
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	794	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	795
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	796	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	797
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	798	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	799	adapter->rx_ps_bsize0 = E1000_RXBUFFER_256;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	800	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	801	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	802	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	803
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	804	/* identify the MAC */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	805
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	806	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	807	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	808	return -EIO;
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	/* initialize eeprom parameters */
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	if(e1000_init_eeprom_params(hw)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	814	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	815	return -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	816	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	817
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	818	switch(hw->mac_type) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	819	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	820	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	821	case e1000_82541:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	822	case e1000_82547:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	823	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	824	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	825	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	826	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	827	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	828
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	829	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	830
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	831	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	832	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	833	hw->adaptive_ifs = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	834
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	835	/* Copper options */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	836
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	837	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	838	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	839	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	840	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	841	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	842
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	843	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	844	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	845	spin_lock_init(&adapter->tx_lock);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	846
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	847	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	848	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	849
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	850	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	851	* 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	852	* @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	853	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	854	* 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	855	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	856	* 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	857	* 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	858	* 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	859	* 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	860	* 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	861	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	862
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	863	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	864	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	865	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	866	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	867	int err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	868
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	869	/* allocate transmit descriptors */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	870
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	871	if((err = e1000_setup_tx_resources(adapter)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	872	goto err_setup_tx;
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	/* allocate receive descriptors */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	875
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	876	if((err = e1000_setup_rx_resources(adapter)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	877	goto err_setup_rx;
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	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	880	goto err_up;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	881	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	882	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	883	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	884	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	885	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	886
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	887	return E1000_SUCCESS;
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	err_up:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	890	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	891	err_setup_rx:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	892	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	893	err_setup_tx:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	894	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	895
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	896	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	897	}
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	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	900	* 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	901	* @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	902	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	903	* 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	904	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	905	* 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	906	* 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	907	* 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	908	* 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	909	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	910
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	911	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	912	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	913	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	914	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	915
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	916	e1000_down(adapter);
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	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	919	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	920
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	921	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	922	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	923	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	924	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	925	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	926	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	927
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	* 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	930	* @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	931	* @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	932	* @len: length of memory
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	933	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	934	static inline boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	935	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	936	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	937	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	938	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	939	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	940
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	941	/* 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	942	* 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	943	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	944	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	945	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	946	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	947
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	948	return TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	949	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	950
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	951	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	952	* 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	953	* @adapter: board private structure
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	* 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	956	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	957
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	958	int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	959	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	960	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	961	struct e1000_desc_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	962	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	963	int size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	964
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	965	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	966	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	967	if(!txdr->buffer_info) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	968	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	969	"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	970	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	971	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	972	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	973
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	974	/* 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	975
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	976	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	977	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	978
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	979	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	980	if(!txdr->desc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	981	setup_tx_desc_die:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	982	vfree(txdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	983	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	984	"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	985	return -ENOMEM;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	988	/* 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	989	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	990	void *olddesc = txdr->desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	991	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	992	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	993	"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	994	/* 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	995	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	996	if(!txdr->desc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	997	/* Failed allocation, critical failure */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	998	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	999	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	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_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	1003	/* give up */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1004	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	1005	txdr->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1006	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	1007	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1008	"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	1009	"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	1010	vfree(txdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1011	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1012	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1013	/* 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	1014	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	1015	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1016	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1017	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	1018
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1019	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	1020	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	1021
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1022	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1023	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1024
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1025	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1026	* 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	1027	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1028	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1029	* 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	1030	**/
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	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1033	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	1034	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1035	uint64_t tdba = adapter->tx_ring.dma;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1036	uint32_t tdlen = adapter->tx_ring.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	1037	uint32_t tctl, tipg;
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	E1000_WRITE_REG(&adapter->hw, TDBAL, (tdba & 0x00000000ffffffffULL));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1040	E1000_WRITE_REG(&adapter->hw, TDBAH, (tdba >> 32));
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_WRITE_REG(&adapter->hw, TDLEN, tdlen);
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	/* 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	1045
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1046	E1000_WRITE_REG(&adapter->hw, TDH, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1047	E1000_WRITE_REG(&adapter->hw, TDT, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1048
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1049	/* 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	1050
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1051	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	1052	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	1053	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	1054	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	1055	tipg \|= DEFAULT_82542_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	1056	tipg \|= DEFAULT_82542_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	1057	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1058	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1059	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	1060	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	1061	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	1062	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1063	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	1064	tipg \|= DEFAULT_82543_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	1065	tipg \|= DEFAULT_82543_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	1066	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1067	E1000_WRITE_REG(&adapter->hw, TIPG, tipg);
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	/* 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	1070
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1071	E1000_WRITE_REG(&adapter->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	1072	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	1073	E1000_WRITE_REG(&adapter->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	1074
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1075	/* 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	1076
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1077	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	1078
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1079	tctl &= ~E1000_TCTL_CT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1080	tctl \|= E1000_TCTL_EN \| E1000_TCTL_PSP \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1081	(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	1082
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1083	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	1084
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1085	e1000_config_collision_dist(&adapter->hw);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1086
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1087	/* 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	1088	adapter->txd_cmd = E1000_TXD_CMD_IDE \| E1000_TXD_CMD_EOP \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1089	E1000_TXD_CMD_IFCS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1090
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1091	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	1092	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	1093	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1094	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	1095
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1096	/* 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	1097	* 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	1098	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	1099	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	1100	adapter->pcix_82544 = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1101	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1102
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1103	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1104	* 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	1105	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1106	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1107	* 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	1108	**/
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	int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1111	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	1112	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1113	struct e1000_desc_ring *rxdr = &adapter->rx_ring;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1114	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	1115	int size, desc_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1116
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1117	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	1118	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	1119	if(!rxdr->buffer_info) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1120	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1121	"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	1122	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1123	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1124	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	1125
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1126	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	1127	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	1128	if(!rxdr->ps_page) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1129	vfree(rxdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1130	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1131	"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	1132	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1133	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1134	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	1135
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1136	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	1137	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	1138	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	1139	vfree(rxdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1140	kfree(rxdr->ps_page);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1141	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1142	"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	1143	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1144	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1145	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	1146
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1147	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	1148	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	1149	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1150	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	1151
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1152	/* 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	1153
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1154	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	1155	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	1156
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1157	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	1158
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1159	if(!rxdr->desc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1160	setup_rx_desc_die:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1161	vfree(rxdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1162	kfree(rxdr->ps_page);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1163	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	1164	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1165	"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	1166	return -ENOMEM;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1169	/* 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	1170	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	1171	void *olddesc = rxdr->desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1172	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	1173	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	1174	"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	1175	/* 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	1176	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	1177	if(!rxdr->desc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1178	/* Failed allocation, critical failure */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1179	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	1180	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	1181	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1182
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1183	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	1184	/* give up */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1185	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	1186	rxdr->dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1187	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	1188	DPRINTK(PROBE, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1189	"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	1190	"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	1191	vfree(rxdr->buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1192	kfree(rxdr->ps_page);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1193	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	1194	return -ENOMEM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1195	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1196	/* 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	1197	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	1198	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1199	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1200	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	1201
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1202	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	1203	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	1204
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1205	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1206	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1207
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1208	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1209	* 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	1210	* @adapter: Board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1211	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1212
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1213	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1214	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	1215	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1216	uint32_t rctl, rfctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1217	uint32_t psrctl = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1218
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1219	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	1220
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1221	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	1222
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1223	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	1224	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	1225	(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	1226
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1227	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	1228	rctl \|= E1000_RCTL_SBP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1229	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1230	rctl &= ~E1000_RCTL_SBP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1231
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1232	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	1233	rctl &= ~E1000_RCTL_LPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1234	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1235	rctl \|= E1000_RCTL_LPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1236
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1237	/* Setup buffer sizes */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1238	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	1239	/* We can now specify buffers in 1K increments.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1240	* BSIZE and BSEX are ignored in this case. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1241	rctl \|= adapter->rx_buffer_len << 0x11;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1242	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1243	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	1244	rctl \|= E1000_RCTL_BSEX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1245	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	1246	case E1000_RXBUFFER_2048:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1247	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1248	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	1249	rctl &= ~E1000_RCTL_BSEX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1250	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1251	case E1000_RXBUFFER_4096:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1252	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	1253	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1254	case E1000_RXBUFFER_8192:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1255	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	1256	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1257	case E1000_RXBUFFER_16384:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1258	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	1259	break;
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	}
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	#ifdef CONFIG_E1000_PACKET_SPLIT
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1264	/* 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	1265	* 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	1266	* 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	1267	* 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	1268	* 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	1269	* 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	1270	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1271	adapter->rx_ps = (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	1272	&& (adapter->netdev->mtu
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1273	< ((3 * PAGE_SIZE) + adapter->rx_ps_bsize0));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1274	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1275	if(adapter->rx_ps) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1276	/* 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	1277	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	1278	rfctl \|= E1000_RFCTL_EXTEN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1279	/* disable IPv6 packet split support */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1280	rfctl \|= E1000_RFCTL_IPV6_DIS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1281	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	1282
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1283	rctl \|= E1000_RCTL_DTYP_PS \| E1000_RCTL_SECRC;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1284
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1285	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	1286	E1000_PSRCTL_BSIZE0_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1287	psrctl \|= PAGE_SIZE >>
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1288	E1000_PSRCTL_BSIZE1_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1289	psrctl \|= PAGE_SIZE <<
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1290	E1000_PSRCTL_BSIZE2_SHIFT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1291	psrctl \|= PAGE_SIZE <<
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1292	E1000_PSRCTL_BSIZE3_SHIFT;
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	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	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	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	1298	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1299
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_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	1302	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1303	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1304	* 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	1305	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1306
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1307	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1308	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	1309	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1310	uint64_t rdba = adapter->rx_ring.dma;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1311	uint32_t rdlen, rctl, rxcsum;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1312
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1313	if(adapter->rx_ps) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1314	rdlen = adapter->rx_ring.count *
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1315	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	1316	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	1317	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	1318	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1319	rdlen = adapter->rx_ring.count * 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	1320	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	1321	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	1322	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1323
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1324	/* 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	1325	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	1326	E1000_WRITE_REG(&adapter->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	1327
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1328	/* 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	1329	E1000_WRITE_REG(&adapter->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	1330
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1331	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	1332	E1000_WRITE_REG(&adapter->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	1333	if(adapter->itr > 1)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1334	E1000_WRITE_REG(&adapter->hw, ITR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1335	1000000000 / (adapter->itr * 256));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1336	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1337
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1338	/* Setup 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	1339	E1000_WRITE_REG(&adapter->hw, RDBAL, (rdba & 0x00000000ffffffffULL));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1340	E1000_WRITE_REG(&adapter->hw, RDBAH, (rdba >> 32));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1341
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1342	E1000_WRITE_REG(&adapter->hw, RDLEN, rdlen);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1343
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1344	/* Setup the HW Rx 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	1345	E1000_WRITE_REG(&adapter->hw, RDH, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1346	E1000_WRITE_REG(&adapter->hw, RDT, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1347
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1348	/* 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	1349	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	1350	rxcsum = E1000_READ_REG(&adapter->hw, RXCSUM);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1351	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	1352	rxcsum \|= E1000_RXCSUM_TUOFL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1353
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1354	/* Enable 82573 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	1355	* 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	1356	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	1357	(adapter->rx_ps)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1358	rxcsum \|= E1000_RXCSUM_IPPCSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1359	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1360	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1361	rxcsum &= ~E1000_RXCSUM_TUOFL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1362	/* 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	1363	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1364	E1000_WRITE_REG(&adapter->hw, RXCSUM, rxcsum);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1365	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1366
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1367	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	1368	E1000_WRITE_REG(&adapter->hw, ERT, 0x0100);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1369
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1370	/* Enable Receives */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1371	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	1372	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1373
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1374	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1375	* e1000_free_tx_resources - Free Tx Resources
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1376	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1377	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1378	* 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	1379	**/
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	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1382	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	1383	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1384	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	1385
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1386	e1000_clean_tx_ring(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1387
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1388	vfree(adapter->tx_ring.buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1389	adapter->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	1390
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1391	pci_free_consistent(pdev, adapter->tx_ring.size,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1392	adapter->tx_ring.desc, adapter->tx_ring.dma);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1393
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1394	adapter->tx_ring.desc = NULL;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1397	static inline void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1398	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	1399	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	1400	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1401	if(buffer_info->dma) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1402	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	1403	buffer_info->dma,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1404	buffer_info->length,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1405	PCI_DMA_TODEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1406	buffer_info->dma = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1407	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1408	if(buffer_info->skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1409	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	1410	buffer_info->skb = NULL;
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	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1413
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1414	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1415	* 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	1416	* @adapter: board private structure
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1419	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1420	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	1421	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1422	struct e1000_desc_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	1423	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	1424	unsigned long size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1425	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1426
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1427	/* 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	1428
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1429	if (likely(adapter->previous_buffer_info.skb != NULL)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1430	e1000_unmap_and_free_tx_resource(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1431	&adapter->previous_buffer_info);
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	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	1435	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	1436	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	1437	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1438
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1439	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	1440	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	1441
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1442	/* 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	1443
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1444	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	1445
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1446	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	1447	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	1448
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1449	E1000_WRITE_REG(&adapter->hw, TDH, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1450	E1000_WRITE_REG(&adapter->hw, TDT, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1451	}
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	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1454	* 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	1455	* @adapter: board private structure
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	* 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	1458	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1459
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1460	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1461	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	1462	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1463	struct e1000_desc_ring *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	1464	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	1465
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1466	e1000_clean_rx_ring(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1467
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1468	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	1469	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	1470	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	1471	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	1472	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	1473	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	1474
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1475	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	1476
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1477	rx_ring->desc = NULL;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1480	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1481	* e1000_clean_rx_ring - Free Rx Buffers
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1482	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1483	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1484
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1485	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1486	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	1487	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1488	struct e1000_desc_ring *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	1489	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	1490	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	1491	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	1492	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	1493	unsigned long size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1494	unsigned int i, j;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1495
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1496	/* 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	1497
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1498	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	1499	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	1500	if(buffer_info->skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1501	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	1502	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	1503	pci_unmap_single(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1504	buffer_info->dma,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1505	buffer_info->length,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1506	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1507
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1508	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	1509	buffer_info->skb = NULL;
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	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	1512	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	1513	pci_unmap_single(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1514	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	1515	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	1516	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	1517	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	1518	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	1519	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1520	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1521	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1522
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1523	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	1524	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	1525	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	1526	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	1527	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	1528	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	1529
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1530	/* 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	1531
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1532	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	1533
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1534	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	1535	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	1536
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1537	E1000_WRITE_REG(&adapter->hw, RDH, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1538	E1000_WRITE_REG(&adapter->hw, RDT, 0);
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1541	/* 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	1542	* 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	1543	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1544	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1545	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	1546	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1547	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	1548	uint32_t rctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1549
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1550	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	1551
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1552	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	1553	rctl \|= E1000_RCTL_RST;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1554	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	1555	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	1556	mdelay(5);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1557
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1558	if(netif_running(netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1559	e1000_clean_rx_ring(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1560	}
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	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1563	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	1564	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1565	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	1566	uint32_t rctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1567
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1568	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	1569	rctl &= ~E1000_RCTL_RST;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1570	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	1571	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	1572	mdelay(5);
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	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	1575	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	1576
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1577	if(netif_running(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1578	e1000_configure_rx(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1579	e1000_alloc_rx_buffers(adapter);
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	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1582
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1583	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1584	* 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	1585	* @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	1586	* @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	1587	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1588	* 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	1589	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1590
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1591	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1592	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	1593	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1594	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	1595	struct sockaddr *addr = p;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1596
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1597	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	1598	return -EADDRNOTAVAIL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1599
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1600	/* 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	1601
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1602	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	1603	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	1604
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1605	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	1606	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	1607
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1608	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	1609
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1610	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	1611	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	1612
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1613	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1614	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1615
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	* 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	1618	* @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	1619	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1620	* 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	1621	* 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	1622	* 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	1623	* 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	1624	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1625
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1626	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1627	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	1628	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1629	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	1630	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	1631	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	1632	unsigned long flags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1633	uint32_t rctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1634	uint32_t hash_value;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1635	int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1636
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1637	spin_lock_irqsave(&adapter->tx_lock, flags);
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	/* 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	1640
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1641	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	1642
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1643	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	1644	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	1645	} 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	1646	rctl \|= E1000_RCTL_MPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1647	rctl &= ~E1000_RCTL_UPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1648	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1649	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	1650	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1651
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1652	E1000_WRITE_REG(hw, RCTL, rctl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1653
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1654	/* 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	1655
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1656	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	1657	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	1658
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1659	/* 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	1660	* 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	1661	* 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	1662	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1663	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	1664
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1665	for(i = 1; i < E1000_RAR_ENTRIES; i++) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1666	if(mc_ptr) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1667	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	1668	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	1669	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1670	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	1671	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	1672	}
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1675	/* 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	1676
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1677	for(i = 0; i < E1000_NUM_MTA_REGISTERS; i++)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1678	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	1679
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1680	/* 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	1681
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1682	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	1683	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	1684	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	1685	}
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	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	1688	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	1689
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1690	spin_unlock_irqrestore(&adapter->tx_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1691	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1692
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1693	/* 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	1694	* the phy */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1695
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1696	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1697	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	1698	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1699	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	1700	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	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	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1704	* 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	1705	* @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	1706	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1707
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1708	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1709	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	1710	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1711	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	1712	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	1713	uint32_t tctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1714
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1715	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	1716	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	1717	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	1718	(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	1719	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	1720	(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	1721	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	1722	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	1723	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	1724	tctl & ~E1000_TCTL_EN);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1725	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	1726	adapter->tx_head_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1727	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	1728	adapter->tx_head_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1729	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	1730	adapter->tx_head_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1731	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	1732	adapter->tx_head_addr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1733	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	1734	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	1735
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1736	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	1737	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	1738	netif_wake_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1739	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1740	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	1741	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1742	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1743	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1744
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1745	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1746	* 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	1747	* @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	1748	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1749	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1750	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	1751	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1752	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	1753
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1754	/* Do the rest outside of interrupt context */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1755	schedule_work(&adapter->watchdog_task);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1756	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1757
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1758	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1759	e1000_watchdog_task(struct e1000_adapter *adapter)
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	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	1762	struct e1000_desc_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	1763	uint32_t link;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1764
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1765	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	1766	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	1767	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	1768	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	1769	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	1770	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1771
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1772	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	1773	!(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	1774	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	1775	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1776	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	1777
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1778	if(link) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1779	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	1780	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	1781	&adapter->link_speed,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1782	&adapter->link_duplex);
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	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	1785	adapter->link_speed,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1786	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	1787	"Full Duplex" : "Half Duplex");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1788
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1789	netif_carrier_on(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1790	netif_wake_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1791	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	1792	adapter->smartspeed = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1793	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1794	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1795	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	1796	adapter->link_speed = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1797	adapter->link_duplex = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1798	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	1799	netif_carrier_off(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1800	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1801	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	1802	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1803
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1804	e1000_smartspeed(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1805	}
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	e1000_update_stats(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1808
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1809	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	1810	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	1811	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	1812	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	1813
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1814	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	1815	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	1816	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	1817	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	1818
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1819	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	1820
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1821	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	1822	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	1823	/* 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	1824	* 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	1825	* 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	1826	* (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	1827	schedule_work(&adapter->tx_timeout_task);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1828	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1829	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1830
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1831	/* Dynamic mode for Interrupt Throttle Rate (ITR) */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1832	if(adapter->hw.mac_type >= e1000_82540 && adapter->itr == 1) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1833	/* Symmetric Tx/Rx gets a reduced ITR=2000; Total
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1834	* asymmetrical Tx or Rx gets ITR=8000; everyone
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1835	* else is between 2000-8000. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1836	uint32_t goc = (adapter->gotcl + adapter->gorcl) / 10000;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1837	uint32_t dif = (adapter->gotcl > adapter->gorcl ?
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1838	adapter->gotcl - adapter->gorcl :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1839	adapter->gorcl - adapter->gotcl) / 10000;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1840	uint32_t itr = goc > 0 ? (dif * 6000 / goc + 2000) : 8000;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1841	E1000_WRITE_REG(&adapter->hw, ITR, 1000000000 / (itr * 256));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1842	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1843
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1844	/* 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	1845	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	1846
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1847	/* 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	1848	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	1849
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1850	/* Reset the timer */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1851	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	1852	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1853
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1854	#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	1855	#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	1856	#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	1857	#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	1858	#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	1859	#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	1860
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1861	static inline int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1862	e1000_tso(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	1863	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1864	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1865	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	1866	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1867	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	1868	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	1869	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	1870	int err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1871
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1872	if(skb_shinfo(skb)->tso_size) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1873	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	1874	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	1875	if (err)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1876	return err;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1877	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1878
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1879	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	1880	mss = skb_shinfo(skb)->tso_size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1881	if(skb->protocol == ntohs(ETH_P_IP)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1882	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	1883	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	1884	skb->h.th->check =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1885	~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	1886	skb->nh.iph->daddr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1887	0,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1888	IPPROTO_TCP,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1889	0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1890	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	1891	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	1892	#ifdef NETIF_F_TSO_IPV6
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1893	} else if(skb->protocol == ntohs(ETH_P_IPV6)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1894	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	1895	skb->h.th->check =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1896	~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	1897	&skb->nh.ipv6h->daddr,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1898	0,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1899	IPPROTO_TCP,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1900	0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1901	ipcse = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1902	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1903	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1904	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	1905	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	1906	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	1907	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	1908	tucse = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1909
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1910	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	1911	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	1912
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1913	i = adapter->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	1914	context_desc = E1000_CONTEXT_DESC(adapter->tx_ring, i);
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	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	1917	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	1918	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	1919	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	1920	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	1921	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	1922	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	1923	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	1924	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	1925
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1926	if(++i == adapter->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	1927	adapter->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	1928
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1929	return 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1930	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1931	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1932
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1933	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1934	}
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	static inline boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1937	e1000_tx_csum(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	1938	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1939	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	1940	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1941	uint8_t css;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1942
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1943	if(likely(skb->ip_summed == CHECKSUM_HW)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1944	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	1945
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1946	i = adapter->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	1947	context_desc = E1000_CONTEXT_DESC(adapter->tx_ring, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1948
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1949	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	1950	context_desc->upper_setup.tcp_fields.tucso = css + skb->csum;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1951	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	1952	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	1953	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	1954
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1955	if(unlikely(++i == adapter->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	1956	adapter->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	1957
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1958	return TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1959	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1960
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1961	return FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1962	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1963
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1964	#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	1965	#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	1966
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1967	static inline int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1968	e1000_tx_map(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	1969	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	1970	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	1971	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1972	struct e1000_desc_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	1973	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	1974	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	1975	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	1976	unsigned int f;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1977	len -= skb->data_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1978
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1979	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	1980
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1981	while(len) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1982	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	1983	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	1984	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1985	/* 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	1986	* 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	1987	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	1988	size -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1989	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1990	/* 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	1991	* 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	1992	* 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	1993	* 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	1994	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1995	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	1996	(size > 2015) && count == 0))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1997	size = 2015;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1998
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	1999	/* 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	2000	* 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	2001	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	2002	!((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	2003	size > 4))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2004	size -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2005
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2006	buffer_info->length = size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2007	buffer_info->dma =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2008	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	2009	skb->data + offset,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2010	size,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2011	PCI_DMA_TODEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2012	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	2013
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2014	len -= size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2015	offset += size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2016	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2017	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	2018	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2019
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2020	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	2021	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	2022
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2023	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	2024	len = frag->size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2025	offset = frag->page_offset;
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	while(len) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2028	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	2029	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	2030	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2031	/* 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	2032	* 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	2033	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	2034	size -= 4;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2035	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2036	/* 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	2037	* 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	2038	* dwords. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2039	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	2040	!((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	2041	size > 4))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2042	size -= 4;
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	buffer_info->length = size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2045	buffer_info->dma =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2046	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	2047	frag->page,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2048	offset,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2049	size,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2050	PCI_DMA_TODEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2051	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	2052
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2053	len -= size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2054	offset += size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2055	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2056	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	2057	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2058	}
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	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	2061	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	2062	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	2063
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2064	return count;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2065	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2066
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2067	static inline void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2068	e1000_tx_queue(struct e1000_adapter *adapter, int count, int tx_flags)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2069	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2070	struct e1000_desc_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	2071	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	2072	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	2073	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	2074	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2075
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2076	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	2077	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	2078	E1000_TXD_CMD_TSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2079	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	2080
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2081	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	2082	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	2083	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2084
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2085	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	2086	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	2087	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	2088	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2089
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2090	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	2091	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	2092	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	2093	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2094
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2095	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	2096
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2097	while(count--) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2098	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	2099	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	2100	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	2101	tx_desc->lower.data =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2102	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	2103	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	2104	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	2105	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2106
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2107	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	2108
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2109	/* 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	2110	* 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	2111	* 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	2112	* such as IA-64). */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2113	wmb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2114
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2115	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	2116	E1000_WRITE_REG(&adapter->hw, TDT, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2117	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2118
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	* 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	2121	* 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	2122	* 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	2123	* 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	2124	* 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	2125	* 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	2126	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2127
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2128	#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	2129	#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	2130
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2131	static inline int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2132	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	2133	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2134	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	2135	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	2136
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2137	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	2138
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2139	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	2140	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	2141
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2142	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	2143	return 1;
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	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	2146	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	2147	return 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2148	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2149
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2150	no_fifo_stall_required:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2151	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	2152	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	2153	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	2154	return 0;
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	#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	2158	static inline int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2159	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	2160	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2161	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	2162	uint16_t length, offset;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2163	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	2164	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	2165	( 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	2166	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	2167	return 0;
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	if(htons(ETH_P_IP) == skb->protocol) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2170	const struct iphdr *ip = skb->nh.iph;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2171	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	2172	struct udphdr udp = (struct udphdr )(skb->h.uh);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2173	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	2174	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	2175	length = skb->len - offset;
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	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	2178	(uint8_t *)udp + 8, length);
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	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2181	} else if((skb->len > MINIMUM_DHCP_PACKET_SIZE) && (!skb->protocol)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2182	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	2183	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	2184	const struct iphdr *ip =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2185	(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	2186	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	2187	struct udphdr *udp =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2188	(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	2189	(ip->ihl << 2));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2190	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	2191	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	2192	length = skb->len - offset;
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	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	2195	(uint8_t *)udp + 8,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2196	length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2197	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2198	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2199	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2200	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2201	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2202	}
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	#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	2205	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2206	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	2207	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2208	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	2209	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	2210	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	2211	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	2212	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	2213	unsigned long flags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2214	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	2215	unsigned int mss = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2216	int count = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2217	int tso;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2218	unsigned int f;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2219	len -= skb->data_len;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2220
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2221	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	2222	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	2223	return NETDEV_TX_OK;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2224	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2225
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2226	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2227	mss = skb_shinfo(skb)->tso_size;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2228	/* 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	2229	* 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	2230	* 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	2231	* 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	2232	* 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	2233	* drops. */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2234	if(mss) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2235	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	2236	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	2237	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2238
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2239	if((mss) \|\| (skb->ip_summed == CHECKSUM_HW))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2240	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2241	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2242	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2243	if(skb->ip_summed == CHECKSUM_HW)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2244	count++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2245	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2246	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	2247
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2248	if(adapter->pcix_82544)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2249	count++;
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	/* 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	2252	* 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	2253	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2254	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	2255	(len > 2015)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2256	count++;
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	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	2259	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	2260	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	2261	max_txd_pwr);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2262	if(adapter->pcix_82544)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2263	count += nr_frags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2264
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2265	local_irq_save(flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2266	if (!spin_trylock(&adapter->tx_lock)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2267	/* 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	2268	local_irq_restore(flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2269	return NETDEV_TX_LOCKED;
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	if(adapter->hw.tx_pkt_filtering && (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	2272	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	2273
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2274
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2275	/* 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	2276	* 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	2277	if(unlikely(E1000_DESC_UNUSED(&adapter->tx_ring) < count + 2)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2278	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2279	spin_unlock_irqrestore(&adapter->tx_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2280	return NETDEV_TX_BUSY;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2283	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	2284	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	2285	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2286	mod_timer(&adapter->tx_fifo_stall_timer, jiffies);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2287	spin_unlock_irqrestore(&adapter->tx_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2288	return NETDEV_TX_BUSY;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2289	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2290	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2291
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2292	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	2293	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	2294	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	2295	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2296
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2297	first = adapter->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	2298
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2299	tso = e1000_tso(adapter, skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2300	if (tso < 0) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2301	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	2302	spin_unlock_irqrestore(&adapter->tx_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2303	return NETDEV_TX_OK;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2306	if (likely(tso))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2307	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	2308	else if(likely(e1000_tx_csum(adapter, skb)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2309	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	2310
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2311	/* 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	2312	* 82573 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	2313	* 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	2314	if(likely(skb->protocol == ntohs(ETH_P_IP)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2315	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	2316
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2317	e1000_tx_queue(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2318	e1000_tx_map(adapter, skb, first, 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	2319	tx_flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2320
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2321	netdev->trans_start = jiffies;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2322
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2323	/* 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	2324	if(unlikely(E1000_DESC_UNUSED(&adapter->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	2325	netif_stop_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2326
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2327	spin_unlock_irqrestore(&adapter->tx_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2328	return NETDEV_TX_OK;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2331	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2332	* 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	2333	* @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	2334	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2335
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2336	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2337	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	2338	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2339	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	2340
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2341	/* 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	2342	schedule_work(&adapter->tx_timeout_task);
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2345	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2346	e1000_tx_timeout_task(struct net_device *netdev)
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	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	2349
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2350	e1000_down(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2351	e1000_up(adapter);
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2354	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2355	* 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	2356	* @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	2357	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2358	* 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	2359	* 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	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	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	2363	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	2364	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2365	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	2366
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2367	e1000_update_stats(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2368	return &adapter->net_stats;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2369	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2370
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2371	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2372	* 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	2373	* @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	2374	* @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	2375	*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2376	* 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	2377	**/
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	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2380	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	2381	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2382	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	2383	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	2384
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2385	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	2386	(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	2387	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	2388	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2389	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2390
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2391	#define MAX_STD_JUMBO_FRAME_SIZE 9216
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2392	/* might want this to be bigger enum check... */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2393	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	2394	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	2395	DPRINTK(PROBE, ERR, "Jumbo Frames not supported "
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2396	"on 82573\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2397	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2398	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2399
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2400	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	2401	adapter->rx_buffer_len = max_frame;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2402	E1000_ROUNDUP(adapter->rx_buffer_len, 1024);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2403	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2404	if(unlikely((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	2405	(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	2406	DPRINTK(PROBE, ERR, "Jumbo Frames not supported "
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2407	"on 82542\n");
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2408	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2409
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2410	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2411	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	2412	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	2413	} 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	2414	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	2415	} 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	2416	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	2417	} 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	2418	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	2419	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2420	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2421	}
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	netdev->mtu = new_mtu;
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(netif_running(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2426	e1000_down(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2427	e1000_up(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2428	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2429
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2430	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	2431
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2432	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2433	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2434
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2435	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2436	* 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	2437	* @adapter: board private structure
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2440	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2441	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	2442	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2443	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	2444	unsigned long flags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2445	uint16_t phy_tmp;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2446
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2447	#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	2448
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2449	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	2450
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2451	/* 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	2452	* 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	2453	* 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	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	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	2457	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	2458	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	2459	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	2460	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	2461	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	2462	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	2463	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	2464	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	2465	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	2466	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	2467	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	2468	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	2469
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2470	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	2471	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	2472	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	2473	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	2474	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	2475	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	2476	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	2477	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	2478	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	2479	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	2480	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	2481	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	2482	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	2483	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	2484	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	2485	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	2486	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	2487	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	2488	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	2489	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	2490	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	2491	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	2492	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	2493	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	2494	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	2495	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	2496	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	2497	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	2498	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	2499	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	2500	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	2501	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	2502	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	2503	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	2504
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2505	/* used for adaptive IFS */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2506
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2507	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	2508	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	2509	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	2510	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	2511
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2512	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	2513	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	2514	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	2515	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	2516	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	2517	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	2518	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	2519	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2520	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	2521	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	2522	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	2523	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	2524	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	2525	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	2526	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	2527	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	2528	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	2529	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	2530	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2531
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2532	/* 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	2533
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2534	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	2535	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	2536	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	2537	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	2538	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	2539	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	2540
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2541	/* Rx Errors */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2542
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2543	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	2544	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	2545	adapter->stats.rlec + adapter->stats.mpc +
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2546	adapter->stats.cexterr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2547	adapter->net_stats.rx_dropped = adapter->stats.mpc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2548	adapter->net_stats.rx_length_errors = adapter->stats.rlec;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2549	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	2550	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	2551	adapter->net_stats.rx_fifo_errors = adapter->stats.mpc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2552	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	2553
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2554	/* Tx Errors */
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	adapter->net_stats.tx_errors = adapter->stats.ecol +
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2557	adapter->stats.latecol;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2558	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	2559	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	2560	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	2561
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2562	/* 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	2563
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2564	/* Phy Stats */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2565
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2566	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	2567	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	2568	(!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	2569	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	2570	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	2571	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2572
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2573	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	2574	(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	2575	!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	2576	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	2577	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2578
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2579	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	2580	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2581
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2582	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2583	* e1000_intr - Interrupt Handler
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2584	* @irq: interrupt number
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2585	* @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	2586	* @pt_regs: CPU registers structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2587	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2588
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2589	static irqreturn_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2590	e1000_intr(int irq, void data, struct pt_regs regs)
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	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	2593	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	2594	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	2595	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	2596	#ifndef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2597	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2598	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2599
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2600	if(unlikely(!icr))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2601	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	2602
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2603	if(unlikely(icr & (E1000_ICR_RXSEQ \| E1000_ICR_LSC))) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2604	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	2605	mod_timer(&adapter->watchdog_timer, jiffies);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2606	}
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	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2609	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	2610
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2611	/* Disable interrupts and register for poll. The flush
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2612	of the posted write is intentionally left out.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2613	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2614
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2615	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	2616	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	2617	__netif_rx_schedule(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2618	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2619	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2620	/* 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	2621	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	2622	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	2623	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	2624	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	2625	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	2626	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	2627	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	2628	de-assertion state.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2629	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2630	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	2631	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	2632	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	2633	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2634
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2635	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	2636	if(unlikely(!adapter->clean_rx(adapter) &
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2637	!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	2638	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2639
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2640	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	2641	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2642	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2643
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2644	return IRQ_HANDLED;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2645	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2646
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2647	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2648	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2649	* 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	2650	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2651	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2652
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2653	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2654	e1000_clean(struct net_device netdev, int budget)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2655	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2656	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	2657	int work_to_do = min(*budget, netdev->quota);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2658	int tx_cleaned;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2659	int work_done = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2660
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2661	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	2662	adapter->clean_rx(adapter, &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	2663
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2664	*budget -= work_done;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2665	netdev->quota -= work_done;
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	if ((!tx_cleaned && (work_done == 0)) \|\| !netif_running(netdev)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2668	/* 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	2669	netif_rx_complete(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2670	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2671	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2672	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2673
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2674	return 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2675	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2676
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2677	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2678	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2679	* 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	2680	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2681	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2682
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2683	static boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2684	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	2685	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2686	struct e1000_desc_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	2687	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	2688	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	2689	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	2690	unsigned int i, eop;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2691	boolean_t cleaned = FALSE;
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	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	2694	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	2695	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	2696
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2697	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	2698	/* Premature writeback of Tx descriptors clear (free buffers
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2699	* and unmap pci_mapping) previous_buffer_info */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2700	if (likely(adapter->previous_buffer_info.skb != NULL)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2701	e1000_unmap_and_free_tx_resource(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2702	&adapter->previous_buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2703	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2704
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2705	for(cleaned = FALSE; !cleaned; ) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2706	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	2707	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	2708	cleaned = (i == eop);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2709
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2710	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2711	if (!(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	2712	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2713	e1000_unmap_and_free_tx_resource(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2714	buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2715	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2716	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2717	if (cleaned) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2718	memcpy(&adapter->previous_buffer_info,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2719	buffer_info,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2720	sizeof(struct e1000_buffer));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2721	memset(buffer_info, 0,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2722	sizeof(struct e1000_buffer));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2723	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2724	e1000_unmap_and_free_tx_resource(
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2725	adapter, buffer_info);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2726	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2727	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2728	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2729
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2730	tx_desc->buffer_addr = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2731	tx_desc->lower.data = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2732	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	2733
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2734	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	2735	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2736
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2737	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	2738	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	2739	}
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	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	2742
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2743	spin_lock(&adapter->tx_lock);
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	if(unlikely(cleaned && netif_queue_stopped(netdev) &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2746	netif_carrier_ok(netdev)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2747	netif_wake_queue(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2748
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2749	spin_unlock(&adapter->tx_lock);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2750	if(adapter->detect_tx_hung) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2751
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2752	/* 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	2753	* 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	2754	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	2755	if (tx_ring->buffer_info[i].dma &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2756	time_after(jiffies, tx_ring->buffer_info[i].time_stamp + HZ)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2757	&& !(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	2758	E1000_STATUS_TXOFF)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2759
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2760	/* detected Tx unit hang */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2761	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	2762	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	2763	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	2764	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	2765	" TDH <%x>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2766	" TDT <%x>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2767	" 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	2768	" 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	2769	"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	2770	" dma <%zx>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2771	" time_stamp <%lx>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2772	" 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	2773	" jiffies <%lx>\n"
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2774	" 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	2775	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	2776	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	2777	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	2778	i,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2779	tx_ring->buffer_info[i].dma,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2780	tx_ring->buffer_info[i].time_stamp,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2781	eop,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2782	jiffies,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2783	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	2784	netif_stop_queue(netdev);
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	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2787	#ifdef NETIF_F_TSO
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2788
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2789	if( unlikely(!(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	2790	time_after(jiffies, adapter->previous_buffer_info.time_stamp + HZ)))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2791	e1000_unmap_and_free_tx_resource(
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2792	adapter, &adapter->previous_buffer_info);
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	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2795	return cleaned;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2796	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2797
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2798	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2799	* 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	2800	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2801	* @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	2802	* @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	2803	* @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	2804	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2805
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2806	static inline void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2807	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	2808	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	2809	struct sk_buff *skb)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2810	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2811	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	2812	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	2813	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	2814
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2815	/* 82543 or newer only */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2816	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	2817	/* 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	2818	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	2819	/* 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	2820	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	2821	/* 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	2822	adapter->hw_csum_err++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2823	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2824	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2825	/* 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	2826	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	2827	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	2828	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2829	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2830	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	2831	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2832	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2833	/* 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	2834	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	2835	/* TCP checksum is good */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2836	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	2837	} 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	2838	/* 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	2839	/* 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	2840	* 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	2841	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2842	csum = ntohl(csum ^ 0xFFFF);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2843	skb->csum = csum;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2844	skb->ip_summed = CHECKSUM_HW;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2845	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2846	adapter->hw_csum_good++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2847	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2848
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2849	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2850	* 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	2851	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2852	**/
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	static boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2855	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2856	e1000_clean_rx_irq(struct e1000_adapter adapter, int work_done,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2857	int work_to_do)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2858	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2859	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	2860	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2861	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2862	struct e1000_desc_ring *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	2863	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	2864	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	2865	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	2866	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	2867	struct sk_buff *skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2868	unsigned long flags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2869	uint32_t length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2870	uint8_t last_byte;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2871	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2872	boolean_t cleaned = FALSE;
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	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	2875	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	2876
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2877	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	2878	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	2879	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2880	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	2881	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2882	(*work_done)++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2883	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2884	cleaned = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2885
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2886	pci_unmap_single(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2887	buffer_info->dma,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2888	buffer_info->length,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2889	PCI_DMA_FROMDEVICE);
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	skb = buffer_info->skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2892	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	2893
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2894	if(unlikely(!(rx_desc->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	2895	/* 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	2896	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	2897	" buffers\n", netdev->name);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2898	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	2899	goto next_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2900	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2901
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2902	if(unlikely(rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2903	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	2904	if(TBI_ACCEPT(&adapter->hw, rx_desc->status,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2905	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	2906	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	2907	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	2908	&adapter->stats,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2909	length, skb->data);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2910	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	2911	flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2912	length--;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2913	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2914	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	2915	goto next_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2916	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2917	}
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	/* Good Receive */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2920	skb_put(skb, length - ETHERNET_FCS_SIZE);
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	/* Receive Checksum Offload */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2923	e1000_rx_checksum(adapter,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2924	(uint32_t)(rx_desc->status) \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2925	((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	2926	rx_desc->csum, skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2927	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	2928	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2929	if(unlikely(adapter->vlgrp &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2930	(rx_desc->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	2931	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	2932	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	2933	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	2934	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2935	netif_receive_skb(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2936	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2937	#else /* CONFIG_E1000_NAPI */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2938	if(unlikely(adapter->vlgrp &&
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2939	(rx_desc->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	2940	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	2941	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	2942	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	2943	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2944	netif_rx(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2945	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2946	#endif /* CONFIG_E1000_NAPI */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2947	netdev->last_rx = jiffies;
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	next_desc:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2950	rx_desc->status = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2951	buffer_info->skb = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2952	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	2953
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2954	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	2955	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2956	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	2957	adapter->alloc_rx_buf(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2958
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2959	return cleaned;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2960	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2961
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2962	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2963	* 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	2964	* @adapter: board private structure
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2965	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2966
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2967	static boolean_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2968	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2969	e1000_clean_rx_irq_ps(struct e1000_adapter adapter, int work_done,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2970	int work_to_do)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2971	#else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2972	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	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	struct e1000_desc_ring *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	2976	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	2977	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	2978	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	2979	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	2980	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	2981	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	2982	struct sk_buff *skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2983	unsigned int i, j;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2984	uint32_t length, staterr;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2985	boolean_t cleaned = FALSE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2986
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2987	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	2988	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	2989	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	2990
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2991	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	2992	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	2993	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	2994	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	2995	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2996	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	2997	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2998	(*work_done)++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	2999	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3000	cleaned = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3001	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	3002	buffer_info->length,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3003	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3004
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3005	skb = buffer_info->skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3006
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3007	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	3008	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	3009	" 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	3010	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	3011	goto next_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3012	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3013
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3014	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	3015	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	3016	goto next_desc;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3017	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3018
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3019	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	3020
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3021	if(unlikely(!length)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3022	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	3023	" 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	3024	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	3025	goto next_desc;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3028	/* Good Receive */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3029	skb_put(skb, length);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3030
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3031	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	3032	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	3033	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3034
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3035	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	3036	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	3037	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	3038	skb_shinfo(skb)->frags[j].page =
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3039	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	3040	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	3041	skb_shinfo(skb)->frags[j].page_offset = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3042	skb_shinfo(skb)->frags[j].size = length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3043	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	3044	skb->len += length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3045	skb->data_len += length;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3046	}
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	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	3049	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	3050	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	3051
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3052	#ifdef HAVE_RX_ZERO_COPY
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3053	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	3054	E1000_RXDPS_HDRSTAT_HDRSP))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3055	skb_shinfo(skb)->zero_copy = TRUE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3056	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3057	#ifdef CONFIG_E1000_NAPI
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3058	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	3059	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	3060	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	3061	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	3062	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3063	netif_receive_skb(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3064	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3065	#else /* CONFIG_E1000_NAPI */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3066	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	3067	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	3068	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	3069	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	3070	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3071	netif_rx(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3072	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3073	#endif /* CONFIG_E1000_NAPI */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3074	netdev->last_rx = jiffies;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3075
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3076	next_desc:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3077	rx_desc->wb.middle.status_error &= ~0xFF;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3078	buffer_info->skb = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3079	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	3080
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3081	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	3082	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	3083	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3084	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	3085	adapter->alloc_rx_buf(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3086
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3087	return cleaned;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3090	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3091	* 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	3092	* @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	3093	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3094
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3095	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3096	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	3097	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3098	struct e1000_desc_ring *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	3099	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	3100	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	3101	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	3102	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	3103	struct sk_buff *skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3104	unsigned int i;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3105	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	3106
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3107	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	3108	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	3109
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3110	while(!buffer_info->skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3111	skb = dev_alloc_skb(bufsz);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3112
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3113	if(unlikely(!skb)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3114	/* Better luck next round */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3115	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3116	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3117
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3118	/* 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	3119	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	3120	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	3121	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	3122	"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	3123	/* 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	3124	skb = dev_alloc_skb(bufsz);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3125	/* Failed allocation, critical failure */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3126	if (!skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3127	dev_kfree_skb(oldskb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3128	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3129	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3130
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3131	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	3132	/* give up */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3133	dev_kfree_skb(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3134	dev_kfree_skb(oldskb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3135	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	3136	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3137	/* Use new allocation */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3138	dev_kfree_skb(oldskb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3139	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3140	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3141	/* 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	3142	* 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	3143	* 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	3144	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3145	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	3146
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3147	skb->dev = netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3148
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3149	buffer_info->skb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3150	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	3151	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	3152	skb->data,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3153	adapter->rx_buffer_len,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3154	PCI_DMA_FROMDEVICE);
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	/* 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	3157	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	3158	(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	3159	adapter->rx_buffer_len)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3160	DPRINTK(RX_ERR, ERR,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3161	"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	3162	adapter->rx_buffer_len,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3163	(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	3164	dev_kfree_skb(skb);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3165	buffer_info->skb = NULL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3166
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3167	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	3168	adapter->rx_buffer_len,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3169	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3170
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3171	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	3172	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3173	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	3174	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	3175
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3176	if(unlikely((i & ~(E1000_RX_BUFFER_WRITE - 1)) == i)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3177	/* 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	3178	* 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	3179	* 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	3180	* such as IA-64). */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3181	wmb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3182	E1000_WRITE_REG(&adapter->hw, RDT, i);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3183	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3184
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3185	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	3186	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	3187	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3188
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3189	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	3190	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3191
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3192	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3193	* 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	3194	* @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	3195	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3196
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3197	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3198	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	3199	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3200	struct e1000_desc_ring *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	3201	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	3202	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	3203	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	3204	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	3205	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	3206	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	3207	struct sk_buff *skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3208	unsigned int i, j;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3209
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3210	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	3211	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	3212	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	3213	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	3214
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3215	while(!buffer_info->skb) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3216	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	3217
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3218	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	3219	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	3220	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	3221	alloc_page(GFP_ATOMIC);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3222	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	3223	goto no_buffers;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3224	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	3225	pci_map_page(pdev,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3226	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	3227	0, PAGE_SIZE,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3228	PCI_DMA_FROMDEVICE);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3229	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3230	/* 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	3231	* change because each write-back erases this info.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3232	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3233	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	3234	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	3235	}
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	skb = dev_alloc_skb(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	3238
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3239	if(unlikely(!skb))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3240	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3241
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3242	/* 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	3243	* 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	3244	* 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	3245	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3246	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	3247
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3248	skb->dev = netdev;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3249
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3250	buffer_info->skb = skb;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3251	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	3252	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	3253	adapter->rx_ps_bsize0,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3254	PCI_DMA_FROMDEVICE);
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	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	3257
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3258	if(unlikely((i & ~(E1000_RX_BUFFER_WRITE - 1)) == i)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3259	/* 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	3260	* 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	3261	* 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	3262	* such as IA-64). */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3263	wmb();
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3264	/* 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	3265	* 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	3266	* twice as much.
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3267	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3268	E1000_WRITE_REG(&adapter->hw, RDT, i<<1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3269	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3270
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3271	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	3272	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	3273	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	3274	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	3275	}
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	no_buffers:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3278	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	3279	}
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	* 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	3283	* @adapter:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3284	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3285
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3286	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3287	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	3288	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3289	uint16_t phy_status;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3290	uint16_t phy_ctrl;
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	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	3293	!(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	3294	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3295
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3296	if(adapter->smartspeed == 0) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3297	/* 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	3298	* 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	3299	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	3300	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	3301	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	3302	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	3303	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	3304	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	3305	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	3306	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	3307	phy_ctrl);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3308	adapter->smartspeed++;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3309	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	3310	!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	3311	&phy_ctrl)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3312	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	3313	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	3314	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	3315	phy_ctrl);
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	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3318	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3319	} 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	3320	/* 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	3321	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	3322	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	3323	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	3324	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	3325	!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	3326	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	3327	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	3328	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	3329	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3330	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3331	/* 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	3332	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	3333	adapter->smartspeed = 0;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3336	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3337	* e1000_ioctl -
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3338	* @netdev:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3339	* @ifreq:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3340	* @cmd:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3341	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3342
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3343	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3344	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	3345	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3346	switch (cmd) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3347	case SIOCGMIIPHY:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3348	case SIOCGMIIREG:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3349	case SIOCSMIIREG:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3350	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	3351	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3352	return -EOPNOTSUPP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3353	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3354	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3355
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3356	/**
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3357	* e1000_mii_ioctl -
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3358	* @netdev:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3359	* @ifreq:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3360	* @cmd:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3361	**/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3362
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3363	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3364	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	3365	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3366	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	3367	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	3368	int retval;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3369	uint16_t mii_reg;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3370	uint16_t spddplx;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3371	unsigned long flags;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3372
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3373	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	3374	return -EOPNOTSUPP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3375
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3376	switch (cmd) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3377	case SIOCGMIIPHY:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3378	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	3379	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3380	case SIOCGMIIREG:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3381	if(!capable(CAP_NET_ADMIN))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3382	return -EPERM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3383	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	3384	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	3385	&data->val_out)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3386	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	3387	return -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3388	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3389	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	3390	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3391	case SIOCSMIIREG:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3392	if(!capable(CAP_NET_ADMIN))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3393	return -EPERM;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3394	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	3395	return -EFAULT;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3396	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	3397	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	3398	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	3399	mii_reg)) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3400	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	3401	return -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3402	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3403	if(adapter->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	3404	switch (data->reg_num) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3405	case PHY_CTRL:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3406	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	3407	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3408	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	3409	adapter->hw.autoneg = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3410	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	3411	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3412	if (mii_reg & 0x40)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3413	spddplx = SPEED_1000;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3414	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	3415	spddplx = SPEED_100;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3416	else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3417	spddplx = SPEED_10;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3418	spddplx += (mii_reg & 0x100)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3419	? FULL_DUPLEX :
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3420	HALF_DUPLEX;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3421	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	3422	spddplx);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3423	if(retval) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3424	spin_unlock_irqrestore(
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3425	&adapter->stats_lock,
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3426	flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3427	return retval;
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	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3430	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	3431	e1000_down(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3432	e1000_up(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3433	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3434	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3435	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3436	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	3437	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	3438	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	3439	spin_unlock_irqrestore(
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3440	&adapter->stats_lock, flags);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3441	return -EIO;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3442	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3443	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3444	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3445	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3446	switch (data->reg_num) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3447	case PHY_CTRL:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3448	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	3449	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3450	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	3451	e1000_down(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3452	e1000_up(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3453	} else
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3454	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3455	break;
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	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3458	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	3459	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3460	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3461	return -EOPNOTSUPP;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3462	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3463	return E1000_SUCCESS;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3464	}
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	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3467	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	3468	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3469	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	3470	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	3471
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3472	if(ret_val)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3473	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	3474	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3475
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3476	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3477	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	3478	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3479	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	3480
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3481	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	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	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3485	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	3486	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3487	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	3488
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3489	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	3490	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3491
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3492	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3493	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	3494	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3495	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	3496
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3497	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	3498	}
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	uint32_t
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3501	e1000_io_read(struct e1000_hw *hw, unsigned long port)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3502	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3503	return inl(port);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3504	}
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	void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3507	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	3508	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3509	outl(value, port);
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	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3513	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	3514	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3515	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	3516	uint32_t ctrl, rctl;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3517
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3518	e1000_irq_disable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3519	adapter->vlgrp = grp;
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	if(grp) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3522	/* 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	3523	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	3524	ctrl \|= E1000_CTRL_VME;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3525	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	3526
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3527	/* enable VLAN receive filtering */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3528	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	3529	rctl \|= E1000_RCTL_VFE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3530	rctl &= ~E1000_RCTL_CFIEN;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3531	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	3532	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	3533	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3534	/* 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	3535	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	3536	ctrl &= ~E1000_CTRL_VME;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3537	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	3538
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3539	/* disable VLAN filtering */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3540	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	3541	rctl &= ~E1000_RCTL_VFE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3542	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	3543	if(adapter->mng_vlan_id != (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	3544	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	3545	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	3546	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3547	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3548
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3549	e1000_irq_enable(adapter);
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	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3553	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	3554	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3555	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	3556	uint32_t vfta, index;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3557	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	3558	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	3559	(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	3560	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3561	/* 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	3562	index = (vid >> 5) & 0x7F;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3563	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	3564	vfta \|= (1 << (vid & 0x1F));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3565	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	3566	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3567
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3568	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3569	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	3570	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3571	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	3572	uint32_t vfta, index;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3573
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3574	e1000_irq_disable(adapter);
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	if(adapter->vlgrp)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3577	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	3578
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3579	e1000_irq_enable(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3580
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3581	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	3582	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	3583	(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	3584	return;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3585	/* 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	3586	index = (vid >> 5) & 0x7F;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3587	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	3588	vfta &= ~(1 << (vid & 0x1F));
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3589	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	3590	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3591
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3592	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3593	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	3594	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3595	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	3596
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3597	if(adapter->vlgrp) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3598	uint16_t vid;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3599	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	3600	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	3601	continue;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3602	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	3603	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3604	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3605	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3606
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3607	int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3608	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	3609	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3610	adapter->hw.autoneg = 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3611
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3612	/* 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	3613	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	3614	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	3615	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	3616	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3617	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3618
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3619	switch(spddplx) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3620	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	3621	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	3622	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3623	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	3624	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	3625	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3626	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	3627	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	3628	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3629	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	3630	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	3631	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3632	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	3633	adapter->hw.autoneg = 1;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3634	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	3635	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3636	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	3637	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3638	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	3639	return -EINVAL;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3640	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3641	return 0;
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
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3644	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3645	e1000_suspend(struct pci_dev *pdev, uint32_t state)
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3646	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3647	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	3648	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	3649	uint32_t ctrl, ctrl_ext, rctl, manc, status, swsm;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3650	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	3651
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3652	netif_device_detach(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3653
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3654	if(netif_running(netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3655	e1000_down(adapter);
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	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	3658	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	3659	wufc &= ~E1000_WUFC_LNKC;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3660
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3661	if(wufc) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3662	e1000_setup_rctl(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3663	e1000_set_multi(netdev);
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	/* 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	3666	if(adapter->wol & E1000_WUFC_MC) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3667	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	3668	rctl \|= E1000_RCTL_MPE;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3669	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	3670	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3671
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3672	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	3673	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	3674	/* advertise wake from D3Cold */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3675	#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	3676	/* phy power management enable */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3677	#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	3678	ctrl \|= E1000_CTRL_ADVD3WUC \|
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3679	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	3680	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	3681	}
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	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	3684	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	3685	/* 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	3686	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	3687	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	3688	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	3689	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3690
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3691	/* 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	3692	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	3693
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3694	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	3695	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	3696	pci_enable_wake(pdev, 3, 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3697	pci_enable_wake(pdev, 4, 1); /* 4 == D3 cold */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3698	} else {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3699	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	3700	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	3701	pci_enable_wake(pdev, 3, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3702	pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3703	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3704
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3705	pci_save_state(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3706
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3707	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	3708	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	3709	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	3710	if(manc & E1000_MANC_SMBUS_EN) {
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3711	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	3712	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	3713	pci_enable_wake(pdev, 3, 1);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3714	pci_enable_wake(pdev, 4, 1); /* 4 == D3 cold */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3715	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3716	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3717
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3718	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	3719	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3720	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	3721	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	3722	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	3723	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3724	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3725	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3726	}
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	pci_disable_device(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3729
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3730	state = (state > 0) ? 3 : 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3731	pci_set_power_state(pdev, state);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3732
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3733	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3734	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3735
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3736	#ifdef CONFIG_PM
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3737	static int
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3738	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	3739	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3740	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	3741	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	3742	uint32_t manc, ret_val, swsm;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3743
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3744	pci_set_power_state(pdev, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3745	pci_restore_state(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3746	ret_val = pci_enable_device(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3747	pci_set_master(pdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3748
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3749	pci_enable_wake(pdev, 3, 0);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3750	pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3751
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3752	e1000_reset(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3753	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	3754
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3755	if(netif_running(netdev))
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3756	e1000_up(adapter);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3757
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3758	netif_device_attach(netdev);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3759
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3760	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	3761	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	3762	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	3763	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	3764	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	3765	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3766
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3767	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	3768	case e1000_82573:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3769	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	3770	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	3771	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	3772	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3773	default:
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3774	break;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3775	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3776
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3777	return 0;
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3778	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3779	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3780	#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	3781	/*
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3782	* 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	3783	* 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	3784	* 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	3785	*/
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3786	static void
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3787	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	3788	{
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3789	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	3790	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	3791	e1000_intr(adapter->pdev->irq, netdev, NULL);
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3792	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	3793	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	3794	}
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3795	#endif
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3796
7bc131b92039 MERGE trunk -r770:907 -> branches-1.3 (1.3 changes) Florian Pose <fp@igh-essen.com> parents: diff changeset	3797	/* 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
permissions	-rw-r--r--