| author | Florian Pose <fp@igh-essen.com> |
| Wed, 05 Nov 2014 15:06:54 +0100 | |
| changeset 2590 | 0e207abed88a |
| parent 2589 | 2b9c78543663 |
| child 2598 | 19ff84bbbcb3 |
| permissions | -rw-r--r-- |
|
2589
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1 |
/******************************************************************************* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3 |
Intel PRO/1000 Linux driver |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4 |
Copyright(c) 1999 - 2006 Intel Corporation. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
6 |
This program is free software; you can redistribute it and/or modify it |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
7 |
under the terms and conditions of the GNU General Public License, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
8 |
version 2, as published by the Free Software Foundation. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
9 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
10 |
This program is distributed in the hope it will be useful, but WITHOUT |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
11 |
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
12 |
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
13 |
more details. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
14 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
15 |
You should have received a copy of the GNU General Public License along with |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
16 |
this program; if not, write to the Free Software Foundation, Inc., |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
17 |
51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
18 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
19 |
The full GNU General Public License is included in this distribution in |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
20 |
the file called "COPYING". |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
21 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
22 |
Contact Information: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
23 |
Linux NICS <linux.nics@intel.com> |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
24 |
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net> |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
25 |
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
26 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
27 |
vim: noexpandtab |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
28 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
29 |
*******************************************************************************/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
30 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
31 |
#include "e1000-3.8-ethercat.h" |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
32 |
#include <net/ip6_checksum.h> |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
33 |
#include <linux/io.h> |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
34 |
#include <linux/prefetch.h> |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
35 |
#include <linux/bitops.h> |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
36 |
#include <linux/if_vlan.h> |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
37 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
38 |
char e1000_driver_name[] = "ec_e1000"; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
39 |
static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver"; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
40 |
#define DRV_VERSION "7.3.21-k8-NAPI" |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
41 |
const char e1000_driver_version[] = DRV_VERSION; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
42 |
static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation."; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
43 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
44 |
/* e1000_pci_tbl - PCI Device ID Table |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
45 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
46 |
* Last entry must be all 0s |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
47 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
48 |
* Macro expands to... |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
49 |
* {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
50 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
51 |
static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
52 |
INTEL_E1000_ETHERNET_DEVICE(0x1000), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
53 |
INTEL_E1000_ETHERNET_DEVICE(0x1001), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
54 |
INTEL_E1000_ETHERNET_DEVICE(0x1004), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
55 |
INTEL_E1000_ETHERNET_DEVICE(0x1008), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
56 |
INTEL_E1000_ETHERNET_DEVICE(0x1009), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
57 |
INTEL_E1000_ETHERNET_DEVICE(0x100C), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
58 |
INTEL_E1000_ETHERNET_DEVICE(0x100D), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
59 |
INTEL_E1000_ETHERNET_DEVICE(0x100E), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
60 |
INTEL_E1000_ETHERNET_DEVICE(0x100F), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
61 |
INTEL_E1000_ETHERNET_DEVICE(0x1010), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
62 |
INTEL_E1000_ETHERNET_DEVICE(0x1011), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
63 |
INTEL_E1000_ETHERNET_DEVICE(0x1012), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
64 |
INTEL_E1000_ETHERNET_DEVICE(0x1013), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
65 |
INTEL_E1000_ETHERNET_DEVICE(0x1014), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
66 |
INTEL_E1000_ETHERNET_DEVICE(0x1015), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
67 |
INTEL_E1000_ETHERNET_DEVICE(0x1016), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
68 |
INTEL_E1000_ETHERNET_DEVICE(0x1017), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
69 |
INTEL_E1000_ETHERNET_DEVICE(0x1018), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
70 |
INTEL_E1000_ETHERNET_DEVICE(0x1019), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
71 |
INTEL_E1000_ETHERNET_DEVICE(0x101A), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
72 |
INTEL_E1000_ETHERNET_DEVICE(0x101D), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
73 |
INTEL_E1000_ETHERNET_DEVICE(0x101E), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
74 |
INTEL_E1000_ETHERNET_DEVICE(0x1026), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
75 |
INTEL_E1000_ETHERNET_DEVICE(0x1027), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
76 |
INTEL_E1000_ETHERNET_DEVICE(0x1028), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
77 |
INTEL_E1000_ETHERNET_DEVICE(0x1075), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
78 |
INTEL_E1000_ETHERNET_DEVICE(0x1076), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
79 |
INTEL_E1000_ETHERNET_DEVICE(0x1077), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
80 |
INTEL_E1000_ETHERNET_DEVICE(0x1078), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
81 |
INTEL_E1000_ETHERNET_DEVICE(0x1079), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
82 |
INTEL_E1000_ETHERNET_DEVICE(0x107A), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
83 |
INTEL_E1000_ETHERNET_DEVICE(0x107B), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
84 |
INTEL_E1000_ETHERNET_DEVICE(0x107C), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
85 |
INTEL_E1000_ETHERNET_DEVICE(0x108A), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
86 |
INTEL_E1000_ETHERNET_DEVICE(0x1099), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
87 |
INTEL_E1000_ETHERNET_DEVICE(0x10B5), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
88 |
INTEL_E1000_ETHERNET_DEVICE(0x2E6E), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
89 |
/* required last entry */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
90 |
{0,}
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
91 |
}; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
92 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
93 |
// do not auto-load driver |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
94 |
// MODULE_DEVICE_TABLE(pci, e1000_pci_tbl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
95 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
96 |
int e1000_up(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
97 |
void e1000_down(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
98 |
void e1000_reinit_locked(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
99 |
void e1000_reset(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
100 |
int e1000_setup_all_tx_resources(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
101 |
int e1000_setup_all_rx_resources(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
102 |
void e1000_free_all_tx_resources(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
103 |
void e1000_free_all_rx_resources(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
104 |
static int e1000_setup_tx_resources(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
105 |
struct e1000_tx_ring *txdr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
106 |
static int e1000_setup_rx_resources(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
107 |
struct e1000_rx_ring *rxdr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
108 |
static void e1000_free_tx_resources(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
109 |
struct e1000_tx_ring *tx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
110 |
static void e1000_free_rx_resources(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
111 |
struct e1000_rx_ring *rx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
112 |
void e1000_update_stats(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
113 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
114 |
static int e1000_init_module(void); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
115 |
static void e1000_exit_module(void); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
116 |
static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
117 |
static void e1000_remove(struct pci_dev *pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
118 |
static int e1000_alloc_queues(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
119 |
static int e1000_sw_init(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
120 |
static int e1000_open(struct net_device *netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
121 |
static int e1000_close(struct net_device *netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
122 |
static void e1000_configure_tx(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
123 |
static void e1000_configure_rx(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
124 |
static void e1000_setup_rctl(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
125 |
static void e1000_clean_all_tx_rings(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
126 |
static void e1000_clean_all_rx_rings(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
127 |
static void e1000_clean_tx_ring(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
128 |
struct e1000_tx_ring *tx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
129 |
static void e1000_clean_rx_ring(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
130 |
struct e1000_rx_ring *rx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
131 |
static void e1000_set_rx_mode(struct net_device *netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
132 |
static void e1000_update_phy_info_task(struct work_struct *work); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
133 |
static void e1000_watchdog(struct work_struct *work); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
134 |
static void e1000_82547_tx_fifo_stall_task(struct work_struct *work); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
135 |
static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
136 |
struct net_device *netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
137 |
static struct net_device_stats * e1000_get_stats(struct net_device *netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
138 |
static int e1000_change_mtu(struct net_device *netdev, int new_mtu); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
139 |
static int e1000_set_mac(struct net_device *netdev, void *p); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
140 |
void ec_poll(struct net_device *); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
141 |
static irqreturn_t e1000_intr(int irq, void *data); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
142 |
static bool e1000_clean_tx_irq(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
143 |
struct e1000_tx_ring *tx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
144 |
static int e1000_clean(struct napi_struct *napi, int budget); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
145 |
static bool e1000_clean_rx_irq(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
146 |
struct e1000_rx_ring *rx_ring, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
147 |
int *work_done, int work_to_do); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
148 |
static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
149 |
struct e1000_rx_ring *rx_ring, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
150 |
int *work_done, int work_to_do); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
151 |
static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
152 |
struct e1000_rx_ring *rx_ring, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
153 |
int cleaned_count); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
154 |
static void e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
155 |
struct e1000_rx_ring *rx_ring, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
156 |
int cleaned_count); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
157 |
static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
158 |
static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
159 |
int cmd); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
160 |
static void e1000_enter_82542_rst(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
161 |
static void e1000_leave_82542_rst(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
162 |
static void e1000_tx_timeout(struct net_device *dev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
163 |
static void e1000_reset_task(struct work_struct *work); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
164 |
static void e1000_smartspeed(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
165 |
static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
166 |
struct sk_buff *skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
167 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
168 |
static bool e1000_vlan_used(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
169 |
static void e1000_vlan_mode(struct net_device *netdev, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
170 |
netdev_features_t features); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
171 |
static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
172 |
bool filter_on); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
173 |
static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
174 |
static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
175 |
static void e1000_restore_vlan(struct e1000_adapter *adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
176 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
177 |
#ifdef CONFIG_PM |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
178 |
static int e1000_suspend(struct pci_dev *pdev, pm_message_t state); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
179 |
static int e1000_resume(struct pci_dev *pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
180 |
#endif |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
181 |
static void e1000_shutdown(struct pci_dev *pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
182 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
183 |
#ifdef CONFIG_NET_POLL_CONTROLLER |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
184 |
/* for netdump / net console */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
185 |
static void e1000_netpoll (struct net_device *netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
186 |
#endif |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
187 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
188 |
#define COPYBREAK_DEFAULT 256 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
189 |
static unsigned int copybreak __read_mostly = COPYBREAK_DEFAULT; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
190 |
module_param(copybreak, uint, 0644); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
191 |
MODULE_PARM_DESC(copybreak, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
192 |
"Maximum size of packet that is copied to a new buffer on receive"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
193 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
194 |
static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
195 |
pci_channel_state_t state); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
196 |
static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
197 |
static void e1000_io_resume(struct pci_dev *pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
198 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
199 |
static const struct pci_error_handlers e1000_err_handler = {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
200 |
.error_detected = e1000_io_error_detected, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
201 |
.slot_reset = e1000_io_slot_reset, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
202 |
.resume = e1000_io_resume, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
203 |
}; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
204 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
205 |
static struct pci_driver e1000_driver = {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
206 |
.name = e1000_driver_name, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
207 |
.id_table = e1000_pci_tbl, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
208 |
.probe = e1000_probe, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
209 |
.remove = e1000_remove, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
210 |
#ifdef CONFIG_PM |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
211 |
/* Power Management Hooks */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
212 |
.suspend = e1000_suspend, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
213 |
.resume = e1000_resume, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
214 |
#endif |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
215 |
.shutdown = e1000_shutdown, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
216 |
.err_handler = &e1000_err_handler |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
217 |
}; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
218 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
219 |
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
220 |
MODULE_DESCRIPTION("EtherCAT-capable Intel(R) PRO/1000 Network Driver");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
221 |
MODULE_LICENSE("GPL");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
222 |
MODULE_VERSION(DRV_VERSION); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
223 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
224 |
#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
225 |
static int debug = -1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
226 |
module_param(debug, int, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
227 |
MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
228 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
229 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
230 |
* e1000_get_hw_dev - return device |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
231 |
* used by hardware layer to print debugging information |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
232 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
233 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
234 |
struct net_device *e1000_get_hw_dev(struct e1000_hw *hw) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
235 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
236 |
struct e1000_adapter *adapter = hw->back; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
237 |
return adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
238 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
239 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
240 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
241 |
* e1000_init_module - Driver Registration Routine |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
242 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
243 |
* e1000_init_module is the first routine called when the driver is |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
244 |
* loaded. All it does is register with the PCI subsystem. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
245 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
246 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
247 |
static int __init e1000_init_module(void) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
248 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
249 |
int ret; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
250 |
pr_info("%s - version %s\n", e1000_driver_string, e1000_driver_version);
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
251 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
252 |
pr_info("%s\n", e1000_copyright);
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
253 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
254 |
ret = pci_register_driver(&e1000_driver); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
255 |
if (copybreak != COPYBREAK_DEFAULT) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
256 |
if (copybreak == 0) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
257 |
pr_info("copybreak disabled\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
258 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
259 |
pr_info("copybreak enabled for "
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
260 |
"packets <= %u bytes\n", copybreak); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
261 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
262 |
return ret; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
263 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
264 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
265 |
module_init(e1000_init_module); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
266 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
267 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
268 |
* e1000_exit_module - Driver Exit Cleanup Routine |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
269 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
270 |
* e1000_exit_module is called just before the driver is removed |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
271 |
* from memory. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
272 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
273 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
274 |
static void __exit e1000_exit_module(void) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
275 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
276 |
pci_unregister_driver(&e1000_driver); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
277 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
278 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
279 |
module_exit(e1000_exit_module); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
280 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
281 |
static int e1000_request_irq(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
282 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
283 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
284 |
irq_handler_t handler = e1000_intr; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
285 |
int irq_flags = IRQF_SHARED; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
286 |
int err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
287 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
288 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
289 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
290 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
291 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
292 |
err = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
293 |
netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
294 |
if (err) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
295 |
e_err(probe, "Unable to allocate interrupt Error: %d\n", err); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
296 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
297 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
298 |
return err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
299 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
300 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
301 |
static void e1000_free_irq(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
302 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
303 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
304 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
305 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
306 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
307 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
308 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
309 |
free_irq(adapter->pdev->irq, netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
310 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
311 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
312 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
313 |
* e1000_irq_disable - Mask off interrupt generation on the NIC |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
314 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
315 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
316 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
317 |
static void e1000_irq_disable(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
318 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
319 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
320 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
321 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
322 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
323 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
324 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
325 |
ew32(IMC, ~0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
326 |
E1000_WRITE_FLUSH(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
327 |
synchronize_irq(adapter->pdev->irq); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
328 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
329 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
330 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
331 |
* e1000_irq_enable - Enable default interrupt generation settings |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
332 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
333 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
334 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
335 |
static void e1000_irq_enable(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
336 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
337 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
338 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
339 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
340 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
341 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
342 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
343 |
ew32(IMS, IMS_ENABLE_MASK); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
344 |
E1000_WRITE_FLUSH(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
345 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
346 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
347 |
static void e1000_update_mng_vlan(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
348 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
349 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
350 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
351 |
u16 vid = hw->mng_cookie.vlan_id; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
352 |
u16 old_vid = adapter->mng_vlan_id; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
353 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
354 |
if (!e1000_vlan_used(adapter)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
355 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
356 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
357 |
if (!test_bit(vid, adapter->active_vlans)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
358 |
if (hw->mng_cookie.status & |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
359 |
E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
360 |
e1000_vlan_rx_add_vid(netdev, vid); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
361 |
adapter->mng_vlan_id = vid; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
362 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
363 |
adapter->mng_vlan_id = E1000_MNG_VLAN_NONE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
364 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
365 |
if ((old_vid != (u16)E1000_MNG_VLAN_NONE) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
366 |
(vid != old_vid) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
367 |
!test_bit(old_vid, adapter->active_vlans)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
368 |
e1000_vlan_rx_kill_vid(netdev, old_vid); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
369 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
370 |
adapter->mng_vlan_id = vid; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
371 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
372 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
373 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
374 |
static void e1000_init_manageability(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
375 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
376 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
377 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
378 |
if (adapter->en_mng_pt) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
379 |
u32 manc = er32(MANC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
380 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
381 |
/* disable hardware interception of ARP */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
382 |
manc &= ~(E1000_MANC_ARP_EN); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
383 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
384 |
ew32(MANC, manc); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
385 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
386 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
387 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
388 |
static void e1000_release_manageability(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
389 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
390 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
391 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
392 |
if (adapter->en_mng_pt) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
393 |
u32 manc = er32(MANC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
394 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
395 |
/* re-enable hardware interception of ARP */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
396 |
manc |= E1000_MANC_ARP_EN; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
397 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
398 |
ew32(MANC, manc); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
399 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
400 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
401 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
402 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
403 |
* e1000_configure - configure the hardware for RX and TX |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
404 |
* @adapter = private board structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
405 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
406 |
static void e1000_configure(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
407 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
408 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
409 |
int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
410 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
411 |
e1000_set_rx_mode(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
412 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
413 |
e1000_restore_vlan(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
414 |
e1000_init_manageability(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
415 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
416 |
e1000_configure_tx(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
417 |
e1000_setup_rctl(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
418 |
e1000_configure_rx(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
419 |
/* call E1000_DESC_UNUSED which always leaves |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
420 |
* at least 1 descriptor unused to make sure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
421 |
* next_to_use != next_to_clean */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
422 |
for (i = 0; i < adapter->num_rx_queues; i++) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
423 |
struct e1000_rx_ring *ring = &adapter->rx_ring[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
424 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
425 |
/* fill rx ring completely! */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
426 |
adapter->alloc_rx_buf(adapter, ring, ring->count); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
427 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
428 |
/* this one leaves the last ring element unallocated! */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
429 |
adapter->alloc_rx_buf(adapter, ring, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
430 |
E1000_DESC_UNUSED(ring)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
431 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
432 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
433 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
434 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
435 |
int e1000_up(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
436 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
437 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
438 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
439 |
/* hardware has been reset, we need to reload some things */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
440 |
e1000_configure(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
441 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
442 |
clear_bit(__E1000_DOWN, &adapter->flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
443 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
444 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
445 |
napi_enable(&adapter->napi); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
446 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
447 |
e1000_irq_enable(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
448 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
449 |
netif_wake_queue(adapter->netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
450 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
451 |
/* fire a link change interrupt to start the watchdog */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
452 |
ew32(ICS, E1000_ICS_LSC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
453 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
454 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
455 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
456 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
457 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
458 |
* e1000_power_up_phy - restore link in case the phy was powered down |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
459 |
* @adapter: address of board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
460 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
461 |
* The phy may be powered down to save power and turn off link when the |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
462 |
* driver is unloaded and wake on lan is not enabled (among others) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
463 |
* *** this routine MUST be followed by a call to e1000_reset *** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
464 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
465 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
466 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
467 |
void e1000_power_up_phy(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
468 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
469 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
470 |
u16 mii_reg = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
471 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
472 |
/* Just clear the power down bit to wake the phy back up */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
473 |
if (hw->media_type == e1000_media_type_copper) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
474 |
/* according to the manual, the phy will retain its |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
475 |
* settings across a power-down/up cycle */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
476 |
e1000_read_phy_reg(hw, PHY_CTRL, &mii_reg); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
477 |
mii_reg &= ~MII_CR_POWER_DOWN; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
478 |
e1000_write_phy_reg(hw, PHY_CTRL, mii_reg); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
479 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
480 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
481 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
482 |
static void e1000_power_down_phy(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
483 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
484 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
485 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
486 |
/* Power down the PHY so no link is implied when interface is down * |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
487 |
* The PHY cannot be powered down if any of the following is true * |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
488 |
* (a) WoL is enabled |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
489 |
* (b) AMT is active |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
490 |
* (c) SoL/IDER session is active */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
491 |
if (!adapter->wol && hw->mac_type >= e1000_82540 && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
492 |
hw->media_type == e1000_media_type_copper) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
493 |
u16 mii_reg = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
494 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
495 |
switch (hw->mac_type) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
496 |
case e1000_82540: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
497 |
case e1000_82545: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
498 |
case e1000_82545_rev_3: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
499 |
case e1000_82546: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
500 |
case e1000_ce4100: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
501 |
case e1000_82546_rev_3: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
502 |
case e1000_82541: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
503 |
case e1000_82541_rev_2: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
504 |
case e1000_82547: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
505 |
case e1000_82547_rev_2: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
506 |
if (er32(MANC) & E1000_MANC_SMBUS_EN) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
507 |
goto out; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
508 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
509 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
510 |
goto out; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
511 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
512 |
e1000_read_phy_reg(hw, PHY_CTRL, &mii_reg); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
513 |
mii_reg |= MII_CR_POWER_DOWN; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
514 |
e1000_write_phy_reg(hw, PHY_CTRL, mii_reg); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
515 |
msleep(1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
516 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
517 |
out: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
518 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
519 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
520 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
521 |
static void e1000_down_and_stop(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
522 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
523 |
set_bit(__E1000_DOWN, &adapter->flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
524 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
525 |
/* Only kill reset task if adapter is not resetting */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
526 |
if (!test_bit(__E1000_RESETTING, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
527 |
cancel_work_sync(&adapter->reset_task); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
528 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
529 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
530 |
cancel_delayed_work_sync(&adapter->watchdog_task); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
531 |
cancel_delayed_work_sync(&adapter->phy_info_task); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
532 |
cancel_delayed_work_sync(&adapter->fifo_stall_task); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
533 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
534 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
535 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
536 |
void e1000_down(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
537 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
538 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
539 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
540 |
u32 rctl, tctl; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
541 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
542 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
543 |
/* disable receives in the hardware */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
544 |
rctl = er32(RCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
545 |
ew32(RCTL, rctl & ~E1000_RCTL_EN); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
546 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
547 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
548 |
/* flush and sleep below */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
549 |
netif_tx_disable(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
550 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
551 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
552 |
/* disable transmits in the hardware */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
553 |
tctl = er32(TCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
554 |
tctl &= ~E1000_TCTL_EN; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
555 |
ew32(TCTL, tctl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
556 |
/* flush both disables and wait for them to finish */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
557 |
E1000_WRITE_FLUSH(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
558 |
msleep(10); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
559 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
560 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
561 |
napi_disable(&adapter->napi); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
562 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
563 |
e1000_irq_disable(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
564 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
565 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
566 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
567 |
* Setting DOWN must be after irq_disable to prevent |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
568 |
* a screaming interrupt. Setting DOWN also prevents |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
569 |
* tasks from rescheduling. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
570 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
571 |
e1000_down_and_stop(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
572 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
573 |
adapter->link_speed = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
574 |
adapter->link_duplex = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
575 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
576 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
577 |
netif_carrier_off(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
578 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
579 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
580 |
e1000_reset(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
581 |
e1000_clean_all_tx_rings(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
582 |
e1000_clean_all_rx_rings(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
583 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
584 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
585 |
static void e1000_reinit_safe(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
586 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
587 |
while (test_and_set_bit(__E1000_RESETTING, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
588 |
msleep(1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
589 |
mutex_lock(&adapter->mutex); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
590 |
e1000_down(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
591 |
e1000_up(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
592 |
mutex_unlock(&adapter->mutex); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
593 |
clear_bit(__E1000_RESETTING, &adapter->flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
594 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
595 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
596 |
void e1000_reinit_locked(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
597 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
598 |
/* if rtnl_lock is not held the call path is bogus */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
599 |
ASSERT_RTNL(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
600 |
WARN_ON(in_interrupt()); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
601 |
while (test_and_set_bit(__E1000_RESETTING, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
602 |
msleep(1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
603 |
e1000_down(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
604 |
e1000_up(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
605 |
clear_bit(__E1000_RESETTING, &adapter->flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
606 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
607 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
608 |
void e1000_reset(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
609 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
610 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
611 |
u32 pba = 0, tx_space, min_tx_space, min_rx_space; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
612 |
bool legacy_pba_adjust = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
613 |
u16 hwm; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
614 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
615 |
/* Repartition Pba for greater than 9k mtu |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
616 |
* To take effect CTRL.RST is required. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
617 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
618 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
619 |
switch (hw->mac_type) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
620 |
case e1000_82542_rev2_0: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
621 |
case e1000_82542_rev2_1: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
622 |
case e1000_82543: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
623 |
case e1000_82544: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
624 |
case e1000_82540: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
625 |
case e1000_82541: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
626 |
case e1000_82541_rev_2: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
627 |
legacy_pba_adjust = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
628 |
pba = E1000_PBA_48K; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
629 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
630 |
case e1000_82545: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
631 |
case e1000_82545_rev_3: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
632 |
case e1000_82546: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
633 |
case e1000_ce4100: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
634 |
case e1000_82546_rev_3: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
635 |
pba = E1000_PBA_48K; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
636 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
637 |
case e1000_82547: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
638 |
case e1000_82547_rev_2: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
639 |
legacy_pba_adjust = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
640 |
pba = E1000_PBA_30K; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
641 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
642 |
case e1000_undefined: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
643 |
case e1000_num_macs: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
644 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
645 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
646 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
647 |
if (legacy_pba_adjust) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
648 |
if (hw->max_frame_size > E1000_RXBUFFER_8192) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
649 |
pba -= 8; /* allocate more FIFO for Tx */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
650 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
651 |
if (hw->mac_type == e1000_82547) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
652 |
adapter->tx_fifo_head = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
653 |
adapter->tx_head_addr = pba << E1000_TX_HEAD_ADDR_SHIFT; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
654 |
adapter->tx_fifo_size = |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
655 |
(E1000_PBA_40K - pba) << E1000_PBA_BYTES_SHIFT; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
656 |
atomic_set(&adapter->tx_fifo_stall, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
657 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
658 |
} else if (hw->max_frame_size > ETH_FRAME_LEN + ETH_FCS_LEN) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
659 |
/* adjust PBA for jumbo frames */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
660 |
ew32(PBA, pba); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
661 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
662 |
/* To maintain wire speed transmits, the Tx FIFO should be |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
663 |
* large enough to accommodate two full transmit packets, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
664 |
* rounded up to the next 1KB and expressed in KB. Likewise, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
665 |
* the Rx FIFO should be large enough to accommodate at least |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
666 |
* one full receive packet and is similarly rounded up and |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
667 |
* expressed in KB. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
668 |
pba = er32(PBA); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
669 |
/* upper 16 bits has Tx packet buffer allocation size in KB */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
670 |
tx_space = pba >> 16; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
671 |
/* lower 16 bits has Rx packet buffer allocation size in KB */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
672 |
pba &= 0xffff; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
673 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
674 |
* the tx fifo also stores 16 bytes of information about the tx |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
675 |
* but don't include ethernet FCS because hardware appends it |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
676 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
677 |
min_tx_space = (hw->max_frame_size + |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
678 |
sizeof(struct e1000_tx_desc) - |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
679 |
ETH_FCS_LEN) * 2; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
680 |
min_tx_space = ALIGN(min_tx_space, 1024); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
681 |
min_tx_space >>= 10; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
682 |
/* software strips receive CRC, so leave room for it */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
683 |
min_rx_space = hw->max_frame_size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
684 |
min_rx_space = ALIGN(min_rx_space, 1024); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
685 |
min_rx_space >>= 10; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
686 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
687 |
/* If current Tx allocation is less than the min Tx FIFO size, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
688 |
* and the min Tx FIFO size is less than the current Rx FIFO |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
689 |
* allocation, take space away from current Rx allocation */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
690 |
if (tx_space < min_tx_space && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
691 |
((min_tx_space - tx_space) < pba)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
692 |
pba = pba - (min_tx_space - tx_space); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
693 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
694 |
/* PCI/PCIx hardware has PBA alignment constraints */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
695 |
switch (hw->mac_type) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
696 |
case e1000_82545 ... e1000_82546_rev_3: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
697 |
pba &= ~(E1000_PBA_8K - 1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
698 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
699 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
700 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
701 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
702 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
703 |
/* if short on rx space, rx wins and must trump tx |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
704 |
* adjustment or use Early Receive if available */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
705 |
if (pba < min_rx_space) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
706 |
pba = min_rx_space; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
707 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
708 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
709 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
710 |
ew32(PBA, pba); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
711 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
712 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
713 |
* flow control settings: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
714 |
* The high water mark must be low enough to fit one full frame |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
715 |
* (or the size used for early receive) above it in the Rx FIFO. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
716 |
* Set it to the lower of: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
717 |
* - 90% of the Rx FIFO size, and |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
718 |
* - the full Rx FIFO size minus the early receive size (for parts |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
719 |
* with ERT support assuming ERT set to E1000_ERT_2048), or |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
720 |
* - the full Rx FIFO size minus one full frame |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
721 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
722 |
hwm = min(((pba << 10) * 9 / 10), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
723 |
((pba << 10) - hw->max_frame_size)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
724 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
725 |
hw->fc_high_water = hwm & 0xFFF8; /* 8-byte granularity */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
726 |
hw->fc_low_water = hw->fc_high_water - 8; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
727 |
hw->fc_pause_time = E1000_FC_PAUSE_TIME; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
728 |
hw->fc_send_xon = 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
729 |
hw->fc = hw->original_fc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
730 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
731 |
/* Allow time for pending master requests to run */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
732 |
e1000_reset_hw(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
733 |
if (hw->mac_type >= e1000_82544) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
734 |
ew32(WUC, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
735 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
736 |
if (e1000_init_hw(hw)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
737 |
e_dev_err("Hardware Error\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
738 |
e1000_update_mng_vlan(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
739 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
740 |
/* if (adapter->hwflags & HWFLAGS_PHY_PWR_BIT) { */
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
741 |
if (hw->mac_type >= e1000_82544 && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
742 |
hw->autoneg == 1 && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
743 |
hw->autoneg_advertised == ADVERTISE_1000_FULL) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
744 |
u32 ctrl = er32(CTRL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
745 |
/* clear phy power management bit if we are in gig only mode, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
746 |
* which if enabled will attempt negotiation to 100Mb, which |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
747 |
* can cause a loss of link at power off or driver unload */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
748 |
ctrl &= ~E1000_CTRL_SWDPIN3; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
749 |
ew32(CTRL, ctrl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
750 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
751 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
752 |
/* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
753 |
ew32(VET, ETHERNET_IEEE_VLAN_TYPE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
754 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
755 |
e1000_reset_adaptive(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
756 |
e1000_phy_get_info(hw, &adapter->phy_info); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
757 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
758 |
e1000_release_manageability(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
759 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
760 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
761 |
/* Dump the eeprom for users having checksum issues */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
762 |
static void e1000_dump_eeprom(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
763 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
764 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
765 |
struct ethtool_eeprom eeprom; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
766 |
const struct ethtool_ops *ops = netdev->ethtool_ops; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
767 |
u8 *data; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
768 |
int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
769 |
u16 csum_old, csum_new = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
770 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
771 |
eeprom.len = ops->get_eeprom_len(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
772 |
eeprom.offset = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
773 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
774 |
data = kmalloc(eeprom.len, GFP_KERNEL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
775 |
if (!data) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
776 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
777 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
778 |
ops->get_eeprom(netdev, &eeprom, data); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
779 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
780 |
csum_old = (data[EEPROM_CHECKSUM_REG * 2]) + |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
781 |
(data[EEPROM_CHECKSUM_REG * 2 + 1] << 8); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
782 |
for (i = 0; i < EEPROM_CHECKSUM_REG * 2; i += 2) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
783 |
csum_new += data[i] + (data[i + 1] << 8); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
784 |
csum_new = EEPROM_SUM - csum_new; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
785 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
786 |
pr_err("/*********************/\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
787 |
pr_err("Current EEPROM Checksum : 0x%04x\n", csum_old);
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
788 |
pr_err("Calculated : 0x%04x\n", csum_new);
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
789 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
790 |
pr_err("Offset Values\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
791 |
pr_err("======== ======\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
792 |
print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 16, 1, data, 128, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
793 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
794 |
pr_err("Include this output when contacting your support provider.\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
795 |
pr_err("This is not a software error! Something bad happened to\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
796 |
pr_err("your hardware or EEPROM image. Ignoring this problem could\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
797 |
pr_err("result in further problems, possibly loss of data,\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
798 |
pr_err("corruption or system hangs!\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
799 |
pr_err("The MAC Address will be reset to 00:00:00:00:00:00,\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
800 |
pr_err("which is invalid and requires you to set the proper MAC\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
801 |
pr_err("address manually before continuing to enable this network\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
802 |
pr_err("device. Please inspect the EEPROM dump and report the\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
803 |
pr_err("issue to your hardware vendor or Intel Customer Support.\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
804 |
pr_err("/*********************/\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
805 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
806 |
kfree(data); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
807 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
808 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
809 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
810 |
* e1000_is_need_ioport - determine if an adapter needs ioport resources or not |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
811 |
* @pdev: PCI device information struct |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
812 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
813 |
* Return true if an adapter needs ioport resources |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
814 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
815 |
static int e1000_is_need_ioport(struct pci_dev *pdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
816 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
817 |
switch (pdev->device) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
818 |
case E1000_DEV_ID_82540EM: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
819 |
case E1000_DEV_ID_82540EM_LOM: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
820 |
case E1000_DEV_ID_82540EP: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
821 |
case E1000_DEV_ID_82540EP_LOM: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
822 |
case E1000_DEV_ID_82540EP_LP: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
823 |
case E1000_DEV_ID_82541EI: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
824 |
case E1000_DEV_ID_82541EI_MOBILE: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
825 |
case E1000_DEV_ID_82541ER: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
826 |
case E1000_DEV_ID_82541ER_LOM: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
827 |
case E1000_DEV_ID_82541GI: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
828 |
case E1000_DEV_ID_82541GI_LF: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
829 |
case E1000_DEV_ID_82541GI_MOBILE: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
830 |
case E1000_DEV_ID_82544EI_COPPER: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
831 |
case E1000_DEV_ID_82544EI_FIBER: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
832 |
case E1000_DEV_ID_82544GC_COPPER: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
833 |
case E1000_DEV_ID_82544GC_LOM: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
834 |
case E1000_DEV_ID_82545EM_COPPER: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
835 |
case E1000_DEV_ID_82545EM_FIBER: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
836 |
case E1000_DEV_ID_82546EB_COPPER: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
837 |
case E1000_DEV_ID_82546EB_FIBER: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
838 |
case E1000_DEV_ID_82546EB_QUAD_COPPER: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
839 |
return true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
840 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
841 |
return false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
842 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
843 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
844 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
845 |
static netdev_features_t e1000_fix_features(struct net_device *netdev, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
846 |
netdev_features_t features) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
847 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
848 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
849 |
* Since there is no support for separate rx/tx vlan accel |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
850 |
* enable/disable make sure tx flag is always in same state as rx. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
851 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
852 |
if (features & NETIF_F_HW_VLAN_RX) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
853 |
features |= NETIF_F_HW_VLAN_TX; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
854 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
855 |
features &= ~NETIF_F_HW_VLAN_TX; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
856 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
857 |
return features; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
858 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
859 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
860 |
static int e1000_set_features(struct net_device *netdev, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
861 |
netdev_features_t features) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
862 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
863 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
864 |
netdev_features_t changed = features ^ netdev->features; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
865 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
866 |
if (changed & NETIF_F_HW_VLAN_RX) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
867 |
e1000_vlan_mode(netdev, features); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
868 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
869 |
if (!(changed & (NETIF_F_RXCSUM | NETIF_F_RXALL))) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
870 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
871 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
872 |
netdev->features = features; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
873 |
adapter->rx_csum = !!(features & NETIF_F_RXCSUM); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
874 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
875 |
if (netif_running(netdev)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
876 |
e1000_reinit_locked(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
877 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
878 |
e1000_reset(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
879 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
880 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
881 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
882 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
883 |
static const struct net_device_ops e1000_netdev_ops = {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
884 |
.ndo_open = e1000_open, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
885 |
.ndo_stop = e1000_close, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
886 |
.ndo_start_xmit = e1000_xmit_frame, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
887 |
.ndo_get_stats = e1000_get_stats, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
888 |
.ndo_set_rx_mode = e1000_set_rx_mode, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
889 |
.ndo_set_mac_address = e1000_set_mac, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
890 |
.ndo_tx_timeout = e1000_tx_timeout, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
891 |
.ndo_change_mtu = e1000_change_mtu, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
892 |
.ndo_do_ioctl = e1000_ioctl, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
893 |
.ndo_validate_addr = eth_validate_addr, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
894 |
.ndo_vlan_rx_add_vid = e1000_vlan_rx_add_vid, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
895 |
.ndo_vlan_rx_kill_vid = e1000_vlan_rx_kill_vid, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
896 |
#ifdef CONFIG_NET_POLL_CONTROLLER |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
897 |
.ndo_poll_controller = e1000_netpoll, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
898 |
#endif |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
899 |
.ndo_fix_features = e1000_fix_features, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
900 |
.ndo_set_features = e1000_set_features, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
901 |
}; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
902 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
903 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
904 |
* e1000_init_hw_struct - initialize members of hw struct |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
905 |
* @adapter: board private struct |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
906 |
* @hw: structure used by e1000_hw.c |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
907 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
908 |
* Factors out initialization of the e1000_hw struct to its own function |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
909 |
* that can be called very early at init (just after struct allocation). |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
910 |
* Fields are initialized based on PCI device information and |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
911 |
* OS network device settings (MTU size). |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
912 |
* Returns negative error codes if MAC type setup fails. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
913 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
914 |
static int e1000_init_hw_struct(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
915 |
struct e1000_hw *hw) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
916 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
917 |
struct pci_dev *pdev = adapter->pdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
918 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
919 |
/* PCI config space info */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
920 |
hw->vendor_id = pdev->vendor; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
921 |
hw->device_id = pdev->device; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
922 |
hw->subsystem_vendor_id = pdev->subsystem_vendor; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
923 |
hw->subsystem_id = pdev->subsystem_device; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
924 |
hw->revision_id = pdev->revision; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
925 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
926 |
pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
927 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
928 |
hw->max_frame_size = adapter->netdev->mtu + |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
929 |
ENET_HEADER_SIZE + ETHERNET_FCS_SIZE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
930 |
hw->min_frame_size = MINIMUM_ETHERNET_FRAME_SIZE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
931 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
932 |
/* identify the MAC */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
933 |
if (e1000_set_mac_type(hw)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
934 |
e_err(probe, "Unknown MAC Type\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
935 |
return -EIO; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
936 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
937 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
938 |
switch (hw->mac_type) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
939 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
940 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
941 |
case e1000_82541: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
942 |
case e1000_82547: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
943 |
case e1000_82541_rev_2: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
944 |
case e1000_82547_rev_2: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
945 |
hw->phy_init_script = 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
946 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
947 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
948 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
949 |
e1000_set_media_type(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
950 |
e1000_get_bus_info(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
951 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
952 |
hw->wait_autoneg_complete = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
953 |
hw->tbi_compatibility_en = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
954 |
hw->adaptive_ifs = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
955 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
956 |
/* Copper options */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
957 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
958 |
if (hw->media_type == e1000_media_type_copper) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
959 |
hw->mdix = AUTO_ALL_MODES; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
960 |
hw->disable_polarity_correction = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
961 |
hw->master_slave = E1000_MASTER_SLAVE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
962 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
963 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
964 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
965 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
966 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
967 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
968 |
* e1000_probe - Device Initialization Routine |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
969 |
* @pdev: PCI device information struct |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
970 |
* @ent: entry in e1000_pci_tbl |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
971 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
972 |
* Returns 0 on success, negative on failure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
973 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
974 |
* e1000_probe initializes an adapter identified by a pci_dev structure. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
975 |
* The OS initialization, configuring of the adapter private structure, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
976 |
* and a hardware reset occur. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
977 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
978 |
static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
979 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
980 |
struct net_device *netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
981 |
struct e1000_adapter *adapter; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
982 |
struct e1000_hw *hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
983 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
984 |
static int cards_found = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
985 |
static int global_quad_port_a = 0; /* global ksp3 port a indication */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
986 |
int i, err, pci_using_dac; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
987 |
u16 eeprom_data = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
988 |
u16 tmp = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
989 |
u16 eeprom_apme_mask = E1000_EEPROM_APME; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
990 |
int bars, need_ioport; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
991 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
992 |
/* do not allocate ioport bars when not needed */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
993 |
need_ioport = e1000_is_need_ioport(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
994 |
if (need_ioport) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
995 |
bars = pci_select_bars(pdev, IORESOURCE_MEM | IORESOURCE_IO); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
996 |
err = pci_enable_device(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
997 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
998 |
bars = pci_select_bars(pdev, IORESOURCE_MEM); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
999 |
err = pci_enable_device_mem(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1000 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1001 |
if (err) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1002 |
return err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1003 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1004 |
err = pci_request_selected_regions(pdev, bars, e1000_driver_name); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1005 |
if (err) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1006 |
goto err_pci_reg; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1007 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1008 |
pci_set_master(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1009 |
err = pci_save_state(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1010 |
if (err) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1011 |
goto err_alloc_etherdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1012 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1013 |
err = -ENOMEM; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1014 |
netdev = alloc_etherdev(sizeof(struct e1000_adapter)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1015 |
if (!netdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1016 |
goto err_alloc_etherdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1017 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1018 |
SET_NETDEV_DEV(netdev, &pdev->dev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1019 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1020 |
pci_set_drvdata(pdev, netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1021 |
adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1022 |
adapter->netdev = netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1023 |
adapter->pdev = pdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1024 |
adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1025 |
adapter->bars = bars; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1026 |
adapter->need_ioport = need_ioport; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1027 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1028 |
hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1029 |
hw->back = adapter; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1030 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1031 |
err = -EIO; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1032 |
hw->hw_addr = pci_ioremap_bar(pdev, BAR_0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1033 |
if (!hw->hw_addr) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1034 |
goto err_ioremap; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1035 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1036 |
if (adapter->need_ioport) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1037 |
for (i = BAR_1; i <= BAR_5; i++) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1038 |
if (pci_resource_len(pdev, i) == 0) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1039 |
continue; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1040 |
if (pci_resource_flags(pdev, i) & IORESOURCE_IO) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1041 |
hw->io_base = pci_resource_start(pdev, i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1042 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1043 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1044 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1045 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1046 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1047 |
/* make ready for any if (hw->...) below */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1048 |
err = e1000_init_hw_struct(adapter, hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1049 |
if (err) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1050 |
goto err_sw_init; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1051 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1052 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1053 |
* there is a workaround being applied below that limits |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1054 |
* 64-bit DMA addresses to 64-bit hardware. There are some |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1055 |
* 32-bit adapters that Tx hang when given 64-bit DMA addresses |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1056 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1057 |
pci_using_dac = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1058 |
if ((hw->bus_type == e1000_bus_type_pcix) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1059 |
!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1060 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1061 |
* according to DMA-API-HOWTO, coherent calls will always |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1062 |
* succeed if the set call did |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1063 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1064 |
dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1065 |
pci_using_dac = 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1066 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1067 |
err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1068 |
if (err) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1069 |
pr_err("No usable DMA config, aborting\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1070 |
goto err_dma; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1071 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1072 |
dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1073 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1074 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1075 |
netdev->netdev_ops = &e1000_netdev_ops; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1076 |
e1000_set_ethtool_ops(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1077 |
netdev->watchdog_timeo = 5 * HZ; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1078 |
netif_napi_add(netdev, &adapter->napi, e1000_clean, 64); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1079 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1080 |
strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1081 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1082 |
adapter->bd_number = cards_found; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1083 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1084 |
/* setup the private structure */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1085 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1086 |
err = e1000_sw_init(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1087 |
if (err) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1088 |
goto err_sw_init; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1089 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1090 |
err = -EIO; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1091 |
if (hw->mac_type == e1000_ce4100) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1092 |
hw->ce4100_gbe_mdio_base_virt = |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1093 |
ioremap(pci_resource_start(pdev, BAR_1), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1094 |
pci_resource_len(pdev, BAR_1)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1095 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1096 |
if (!hw->ce4100_gbe_mdio_base_virt) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1097 |
goto err_mdio_ioremap; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1098 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1099 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1100 |
if (hw->mac_type >= e1000_82543) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1101 |
netdev->hw_features = NETIF_F_SG | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1102 |
NETIF_F_HW_CSUM | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1103 |
NETIF_F_HW_VLAN_RX; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1104 |
netdev->features = NETIF_F_HW_VLAN_TX | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1105 |
NETIF_F_HW_VLAN_FILTER; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1106 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1107 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1108 |
if ((hw->mac_type >= e1000_82544) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1109 |
(hw->mac_type != e1000_82547)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1110 |
netdev->hw_features |= NETIF_F_TSO; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1111 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1112 |
netdev->priv_flags |= IFF_SUPP_NOFCS; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1113 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1114 |
netdev->features |= netdev->hw_features; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1115 |
netdev->hw_features |= (NETIF_F_RXCSUM | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1116 |
NETIF_F_RXALL | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1117 |
NETIF_F_RXFCS); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1118 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1119 |
if (pci_using_dac) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1120 |
netdev->features |= NETIF_F_HIGHDMA; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1121 |
netdev->vlan_features |= NETIF_F_HIGHDMA; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1122 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1123 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1124 |
netdev->vlan_features |= (NETIF_F_TSO | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1125 |
NETIF_F_HW_CSUM | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1126 |
NETIF_F_SG); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1127 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1128 |
netdev->priv_flags |= IFF_UNICAST_FLT; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1129 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1130 |
adapter->en_mng_pt = e1000_enable_mng_pass_thru(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1131 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1132 |
/* initialize eeprom parameters */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1133 |
if (e1000_init_eeprom_params(hw)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1134 |
e_err(probe, "EEPROM initialization failed\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1135 |
goto err_eeprom; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1136 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1137 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1138 |
/* before reading the EEPROM, reset the controller to |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1139 |
* put the device in a known good starting state */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1140 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1141 |
e1000_reset_hw(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1142 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1143 |
/* make sure the EEPROM is good */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1144 |
if (e1000_validate_eeprom_checksum(hw) < 0) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1145 |
e_err(probe, "The EEPROM Checksum Is Not Valid\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1146 |
e1000_dump_eeprom(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1147 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1148 |
* set MAC address to all zeroes to invalidate and temporary |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1149 |
* disable this device for the user. This blocks regular |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1150 |
* traffic while still permitting ethtool ioctls from reaching |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1151 |
* the hardware as well as allowing the user to run the |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1152 |
* interface after manually setting a hw addr using |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1153 |
* `ip set address` |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1154 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1155 |
memset(hw->mac_addr, 0, netdev->addr_len); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1156 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1157 |
/* copy the MAC address out of the EEPROM */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1158 |
if (e1000_read_mac_addr(hw)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1159 |
e_err(probe, "EEPROM Read Error\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1160 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1161 |
/* don't block initalization here due to bad MAC address */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1162 |
memcpy(netdev->dev_addr, hw->mac_addr, netdev->addr_len); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1163 |
memcpy(netdev->perm_addr, hw->mac_addr, netdev->addr_len); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1164 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1165 |
if (!is_valid_ether_addr(netdev->perm_addr)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1166 |
e_err(probe, "Invalid MAC Address\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1167 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1168 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1169 |
INIT_DELAYED_WORK(&adapter->watchdog_task, e1000_watchdog); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1170 |
INIT_DELAYED_WORK(&adapter->fifo_stall_task, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1171 |
e1000_82547_tx_fifo_stall_task); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1172 |
INIT_DELAYED_WORK(&adapter->phy_info_task, e1000_update_phy_info_task); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1173 |
INIT_WORK(&adapter->reset_task, e1000_reset_task); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1174 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1175 |
e1000_check_options(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1176 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1177 |
/* Initial Wake on LAN setting |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1178 |
* If APM wake is enabled in the EEPROM, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1179 |
* enable the ACPI Magic Packet filter |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1180 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1181 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1182 |
switch (hw->mac_type) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1183 |
case e1000_82542_rev2_0: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1184 |
case e1000_82542_rev2_1: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1185 |
case e1000_82543: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1186 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1187 |
case e1000_82544: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1188 |
e1000_read_eeprom(hw, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1189 |
EEPROM_INIT_CONTROL2_REG, 1, &eeprom_data); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1190 |
eeprom_apme_mask = E1000_EEPROM_82544_APM; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1191 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1192 |
case e1000_82546: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1193 |
case e1000_82546_rev_3: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1194 |
if (er32(STATUS) & E1000_STATUS_FUNC_1){
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1195 |
e1000_read_eeprom(hw, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1196 |
EEPROM_INIT_CONTROL3_PORT_B, 1, &eeprom_data); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1197 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1198 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1199 |
/* Fall Through */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1200 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1201 |
e1000_read_eeprom(hw, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1202 |
EEPROM_INIT_CONTROL3_PORT_A, 1, &eeprom_data); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1203 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1204 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1205 |
if (eeprom_data & eeprom_apme_mask) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1206 |
adapter->eeprom_wol |= E1000_WUFC_MAG; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1207 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1208 |
/* now that we have the eeprom settings, apply the special cases |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1209 |
* where the eeprom may be wrong or the board simply won't support |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1210 |
* wake on lan on a particular port */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1211 |
switch (pdev->device) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1212 |
case E1000_DEV_ID_82546GB_PCIE: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1213 |
adapter->eeprom_wol = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1214 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1215 |
case E1000_DEV_ID_82546EB_FIBER: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1216 |
case E1000_DEV_ID_82546GB_FIBER: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1217 |
/* Wake events only supported on port A for dual fiber |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1218 |
* regardless of eeprom setting */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1219 |
if (er32(STATUS) & E1000_STATUS_FUNC_1) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1220 |
adapter->eeprom_wol = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1221 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1222 |
case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1223 |
/* if quad port adapter, disable WoL on all but port A */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1224 |
if (global_quad_port_a != 0) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1225 |
adapter->eeprom_wol = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1226 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1227 |
adapter->quad_port_a = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1228 |
/* Reset for multiple quad port adapters */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1229 |
if (++global_quad_port_a == 4) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1230 |
global_quad_port_a = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1231 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1232 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1233 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1234 |
/* initialize the wol settings based on the eeprom settings */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1235 |
adapter->wol = adapter->eeprom_wol; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1236 |
device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1237 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1238 |
/* Auto detect PHY address */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1239 |
if (hw->mac_type == e1000_ce4100) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1240 |
for (i = 0; i < 32; i++) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1241 |
hw->phy_addr = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1242 |
e1000_read_phy_reg(hw, PHY_ID2, &tmp); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1243 |
if (tmp == 0 || tmp == 0xFF) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1244 |
if (i == 31) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1245 |
goto err_eeprom; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1246 |
continue; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1247 |
} else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1248 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1249 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1250 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1251 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1252 |
/* reset the hardware with the new settings */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1253 |
e1000_reset(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1254 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1255 |
// offer device to EtherCAT master module |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1256 |
adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1257 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1258 |
err = ecdev_open(adapter->ecdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1259 |
if (err) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1260 |
ecdev_withdraw(adapter->ecdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1261 |
goto err_register; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1262 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1263 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1264 |
strcpy(netdev->name, "eth%d"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1265 |
err = register_netdev(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1266 |
if (err) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1267 |
goto err_register; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1268 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1269 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1270 |
e1000_vlan_filter_on_off(adapter, false); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1271 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1272 |
/* print bus type/speed/width info */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1273 |
e_info(probe, "(PCI%s:%dMHz:%d-bit) %pM\n", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1274 |
((hw->bus_type == e1000_bus_type_pcix) ? "-X" : ""), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1275 |
((hw->bus_speed == e1000_bus_speed_133) ? 133 : |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1276 |
(hw->bus_speed == e1000_bus_speed_120) ? 120 : |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1277 |
(hw->bus_speed == e1000_bus_speed_100) ? 100 : |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1278 |
(hw->bus_speed == e1000_bus_speed_66) ? 66 : 33), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1279 |
((hw->bus_width == e1000_bus_width_64) ? 64 : 32), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1280 |
netdev->dev_addr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1281 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1282 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1283 |
/* carrier off reporting is important to ethtool even BEFORE open */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1284 |
netif_carrier_off(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1285 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1286 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1287 |
e_info(probe, "Intel(R) PRO/1000 Network Connection\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1288 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1289 |
cards_found++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1290 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1291 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1292 |
err_register: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1293 |
err_eeprom: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1294 |
e1000_phy_hw_reset(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1295 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1296 |
if (hw->flash_address) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1297 |
iounmap(hw->flash_address); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1298 |
kfree(adapter->tx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1299 |
kfree(adapter->rx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1300 |
err_dma: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1301 |
err_sw_init: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1302 |
err_mdio_ioremap: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1303 |
iounmap(hw->ce4100_gbe_mdio_base_virt); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1304 |
iounmap(hw->hw_addr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1305 |
err_ioremap: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1306 |
free_netdev(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1307 |
err_alloc_etherdev: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1308 |
pci_release_selected_regions(pdev, bars); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1309 |
err_pci_reg: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1310 |
pci_disable_device(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1311 |
return err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1312 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1313 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1314 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1315 |
* e1000_remove - Device Removal Routine |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1316 |
* @pdev: PCI device information struct |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1317 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1318 |
* e1000_remove is called by the PCI subsystem to alert the driver |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1319 |
* that it should release a PCI device. The could be caused by a |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1320 |
* Hot-Plug event, or because the driver is going to be removed from |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1321 |
* memory. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1322 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1323 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1324 |
static void e1000_remove(struct pci_dev *pdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1325 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1326 |
struct net_device *netdev = pci_get_drvdata(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1327 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1328 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1329 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1330 |
e1000_down_and_stop(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1331 |
e1000_release_manageability(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1332 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1333 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1334 |
ecdev_close(adapter->ecdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1335 |
ecdev_withdraw(adapter->ecdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1336 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1337 |
unregister_netdev(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1338 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1339 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1340 |
e1000_phy_hw_reset(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1341 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1342 |
kfree(adapter->tx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1343 |
kfree(adapter->rx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1344 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1345 |
if (hw->mac_type == e1000_ce4100) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1346 |
iounmap(hw->ce4100_gbe_mdio_base_virt); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1347 |
iounmap(hw->hw_addr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1348 |
if (hw->flash_address) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1349 |
iounmap(hw->flash_address); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1350 |
pci_release_selected_regions(pdev, adapter->bars); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1351 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1352 |
free_netdev(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1353 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1354 |
pci_disable_device(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1355 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1356 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1357 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1358 |
* e1000_sw_init - Initialize general software structures (struct e1000_adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1359 |
* @adapter: board private structure to initialize |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1360 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1361 |
* e1000_sw_init initializes the Adapter private data structure. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1362 |
* e1000_init_hw_struct MUST be called before this function |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1363 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1364 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1365 |
static int e1000_sw_init(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1366 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1367 |
adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1368 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1369 |
adapter->num_tx_queues = 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1370 |
adapter->num_rx_queues = 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1371 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1372 |
if (e1000_alloc_queues(adapter)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1373 |
e_err(probe, "Unable to allocate memory for queues\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1374 |
return -ENOMEM; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1375 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1376 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1377 |
/* Explicitly disable IRQ since the NIC can be in any state. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1378 |
e1000_irq_disable(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1379 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1380 |
spin_lock_init(&adapter->stats_lock); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1381 |
mutex_init(&adapter->mutex); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1382 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1383 |
set_bit(__E1000_DOWN, &adapter->flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1384 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1385 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1386 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1387 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1388 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1389 |
* e1000_alloc_queues - Allocate memory for all rings |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1390 |
* @adapter: board private structure to initialize |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1391 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1392 |
* We allocate one ring per queue at run-time since we don't know the |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1393 |
* number of queues at compile-time. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1394 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1395 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1396 |
static int e1000_alloc_queues(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1397 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1398 |
adapter->tx_ring = kcalloc(adapter->num_tx_queues, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1399 |
sizeof(struct e1000_tx_ring), GFP_KERNEL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1400 |
if (!adapter->tx_ring) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1401 |
return -ENOMEM; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1402 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1403 |
adapter->rx_ring = kcalloc(adapter->num_rx_queues, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1404 |
sizeof(struct e1000_rx_ring), GFP_KERNEL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1405 |
if (!adapter->rx_ring) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1406 |
kfree(adapter->tx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1407 |
return -ENOMEM; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1408 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1409 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1410 |
return E1000_SUCCESS; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1411 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1412 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1413 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1414 |
* e1000_open - Called when a network interface is made active |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1415 |
* @netdev: network interface device structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1416 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1417 |
* Returns 0 on success, negative value on failure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1418 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1419 |
* The open entry point is called when a network interface is made |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1420 |
* active by the system (IFF_UP). At this point all resources needed |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1421 |
* for transmit and receive operations are allocated, the interrupt |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1422 |
* handler is registered with the OS, the watchdog task is started, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1423 |
* and the stack is notified that the interface is ready. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1424 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1425 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1426 |
static int e1000_open(struct net_device *netdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1427 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1428 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1429 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1430 |
int err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1431 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1432 |
/* disallow open during test */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1433 |
if (test_bit(__E1000_TESTING, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1434 |
return -EBUSY; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1435 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1436 |
netif_carrier_off(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1437 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1438 |
/* allocate transmit descriptors */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1439 |
err = e1000_setup_all_tx_resources(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1440 |
if (err) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1441 |
goto err_setup_tx; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1442 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1443 |
/* allocate receive descriptors */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1444 |
err = e1000_setup_all_rx_resources(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1445 |
if (err) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1446 |
goto err_setup_rx; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1447 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1448 |
e1000_power_up_phy(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1449 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1450 |
adapter->mng_vlan_id = E1000_MNG_VLAN_NONE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1451 |
if ((hw->mng_cookie.status & |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1452 |
E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1453 |
e1000_update_mng_vlan(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1454 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1455 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1456 |
/* before we allocate an interrupt, we must be ready to handle it. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1457 |
* Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1458 |
* as soon as we call pci_request_irq, so we have to setup our |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1459 |
* clean_rx handler before we do so. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1460 |
e1000_configure(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1461 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1462 |
err = e1000_request_irq(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1463 |
if (err) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1464 |
goto err_req_irq; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1465 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1466 |
/* From here on the code is the same as e1000_up() */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1467 |
clear_bit(__E1000_DOWN, &adapter->flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1468 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1469 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1470 |
napi_enable(&adapter->napi); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1471 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1472 |
e1000_irq_enable(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1473 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1474 |
netif_start_queue(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1475 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1476 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1477 |
/* fire a link status change interrupt to start the watchdog */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1478 |
ew32(ICS, E1000_ICS_LSC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1479 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1480 |
return E1000_SUCCESS; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1481 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1482 |
err_req_irq: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1483 |
e1000_power_down_phy(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1484 |
e1000_free_all_rx_resources(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1485 |
err_setup_rx: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1486 |
e1000_free_all_tx_resources(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1487 |
err_setup_tx: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1488 |
e1000_reset(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1489 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1490 |
return err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1491 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1492 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1493 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1494 |
* e1000_close - Disables a network interface |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1495 |
* @netdev: network interface device structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1496 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1497 |
* Returns 0, this is not allowed to fail |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1498 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1499 |
* The close entry point is called when an interface is de-activated |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1500 |
* by the OS. The hardware is still under the drivers control, but |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1501 |
* needs to be disabled. A global MAC reset is issued to stop the |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1502 |
* hardware, and all transmit and receive resources are freed. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1503 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1504 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1505 |
static int e1000_close(struct net_device *netdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1506 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1507 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1508 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1509 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1510 |
WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1511 |
e1000_down(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1512 |
e1000_power_down_phy(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1513 |
e1000_free_irq(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1514 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1515 |
e1000_free_all_tx_resources(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1516 |
e1000_free_all_rx_resources(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1517 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1518 |
/* kill manageability vlan ID if supported, but not if a vlan with |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1519 |
* the same ID is registered on the host OS (let 8021q kill it) */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1520 |
if ((hw->mng_cookie.status & |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1521 |
E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1522 |
!test_bit(adapter->mng_vlan_id, adapter->active_vlans)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1523 |
e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1524 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1525 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1526 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1527 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1528 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1529 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1530 |
* e1000_check_64k_bound - check that memory doesn't cross 64kB boundary |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1531 |
* @adapter: address of board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1532 |
* @start: address of beginning of memory |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1533 |
* @len: length of memory |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1534 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1535 |
static bool e1000_check_64k_bound(struct e1000_adapter *adapter, void *start, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1536 |
unsigned long len) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1537 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1538 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1539 |
unsigned long begin = (unsigned long)start; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1540 |
unsigned long end = begin + len; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1541 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1542 |
/* First rev 82545 and 82546 need to not allow any memory |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1543 |
* write location to cross 64k boundary due to errata 23 */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1544 |
if (hw->mac_type == e1000_82545 || |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1545 |
hw->mac_type == e1000_ce4100 || |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1546 |
hw->mac_type == e1000_82546) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1547 |
return ((begin ^ (end - 1)) >> 16) != 0 ? false : true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1548 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1549 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1550 |
return true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1551 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1552 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1553 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1554 |
* e1000_setup_tx_resources - allocate Tx resources (Descriptors) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1555 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1556 |
* @txdr: tx descriptor ring (for a specific queue) to setup |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1557 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1558 |
* Return 0 on success, negative on failure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1559 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1560 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1561 |
static int e1000_setup_tx_resources(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1562 |
struct e1000_tx_ring *txdr) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1563 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1564 |
struct pci_dev *pdev = adapter->pdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1565 |
int size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1566 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1567 |
size = sizeof(struct e1000_buffer) * txdr->count; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1568 |
txdr->buffer_info = vzalloc(size); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1569 |
if (!txdr->buffer_info) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1570 |
e_err(probe, "Unable to allocate memory for the Tx descriptor " |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1571 |
"ring\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1572 |
return -ENOMEM; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1573 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1574 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1575 |
/* round up to nearest 4K */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1576 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1577 |
txdr->size = txdr->count * sizeof(struct e1000_tx_desc); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1578 |
txdr->size = ALIGN(txdr->size, 4096); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1579 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1580 |
txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1581 |
GFP_KERNEL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1582 |
if (!txdr->desc) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1583 |
setup_tx_desc_die: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1584 |
vfree(txdr->buffer_info); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1585 |
e_err(probe, "Unable to allocate memory for the Tx descriptor " |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1586 |
"ring\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1587 |
return -ENOMEM; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1588 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1589 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1590 |
/* Fix for errata 23, can't cross 64kB boundary */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1591 |
if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1592 |
void *olddesc = txdr->desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1593 |
dma_addr_t olddma = txdr->dma; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1594 |
e_err(tx_err, "txdr align check failed: %u bytes at %p\n", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1595 |
txdr->size, txdr->desc); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1596 |
/* Try again, without freeing the previous */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1597 |
txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1598 |
&txdr->dma, GFP_KERNEL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1599 |
/* Failed allocation, critical failure */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1600 |
if (!txdr->desc) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1601 |
dma_free_coherent(&pdev->dev, txdr->size, olddesc, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1602 |
olddma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1603 |
goto setup_tx_desc_die; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1604 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1605 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1606 |
if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1607 |
/* give up */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1608 |
dma_free_coherent(&pdev->dev, txdr->size, txdr->desc, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1609 |
txdr->dma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1610 |
dma_free_coherent(&pdev->dev, txdr->size, olddesc, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1611 |
olddma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1612 |
e_err(probe, "Unable to allocate aligned memory " |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1613 |
"for the transmit descriptor ring\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1614 |
vfree(txdr->buffer_info); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1615 |
return -ENOMEM; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1616 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1617 |
/* Free old allocation, new allocation was successful */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1618 |
dma_free_coherent(&pdev->dev, txdr->size, olddesc, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1619 |
olddma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1620 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1621 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1622 |
memset(txdr->desc, 0, txdr->size); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1623 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1624 |
txdr->next_to_use = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1625 |
txdr->next_to_clean = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1626 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1627 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1628 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1629 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1630 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1631 |
* e1000_setup_all_tx_resources - wrapper to allocate Tx resources |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1632 |
* (Descriptors) for all queues |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1633 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1634 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1635 |
* Return 0 on success, negative on failure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1636 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1637 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1638 |
int e1000_setup_all_tx_resources(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1639 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1640 |
int i, err = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1641 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1642 |
for (i = 0; i < adapter->num_tx_queues; i++) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1643 |
err = e1000_setup_tx_resources(adapter, &adapter->tx_ring[i]); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1644 |
if (err) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1645 |
e_err(probe, "Allocation for Tx Queue %u failed\n", i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1646 |
for (i-- ; i >= 0; i--) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1647 |
e1000_free_tx_resources(adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1648 |
&adapter->tx_ring[i]); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1649 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1650 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1651 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1652 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1653 |
return err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1654 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1655 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1656 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1657 |
* e1000_configure_tx - Configure 8254x Transmit Unit after Reset |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1658 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1659 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1660 |
* Configure the Tx unit of the MAC after a reset. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1661 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1662 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1663 |
static void e1000_configure_tx(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1664 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1665 |
u64 tdba; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1666 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1667 |
u32 tdlen, tctl, tipg; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1668 |
u32 ipgr1, ipgr2; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1669 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1670 |
/* Setup the HW Tx Head and Tail descriptor pointers */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1671 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1672 |
switch (adapter->num_tx_queues) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1673 |
case 1: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1674 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1675 |
tdba = adapter->tx_ring[0].dma; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1676 |
tdlen = adapter->tx_ring[0].count * |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1677 |
sizeof(struct e1000_tx_desc); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1678 |
ew32(TDLEN, tdlen); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1679 |
ew32(TDBAH, (tdba >> 32)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1680 |
ew32(TDBAL, (tdba & 0x00000000ffffffffULL)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1681 |
ew32(TDT, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1682 |
ew32(TDH, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1683 |
adapter->tx_ring[0].tdh = ((hw->mac_type >= e1000_82543) ? E1000_TDH : E1000_82542_TDH); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1684 |
adapter->tx_ring[0].tdt = ((hw->mac_type >= e1000_82543) ? E1000_TDT : E1000_82542_TDT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1685 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1686 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1687 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1688 |
/* Set the default values for the Tx Inter Packet Gap timer */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1689 |
if ((hw->media_type == e1000_media_type_fiber || |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1690 |
hw->media_type == e1000_media_type_internal_serdes)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1691 |
tipg = DEFAULT_82543_TIPG_IPGT_FIBER; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1692 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1693 |
tipg = DEFAULT_82543_TIPG_IPGT_COPPER; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1694 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1695 |
switch (hw->mac_type) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1696 |
case e1000_82542_rev2_0: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1697 |
case e1000_82542_rev2_1: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1698 |
tipg = DEFAULT_82542_TIPG_IPGT; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1699 |
ipgr1 = DEFAULT_82542_TIPG_IPGR1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1700 |
ipgr2 = DEFAULT_82542_TIPG_IPGR2; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1701 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1702 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1703 |
ipgr1 = DEFAULT_82543_TIPG_IPGR1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1704 |
ipgr2 = DEFAULT_82543_TIPG_IPGR2; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1705 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1706 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1707 |
tipg |= ipgr1 << E1000_TIPG_IPGR1_SHIFT; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1708 |
tipg |= ipgr2 << E1000_TIPG_IPGR2_SHIFT; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1709 |
ew32(TIPG, tipg); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1710 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1711 |
/* Set the Tx Interrupt Delay register */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1712 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1713 |
ew32(TIDV, adapter->tx_int_delay); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1714 |
if (hw->mac_type >= e1000_82540) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1715 |
ew32(TADV, adapter->tx_abs_int_delay); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1716 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1717 |
/* Program the Transmit Control Register */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1718 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1719 |
tctl = er32(TCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1720 |
tctl &= ~E1000_TCTL_CT; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1721 |
tctl |= E1000_TCTL_PSP | E1000_TCTL_RTLC | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1722 |
(E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1723 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1724 |
e1000_config_collision_dist(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1725 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1726 |
/* Setup Transmit Descriptor Settings for eop descriptor */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1727 |
adapter->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1728 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1729 |
/* only set IDE if we are delaying interrupts using the timers */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1730 |
if (adapter->tx_int_delay) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1731 |
adapter->txd_cmd |= E1000_TXD_CMD_IDE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1732 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1733 |
if (hw->mac_type < e1000_82543) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1734 |
adapter->txd_cmd |= E1000_TXD_CMD_RPS; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1735 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1736 |
adapter->txd_cmd |= E1000_TXD_CMD_RS; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1737 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1738 |
/* Cache if we're 82544 running in PCI-X because we'll |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1739 |
* need this to apply a workaround later in the send path. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1740 |
if (hw->mac_type == e1000_82544 && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1741 |
hw->bus_type == e1000_bus_type_pcix) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1742 |
adapter->pcix_82544 = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1743 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1744 |
ew32(TCTL, tctl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1745 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1746 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1747 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1748 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1749 |
* e1000_setup_rx_resources - allocate Rx resources (Descriptors) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1750 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1751 |
* @rxdr: rx descriptor ring (for a specific queue) to setup |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1752 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1753 |
* Returns 0 on success, negative on failure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1754 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1755 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1756 |
static int e1000_setup_rx_resources(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1757 |
struct e1000_rx_ring *rxdr) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1758 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1759 |
struct pci_dev *pdev = adapter->pdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1760 |
int size, desc_len; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1761 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1762 |
size = sizeof(struct e1000_buffer) * rxdr->count; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1763 |
rxdr->buffer_info = vzalloc(size); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1764 |
if (!rxdr->buffer_info) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1765 |
e_err(probe, "Unable to allocate memory for the Rx descriptor " |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1766 |
"ring\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1767 |
return -ENOMEM; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1768 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1769 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1770 |
desc_len = sizeof(struct e1000_rx_desc); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1771 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1772 |
/* Round up to nearest 4K */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1773 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1774 |
rxdr->size = rxdr->count * desc_len; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1775 |
rxdr->size = ALIGN(rxdr->size, 4096); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1776 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1777 |
rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1778 |
GFP_KERNEL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1779 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1780 |
if (!rxdr->desc) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1781 |
e_err(probe, "Unable to allocate memory for the Rx descriptor " |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1782 |
"ring\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1783 |
setup_rx_desc_die: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1784 |
vfree(rxdr->buffer_info); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1785 |
return -ENOMEM; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1786 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1787 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1788 |
/* Fix for errata 23, can't cross 64kB boundary */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1789 |
if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1790 |
void *olddesc = rxdr->desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1791 |
dma_addr_t olddma = rxdr->dma; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1792 |
e_err(rx_err, "rxdr align check failed: %u bytes at %p\n", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1793 |
rxdr->size, rxdr->desc); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1794 |
/* Try again, without freeing the previous */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1795 |
rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1796 |
&rxdr->dma, GFP_KERNEL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1797 |
/* Failed allocation, critical failure */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1798 |
if (!rxdr->desc) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1799 |
dma_free_coherent(&pdev->dev, rxdr->size, olddesc, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1800 |
olddma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1801 |
e_err(probe, "Unable to allocate memory for the Rx " |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1802 |
"descriptor ring\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1803 |
goto setup_rx_desc_die; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1804 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1805 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1806 |
if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1807 |
/* give up */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1808 |
dma_free_coherent(&pdev->dev, rxdr->size, rxdr->desc, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1809 |
rxdr->dma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1810 |
dma_free_coherent(&pdev->dev, rxdr->size, olddesc, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1811 |
olddma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1812 |
e_err(probe, "Unable to allocate aligned memory for " |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1813 |
"the Rx descriptor ring\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1814 |
goto setup_rx_desc_die; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1815 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1816 |
/* Free old allocation, new allocation was successful */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1817 |
dma_free_coherent(&pdev->dev, rxdr->size, olddesc, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1818 |
olddma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1819 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1820 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1821 |
memset(rxdr->desc, 0, rxdr->size); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1822 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1823 |
rxdr->next_to_clean = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1824 |
rxdr->next_to_use = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1825 |
rxdr->rx_skb_top = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1826 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1827 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1828 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1829 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1830 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1831 |
* e1000_setup_all_rx_resources - wrapper to allocate Rx resources |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1832 |
* (Descriptors) for all queues |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1833 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1834 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1835 |
* Return 0 on success, negative on failure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1836 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1837 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1838 |
int e1000_setup_all_rx_resources(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1839 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1840 |
int i, err = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1841 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1842 |
for (i = 0; i < adapter->num_rx_queues; i++) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1843 |
err = e1000_setup_rx_resources(adapter, &adapter->rx_ring[i]); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1844 |
if (err) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1845 |
e_err(probe, "Allocation for Rx Queue %u failed\n", i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1846 |
for (i-- ; i >= 0; i--) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1847 |
e1000_free_rx_resources(adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1848 |
&adapter->rx_ring[i]); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1849 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1850 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1851 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1852 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1853 |
return err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1854 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1855 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1856 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1857 |
* e1000_setup_rctl - configure the receive control registers |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1858 |
* @adapter: Board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1859 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1860 |
static void e1000_setup_rctl(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1861 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1862 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1863 |
u32 rctl; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1864 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1865 |
rctl = er32(RCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1866 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1867 |
rctl &= ~(3 << E1000_RCTL_MO_SHIFT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1868 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1869 |
rctl |= E1000_RCTL_BAM | E1000_RCTL_LBM_NO | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1870 |
E1000_RCTL_RDMTS_HALF | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1871 |
(hw->mc_filter_type << E1000_RCTL_MO_SHIFT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1872 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1873 |
if (hw->tbi_compatibility_on == 1) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1874 |
rctl |= E1000_RCTL_SBP; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1875 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1876 |
rctl &= ~E1000_RCTL_SBP; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1877 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1878 |
if (adapter->netdev->mtu <= ETH_DATA_LEN) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1879 |
rctl &= ~E1000_RCTL_LPE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1880 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1881 |
rctl |= E1000_RCTL_LPE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1882 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1883 |
/* Setup buffer sizes */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1884 |
rctl &= ~E1000_RCTL_SZ_4096; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1885 |
rctl |= E1000_RCTL_BSEX; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1886 |
switch (adapter->rx_buffer_len) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1887 |
case E1000_RXBUFFER_2048: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1888 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1889 |
rctl |= E1000_RCTL_SZ_2048; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1890 |
rctl &= ~E1000_RCTL_BSEX; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1891 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1892 |
case E1000_RXBUFFER_4096: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1893 |
rctl |= E1000_RCTL_SZ_4096; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1894 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1895 |
case E1000_RXBUFFER_8192: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1896 |
rctl |= E1000_RCTL_SZ_8192; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1897 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1898 |
case E1000_RXBUFFER_16384: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1899 |
rctl |= E1000_RCTL_SZ_16384; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1900 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1901 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1902 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1903 |
/* This is useful for sniffing bad packets. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1904 |
if (adapter->netdev->features & NETIF_F_RXALL) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1905 |
/* UPE and MPE will be handled by normal PROMISC logic |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1906 |
* in e1000e_set_rx_mode */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1907 |
rctl |= (E1000_RCTL_SBP | /* Receive bad packets */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1908 |
E1000_RCTL_BAM | /* RX All Bcast Pkts */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1909 |
E1000_RCTL_PMCF); /* RX All MAC Ctrl Pkts */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1910 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1911 |
rctl &= ~(E1000_RCTL_VFE | /* Disable VLAN filter */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1912 |
E1000_RCTL_DPF | /* Allow filtered pause */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1913 |
E1000_RCTL_CFIEN); /* Dis VLAN CFIEN Filter */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1914 |
/* Do not mess with E1000_CTRL_VME, it affects transmit as well, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1915 |
* and that breaks VLANs. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1916 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1917 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1918 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1919 |
ew32(RCTL, rctl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1920 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1921 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1922 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1923 |
* e1000_configure_rx - Configure 8254x Receive Unit after Reset |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1924 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1925 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1926 |
* Configure the Rx unit of the MAC after a reset. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1927 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1928 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1929 |
static void e1000_configure_rx(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1930 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1931 |
u64 rdba; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1932 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1933 |
u32 rdlen, rctl, rxcsum; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1934 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1935 |
if (adapter->netdev->mtu > ETH_DATA_LEN) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1936 |
rdlen = adapter->rx_ring[0].count * |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1937 |
sizeof(struct e1000_rx_desc); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1938 |
adapter->clean_rx = e1000_clean_jumbo_rx_irq; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1939 |
adapter->alloc_rx_buf = e1000_alloc_jumbo_rx_buffers; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1940 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1941 |
rdlen = adapter->rx_ring[0].count * |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1942 |
sizeof(struct e1000_rx_desc); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1943 |
adapter->clean_rx = e1000_clean_rx_irq; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1944 |
adapter->alloc_rx_buf = e1000_alloc_rx_buffers; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1945 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1946 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1947 |
/* disable receives while setting up the descriptors */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1948 |
rctl = er32(RCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1949 |
ew32(RCTL, rctl & ~E1000_RCTL_EN); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1950 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1951 |
/* set the Receive Delay Timer Register */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1952 |
ew32(RDTR, adapter->rx_int_delay); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1953 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1954 |
if (hw->mac_type >= e1000_82540) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1955 |
ew32(RADV, adapter->rx_abs_int_delay); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1956 |
if (adapter->itr_setting != 0) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1957 |
ew32(ITR, 1000000000 / (adapter->itr * 256)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1958 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1959 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1960 |
/* Setup the HW Rx Head and Tail Descriptor Pointers and |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1961 |
* the Base and Length of the Rx Descriptor Ring */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1962 |
switch (adapter->num_rx_queues) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1963 |
case 1: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1964 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1965 |
rdba = adapter->rx_ring[0].dma; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1966 |
ew32(RDLEN, rdlen); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1967 |
ew32(RDBAH, (rdba >> 32)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1968 |
ew32(RDBAL, (rdba & 0x00000000ffffffffULL)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1969 |
ew32(RDT, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1970 |
ew32(RDH, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1971 |
adapter->rx_ring[0].rdh = ((hw->mac_type >= e1000_82543) ? E1000_RDH : E1000_82542_RDH); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1972 |
adapter->rx_ring[0].rdt = ((hw->mac_type >= e1000_82543) ? E1000_RDT : E1000_82542_RDT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1973 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1974 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1975 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1976 |
/* Enable 82543 Receive Checksum Offload for TCP and UDP */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1977 |
if (hw->mac_type >= e1000_82543) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1978 |
rxcsum = er32(RXCSUM); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1979 |
if (adapter->rx_csum) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1980 |
rxcsum |= E1000_RXCSUM_TUOFL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1981 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1982 |
/* don't need to clear IPPCSE as it defaults to 0 */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1983 |
rxcsum &= ~E1000_RXCSUM_TUOFL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1984 |
ew32(RXCSUM, rxcsum); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1985 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1986 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1987 |
/* Enable Receives */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1988 |
ew32(RCTL, rctl | E1000_RCTL_EN); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1989 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1990 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1991 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1992 |
* e1000_free_tx_resources - Free Tx Resources per Queue |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1993 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1994 |
* @tx_ring: Tx descriptor ring for a specific queue |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1995 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1996 |
* Free all transmit software resources |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1997 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1998 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1999 |
static void e1000_free_tx_resources(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2000 |
struct e1000_tx_ring *tx_ring) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2001 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2002 |
struct pci_dev *pdev = adapter->pdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2003 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2004 |
e1000_clean_tx_ring(adapter, tx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2005 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2006 |
vfree(tx_ring->buffer_info); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2007 |
tx_ring->buffer_info = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2008 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2009 |
dma_free_coherent(&pdev->dev, tx_ring->size, tx_ring->desc, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2010 |
tx_ring->dma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2011 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2012 |
tx_ring->desc = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2013 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2014 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2015 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2016 |
* e1000_free_all_tx_resources - Free Tx Resources for All Queues |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2017 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2018 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2019 |
* Free all transmit software resources |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2020 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2021 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2022 |
void e1000_free_all_tx_resources(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2023 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2024 |
int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2025 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2026 |
for (i = 0; i < adapter->num_tx_queues; i++) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2027 |
e1000_free_tx_resources(adapter, &adapter->tx_ring[i]); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2028 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2029 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2030 |
static void e1000_unmap_and_free_tx_resource(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2031 |
struct e1000_buffer *buffer_info) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2032 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2033 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2034 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2035 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2036 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2037 |
if (buffer_info->dma) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2038 |
if (buffer_info->mapped_as_page) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2039 |
dma_unmap_page(&adapter->pdev->dev, buffer_info->dma, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2040 |
buffer_info->length, DMA_TO_DEVICE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2041 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2042 |
dma_unmap_single(&adapter->pdev->dev, buffer_info->dma, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2043 |
buffer_info->length, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2044 |
DMA_TO_DEVICE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2045 |
buffer_info->dma = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2046 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2047 |
if (buffer_info->skb) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2048 |
dev_kfree_skb_any(buffer_info->skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2049 |
buffer_info->skb = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2050 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2051 |
buffer_info->time_stamp = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2052 |
/* buffer_info must be completely set up in the transmit path */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2053 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2054 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2055 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2056 |
* e1000_clean_tx_ring - Free Tx Buffers |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2057 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2058 |
* @tx_ring: ring to be cleaned |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2059 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2060 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2061 |
static void e1000_clean_tx_ring(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2062 |
struct e1000_tx_ring *tx_ring) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2063 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2064 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2065 |
struct e1000_buffer *buffer_info; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2066 |
unsigned long size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2067 |
unsigned int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2068 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2069 |
/* Free all the Tx ring sk_buffs */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2070 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2071 |
for (i = 0; i < tx_ring->count; i++) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2072 |
buffer_info = &tx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2073 |
e1000_unmap_and_free_tx_resource(adapter, buffer_info); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2074 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2075 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2076 |
netdev_reset_queue(adapter->netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2077 |
size = sizeof(struct e1000_buffer) * tx_ring->count; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2078 |
memset(tx_ring->buffer_info, 0, size); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2079 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2080 |
/* Zero out the descriptor ring */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2081 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2082 |
memset(tx_ring->desc, 0, tx_ring->size); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2083 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2084 |
tx_ring->next_to_use = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2085 |
tx_ring->next_to_clean = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2086 |
tx_ring->last_tx_tso = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2087 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2088 |
writel(0, hw->hw_addr + tx_ring->tdh); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2089 |
writel(0, hw->hw_addr + tx_ring->tdt); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2090 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2091 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2092 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2093 |
* e1000_clean_all_tx_rings - Free Tx Buffers for all queues |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2094 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2095 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2096 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2097 |
static void e1000_clean_all_tx_rings(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2098 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2099 |
int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2100 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2101 |
for (i = 0; i < adapter->num_tx_queues; i++) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2102 |
e1000_clean_tx_ring(adapter, &adapter->tx_ring[i]); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2103 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2104 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2105 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2106 |
* e1000_free_rx_resources - Free Rx Resources |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2107 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2108 |
* @rx_ring: ring to clean the resources from |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2109 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2110 |
* Free all receive software resources |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2111 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2112 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2113 |
static void e1000_free_rx_resources(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2114 |
struct e1000_rx_ring *rx_ring) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2115 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2116 |
struct pci_dev *pdev = adapter->pdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2117 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2118 |
e1000_clean_rx_ring(adapter, rx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2119 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2120 |
vfree(rx_ring->buffer_info); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2121 |
rx_ring->buffer_info = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2122 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2123 |
dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2124 |
rx_ring->dma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2125 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2126 |
rx_ring->desc = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2127 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2128 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2129 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2130 |
* e1000_free_all_rx_resources - Free Rx Resources for All Queues |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2131 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2132 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2133 |
* Free all receive software resources |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2134 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2135 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2136 |
void e1000_free_all_rx_resources(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2137 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2138 |
int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2139 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2140 |
for (i = 0; i < adapter->num_rx_queues; i++) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2141 |
e1000_free_rx_resources(adapter, &adapter->rx_ring[i]); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2142 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2143 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2144 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2145 |
* e1000_clean_rx_ring - Free Rx Buffers per Queue |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2146 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2147 |
* @rx_ring: ring to free buffers from |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2148 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2149 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2150 |
static void e1000_clean_rx_ring(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2151 |
struct e1000_rx_ring *rx_ring) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2152 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2153 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2154 |
struct e1000_buffer *buffer_info; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2155 |
struct pci_dev *pdev = adapter->pdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2156 |
unsigned long size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2157 |
unsigned int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2158 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2159 |
/* Free all the Rx ring sk_buffs */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2160 |
for (i = 0; i < rx_ring->count; i++) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2161 |
buffer_info = &rx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2162 |
if (buffer_info->dma && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2163 |
adapter->clean_rx == e1000_clean_rx_irq) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2164 |
dma_unmap_single(&pdev->dev, buffer_info->dma, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2165 |
buffer_info->length, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2166 |
DMA_FROM_DEVICE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2167 |
} else if (buffer_info->dma && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2168 |
adapter->clean_rx == e1000_clean_jumbo_rx_irq) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2169 |
dma_unmap_page(&pdev->dev, buffer_info->dma, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2170 |
buffer_info->length, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2171 |
DMA_FROM_DEVICE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2172 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2173 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2174 |
buffer_info->dma = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2175 |
if (buffer_info->page) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2176 |
put_page(buffer_info->page); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2177 |
buffer_info->page = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2178 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2179 |
if (buffer_info->skb) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2180 |
dev_kfree_skb(buffer_info->skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2181 |
buffer_info->skb = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2182 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2183 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2184 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2185 |
/* there also may be some cached data from a chained receive */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2186 |
if (rx_ring->rx_skb_top) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2187 |
dev_kfree_skb(rx_ring->rx_skb_top); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2188 |
rx_ring->rx_skb_top = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2189 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2190 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2191 |
size = sizeof(struct e1000_buffer) * rx_ring->count; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2192 |
memset(rx_ring->buffer_info, 0, size); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2193 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2194 |
/* Zero out the descriptor ring */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2195 |
memset(rx_ring->desc, 0, rx_ring->size); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2196 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2197 |
rx_ring->next_to_clean = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2198 |
rx_ring->next_to_use = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2199 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2200 |
writel(0, hw->hw_addr + rx_ring->rdh); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2201 |
writel(0, hw->hw_addr + rx_ring->rdt); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2202 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2203 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2204 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2205 |
* e1000_clean_all_rx_rings - Free Rx Buffers for all queues |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2206 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2207 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2208 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2209 |
static void e1000_clean_all_rx_rings(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2210 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2211 |
int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2212 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2213 |
for (i = 0; i < adapter->num_rx_queues; i++) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2214 |
e1000_clean_rx_ring(adapter, &adapter->rx_ring[i]); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2215 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2216 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2217 |
/* The 82542 2.0 (revision 2) needs to have the receive unit in reset |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2218 |
* and memory write and invalidate disabled for certain operations |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2219 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2220 |
static void e1000_enter_82542_rst(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2221 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2222 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2223 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2224 |
u32 rctl; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2225 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2226 |
e1000_pci_clear_mwi(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2227 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2228 |
rctl = er32(RCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2229 |
rctl |= E1000_RCTL_RST; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2230 |
ew32(RCTL, rctl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2231 |
E1000_WRITE_FLUSH(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2232 |
mdelay(5); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2233 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2234 |
if (!adapter->ecdev && netif_running(netdev)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2235 |
e1000_clean_all_rx_rings(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2236 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2237 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2238 |
static void e1000_leave_82542_rst(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2239 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2240 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2241 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2242 |
u32 rctl; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2243 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2244 |
rctl = er32(RCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2245 |
rctl &= ~E1000_RCTL_RST; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2246 |
ew32(RCTL, rctl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2247 |
E1000_WRITE_FLUSH(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2248 |
mdelay(5); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2249 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2250 |
if (hw->pci_cmd_word & PCI_COMMAND_INVALIDATE) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2251 |
e1000_pci_set_mwi(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2252 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2253 |
if (!adapter->netdev && netif_running(netdev)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2254 |
/* No need to loop, because 82542 supports only 1 queue */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2255 |
struct e1000_rx_ring *ring = &adapter->rx_ring[0]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2256 |
e1000_configure_rx(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2257 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2258 |
/* fill rx ring completely! */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2259 |
adapter->alloc_rx_buf(adapter, ring, ring->count); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2260 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2261 |
/* this one leaves the last ring element unallocated! */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2262 |
adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2263 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2264 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2265 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2266 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2267 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2268 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2269 |
* e1000_set_mac - Change the Ethernet Address of the NIC |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2270 |
* @netdev: network interface device structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2271 |
* @p: pointer to an address structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2272 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2273 |
* Returns 0 on success, negative on failure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2274 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2275 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2276 |
static int e1000_set_mac(struct net_device *netdev, void *p) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2277 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2278 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2279 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2280 |
struct sockaddr *addr = p; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2281 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2282 |
if (!is_valid_ether_addr(addr->sa_data)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2283 |
return -EADDRNOTAVAIL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2284 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2285 |
/* 82542 2.0 needs to be in reset to write receive address registers */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2286 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2287 |
if (hw->mac_type == e1000_82542_rev2_0) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2288 |
e1000_enter_82542_rst(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2289 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2290 |
memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2291 |
memcpy(hw->mac_addr, addr->sa_data, netdev->addr_len); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2292 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2293 |
e1000_rar_set(hw, hw->mac_addr, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2294 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2295 |
if (hw->mac_type == e1000_82542_rev2_0) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2296 |
e1000_leave_82542_rst(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2297 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2298 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2299 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2300 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2301 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2302 |
* e1000_set_rx_mode - Secondary Unicast, Multicast and Promiscuous mode set |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2303 |
* @netdev: network interface device structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2304 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2305 |
* The set_rx_mode entry point is called whenever the unicast or multicast |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2306 |
* address lists or the network interface flags are updated. This routine is |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2307 |
* responsible for configuring the hardware for proper unicast, multicast, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2308 |
* promiscuous mode, and all-multi behavior. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2309 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2310 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2311 |
static void e1000_set_rx_mode(struct net_device *netdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2312 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2313 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2314 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2315 |
struct netdev_hw_addr *ha; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2316 |
bool use_uc = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2317 |
u32 rctl; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2318 |
u32 hash_value; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2319 |
int i, rar_entries = E1000_RAR_ENTRIES; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2320 |
int mta_reg_count = E1000_NUM_MTA_REGISTERS; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2321 |
u32 *mcarray = kcalloc(mta_reg_count, sizeof(u32), GFP_ATOMIC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2322 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2323 |
if (!mcarray) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2324 |
e_err(probe, "memory allocation failed\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2325 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2326 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2327 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2328 |
/* Check for Promiscuous and All Multicast modes */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2329 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2330 |
rctl = er32(RCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2331 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2332 |
if (netdev->flags & IFF_PROMISC) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2333 |
rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2334 |
rctl &= ~E1000_RCTL_VFE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2335 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2336 |
if (netdev->flags & IFF_ALLMULTI) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2337 |
rctl |= E1000_RCTL_MPE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2338 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2339 |
rctl &= ~E1000_RCTL_MPE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2340 |
/* Enable VLAN filter if there is a VLAN */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2341 |
if (e1000_vlan_used(adapter)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2342 |
rctl |= E1000_RCTL_VFE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2343 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2344 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2345 |
if (netdev_uc_count(netdev) > rar_entries - 1) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2346 |
rctl |= E1000_RCTL_UPE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2347 |
} else if (!(netdev->flags & IFF_PROMISC)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2348 |
rctl &= ~E1000_RCTL_UPE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2349 |
use_uc = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2350 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2351 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2352 |
ew32(RCTL, rctl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2353 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2354 |
/* 82542 2.0 needs to be in reset to write receive address registers */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2355 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2356 |
if (hw->mac_type == e1000_82542_rev2_0) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2357 |
e1000_enter_82542_rst(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2358 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2359 |
/* load the first 14 addresses into the exact filters 1-14. Unicast |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2360 |
* addresses take precedence to avoid disabling unicast filtering |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2361 |
* when possible. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2362 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2363 |
* RAR 0 is used for the station MAC address |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2364 |
* if there are not 14 addresses, go ahead and clear the filters |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2365 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2366 |
i = 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2367 |
if (use_uc) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2368 |
netdev_for_each_uc_addr(ha, netdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2369 |
if (i == rar_entries) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2370 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2371 |
e1000_rar_set(hw, ha->addr, i++); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2372 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2373 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2374 |
netdev_for_each_mc_addr(ha, netdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2375 |
if (i == rar_entries) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2376 |
/* load any remaining addresses into the hash table */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2377 |
u32 hash_reg, hash_bit, mta; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2378 |
hash_value = e1000_hash_mc_addr(hw, ha->addr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2379 |
hash_reg = (hash_value >> 5) & 0x7F; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2380 |
hash_bit = hash_value & 0x1F; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2381 |
mta = (1 << hash_bit); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2382 |
mcarray[hash_reg] |= mta; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2383 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2384 |
e1000_rar_set(hw, ha->addr, i++); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2385 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2386 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2387 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2388 |
for (; i < rar_entries; i++) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2389 |
E1000_WRITE_REG_ARRAY(hw, RA, i << 1, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2390 |
E1000_WRITE_FLUSH(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2391 |
E1000_WRITE_REG_ARRAY(hw, RA, (i << 1) + 1, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2392 |
E1000_WRITE_FLUSH(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2393 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2394 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2395 |
/* write the hash table completely, write from bottom to avoid |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2396 |
* both stupid write combining chipsets, and flushing each write */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2397 |
for (i = mta_reg_count - 1; i >= 0 ; i--) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2398 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2399 |
* If we are on an 82544 has an errata where writing odd |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2400 |
* offsets overwrites the previous even offset, but writing |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2401 |
* backwards over the range solves the issue by always |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2402 |
* writing the odd offset first |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2403 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2404 |
E1000_WRITE_REG_ARRAY(hw, MTA, i, mcarray[i]); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2405 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2406 |
E1000_WRITE_FLUSH(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2407 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2408 |
if (hw->mac_type == e1000_82542_rev2_0) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2409 |
e1000_leave_82542_rst(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2410 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2411 |
kfree(mcarray); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2412 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2413 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2414 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2415 |
* e1000_update_phy_info_task - get phy info |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2416 |
* @work: work struct contained inside adapter struct |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2417 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2418 |
* Need to wait a few seconds after link up to get diagnostic information from |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2419 |
* the phy |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2420 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2421 |
static void e1000_update_phy_info_task(struct work_struct *work) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2422 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2423 |
struct e1000_adapter *adapter = container_of(work, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2424 |
struct e1000_adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2425 |
phy_info_task.work); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2426 |
if (test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2427 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2428 |
mutex_lock(&adapter->mutex); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2429 |
e1000_phy_get_info(&adapter->hw, &adapter->phy_info); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2430 |
mutex_unlock(&adapter->mutex); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2431 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2432 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2433 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2434 |
* e1000_82547_tx_fifo_stall_task - task to complete work |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2435 |
* @work: work struct contained inside adapter struct |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2436 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2437 |
static void e1000_82547_tx_fifo_stall_task(struct work_struct *work) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2438 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2439 |
struct e1000_adapter *adapter = container_of(work, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2440 |
struct e1000_adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2441 |
fifo_stall_task.work); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2442 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2443 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2444 |
u32 tctl; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2445 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2446 |
if (test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2447 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2448 |
mutex_lock(&adapter->mutex); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2449 |
if (atomic_read(&adapter->tx_fifo_stall)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2450 |
if ((er32(TDT) == er32(TDH)) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2451 |
(er32(TDFT) == er32(TDFH)) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2452 |
(er32(TDFTS) == er32(TDFHS))) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2453 |
tctl = er32(TCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2454 |
ew32(TCTL, tctl & ~E1000_TCTL_EN); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2455 |
ew32(TDFT, adapter->tx_head_addr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2456 |
ew32(TDFH, adapter->tx_head_addr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2457 |
ew32(TDFTS, adapter->tx_head_addr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2458 |
ew32(TDFHS, adapter->tx_head_addr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2459 |
ew32(TCTL, tctl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2460 |
E1000_WRITE_FLUSH(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2461 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2462 |
adapter->tx_fifo_head = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2463 |
atomic_set(&adapter->tx_fifo_stall, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2464 |
netif_wake_queue(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2465 |
} else if (!test_bit(__E1000_DOWN, &adapter->flags)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2466 |
schedule_delayed_work(&adapter->fifo_stall_task, 1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2467 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2468 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2469 |
mutex_unlock(&adapter->mutex); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2470 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2471 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2472 |
bool e1000_has_link(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2473 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2474 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2475 |
bool link_active = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2476 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2477 |
/* get_link_status is set on LSC (link status) interrupt or rx |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2478 |
* sequence error interrupt (except on intel ce4100). |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2479 |
* get_link_status will stay false until the |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2480 |
* e1000_check_for_link establishes link for copper adapters |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2481 |
* ONLY |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2482 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2483 |
switch (hw->media_type) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2484 |
case e1000_media_type_copper: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2485 |
if (hw->mac_type == e1000_ce4100) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2486 |
hw->get_link_status = 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2487 |
if (hw->get_link_status) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2488 |
e1000_check_for_link(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2489 |
link_active = !hw->get_link_status; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2490 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2491 |
link_active = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2492 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2493 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2494 |
case e1000_media_type_fiber: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2495 |
e1000_check_for_link(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2496 |
link_active = !!(er32(STATUS) & E1000_STATUS_LU); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2497 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2498 |
case e1000_media_type_internal_serdes: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2499 |
e1000_check_for_link(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2500 |
link_active = hw->serdes_has_link; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2501 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2502 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2503 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2504 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2505 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2506 |
return link_active; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2507 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2508 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2509 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2510 |
* e1000_watchdog - work function |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2511 |
* @work: work struct contained inside adapter struct |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2512 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2513 |
static void e1000_watchdog(struct work_struct *work) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2514 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2515 |
struct e1000_adapter *adapter = container_of(work, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2516 |
struct e1000_adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2517 |
watchdog_task.work); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2518 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2519 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2520 |
struct e1000_tx_ring *txdr = adapter->tx_ring; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2521 |
u32 link, tctl; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2522 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2523 |
if (test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2524 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2525 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2526 |
mutex_lock(&adapter->mutex); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2527 |
link = e1000_has_link(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2528 |
if (!adapter->ecdev && (netif_carrier_ok(netdev)) && link) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2529 |
goto link_up; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2530 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2531 |
if (link) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2532 |
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2533 |
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2534 |
u32 ctrl; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2535 |
bool txb2b __attribute__ ((unused)) = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2536 |
/* update snapshot of PHY registers on LSC */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2537 |
e1000_get_speed_and_duplex(hw, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2538 |
&adapter->link_speed, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2539 |
&adapter->link_duplex); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2540 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2541 |
ctrl = er32(CTRL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2542 |
pr_info("%s NIC Link is Up %d Mbps %s, "
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2543 |
"Flow Control: %s\n", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2544 |
netdev->name, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2545 |
adapter->link_speed, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2546 |
adapter->link_duplex == FULL_DUPLEX ? |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2547 |
"Full Duplex" : "Half Duplex", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2548 |
((ctrl & E1000_CTRL_TFCE) && (ctrl & |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2549 |
E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl & |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2550 |
E1000_CTRL_RFCE) ? "RX" : ((ctrl & |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2551 |
E1000_CTRL_TFCE) ? "TX" : "None"))); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2552 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2553 |
/* adjust timeout factor according to speed/duplex */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2554 |
adapter->tx_timeout_factor = 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2555 |
switch (adapter->link_speed) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2556 |
case SPEED_10: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2557 |
txb2b = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2558 |
adapter->tx_timeout_factor = 16; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2559 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2560 |
case SPEED_100: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2561 |
txb2b = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2562 |
/* maybe add some timeout factor ? */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2563 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2564 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2565 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2566 |
/* enable transmits in the hardware */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2567 |
tctl = er32(TCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2568 |
tctl |= E1000_TCTL_EN; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2569 |
ew32(TCTL, tctl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2570 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2571 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2572 |
ecdev_set_link(adapter->ecdev, 1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2573 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2574 |
else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2575 |
netif_carrier_on(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2576 |
if (!test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2577 |
schedule_delayed_work(&adapter->phy_info_task, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2578 |
2 * HZ); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2579 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2580 |
adapter->smartspeed = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2581 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2582 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2583 |
if ((adapter->ecdev && ecdev_get_link(adapter->ecdev)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2584 |
|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2585 |
adapter->link_speed = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2586 |
adapter->link_duplex = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2587 |
pr_info("%s NIC Link is Down\n",
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2588 |
netdev->name); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2589 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2590 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2591 |
ecdev_set_link(adapter->ecdev, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2592 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2593 |
netif_carrier_off(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2594 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2595 |
if (!test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2596 |
schedule_delayed_work(&adapter->phy_info_task, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2597 |
2 * HZ); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2598 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2599 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2600 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2601 |
e1000_smartspeed(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2602 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2603 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2604 |
link_up: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2605 |
e1000_update_stats(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2606 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2607 |
hw->tx_packet_delta = adapter->stats.tpt - adapter->tpt_old; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2608 |
adapter->tpt_old = adapter->stats.tpt; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2609 |
hw->collision_delta = adapter->stats.colc - adapter->colc_old; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2610 |
adapter->colc_old = adapter->stats.colc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2611 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2612 |
adapter->gorcl = adapter->stats.gorcl - adapter->gorcl_old; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2613 |
adapter->gorcl_old = adapter->stats.gorcl; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2614 |
adapter->gotcl = adapter->stats.gotcl - adapter->gotcl_old; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2615 |
adapter->gotcl_old = adapter->stats.gotcl; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2616 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2617 |
e1000_update_adaptive(hw); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2618 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2619 |
if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2620 |
if (E1000_DESC_UNUSED(txdr) + 1 < txdr->count) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2621 |
/* We've lost link, so the controller stops DMA, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2622 |
* but we've got queued Tx work that's never going |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2623 |
* to get done, so reset controller to flush Tx. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2624 |
* (Do the reset outside of interrupt context). */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2625 |
adapter->tx_timeout_count++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2626 |
schedule_work(&adapter->reset_task); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2627 |
/* exit immediately since reset is imminent */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2628 |
goto unlock; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2629 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2630 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2631 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2632 |
/* Simple mode for Interrupt Throttle Rate (ITR) */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2633 |
if (hw->mac_type >= e1000_82540 && adapter->itr_setting == 4) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2634 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2635 |
* Symmetric Tx/Rx gets a reduced ITR=2000; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2636 |
* Total asymmetrical Tx or Rx gets ITR=8000; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2637 |
* everyone else is between 2000-8000. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2638 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2639 |
u32 goc = (adapter->gotcl + adapter->gorcl) / 10000; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2640 |
u32 dif = (adapter->gotcl > adapter->gorcl ? |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2641 |
adapter->gotcl - adapter->gorcl : |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2642 |
adapter->gorcl - adapter->gotcl) / 10000; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2643 |
u32 itr = goc > 0 ? (dif * 6000 / goc + 2000) : 8000; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2644 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2645 |
ew32(ITR, 1000000000 / (itr * 256)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2646 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2647 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2648 |
/* Cause software interrupt to ensure rx ring is cleaned */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2649 |
ew32(ICS, E1000_ICS_RXDMT0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2650 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2651 |
/* Force detection of hung controller every watchdog period */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2652 |
adapter->detect_tx_hung = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2653 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2654 |
/* Reschedule the task */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2655 |
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2656 |
schedule_delayed_work(&adapter->watchdog_task, 2 * HZ); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2657 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2658 |
unlock: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2659 |
mutex_unlock(&adapter->mutex); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2660 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2661 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2662 |
enum latency_range {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2663 |
lowest_latency = 0, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2664 |
low_latency = 1, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2665 |
bulk_latency = 2, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2666 |
latency_invalid = 255 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2667 |
}; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2668 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2669 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2670 |
* e1000_update_itr - update the dynamic ITR value based on statistics |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2671 |
* @adapter: pointer to adapter |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2672 |
* @itr_setting: current adapter->itr |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2673 |
* @packets: the number of packets during this measurement interval |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2674 |
* @bytes: the number of bytes during this measurement interval |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2675 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2676 |
* Stores a new ITR value based on packets and byte |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2677 |
* counts during the last interrupt. The advantage of per interrupt |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2678 |
* computation is faster updates and more accurate ITR for the current |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2679 |
* traffic pattern. Constants in this function were computed |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2680 |
* based on theoretical maximum wire speed and thresholds were set based |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2681 |
* on testing data as well as attempting to minimize response time |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2682 |
* while increasing bulk throughput. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2683 |
* this functionality is controlled by the InterruptThrottleRate module |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2684 |
* parameter (see e1000_param.c) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2685 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2686 |
static unsigned int e1000_update_itr(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2687 |
u16 itr_setting, int packets, int bytes) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2688 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2689 |
unsigned int retval = itr_setting; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2690 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2691 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2692 |
if (unlikely(hw->mac_type < e1000_82540)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2693 |
goto update_itr_done; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2694 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2695 |
if (packets == 0) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2696 |
goto update_itr_done; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2697 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2698 |
switch (itr_setting) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2699 |
case lowest_latency: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2700 |
/* jumbo frames get bulk treatment*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2701 |
if (bytes/packets > 8000) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2702 |
retval = bulk_latency; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2703 |
else if ((packets < 5) && (bytes > 512)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2704 |
retval = low_latency; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2705 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2706 |
case low_latency: /* 50 usec aka 20000 ints/s */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2707 |
if (bytes > 10000) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2708 |
/* jumbo frames need bulk latency setting */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2709 |
if (bytes/packets > 8000) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2710 |
retval = bulk_latency; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2711 |
else if ((packets < 10) || ((bytes/packets) > 1200)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2712 |
retval = bulk_latency; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2713 |
else if ((packets > 35)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2714 |
retval = lowest_latency; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2715 |
} else if (bytes/packets > 2000) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2716 |
retval = bulk_latency; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2717 |
else if (packets <= 2 && bytes < 512) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2718 |
retval = lowest_latency; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2719 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2720 |
case bulk_latency: /* 250 usec aka 4000 ints/s */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2721 |
if (bytes > 25000) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2722 |
if (packets > 35) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2723 |
retval = low_latency; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2724 |
} else if (bytes < 6000) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2725 |
retval = low_latency; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2726 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2727 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2728 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2729 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2730 |
update_itr_done: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2731 |
return retval; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2732 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2733 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2734 |
static void e1000_set_itr(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2735 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2736 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2737 |
u16 current_itr; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2738 |
u32 new_itr = adapter->itr; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2739 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2740 |
if (unlikely(hw->mac_type < e1000_82540)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2741 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2742 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2743 |
/* for non-gigabit speeds, just fix the interrupt rate at 4000 */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2744 |
if (unlikely(adapter->link_speed != SPEED_1000)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2745 |
current_itr = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2746 |
new_itr = 4000; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2747 |
goto set_itr_now; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2748 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2749 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2750 |
adapter->tx_itr = e1000_update_itr(adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2751 |
adapter->tx_itr, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2752 |
adapter->total_tx_packets, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2753 |
adapter->total_tx_bytes); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2754 |
/* conservative mode (itr 3) eliminates the lowest_latency setting */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2755 |
if (adapter->itr_setting == 3 && adapter->tx_itr == lowest_latency) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2756 |
adapter->tx_itr = low_latency; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2757 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2758 |
adapter->rx_itr = e1000_update_itr(adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2759 |
adapter->rx_itr, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2760 |
adapter->total_rx_packets, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2761 |
adapter->total_rx_bytes); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2762 |
/* conservative mode (itr 3) eliminates the lowest_latency setting */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2763 |
if (adapter->itr_setting == 3 && adapter->rx_itr == lowest_latency) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2764 |
adapter->rx_itr = low_latency; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2765 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2766 |
current_itr = max(adapter->rx_itr, adapter->tx_itr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2767 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2768 |
switch (current_itr) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2769 |
/* counts and packets in update_itr are dependent on these numbers */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2770 |
case lowest_latency: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2771 |
new_itr = 70000; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2772 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2773 |
case low_latency: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2774 |
new_itr = 20000; /* aka hwitr = ~200 */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2775 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2776 |
case bulk_latency: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2777 |
new_itr = 4000; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2778 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2779 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2780 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2781 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2782 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2783 |
set_itr_now: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2784 |
if (new_itr != adapter->itr) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2785 |
/* this attempts to bias the interrupt rate towards Bulk |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2786 |
* by adding intermediate steps when interrupt rate is |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2787 |
* increasing */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2788 |
new_itr = new_itr > adapter->itr ? |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2789 |
min(adapter->itr + (new_itr >> 2), new_itr) : |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2790 |
new_itr; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2791 |
adapter->itr = new_itr; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2792 |
ew32(ITR, 1000000000 / (new_itr * 256)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2793 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2794 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2795 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2796 |
#define E1000_TX_FLAGS_CSUM 0x00000001 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2797 |
#define E1000_TX_FLAGS_VLAN 0x00000002 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2798 |
#define E1000_TX_FLAGS_TSO 0x00000004 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2799 |
#define E1000_TX_FLAGS_IPV4 0x00000008 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2800 |
#define E1000_TX_FLAGS_NO_FCS 0x00000010 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2801 |
#define E1000_TX_FLAGS_VLAN_MASK 0xffff0000 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2802 |
#define E1000_TX_FLAGS_VLAN_SHIFT 16 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2803 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2804 |
static int e1000_tso(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2805 |
struct e1000_tx_ring *tx_ring, struct sk_buff *skb) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2806 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2807 |
struct e1000_context_desc *context_desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2808 |
struct e1000_buffer *buffer_info; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2809 |
unsigned int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2810 |
u32 cmd_length = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2811 |
u16 ipcse = 0, tucse, mss; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2812 |
u8 ipcss, ipcso, tucss, tucso, hdr_len; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2813 |
int err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2814 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2815 |
if (skb_is_gso(skb)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2816 |
if (skb_header_cloned(skb)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2817 |
err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2818 |
if (err) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2819 |
return err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2820 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2821 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2822 |
hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2823 |
mss = skb_shinfo(skb)->gso_size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2824 |
if (skb->protocol == htons(ETH_P_IP)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2825 |
struct iphdr *iph = ip_hdr(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2826 |
iph->tot_len = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2827 |
iph->check = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2828 |
tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2829 |
iph->daddr, 0, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2830 |
IPPROTO_TCP, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2831 |
0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2832 |
cmd_length = E1000_TXD_CMD_IP; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2833 |
ipcse = skb_transport_offset(skb) - 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2834 |
} else if (skb->protocol == htons(ETH_P_IPV6)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2835 |
ipv6_hdr(skb)->payload_len = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2836 |
tcp_hdr(skb)->check = |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2837 |
~csum_ipv6_magic(&ipv6_hdr(skb)->saddr, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2838 |
&ipv6_hdr(skb)->daddr, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2839 |
0, IPPROTO_TCP, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2840 |
ipcse = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2841 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2842 |
ipcss = skb_network_offset(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2843 |
ipcso = (void *)&(ip_hdr(skb)->check) - (void *)skb->data; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2844 |
tucss = skb_transport_offset(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2845 |
tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2846 |
tucse = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2847 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2848 |
cmd_length |= (E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2849 |
E1000_TXD_CMD_TCP | (skb->len - (hdr_len))); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2850 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2851 |
i = tx_ring->next_to_use; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2852 |
context_desc = E1000_CONTEXT_DESC(*tx_ring, i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2853 |
buffer_info = &tx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2854 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2855 |
context_desc->lower_setup.ip_fields.ipcss = ipcss; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2856 |
context_desc->lower_setup.ip_fields.ipcso = ipcso; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2857 |
context_desc->lower_setup.ip_fields.ipcse = cpu_to_le16(ipcse); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2858 |
context_desc->upper_setup.tcp_fields.tucss = tucss; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2859 |
context_desc->upper_setup.tcp_fields.tucso = tucso; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2860 |
context_desc->upper_setup.tcp_fields.tucse = cpu_to_le16(tucse); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2861 |
context_desc->tcp_seg_setup.fields.mss = cpu_to_le16(mss); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2862 |
context_desc->tcp_seg_setup.fields.hdr_len = hdr_len; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2863 |
context_desc->cmd_and_length = cpu_to_le32(cmd_length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2864 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2865 |
buffer_info->time_stamp = jiffies; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2866 |
buffer_info->next_to_watch = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2867 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2868 |
if (++i == tx_ring->count) i = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2869 |
tx_ring->next_to_use = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2870 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2871 |
return true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2872 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2873 |
return false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2874 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2875 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2876 |
static bool e1000_tx_csum(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2877 |
struct e1000_tx_ring *tx_ring, struct sk_buff *skb) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2878 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2879 |
struct e1000_context_desc *context_desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2880 |
struct e1000_buffer *buffer_info; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2881 |
unsigned int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2882 |
u8 css; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2883 |
u32 cmd_len = E1000_TXD_CMD_DEXT; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2884 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2885 |
if (skb->ip_summed != CHECKSUM_PARTIAL) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2886 |
return false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2887 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2888 |
switch (skb->protocol) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2889 |
case cpu_to_be16(ETH_P_IP): |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2890 |
if (ip_hdr(skb)->protocol == IPPROTO_TCP) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2891 |
cmd_len |= E1000_TXD_CMD_TCP; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2892 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2893 |
case cpu_to_be16(ETH_P_IPV6): |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2894 |
/* XXX not handling all IPV6 headers */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2895 |
if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2896 |
cmd_len |= E1000_TXD_CMD_TCP; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2897 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2898 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2899 |
if (unlikely(net_ratelimit())) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2900 |
e_warn(drv, "checksum_partial proto=%x!\n", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2901 |
skb->protocol); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2902 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2903 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2904 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2905 |
css = skb_checksum_start_offset(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2906 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2907 |
i = tx_ring->next_to_use; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2908 |
buffer_info = &tx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2909 |
context_desc = E1000_CONTEXT_DESC(*tx_ring, i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2910 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2911 |
context_desc->lower_setup.ip_config = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2912 |
context_desc->upper_setup.tcp_fields.tucss = css; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2913 |
context_desc->upper_setup.tcp_fields.tucso = |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2914 |
css + skb->csum_offset; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2915 |
context_desc->upper_setup.tcp_fields.tucse = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2916 |
context_desc->tcp_seg_setup.data = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2917 |
context_desc->cmd_and_length = cpu_to_le32(cmd_len); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2918 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2919 |
buffer_info->time_stamp = jiffies; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2920 |
buffer_info->next_to_watch = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2921 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2922 |
if (unlikely(++i == tx_ring->count)) i = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2923 |
tx_ring->next_to_use = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2924 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2925 |
return true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2926 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2927 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2928 |
#define E1000_MAX_TXD_PWR 12 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2929 |
#define E1000_MAX_DATA_PER_TXD (1<<E1000_MAX_TXD_PWR) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2930 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2931 |
static int e1000_tx_map(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2932 |
struct e1000_tx_ring *tx_ring, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2933 |
struct sk_buff *skb, unsigned int first, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2934 |
unsigned int max_per_txd, unsigned int nr_frags, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2935 |
unsigned int mss) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2936 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2937 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2938 |
struct pci_dev *pdev = adapter->pdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2939 |
struct e1000_buffer *buffer_info; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2940 |
unsigned int len = skb_headlen(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2941 |
unsigned int offset = 0, size, count = 0, i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2942 |
unsigned int f, bytecount, segs; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2943 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2944 |
i = tx_ring->next_to_use; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2945 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2946 |
while (len) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2947 |
buffer_info = &tx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2948 |
size = min(len, max_per_txd); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2949 |
/* Workaround for Controller erratum -- |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2950 |
* descriptor for non-tso packet in a linear SKB that follows a |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2951 |
* tso gets written back prematurely before the data is fully |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2952 |
* DMA'd to the controller */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2953 |
if (!skb->data_len && tx_ring->last_tx_tso && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2954 |
!skb_is_gso(skb)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2955 |
tx_ring->last_tx_tso = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2956 |
size -= 4; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2957 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2958 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2959 |
/* Workaround for premature desc write-backs |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2960 |
* in TSO mode. Append 4-byte sentinel desc */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2961 |
if (unlikely(mss && !nr_frags && size == len && size > 8)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2962 |
size -= 4; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2963 |
/* work-around for errata 10 and it applies |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2964 |
* to all controllers in PCI-X mode |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2965 |
* The fix is to make sure that the first descriptor of a |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2966 |
* packet is smaller than 2048 - 16 - 16 (or 2016) bytes |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2967 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2968 |
if (unlikely((hw->bus_type == e1000_bus_type_pcix) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2969 |
(size > 2015) && count == 0)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2970 |
size = 2015; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2971 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2972 |
/* Workaround for potential 82544 hang in PCI-X. Avoid |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2973 |
* terminating buffers within evenly-aligned dwords. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2974 |
if (unlikely(adapter->pcix_82544 && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2975 |
!((unsigned long)(skb->data + offset + size - 1) & 4) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2976 |
size > 4)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2977 |
size -= 4; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2978 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2979 |
buffer_info->length = size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2980 |
/* set time_stamp *before* dma to help avoid a possible race */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2981 |
buffer_info->time_stamp = jiffies; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2982 |
buffer_info->mapped_as_page = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2983 |
buffer_info->dma = dma_map_single(&pdev->dev, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2984 |
skb->data + offset, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2985 |
size, DMA_TO_DEVICE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2986 |
if (dma_mapping_error(&pdev->dev, buffer_info->dma)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2987 |
goto dma_error; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2988 |
buffer_info->next_to_watch = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2989 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2990 |
len -= size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2991 |
offset += size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2992 |
count++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2993 |
if (len) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2994 |
i++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2995 |
if (unlikely(i == tx_ring->count)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2996 |
i = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2997 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2998 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2999 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3000 |
for (f = 0; f < nr_frags; f++) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3001 |
const struct skb_frag_struct *frag; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3002 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3003 |
frag = &skb_shinfo(skb)->frags[f]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3004 |
len = skb_frag_size(frag); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3005 |
offset = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3006 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3007 |
while (len) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3008 |
unsigned long bufend; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3009 |
i++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3010 |
if (unlikely(i == tx_ring->count)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3011 |
i = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3012 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3013 |
buffer_info = &tx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3014 |
size = min(len, max_per_txd); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3015 |
/* Workaround for premature desc write-backs |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3016 |
* in TSO mode. Append 4-byte sentinel desc */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3017 |
if (unlikely(mss && f == (nr_frags-1) && size == len && size > 8)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3018 |
size -= 4; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3019 |
/* Workaround for potential 82544 hang in PCI-X. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3020 |
* Avoid terminating buffers within evenly-aligned |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3021 |
* dwords. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3022 |
bufend = (unsigned long) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3023 |
page_to_phys(skb_frag_page(frag)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3024 |
bufend += offset + size - 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3025 |
if (unlikely(adapter->pcix_82544 && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3026 |
!(bufend & 4) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3027 |
size > 4)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3028 |
size -= 4; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3029 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3030 |
buffer_info->length = size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3031 |
buffer_info->time_stamp = jiffies; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3032 |
buffer_info->mapped_as_page = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3033 |
buffer_info->dma = skb_frag_dma_map(&pdev->dev, frag, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3034 |
offset, size, DMA_TO_DEVICE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3035 |
if (dma_mapping_error(&pdev->dev, buffer_info->dma)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3036 |
goto dma_error; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3037 |
buffer_info->next_to_watch = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3038 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3039 |
len -= size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3040 |
offset += size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3041 |
count++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3042 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3043 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3044 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3045 |
segs = skb_shinfo(skb)->gso_segs ?: 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3046 |
/* multiply data chunks by size of headers */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3047 |
bytecount = ((segs - 1) * skb_headlen(skb)) + skb->len; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3048 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3049 |
tx_ring->buffer_info[i].skb = skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3050 |
tx_ring->buffer_info[i].segs = segs; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3051 |
tx_ring->buffer_info[i].bytecount = bytecount; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3052 |
tx_ring->buffer_info[first].next_to_watch = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3053 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3054 |
return count; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3055 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3056 |
dma_error: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3057 |
dev_err(&pdev->dev, "TX DMA map failed\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3058 |
buffer_info->dma = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3059 |
if (count) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3060 |
count--; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3061 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3062 |
while (count--) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3063 |
if (i==0) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3064 |
i += tx_ring->count; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3065 |
i--; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3066 |
buffer_info = &tx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3067 |
e1000_unmap_and_free_tx_resource(adapter, buffer_info); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3068 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3069 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3070 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3071 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3072 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3073 |
static void e1000_tx_queue(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3074 |
struct e1000_tx_ring *tx_ring, int tx_flags, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3075 |
int count) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3076 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3077 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3078 |
struct e1000_tx_desc *tx_desc = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3079 |
struct e1000_buffer *buffer_info; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3080 |
u32 txd_upper = 0, txd_lower = E1000_TXD_CMD_IFCS; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3081 |
unsigned int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3082 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3083 |
if (likely(tx_flags & E1000_TX_FLAGS_TSO)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3084 |
txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3085 |
E1000_TXD_CMD_TSE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3086 |
txd_upper |= E1000_TXD_POPTS_TXSM << 8; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3087 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3088 |
if (likely(tx_flags & E1000_TX_FLAGS_IPV4)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3089 |
txd_upper |= E1000_TXD_POPTS_IXSM << 8; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3090 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3091 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3092 |
if (likely(tx_flags & E1000_TX_FLAGS_CSUM)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3093 |
txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3094 |
txd_upper |= E1000_TXD_POPTS_TXSM << 8; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3095 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3096 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3097 |
if (unlikely(tx_flags & E1000_TX_FLAGS_VLAN)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3098 |
txd_lower |= E1000_TXD_CMD_VLE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3099 |
txd_upper |= (tx_flags & E1000_TX_FLAGS_VLAN_MASK); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3100 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3101 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3102 |
if (unlikely(tx_flags & E1000_TX_FLAGS_NO_FCS)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3103 |
txd_lower &= ~(E1000_TXD_CMD_IFCS); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3104 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3105 |
i = tx_ring->next_to_use; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3106 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3107 |
while (count--) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3108 |
buffer_info = &tx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3109 |
tx_desc = E1000_TX_DESC(*tx_ring, i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3110 |
tx_desc->buffer_addr = cpu_to_le64(buffer_info->dma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3111 |
tx_desc->lower.data = |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3112 |
cpu_to_le32(txd_lower | buffer_info->length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3113 |
tx_desc->upper.data = cpu_to_le32(txd_upper); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3114 |
if (unlikely(++i == tx_ring->count)) i = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3115 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3116 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3117 |
tx_desc->lower.data |= cpu_to_le32(adapter->txd_cmd); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3118 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3119 |
/* txd_cmd re-enables FCS, so we'll re-disable it here as desired. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3120 |
if (unlikely(tx_flags & E1000_TX_FLAGS_NO_FCS)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3121 |
tx_desc->lower.data &= ~(cpu_to_le32(E1000_TXD_CMD_IFCS)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3122 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3123 |
/* Force memory writes to complete before letting h/w |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3124 |
* know there are new descriptors to fetch. (Only |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3125 |
* applicable for weak-ordered memory model archs, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3126 |
* such as IA-64). */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3127 |
wmb(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3128 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3129 |
tx_ring->next_to_use = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3130 |
writel(i, hw->hw_addr + tx_ring->tdt); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3131 |
/* we need this if more than one processor can write to our tail |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3132 |
* at a time, it syncronizes IO on IA64/Altix systems */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3133 |
mmiowb(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3134 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3135 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3136 |
/* 82547 workaround to avoid controller hang in half-duplex environment. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3137 |
* The workaround is to avoid queuing a large packet that would span |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3138 |
* the internal Tx FIFO ring boundary by notifying the stack to resend |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3139 |
* the packet at a later time. This gives the Tx FIFO an opportunity to |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3140 |
* flush all packets. When that occurs, we reset the Tx FIFO pointers |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3141 |
* to the beginning of the Tx FIFO. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3142 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3143 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3144 |
#define E1000_FIFO_HDR 0x10 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3145 |
#define E1000_82547_PAD_LEN 0x3E0 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3146 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3147 |
static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3148 |
struct sk_buff *skb) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3149 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3150 |
u32 fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3151 |
u32 skb_fifo_len = skb->len + E1000_FIFO_HDR; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3152 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3153 |
skb_fifo_len = ALIGN(skb_fifo_len, E1000_FIFO_HDR); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3154 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3155 |
if (adapter->link_duplex != HALF_DUPLEX) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3156 |
goto no_fifo_stall_required; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3157 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3158 |
if (atomic_read(&adapter->tx_fifo_stall)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3159 |
return 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3160 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3161 |
if (skb_fifo_len >= (E1000_82547_PAD_LEN + fifo_space)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3162 |
atomic_set(&adapter->tx_fifo_stall, 1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3163 |
return 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3164 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3165 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3166 |
no_fifo_stall_required: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3167 |
adapter->tx_fifo_head += skb_fifo_len; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3168 |
if (adapter->tx_fifo_head >= adapter->tx_fifo_size) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3169 |
adapter->tx_fifo_head -= adapter->tx_fifo_size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3170 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3171 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3172 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3173 |
static int __e1000_maybe_stop_tx(struct net_device *netdev, int size) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3174 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3175 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3176 |
struct e1000_tx_ring *tx_ring = adapter->tx_ring; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3177 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3178 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3179 |
return -EBUSY; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3180 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3181 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3182 |
netif_stop_queue(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3183 |
/* Herbert's original patch had: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3184 |
* smp_mb__after_netif_stop_queue(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3185 |
* but since that doesn't exist yet, just open code it. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3186 |
smp_mb(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3187 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3188 |
/* We need to check again in a case another CPU has just |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3189 |
* made room available. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3190 |
if (likely(E1000_DESC_UNUSED(tx_ring) < size)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3191 |
return -EBUSY; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3192 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3193 |
/* A reprieve! */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3194 |
netif_start_queue(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3195 |
++adapter->restart_queue; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3196 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3197 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3198 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3199 |
static int e1000_maybe_stop_tx(struct net_device *netdev, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3200 |
struct e1000_tx_ring *tx_ring, int size) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3201 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3202 |
if (likely(E1000_DESC_UNUSED(tx_ring) >= size)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3203 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3204 |
return __e1000_maybe_stop_tx(netdev, size); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3205 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3206 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3207 |
#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 ) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3208 |
static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3209 |
struct net_device *netdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3210 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3211 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3212 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3213 |
struct e1000_tx_ring *tx_ring; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3214 |
unsigned int first, max_per_txd = E1000_MAX_DATA_PER_TXD; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3215 |
unsigned int max_txd_pwr = E1000_MAX_TXD_PWR; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3216 |
unsigned int tx_flags = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3217 |
unsigned int len = skb_headlen(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3218 |
unsigned int nr_frags; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3219 |
unsigned int mss; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3220 |
int count = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3221 |
int tso; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3222 |
unsigned int f; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3223 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3224 |
/* This goes back to the question of how to logically map a tx queue |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3225 |
* to a flow. Right now, performance is impacted slightly negatively |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3226 |
* if using multiple tx queues. If the stack breaks away from a |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3227 |
* single qdisc implementation, we can look at this again. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3228 |
tx_ring = adapter->tx_ring; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3229 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3230 |
if (unlikely(skb->len <= 0)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3231 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3232 |
dev_kfree_skb_any(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3233 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3234 |
return NETDEV_TX_OK; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3235 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3236 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3237 |
/* On PCI/PCI-X HW, if packet size is less than ETH_ZLEN, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3238 |
* packets may get corrupted during padding by HW. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3239 |
* To WA this issue, pad all small packets manually. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3240 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3241 |
if (skb->len < ETH_ZLEN) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3242 |
if (skb_pad(skb, ETH_ZLEN - skb->len)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3243 |
return NETDEV_TX_OK; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3244 |
skb->len = ETH_ZLEN; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3245 |
skb_set_tail_pointer(skb, ETH_ZLEN); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3246 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3247 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3248 |
mss = skb_shinfo(skb)->gso_size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3249 |
/* The controller does a simple calculation to |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3250 |
* make sure there is enough room in the FIFO before |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3251 |
* initiating the DMA for each buffer. The calc is: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3252 |
* 4 = ceil(buffer len/mss). To make sure we don't |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3253 |
* overrun the FIFO, adjust the max buffer len if mss |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3254 |
* drops. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3255 |
if (mss) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3256 |
u8 hdr_len; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3257 |
max_per_txd = min(mss << 2, max_per_txd); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3258 |
max_txd_pwr = fls(max_per_txd) - 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3259 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3260 |
hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3261 |
if (skb->data_len && hdr_len == len) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3262 |
switch (hw->mac_type) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3263 |
unsigned int pull_size; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3264 |
case e1000_82544: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3265 |
/* Make sure we have room to chop off 4 bytes, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3266 |
* and that the end alignment will work out to |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3267 |
* this hardware's requirements |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3268 |
* NOTE: this is a TSO only workaround |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3269 |
* if end byte alignment not correct move us |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3270 |
* into the next dword */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3271 |
if ((unsigned long)(skb_tail_pointer(skb) - 1) & 4) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3272 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3273 |
/* fall through */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3274 |
pull_size = min((unsigned int)4, skb->data_len); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3275 |
if (!__pskb_pull_tail(skb, pull_size)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3276 |
e_err(drv, "__pskb_pull_tail " |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3277 |
"failed.\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3278 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3279 |
dev_kfree_skb_any(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3280 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3281 |
return NETDEV_TX_OK; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3282 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3283 |
len = skb_headlen(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3284 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3285 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3286 |
/* do nothing */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3287 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3288 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3289 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3290 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3291 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3292 |
/* reserve a descriptor for the offload context */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3293 |
if ((mss) || (skb->ip_summed == CHECKSUM_PARTIAL)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3294 |
count++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3295 |
count++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3296 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3297 |
/* Controller Erratum workaround */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3298 |
if (!skb->data_len && tx_ring->last_tx_tso && !skb_is_gso(skb)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3299 |
count++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3300 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3301 |
count += TXD_USE_COUNT(len, max_txd_pwr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3302 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3303 |
if (adapter->pcix_82544) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3304 |
count++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3305 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3306 |
/* work-around for errata 10 and it applies to all controllers |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3307 |
* in PCI-X mode, so add one more descriptor to the count |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3308 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3309 |
if (unlikely((hw->bus_type == e1000_bus_type_pcix) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3310 |
(len > 2015))) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3311 |
count++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3312 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3313 |
nr_frags = skb_shinfo(skb)->nr_frags; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3314 |
for (f = 0; f < nr_frags; f++) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3315 |
count += TXD_USE_COUNT(skb_frag_size(&skb_shinfo(skb)->frags[f]), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3316 |
max_txd_pwr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3317 |
if (adapter->pcix_82544) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3318 |
count += nr_frags; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3319 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3320 |
/* need: count + 2 desc gap to keep tail from touching |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3321 |
* head, otherwise try next time */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3322 |
if (unlikely(e1000_maybe_stop_tx(netdev, tx_ring, count + 2))) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3323 |
return NETDEV_TX_BUSY; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3324 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3325 |
if (unlikely((hw->mac_type == e1000_82547) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3326 |
(e1000_82547_fifo_workaround(adapter, skb)))) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3327 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3328 |
netif_stop_queue(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3329 |
if (!test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3330 |
schedule_delayed_work(&adapter->fifo_stall_task, 1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3331 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3332 |
return NETDEV_TX_BUSY; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3333 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3334 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3335 |
if (vlan_tx_tag_present(skb)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3336 |
tx_flags |= E1000_TX_FLAGS_VLAN; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3337 |
tx_flags |= (vlan_tx_tag_get(skb) << E1000_TX_FLAGS_VLAN_SHIFT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3338 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3339 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3340 |
first = tx_ring->next_to_use; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3341 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3342 |
tso = e1000_tso(adapter, tx_ring, skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3343 |
if (tso < 0) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3344 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3345 |
dev_kfree_skb_any(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3346 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3347 |
return NETDEV_TX_OK; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3348 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3349 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3350 |
if (likely(tso)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3351 |
if (likely(hw->mac_type != e1000_82544)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3352 |
tx_ring->last_tx_tso = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3353 |
tx_flags |= E1000_TX_FLAGS_TSO; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3354 |
} else if (likely(e1000_tx_csum(adapter, tx_ring, skb))) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3355 |
tx_flags |= E1000_TX_FLAGS_CSUM; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3356 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3357 |
if (likely(skb->protocol == htons(ETH_P_IP))) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3358 |
tx_flags |= E1000_TX_FLAGS_IPV4; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3359 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3360 |
if (unlikely(skb->no_fcs)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3361 |
tx_flags |= E1000_TX_FLAGS_NO_FCS; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3362 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3363 |
count = e1000_tx_map(adapter, tx_ring, skb, first, max_per_txd, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3364 |
nr_frags, mss); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3365 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3366 |
if (count) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3367 |
netdev_sent_queue(netdev, skb->len); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3368 |
skb_tx_timestamp(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3369 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3370 |
e1000_tx_queue(adapter, tx_ring, tx_flags, count); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3371 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3372 |
/* Make sure there is space in the ring for the next send. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3373 |
e1000_maybe_stop_tx(netdev, tx_ring, MAX_SKB_FRAGS + 2); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3374 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3375 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3376 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3377 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3378 |
dev_kfree_skb_any(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3379 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3380 |
tx_ring->buffer_info[first].time_stamp = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3381 |
tx_ring->next_to_use = first; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3382 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3383 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3384 |
return NETDEV_TX_OK; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3385 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3386 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3387 |
#define NUM_REGS 38 /* 1 based count */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3388 |
static void e1000_regdump(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3389 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3390 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3391 |
u32 regs[NUM_REGS]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3392 |
u32 *regs_buff = regs; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3393 |
int i = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3394 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3395 |
static const char * const reg_name[] = {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3396 |
"CTRL", "STATUS", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3397 |
"RCTL", "RDLEN", "RDH", "RDT", "RDTR", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3398 |
"TCTL", "TDBAL", "TDBAH", "TDLEN", "TDH", "TDT", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3399 |
"TIDV", "TXDCTL", "TADV", "TARC0", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3400 |
"TDBAL1", "TDBAH1", "TDLEN1", "TDH1", "TDT1", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3401 |
"TXDCTL1", "TARC1", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3402 |
"CTRL_EXT", "ERT", "RDBAL", "RDBAH", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3403 |
"TDFH", "TDFT", "TDFHS", "TDFTS", "TDFPC", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3404 |
"RDFH", "RDFT", "RDFHS", "RDFTS", "RDFPC" |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3405 |
}; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3406 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3407 |
regs_buff[0] = er32(CTRL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3408 |
regs_buff[1] = er32(STATUS); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3409 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3410 |
regs_buff[2] = er32(RCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3411 |
regs_buff[3] = er32(RDLEN); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3412 |
regs_buff[4] = er32(RDH); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3413 |
regs_buff[5] = er32(RDT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3414 |
regs_buff[6] = er32(RDTR); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3415 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3416 |
regs_buff[7] = er32(TCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3417 |
regs_buff[8] = er32(TDBAL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3418 |
regs_buff[9] = er32(TDBAH); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3419 |
regs_buff[10] = er32(TDLEN); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3420 |
regs_buff[11] = er32(TDH); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3421 |
regs_buff[12] = er32(TDT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3422 |
regs_buff[13] = er32(TIDV); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3423 |
regs_buff[14] = er32(TXDCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3424 |
regs_buff[15] = er32(TADV); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3425 |
regs_buff[16] = er32(TARC0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3426 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3427 |
regs_buff[17] = er32(TDBAL1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3428 |
regs_buff[18] = er32(TDBAH1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3429 |
regs_buff[19] = er32(TDLEN1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3430 |
regs_buff[20] = er32(TDH1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3431 |
regs_buff[21] = er32(TDT1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3432 |
regs_buff[22] = er32(TXDCTL1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3433 |
regs_buff[23] = er32(TARC1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3434 |
regs_buff[24] = er32(CTRL_EXT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3435 |
regs_buff[25] = er32(ERT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3436 |
regs_buff[26] = er32(RDBAL0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3437 |
regs_buff[27] = er32(RDBAH0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3438 |
regs_buff[28] = er32(TDFH); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3439 |
regs_buff[29] = er32(TDFT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3440 |
regs_buff[30] = er32(TDFHS); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3441 |
regs_buff[31] = er32(TDFTS); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3442 |
regs_buff[32] = er32(TDFPC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3443 |
regs_buff[33] = er32(RDFH); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3444 |
regs_buff[34] = er32(RDFT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3445 |
regs_buff[35] = er32(RDFHS); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3446 |
regs_buff[36] = er32(RDFTS); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3447 |
regs_buff[37] = er32(RDFPC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3448 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3449 |
pr_info("Register dump\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3450 |
for (i = 0; i < NUM_REGS; i++) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3451 |
pr_info("%-15s %08x\n", reg_name[i], regs_buff[i]);
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3452 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3453 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3454 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3455 |
* e1000_dump: Print registers, tx ring and rx ring |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3456 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3457 |
static void e1000_dump(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3458 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3459 |
/* this code doesn't handle multiple rings */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3460 |
struct e1000_tx_ring *tx_ring = adapter->tx_ring; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3461 |
struct e1000_rx_ring *rx_ring = adapter->rx_ring; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3462 |
int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3463 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3464 |
if (!netif_msg_hw(adapter)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3465 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3466 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3467 |
/* Print Registers */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3468 |
e1000_regdump(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3469 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3470 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3471 |
* transmit dump |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3472 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3473 |
pr_info("TX Desc ring0 dump\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3474 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3475 |
/* Transmit Descriptor Formats - DEXT[29] is 0 (Legacy) or 1 (Extended) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3476 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3477 |
* Legacy Transmit Descriptor |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3478 |
* +--------------------------------------------------------------+ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3479 |
* 0 | Buffer Address [63:0] (Reserved on Write Back) | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3480 |
* +--------------------------------------------------------------+ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3481 |
* 8 | Special | CSS | Status | CMD | CSO | Length | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3482 |
* +--------------------------------------------------------------+ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3483 |
* 63 48 47 36 35 32 31 24 23 16 15 0 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3484 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3485 |
* Extended Context Descriptor (DTYP=0x0) for TSO or checksum offload |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3486 |
* 63 48 47 40 39 32 31 16 15 8 7 0 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3487 |
* +----------------------------------------------------------------+ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3488 |
* 0 | TUCSE | TUCS0 | TUCSS | IPCSE | IPCS0 | IPCSS | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3489 |
* +----------------------------------------------------------------+ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3490 |
* 8 | MSS | HDRLEN | RSV | STA | TUCMD | DTYP | PAYLEN | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3491 |
* +----------------------------------------------------------------+ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3492 |
* 63 48 47 40 39 36 35 32 31 24 23 20 19 0 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3493 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3494 |
* Extended Data Descriptor (DTYP=0x1) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3495 |
* +----------------------------------------------------------------+ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3496 |
* 0 | Buffer Address [63:0] | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3497 |
* +----------------------------------------------------------------+ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3498 |
* 8 | VLAN tag | POPTS | Rsvd | Status | Command | DTYP | DTALEN | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3499 |
* +----------------------------------------------------------------+ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3500 |
* 63 48 47 40 39 36 35 32 31 24 23 20 19 0 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3501 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3502 |
pr_info("Tc[desc] [Ce CoCsIpceCoS] [MssHlRSCm0Plen] [bi->dma ] leng ntw timestmp bi->skb\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3503 |
pr_info("Td[desc] [address 63:0 ] [VlaPoRSCm1Dlen] [bi->dma ] leng ntw timestmp bi->skb\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3504 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3505 |
if (!netif_msg_tx_done(adapter)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3506 |
goto rx_ring_summary; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3507 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3508 |
for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3509 |
struct e1000_tx_desc *tx_desc = E1000_TX_DESC(*tx_ring, i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3510 |
struct e1000_buffer *buffer_info = &tx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3511 |
struct my_u { __le64 a; __le64 b; };
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3512 |
struct my_u *u = (struct my_u *)tx_desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3513 |
const char *type; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3514 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3515 |
if (i == tx_ring->next_to_use && i == tx_ring->next_to_clean) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3516 |
type = "NTC/U"; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3517 |
else if (i == tx_ring->next_to_use) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3518 |
type = "NTU"; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3519 |
else if (i == tx_ring->next_to_clean) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3520 |
type = "NTC"; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3521 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3522 |
type = ""; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3523 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3524 |
pr_info("T%c[0x%03X] %016llX %016llX %016llX %04X %3X %016llX %p %s\n",
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3525 |
((le64_to_cpu(u->b) & (1<<20)) ? 'd' : 'c'), i, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3526 |
le64_to_cpu(u->a), le64_to_cpu(u->b), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3527 |
(u64)buffer_info->dma, buffer_info->length, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3528 |
buffer_info->next_to_watch, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3529 |
(u64)buffer_info->time_stamp, buffer_info->skb, type); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3530 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3531 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3532 |
rx_ring_summary: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3533 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3534 |
* receive dump |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3535 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3536 |
pr_info("\nRX Desc ring dump\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3537 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3538 |
/* Legacy Receive Descriptor Format |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3539 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3540 |
* +-----------------------------------------------------+ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3541 |
* | Buffer Address [63:0] | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3542 |
* +-----------------------------------------------------+ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3543 |
* | VLAN Tag | Errors | Status 0 | Packet csum | Length | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3544 |
* +-----------------------------------------------------+ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3545 |
* 63 48 47 40 39 32 31 16 15 0 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3546 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3547 |
pr_info("R[desc] [address 63:0 ] [vl er S cks ln] [bi->dma ] [bi->skb]\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3548 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3549 |
if (!netif_msg_rx_status(adapter)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3550 |
goto exit; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3551 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3552 |
for (i = 0; rx_ring->desc && (i < rx_ring->count); i++) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3553 |
struct e1000_rx_desc *rx_desc = E1000_RX_DESC(*rx_ring, i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3554 |
struct e1000_buffer *buffer_info = &rx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3555 |
struct my_u { __le64 a; __le64 b; };
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3556 |
struct my_u *u = (struct my_u *)rx_desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3557 |
const char *type; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3558 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3559 |
if (i == rx_ring->next_to_use) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3560 |
type = "NTU"; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3561 |
else if (i == rx_ring->next_to_clean) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3562 |
type = "NTC"; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3563 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3564 |
type = ""; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3565 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3566 |
pr_info("R[0x%03X] %016llX %016llX %016llX %p %s\n",
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3567 |
i, le64_to_cpu(u->a), le64_to_cpu(u->b), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3568 |
(u64)buffer_info->dma, buffer_info->skb, type); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3569 |
} /* for */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3570 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3571 |
/* dump the descriptor caches */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3572 |
/* rx */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3573 |
pr_info("Rx descriptor cache in 64bit format\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3574 |
for (i = 0x6000; i <= 0x63FF ; i += 0x10) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3575 |
pr_info("R%04X: %08X|%08X %08X|%08X\n",
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3576 |
i, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3577 |
readl(adapter->hw.hw_addr + i+4), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3578 |
readl(adapter->hw.hw_addr + i), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3579 |
readl(adapter->hw.hw_addr + i+12), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3580 |
readl(adapter->hw.hw_addr + i+8)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3581 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3582 |
/* tx */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3583 |
pr_info("Tx descriptor cache in 64bit format\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3584 |
for (i = 0x7000; i <= 0x73FF ; i += 0x10) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3585 |
pr_info("T%04X: %08X|%08X %08X|%08X\n",
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3586 |
i, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3587 |
readl(adapter->hw.hw_addr + i+4), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3588 |
readl(adapter->hw.hw_addr + i), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3589 |
readl(adapter->hw.hw_addr + i+12), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3590 |
readl(adapter->hw.hw_addr + i+8)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3591 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3592 |
exit: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3593 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3594 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3595 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3596 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3597 |
* e1000_tx_timeout - Respond to a Tx Hang |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3598 |
* @netdev: network interface device structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3599 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3600 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3601 |
static void e1000_tx_timeout(struct net_device *netdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3602 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3603 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3604 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3605 |
/* Do the reset outside of interrupt context */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3606 |
adapter->tx_timeout_count++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3607 |
schedule_work(&adapter->reset_task); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3608 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3609 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3610 |
static void e1000_reset_task(struct work_struct *work) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3611 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3612 |
struct e1000_adapter *adapter = |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3613 |
container_of(work, struct e1000_adapter, reset_task); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3614 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3615 |
if (test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3616 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3617 |
e_err(drv, "Reset adapter\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3618 |
e1000_reinit_safe(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3619 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3620 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3621 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3622 |
* e1000_get_stats - Get System Network Statistics |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3623 |
* @netdev: network interface device structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3624 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3625 |
* Returns the address of the device statistics structure. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3626 |
* The statistics are actually updated from the watchdog. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3627 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3628 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3629 |
static struct net_device_stats *e1000_get_stats(struct net_device *netdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3630 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3631 |
/* only return the current stats */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3632 |
return &netdev->stats; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3633 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3634 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3635 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3636 |
* e1000_change_mtu - Change the Maximum Transfer Unit |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3637 |
* @netdev: network interface device structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3638 |
* @new_mtu: new value for maximum frame size |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3639 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3640 |
* Returns 0 on success, negative on failure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3641 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3642 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3643 |
static int e1000_change_mtu(struct net_device *netdev, int new_mtu) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3644 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3645 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3646 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3647 |
int max_frame = new_mtu + ENET_HEADER_SIZE + ETHERNET_FCS_SIZE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3648 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3649 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3650 |
return -EBUSY; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3651 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3652 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3653 |
if ((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) || |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3654 |
(max_frame > MAX_JUMBO_FRAME_SIZE)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3655 |
e_err(probe, "Invalid MTU setting\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3656 |
return -EINVAL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3657 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3658 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3659 |
/* Adapter-specific max frame size limits. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3660 |
switch (hw->mac_type) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3661 |
case e1000_undefined ... e1000_82542_rev2_1: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3662 |
if (max_frame > (ETH_FRAME_LEN + ETH_FCS_LEN)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3663 |
e_err(probe, "Jumbo Frames not supported.\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3664 |
return -EINVAL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3665 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3666 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3667 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3668 |
/* Capable of supporting up to MAX_JUMBO_FRAME_SIZE limit. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3669 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3670 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3671 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3672 |
while (test_and_set_bit(__E1000_RESETTING, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3673 |
msleep(1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3674 |
/* e1000_down has a dependency on max_frame_size */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3675 |
hw->max_frame_size = max_frame; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3676 |
if (netif_running(netdev)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3677 |
e1000_down(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3678 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3679 |
/* NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3680 |
* means we reserve 2 more, this pushes us to allocate from the next |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3681 |
* larger slab size. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3682 |
* i.e. RXBUFFER_2048 --> size-4096 slab |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3683 |
* however with the new *_jumbo_rx* routines, jumbo receives will use |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3684 |
* fragmented skbs */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3685 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3686 |
if (max_frame <= E1000_RXBUFFER_2048) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3687 |
adapter->rx_buffer_len = E1000_RXBUFFER_2048; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3688 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3689 |
#if (PAGE_SIZE >= E1000_RXBUFFER_16384) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3690 |
adapter->rx_buffer_len = E1000_RXBUFFER_16384; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3691 |
#elif (PAGE_SIZE >= E1000_RXBUFFER_4096) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3692 |
adapter->rx_buffer_len = PAGE_SIZE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3693 |
#endif |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3694 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3695 |
/* adjust allocation if LPE protects us, and we aren't using SBP */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3696 |
if (!hw->tbi_compatibility_on && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3697 |
((max_frame == (ETH_FRAME_LEN + ETH_FCS_LEN)) || |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3698 |
(max_frame == MAXIMUM_ETHERNET_VLAN_SIZE))) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3699 |
adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3700 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3701 |
pr_info("%s changing MTU from %d to %d\n",
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3702 |
netdev->name, netdev->mtu, new_mtu); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3703 |
netdev->mtu = new_mtu; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3704 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3705 |
if (netif_running(netdev)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3706 |
e1000_up(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3707 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3708 |
e1000_reset(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3709 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3710 |
clear_bit(__E1000_RESETTING, &adapter->flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3711 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3712 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3713 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3714 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3715 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3716 |
* e1000_update_stats - Update the board statistics counters |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3717 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3718 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3719 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3720 |
void e1000_update_stats(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3721 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3722 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3723 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3724 |
struct pci_dev *pdev = adapter->pdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3725 |
unsigned long flags = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3726 |
u16 phy_tmp; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3727 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3728 |
#define PHY_IDLE_ERROR_COUNT_MASK 0x00FF |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3729 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3730 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3731 |
* Prevent stats update while adapter is being reset, or if the pci |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3732 |
* connection is down. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3733 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3734 |
if (adapter->link_speed == 0) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3735 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3736 |
if (pci_channel_offline(pdev)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3737 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3738 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3739 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3740 |
spin_lock_irqsave(&adapter->stats_lock, flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3741 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3742 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3743 |
/* these counters are modified from e1000_tbi_adjust_stats, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3744 |
* called from the interrupt context, so they must only |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3745 |
* be written while holding adapter->stats_lock |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3746 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3747 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3748 |
adapter->stats.crcerrs += er32(CRCERRS); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3749 |
adapter->stats.gprc += er32(GPRC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3750 |
adapter->stats.gorcl += er32(GORCL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3751 |
adapter->stats.gorch += er32(GORCH); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3752 |
adapter->stats.bprc += er32(BPRC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3753 |
adapter->stats.mprc += er32(MPRC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3754 |
adapter->stats.roc += er32(ROC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3755 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3756 |
adapter->stats.prc64 += er32(PRC64); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3757 |
adapter->stats.prc127 += er32(PRC127); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3758 |
adapter->stats.prc255 += er32(PRC255); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3759 |
adapter->stats.prc511 += er32(PRC511); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3760 |
adapter->stats.prc1023 += er32(PRC1023); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3761 |
adapter->stats.prc1522 += er32(PRC1522); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3762 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3763 |
adapter->stats.symerrs += er32(SYMERRS); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3764 |
adapter->stats.mpc += er32(MPC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3765 |
adapter->stats.scc += er32(SCC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3766 |
adapter->stats.ecol += er32(ECOL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3767 |
adapter->stats.mcc += er32(MCC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3768 |
adapter->stats.latecol += er32(LATECOL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3769 |
adapter->stats.dc += er32(DC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3770 |
adapter->stats.sec += er32(SEC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3771 |
adapter->stats.rlec += er32(RLEC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3772 |
adapter->stats.xonrxc += er32(XONRXC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3773 |
adapter->stats.xontxc += er32(XONTXC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3774 |
adapter->stats.xoffrxc += er32(XOFFRXC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3775 |
adapter->stats.xofftxc += er32(XOFFTXC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3776 |
adapter->stats.fcruc += er32(FCRUC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3777 |
adapter->stats.gptc += er32(GPTC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3778 |
adapter->stats.gotcl += er32(GOTCL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3779 |
adapter->stats.gotch += er32(GOTCH); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3780 |
adapter->stats.rnbc += er32(RNBC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3781 |
adapter->stats.ruc += er32(RUC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3782 |
adapter->stats.rfc += er32(RFC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3783 |
adapter->stats.rjc += er32(RJC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3784 |
adapter->stats.torl += er32(TORL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3785 |
adapter->stats.torh += er32(TORH); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3786 |
adapter->stats.totl += er32(TOTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3787 |
adapter->stats.toth += er32(TOTH); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3788 |
adapter->stats.tpr += er32(TPR); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3789 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3790 |
adapter->stats.ptc64 += er32(PTC64); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3791 |
adapter->stats.ptc127 += er32(PTC127); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3792 |
adapter->stats.ptc255 += er32(PTC255); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3793 |
adapter->stats.ptc511 += er32(PTC511); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3794 |
adapter->stats.ptc1023 += er32(PTC1023); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3795 |
adapter->stats.ptc1522 += er32(PTC1522); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3796 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3797 |
adapter->stats.mptc += er32(MPTC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3798 |
adapter->stats.bptc += er32(BPTC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3799 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3800 |
/* used for adaptive IFS */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3801 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3802 |
hw->tx_packet_delta = er32(TPT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3803 |
adapter->stats.tpt += hw->tx_packet_delta; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3804 |
hw->collision_delta = er32(COLC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3805 |
adapter->stats.colc += hw->collision_delta; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3806 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3807 |
if (hw->mac_type >= e1000_82543) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3808 |
adapter->stats.algnerrc += er32(ALGNERRC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3809 |
adapter->stats.rxerrc += er32(RXERRC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3810 |
adapter->stats.tncrs += er32(TNCRS); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3811 |
adapter->stats.cexterr += er32(CEXTERR); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3812 |
adapter->stats.tsctc += er32(TSCTC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3813 |
adapter->stats.tsctfc += er32(TSCTFC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3814 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3815 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3816 |
/* Fill out the OS statistics structure */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3817 |
netdev->stats.multicast = adapter->stats.mprc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3818 |
netdev->stats.collisions = adapter->stats.colc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3819 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3820 |
/* Rx Errors */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3821 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3822 |
/* RLEC on some newer hardware can be incorrect so build |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3823 |
* our own version based on RUC and ROC */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3824 |
netdev->stats.rx_errors = adapter->stats.rxerrc + |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3825 |
adapter->stats.crcerrs + adapter->stats.algnerrc + |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3826 |
adapter->stats.ruc + adapter->stats.roc + |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3827 |
adapter->stats.cexterr; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3828 |
adapter->stats.rlerrc = adapter->stats.ruc + adapter->stats.roc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3829 |
netdev->stats.rx_length_errors = adapter->stats.rlerrc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3830 |
netdev->stats.rx_crc_errors = adapter->stats.crcerrs; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3831 |
netdev->stats.rx_frame_errors = adapter->stats.algnerrc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3832 |
netdev->stats.rx_missed_errors = adapter->stats.mpc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3833 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3834 |
/* Tx Errors */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3835 |
adapter->stats.txerrc = adapter->stats.ecol + adapter->stats.latecol; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3836 |
netdev->stats.tx_errors = adapter->stats.txerrc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3837 |
netdev->stats.tx_aborted_errors = adapter->stats.ecol; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3838 |
netdev->stats.tx_window_errors = adapter->stats.latecol; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3839 |
netdev->stats.tx_carrier_errors = adapter->stats.tncrs; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3840 |
if (hw->bad_tx_carr_stats_fd && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3841 |
adapter->link_duplex == FULL_DUPLEX) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3842 |
netdev->stats.tx_carrier_errors = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3843 |
adapter->stats.tncrs = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3844 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3845 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3846 |
/* Tx Dropped needs to be maintained elsewhere */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3847 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3848 |
/* Phy Stats */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3849 |
if (hw->media_type == e1000_media_type_copper) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3850 |
if ((adapter->link_speed == SPEED_1000) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3851 |
(!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3852 |
phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3853 |
adapter->phy_stats.idle_errors += phy_tmp; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3854 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3855 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3856 |
if ((hw->mac_type <= e1000_82546) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3857 |
(hw->phy_type == e1000_phy_m88) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3858 |
!e1000_read_phy_reg(hw, M88E1000_RX_ERR_CNTR, &phy_tmp)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3859 |
adapter->phy_stats.receive_errors += phy_tmp; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3860 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3861 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3862 |
/* Management Stats */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3863 |
if (hw->has_smbus) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3864 |
adapter->stats.mgptc += er32(MGTPTC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3865 |
adapter->stats.mgprc += er32(MGTPRC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3866 |
adapter->stats.mgpdc += er32(MGTPDC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3867 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3868 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3869 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3870 |
spin_unlock_irqrestore(&adapter->stats_lock, flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3871 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3872 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3873 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3874 |
void ec_poll(struct net_device *netdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3875 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3876 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3877 |
if (jiffies - adapter->ec_watchdog_jiffies >= 2 * HZ) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3878 |
e1000_watchdog(&adapter->watchdog_task.work); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3879 |
adapter->ec_watchdog_jiffies = jiffies; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3880 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3881 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3882 |
e1000_intr(0, netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3883 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3884 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3885 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3886 |
* e1000_intr - Interrupt Handler |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3887 |
* @irq: interrupt number |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3888 |
* @data: pointer to a network interface device structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3889 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3890 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3891 |
static irqreturn_t e1000_intr(int irq, void *data) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3892 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3893 |
struct net_device *netdev = data; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3894 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3895 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3896 |
u32 icr = er32(ICR); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3897 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3898 |
if (unlikely((!icr))) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3899 |
return IRQ_NONE; /* Not our interrupt */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3900 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3901 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3902 |
* we might have caused the interrupt, but the above |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3903 |
* read cleared it, and just in case the driver is |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3904 |
* down there is nothing to do so return handled |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3905 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3906 |
if (unlikely(test_bit(__E1000_DOWN, &adapter->flags))) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3907 |
return IRQ_HANDLED; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3908 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3909 |
if (unlikely(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3910 |
hw->get_link_status = 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3911 |
/* guard against interrupt when we're going down */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3912 |
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3913 |
schedule_delayed_work(&adapter->watchdog_task, 1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3914 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3915 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3916 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3917 |
int i, ec_work_done = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3918 |
for (i = 0; i < E1000_MAX_INTR; i++) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3919 |
if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3920 |
&ec_work_done, 100) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3921 |
!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3922 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3923 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3924 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3925 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3926 |
/* disable interrupts, without the synchronize_irq bit */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3927 |
ew32(IMC, ~0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3928 |
E1000_WRITE_FLUSH(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3929 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3930 |
if (likely(napi_schedule_prep(&adapter->napi))) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3931 |
adapter->total_tx_bytes = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3932 |
adapter->total_tx_packets = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3933 |
adapter->total_rx_bytes = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3934 |
adapter->total_rx_packets = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3935 |
__napi_schedule(&adapter->napi); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3936 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3937 |
/* this really should not happen! if it does it is basically a |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3938 |
* bug, but not a hard error, so enable ints and continue */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3939 |
if (!test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3940 |
e1000_irq_enable(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3941 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3942 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3943 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3944 |
return IRQ_HANDLED; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3945 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3946 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3947 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3948 |
* e1000_clean - NAPI Rx polling callback |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3949 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3950 |
* EtherCAT: never called |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3951 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3952 |
static int e1000_clean(struct napi_struct *napi, int budget) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3953 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3954 |
struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3955 |
int tx_clean_complete = 0, work_done = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3956 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3957 |
tx_clean_complete = e1000_clean_tx_irq(adapter, &adapter->tx_ring[0]); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3958 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3959 |
adapter->clean_rx(adapter, &adapter->rx_ring[0], &work_done, budget); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3960 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3961 |
if (!tx_clean_complete) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3962 |
work_done = budget; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3963 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3964 |
/* If budget not fully consumed, exit the polling mode */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3965 |
if (work_done < budget) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3966 |
if (likely(adapter->itr_setting & 3)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3967 |
e1000_set_itr(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3968 |
napi_complete(napi); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3969 |
if (!test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3970 |
e1000_irq_enable(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3971 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3972 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3973 |
return work_done; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3974 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3975 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3976 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3977 |
* e1000_clean_tx_irq - Reclaim resources after transmit completes |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3978 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3979 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3980 |
static bool e1000_clean_tx_irq(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3981 |
struct e1000_tx_ring *tx_ring) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3982 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3983 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3984 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3985 |
struct e1000_tx_desc *tx_desc, *eop_desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3986 |
struct e1000_buffer *buffer_info; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3987 |
unsigned int i, eop; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3988 |
unsigned int count = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3989 |
unsigned int total_tx_bytes=0, total_tx_packets=0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3990 |
unsigned int bytes_compl = 0, pkts_compl = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3991 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3992 |
i = tx_ring->next_to_clean; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3993 |
eop = tx_ring->buffer_info[i].next_to_watch; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3994 |
eop_desc = E1000_TX_DESC(*tx_ring, eop); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3995 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3996 |
while ((eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3997 |
(count < tx_ring->count)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3998 |
bool cleaned = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3999 |
rmb(); /* read buffer_info after eop_desc */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4000 |
for ( ; !cleaned; count++) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4001 |
tx_desc = E1000_TX_DESC(*tx_ring, i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4002 |
buffer_info = &tx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4003 |
cleaned = (i == eop); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4004 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4005 |
if (cleaned) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4006 |
total_tx_packets += buffer_info->segs; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4007 |
total_tx_bytes += buffer_info->bytecount; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4008 |
if (buffer_info->skb) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4009 |
bytes_compl += buffer_info->skb->len; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4010 |
pkts_compl++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4011 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4012 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4013 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4014 |
e1000_unmap_and_free_tx_resource(adapter, buffer_info); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4015 |
tx_desc->upper.data = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4016 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4017 |
if (unlikely(++i == tx_ring->count)) i = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4018 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4019 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4020 |
eop = tx_ring->buffer_info[i].next_to_watch; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4021 |
eop_desc = E1000_TX_DESC(*tx_ring, eop); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4022 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4023 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4024 |
tx_ring->next_to_clean = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4025 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4026 |
netdev_completed_queue(netdev, pkts_compl, bytes_compl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4027 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4028 |
#define TX_WAKE_THRESHOLD 32 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4029 |
if (!adapter->ecdev && unlikely(count && netif_carrier_ok(netdev) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4030 |
E1000_DESC_UNUSED(tx_ring) >= TX_WAKE_THRESHOLD)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4031 |
/* Make sure that anybody stopping the queue after this |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4032 |
* sees the new next_to_clean. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4033 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4034 |
smp_mb(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4035 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4036 |
if (netif_queue_stopped(netdev) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4037 |
!(test_bit(__E1000_DOWN, &adapter->flags))) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4038 |
netif_wake_queue(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4039 |
++adapter->restart_queue; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4040 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4041 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4042 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4043 |
if (!adapter->ecdev && adapter->detect_tx_hung) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4044 |
/* Detect a transmit hang in hardware, this serializes the |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4045 |
* check with the clearing of time_stamp and movement of i */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4046 |
adapter->detect_tx_hung = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4047 |
if (tx_ring->buffer_info[eop].time_stamp && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4048 |
time_after(jiffies, tx_ring->buffer_info[eop].time_stamp + |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4049 |
(adapter->tx_timeout_factor * HZ)) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4050 |
!(er32(STATUS) & E1000_STATUS_TXOFF)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4051 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4052 |
/* detected Tx unit hang */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4053 |
e_err(drv, "Detected Tx Unit Hang\n" |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4054 |
" Tx Queue <%lu>\n" |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4055 |
" TDH <%x>\n" |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4056 |
" TDT <%x>\n" |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4057 |
" next_to_use <%x>\n" |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4058 |
" next_to_clean <%x>\n" |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4059 |
"buffer_info[next_to_clean]\n" |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4060 |
" time_stamp <%lx>\n" |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4061 |
" next_to_watch <%x>\n" |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4062 |
" jiffies <%lx>\n" |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4063 |
" next_to_watch.status <%x>\n", |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4064 |
(unsigned long)((tx_ring - adapter->tx_ring) / |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4065 |
sizeof(struct e1000_tx_ring)), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4066 |
readl(hw->hw_addr + tx_ring->tdh), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4067 |
readl(hw->hw_addr + tx_ring->tdt), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4068 |
tx_ring->next_to_use, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4069 |
tx_ring->next_to_clean, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4070 |
tx_ring->buffer_info[eop].time_stamp, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4071 |
eop, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4072 |
jiffies, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4073 |
eop_desc->upper.fields.status); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4074 |
e1000_dump(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4075 |
netif_stop_queue(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4076 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4077 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4078 |
adapter->total_tx_bytes += total_tx_bytes; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4079 |
adapter->total_tx_packets += total_tx_packets; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4080 |
netdev->stats.tx_bytes += total_tx_bytes; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4081 |
netdev->stats.tx_packets += total_tx_packets; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4082 |
return count < tx_ring->count; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4083 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4084 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4085 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4086 |
* e1000_rx_checksum - Receive Checksum Offload for 82543 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4087 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4088 |
* @status_err: receive descriptor status and error fields |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4089 |
* @csum: receive descriptor csum field |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4090 |
* @sk_buff: socket buffer with received data |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4091 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4092 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4093 |
static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4094 |
u32 csum, struct sk_buff *skb) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4095 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4096 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4097 |
u16 status = (u16)status_err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4098 |
u8 errors = (u8)(status_err >> 24); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4099 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4100 |
skb_checksum_none_assert(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4101 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4102 |
/* 82543 or newer only */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4103 |
if (unlikely(hw->mac_type < e1000_82543)) return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4104 |
/* Ignore Checksum bit is set */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4105 |
if (unlikely(status & E1000_RXD_STAT_IXSM)) return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4106 |
/* TCP/UDP checksum error bit is set */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4107 |
if (unlikely(errors & E1000_RXD_ERR_TCPE)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4108 |
/* let the stack verify checksum errors */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4109 |
adapter->hw_csum_err++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4110 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4111 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4112 |
/* TCP/UDP Checksum has not been calculated */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4113 |
if (!(status & E1000_RXD_STAT_TCPCS)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4114 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4115 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4116 |
/* It must be a TCP or UDP packet with a valid checksum */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4117 |
if (likely(status & E1000_RXD_STAT_TCPCS)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4118 |
/* TCP checksum is good */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4119 |
skb->ip_summed = CHECKSUM_UNNECESSARY; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4120 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4121 |
adapter->hw_csum_good++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4122 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4123 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4124 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4125 |
* e1000_consume_page - helper function |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4126 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4127 |
static void e1000_consume_page(struct e1000_buffer *bi, struct sk_buff *skb, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4128 |
u16 length) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4129 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4130 |
bi->page = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4131 |
skb->len += length; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4132 |
skb->data_len += length; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4133 |
skb->truesize += PAGE_SIZE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4134 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4135 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4136 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4137 |
* e1000_receive_skb - helper function to handle rx indications |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4138 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4139 |
* @status: descriptor status field as written by hardware |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4140 |
* @vlan: descriptor vlan field as written by hardware (no le/be conversion) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4141 |
* @skb: pointer to sk_buff to be indicated to stack |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4142 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4143 |
static void e1000_receive_skb(struct e1000_adapter *adapter, u8 status, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4144 |
__le16 vlan, struct sk_buff *skb) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4145 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4146 |
skb->protocol = eth_type_trans(skb, adapter->netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4147 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4148 |
if (status & E1000_RXD_STAT_VP) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4149 |
u16 vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4150 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4151 |
__vlan_hwaccel_put_tag(skb, vid); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4152 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4153 |
napi_gro_receive(&adapter->napi, skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4154 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4155 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4156 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4157 |
* e1000_clean_jumbo_rx_irq - Send received data up the network stack; legacy |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4158 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4159 |
* @rx_ring: ring to clean |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4160 |
* @work_done: amount of napi work completed this call |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4161 |
* @work_to_do: max amount of work allowed for this call to do |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4162 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4163 |
* the return value indicates whether actual cleaning was done, there |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4164 |
* is no guarantee that everything was cleaned |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4165 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4166 |
static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4167 |
struct e1000_rx_ring *rx_ring, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4168 |
int *work_done, int work_to_do) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4169 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4170 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4171 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4172 |
struct pci_dev *pdev = adapter->pdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4173 |
struct e1000_rx_desc *rx_desc, *next_rxd; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4174 |
struct e1000_buffer *buffer_info, *next_buffer; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4175 |
unsigned long irq_flags; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4176 |
u32 length; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4177 |
unsigned int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4178 |
int cleaned_count = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4179 |
bool cleaned = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4180 |
unsigned int total_rx_bytes=0, total_rx_packets=0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4181 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4182 |
i = rx_ring->next_to_clean; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4183 |
rx_desc = E1000_RX_DESC(*rx_ring, i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4184 |
buffer_info = &rx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4185 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4186 |
while (rx_desc->status & E1000_RXD_STAT_DD) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4187 |
struct sk_buff *skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4188 |
u8 status; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4189 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4190 |
if (*work_done >= work_to_do) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4191 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4192 |
(*work_done)++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4193 |
rmb(); /* read descriptor and rx_buffer_info after status DD */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4194 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4195 |
status = rx_desc->status; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4196 |
skb = buffer_info->skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4197 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4198 |
buffer_info->skb = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4199 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4200 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4201 |
if (++i == rx_ring->count) i = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4202 |
next_rxd = E1000_RX_DESC(*rx_ring, i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4203 |
prefetch(next_rxd); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4204 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4205 |
next_buffer = &rx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4206 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4207 |
cleaned = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4208 |
cleaned_count++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4209 |
dma_unmap_page(&pdev->dev, buffer_info->dma, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4210 |
buffer_info->length, DMA_FROM_DEVICE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4211 |
buffer_info->dma = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4212 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4213 |
length = le16_to_cpu(rx_desc->length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4214 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4215 |
/* errors is only valid for DD + EOP descriptors */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4216 |
if (!adapter->ecdev && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4217 |
unlikely((status & E1000_RXD_STAT_EOP) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4218 |
(rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK))) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4219 |
u8 *mapped; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4220 |
u8 last_byte; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4221 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4222 |
mapped = page_address(buffer_info->page); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4223 |
last_byte = *(mapped + length - 1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4224 |
if (TBI_ACCEPT(hw, status, rx_desc->errors, length, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4225 |
last_byte)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4226 |
spin_lock_irqsave(&adapter->stats_lock, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4227 |
irq_flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4228 |
e1000_tbi_adjust_stats(hw, &adapter->stats, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4229 |
length, mapped); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4230 |
spin_unlock_irqrestore(&adapter->stats_lock, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4231 |
irq_flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4232 |
length--; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4233 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4234 |
if (netdev->features & NETIF_F_RXALL) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4235 |
goto process_skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4236 |
/* recycle both page and skb */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4237 |
buffer_info->skb = skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4238 |
/* an error means any chain goes out the window |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4239 |
* too */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4240 |
if (rx_ring->rx_skb_top) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4241 |
dev_kfree_skb(rx_ring->rx_skb_top); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4242 |
rx_ring->rx_skb_top = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4243 |
goto next_desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4244 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4245 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4246 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4247 |
#define rxtop rx_ring->rx_skb_top |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4248 |
process_skb: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4249 |
if (!(status & E1000_RXD_STAT_EOP)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4250 |
/* this descriptor is only the beginning (or middle) */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4251 |
if (!rxtop) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4252 |
/* this is the beginning of a chain */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4253 |
rxtop = skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4254 |
skb_fill_page_desc(rxtop, 0, buffer_info->page, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4255 |
0, length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4256 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4257 |
/* this is the middle of a chain */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4258 |
skb_fill_page_desc(rxtop, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4259 |
skb_shinfo(rxtop)->nr_frags, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4260 |
buffer_info->page, 0, length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4261 |
/* re-use the skb, only consumed the page */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4262 |
buffer_info->skb = skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4263 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4264 |
e1000_consume_page(buffer_info, rxtop, length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4265 |
goto next_desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4266 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4267 |
if (rxtop) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4268 |
/* end of the chain */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4269 |
skb_fill_page_desc(rxtop, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4270 |
skb_shinfo(rxtop)->nr_frags, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4271 |
buffer_info->page, 0, length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4272 |
/* re-use the current skb, we only consumed the |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4273 |
* page */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4274 |
buffer_info->skb = skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4275 |
skb = rxtop; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4276 |
rxtop = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4277 |
e1000_consume_page(buffer_info, skb, length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4278 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4279 |
/* no chain, got EOP, this buf is the packet |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4280 |
* copybreak to save the put_page/alloc_page */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4281 |
if (length <= copybreak && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4282 |
skb_tailroom(skb) >= length) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4283 |
u8 *vaddr; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4284 |
vaddr = kmap_atomic(buffer_info->page); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4285 |
memcpy(skb_tail_pointer(skb), vaddr, length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4286 |
kunmap_atomic(vaddr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4287 |
/* re-use the page, so don't erase |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4288 |
* buffer_info->page */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4289 |
skb_put(skb, length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4290 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4291 |
skb_fill_page_desc(skb, 0, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4292 |
buffer_info->page, 0, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4293 |
length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4294 |
e1000_consume_page(buffer_info, skb, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4295 |
length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4296 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4297 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4298 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4299 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4300 |
/* Receive Checksum Offload XXX recompute due to CRC strip? */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4301 |
e1000_rx_checksum(adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4302 |
(u32)(status) | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4303 |
((u32)(rx_desc->errors) << 24), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4304 |
le16_to_cpu(rx_desc->csum), skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4305 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4306 |
total_rx_bytes += (skb->len - 4); /* don't count FCS */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4307 |
if (likely(!(netdev->features & NETIF_F_RXFCS))) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4308 |
pskb_trim(skb, skb->len - 4); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4309 |
total_rx_packets++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4310 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4311 |
/* eth type trans needs skb->data to point to something */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4312 |
if (!pskb_may_pull(skb, ETH_HLEN)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4313 |
e_err(drv, "pskb_may_pull failed.\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4314 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4315 |
dev_kfree_skb(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4316 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4317 |
goto next_desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4318 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4319 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4320 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4321 |
ecdev_receive(adapter->ecdev, skb->data, length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4322 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4323 |
// No need to detect link status as |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4324 |
// long as frames are received: Reset watchdog. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4325 |
adapter->ec_watchdog_jiffies = jiffies; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4326 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4327 |
e1000_receive_skb(adapter, status, rx_desc->special, skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4328 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4329 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4330 |
next_desc: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4331 |
rx_desc->status = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4332 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4333 |
/* return some buffers to hardware, one at a time is too slow */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4334 |
if (unlikely(cleaned_count >= E1000_RX_BUFFER_WRITE)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4335 |
adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4336 |
cleaned_count = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4337 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4338 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4339 |
/* use prefetched values */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4340 |
rx_desc = next_rxd; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4341 |
buffer_info = next_buffer; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4342 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4343 |
rx_ring->next_to_clean = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4344 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4345 |
cleaned_count = E1000_DESC_UNUSED(rx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4346 |
if (cleaned_count) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4347 |
adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4348 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4349 |
adapter->total_rx_packets += total_rx_packets; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4350 |
adapter->total_rx_bytes += total_rx_bytes; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4351 |
netdev->stats.rx_bytes += total_rx_bytes; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4352 |
netdev->stats.rx_packets += total_rx_packets; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4353 |
return cleaned; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4354 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4355 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4356 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4357 |
* this should improve performance for small packets with large amounts |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4358 |
* of reassembly being done in the stack |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4359 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4360 |
static void e1000_check_copybreak(struct net_device *netdev, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4361 |
struct e1000_buffer *buffer_info, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4362 |
u32 length, struct sk_buff **skb) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4363 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4364 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4365 |
struct sk_buff *new_skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4366 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4367 |
if (adapter->ecdev || length > copybreak) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4368 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4369 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4370 |
new_skb = netdev_alloc_skb_ip_align(netdev, length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4371 |
if (!new_skb) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4372 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4373 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4374 |
skb_copy_to_linear_data_offset(new_skb, -NET_IP_ALIGN, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4375 |
(*skb)->data - NET_IP_ALIGN, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4376 |
length + NET_IP_ALIGN); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4377 |
/* save the skb in buffer_info as good */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4378 |
buffer_info->skb = *skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4379 |
*skb = new_skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4380 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4381 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4382 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4383 |
* e1000_clean_rx_irq - Send received data up the network stack; legacy |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4384 |
* @adapter: board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4385 |
* @rx_ring: ring to clean |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4386 |
* @work_done: amount of napi work completed this call |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4387 |
* @work_to_do: max amount of work allowed for this call to do |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4388 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4389 |
static bool e1000_clean_rx_irq(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4390 |
struct e1000_rx_ring *rx_ring, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4391 |
int *work_done, int work_to_do) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4392 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4393 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4394 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4395 |
struct pci_dev *pdev = adapter->pdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4396 |
struct e1000_rx_desc *rx_desc, *next_rxd; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4397 |
struct e1000_buffer *buffer_info, *next_buffer; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4398 |
unsigned long flags; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4399 |
u32 length; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4400 |
unsigned int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4401 |
int cleaned_count = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4402 |
bool cleaned = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4403 |
unsigned int total_rx_bytes=0, total_rx_packets=0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4404 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4405 |
i = rx_ring->next_to_clean; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4406 |
rx_desc = E1000_RX_DESC(*rx_ring, i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4407 |
buffer_info = &rx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4408 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4409 |
while (rx_desc->status & E1000_RXD_STAT_DD) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4410 |
struct sk_buff *skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4411 |
u8 status; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4412 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4413 |
if (*work_done >= work_to_do) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4414 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4415 |
(*work_done)++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4416 |
rmb(); /* read descriptor and rx_buffer_info after status DD */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4417 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4418 |
status = rx_desc->status; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4419 |
skb = buffer_info->skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4420 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4421 |
buffer_info->skb = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4422 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4423 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4424 |
prefetch(skb->data - NET_IP_ALIGN); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4425 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4426 |
if (++i == rx_ring->count) i = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4427 |
next_rxd = E1000_RX_DESC(*rx_ring, i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4428 |
prefetch(next_rxd); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4429 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4430 |
next_buffer = &rx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4431 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4432 |
cleaned = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4433 |
cleaned_count++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4434 |
dma_unmap_single(&pdev->dev, buffer_info->dma, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4435 |
buffer_info->length, DMA_FROM_DEVICE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4436 |
buffer_info->dma = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4437 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4438 |
length = le16_to_cpu(rx_desc->length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4439 |
/* !EOP means multiple descriptors were used to store a single |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4440 |
* packet, if thats the case we need to toss it. In fact, we |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4441 |
* to toss every packet with the EOP bit clear and the next |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4442 |
* frame that _does_ have the EOP bit set, as it is by |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4443 |
* definition only a frame fragment |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4444 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4445 |
if (unlikely(!(status & E1000_RXD_STAT_EOP))) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4446 |
adapter->discarding = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4447 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4448 |
if (adapter->discarding) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4449 |
/* All receives must fit into a single buffer */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4450 |
e_dbg("Receive packet consumed multiple buffers\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4451 |
/* recycle */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4452 |
buffer_info->skb = skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4453 |
if (status & E1000_RXD_STAT_EOP) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4454 |
adapter->discarding = false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4455 |
goto next_desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4456 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4457 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4458 |
if (!adapter->ecdev && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4459 |
unlikely(rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4460 |
u8 last_byte = *(skb->data + length - 1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4461 |
if (TBI_ACCEPT(hw, status, rx_desc->errors, length, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4462 |
last_byte)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4463 |
spin_lock_irqsave(&adapter->stats_lock, flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4464 |
e1000_tbi_adjust_stats(hw, &adapter->stats, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4465 |
length, skb->data); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4466 |
spin_unlock_irqrestore(&adapter->stats_lock, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4467 |
flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4468 |
length--; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4469 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4470 |
if (netdev->features & NETIF_F_RXALL) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4471 |
goto process_skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4472 |
/* recycle */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4473 |
buffer_info->skb = skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4474 |
goto next_desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4475 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4476 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4477 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4478 |
process_skb: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4479 |
total_rx_bytes += (length - 4); /* don't count FCS */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4480 |
total_rx_packets++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4481 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4482 |
if (likely(!(netdev->features & NETIF_F_RXFCS))) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4483 |
/* adjust length to remove Ethernet CRC, this must be |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4484 |
* done after the TBI_ACCEPT workaround above |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4485 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4486 |
length -= 4; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4487 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4488 |
e1000_check_copybreak(netdev, buffer_info, length, &skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4489 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4490 |
skb_put(skb, length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4491 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4492 |
/* Receive Checksum Offload */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4493 |
e1000_rx_checksum(adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4494 |
(u32)(status) | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4495 |
((u32)(rx_desc->errors) << 24), |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4496 |
le16_to_cpu(rx_desc->csum), skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4497 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4498 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4499 |
ecdev_receive(adapter->ecdev, skb->data, length); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4500 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4501 |
// No need to detect link status as |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4502 |
// long as frames are received: Reset watchdog. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4503 |
adapter->ec_watchdog_jiffies = jiffies; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4504 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4505 |
e1000_receive_skb(adapter, status, rx_desc->special, skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4506 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4507 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4508 |
next_desc: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4509 |
rx_desc->status = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4510 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4511 |
/* return some buffers to hardware, one at a time is too slow */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4512 |
if (unlikely(cleaned_count >= E1000_RX_BUFFER_WRITE)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4513 |
adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4514 |
cleaned_count = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4515 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4516 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4517 |
/* use prefetched values */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4518 |
rx_desc = next_rxd; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4519 |
buffer_info = next_buffer; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4520 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4521 |
rx_ring->next_to_clean = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4522 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4523 |
cleaned_count = E1000_DESC_UNUSED(rx_ring); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4524 |
if (cleaned_count) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4525 |
adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4526 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4527 |
adapter->total_rx_packets += total_rx_packets; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4528 |
adapter->total_rx_bytes += total_rx_bytes; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4529 |
netdev->stats.rx_bytes += total_rx_bytes; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4530 |
netdev->stats.rx_packets += total_rx_packets; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4531 |
return cleaned; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4532 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4533 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4534 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4535 |
* e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4536 |
* @adapter: address of board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4537 |
* @rx_ring: pointer to receive ring structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4538 |
* @cleaned_count: number of buffers to allocate this pass |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4539 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4540 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4541 |
static void |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4542 |
e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4543 |
struct e1000_rx_ring *rx_ring, int cleaned_count) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4544 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4545 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4546 |
struct pci_dev *pdev = adapter->pdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4547 |
struct e1000_rx_desc *rx_desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4548 |
struct e1000_buffer *buffer_info; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4549 |
struct sk_buff *skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4550 |
unsigned int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4551 |
unsigned int bufsz = 256 - 16 /*for skb_reserve */ ; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4552 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4553 |
i = rx_ring->next_to_use; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4554 |
buffer_info = &rx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4555 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4556 |
while (cleaned_count--) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4557 |
skb = buffer_info->skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4558 |
if (skb) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4559 |
skb_trim(skb, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4560 |
goto check_page; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4561 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4562 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4563 |
skb = netdev_alloc_skb_ip_align(netdev, bufsz); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4564 |
if (unlikely(!skb)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4565 |
/* Better luck next round */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4566 |
adapter->alloc_rx_buff_failed++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4567 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4568 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4569 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4570 |
buffer_info->skb = skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4571 |
buffer_info->length = adapter->rx_buffer_len; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4572 |
check_page: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4573 |
/* allocate a new page if necessary */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4574 |
if (!buffer_info->page) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4575 |
buffer_info->page = alloc_page(GFP_ATOMIC); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4576 |
if (unlikely(!buffer_info->page)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4577 |
adapter->alloc_rx_buff_failed++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4578 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4579 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4580 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4581 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4582 |
if (!buffer_info->dma) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4583 |
buffer_info->dma = dma_map_page(&pdev->dev, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4584 |
buffer_info->page, 0, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4585 |
buffer_info->length, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4586 |
DMA_FROM_DEVICE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4587 |
if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4588 |
put_page(buffer_info->page); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4589 |
dev_kfree_skb(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4590 |
buffer_info->page = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4591 |
buffer_info->skb = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4592 |
buffer_info->dma = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4593 |
adapter->alloc_rx_buff_failed++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4594 |
break; /* while !buffer_info->skb */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4595 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4596 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4597 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4598 |
rx_desc = E1000_RX_DESC(*rx_ring, i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4599 |
rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4600 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4601 |
if (unlikely(++i == rx_ring->count)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4602 |
i = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4603 |
buffer_info = &rx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4604 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4605 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4606 |
if (likely(rx_ring->next_to_use != i)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4607 |
rx_ring->next_to_use = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4608 |
if (unlikely(i-- == 0)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4609 |
i = (rx_ring->count - 1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4610 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4611 |
/* Force memory writes to complete before letting h/w |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4612 |
* know there are new descriptors to fetch. (Only |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4613 |
* applicable for weak-ordered memory model archs, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4614 |
* such as IA-64). */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4615 |
wmb(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4616 |
writel(i, adapter->hw.hw_addr + rx_ring->rdt); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4617 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4618 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4619 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4620 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4621 |
* e1000_alloc_rx_buffers - Replace used receive buffers; legacy & extended |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4622 |
* @adapter: address of board private structure |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4623 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4624 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4625 |
static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4626 |
struct e1000_rx_ring *rx_ring, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4627 |
int cleaned_count) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4628 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4629 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4630 |
struct net_device *netdev = adapter->netdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4631 |
struct pci_dev *pdev = adapter->pdev; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4632 |
struct e1000_rx_desc *rx_desc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4633 |
struct e1000_buffer *buffer_info; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4634 |
struct sk_buff *skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4635 |
unsigned int i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4636 |
unsigned int bufsz = adapter->rx_buffer_len; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4637 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4638 |
i = rx_ring->next_to_use; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4639 |
buffer_info = &rx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4640 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4641 |
while (cleaned_count--) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4642 |
skb = buffer_info->skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4643 |
if (skb) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4644 |
skb_trim(skb, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4645 |
goto map_skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4646 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4647 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4648 |
skb = netdev_alloc_skb_ip_align(netdev, bufsz); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4649 |
if (unlikely(!skb)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4650 |
/* Better luck next round */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4651 |
adapter->alloc_rx_buff_failed++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4652 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4653 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4654 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4655 |
/* Fix for errata 23, can't cross 64kB boundary */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4656 |
if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4657 |
struct sk_buff *oldskb = skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4658 |
e_err(rx_err, "skb align check failed: %u bytes at " |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4659 |
"%p\n", bufsz, skb->data); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4660 |
/* Try again, without freeing the previous */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4661 |
skb = netdev_alloc_skb_ip_align(netdev, bufsz); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4662 |
/* Failed allocation, critical failure */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4663 |
if (!skb) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4664 |
dev_kfree_skb(oldskb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4665 |
adapter->alloc_rx_buff_failed++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4666 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4667 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4668 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4669 |
if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4670 |
/* give up */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4671 |
dev_kfree_skb(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4672 |
dev_kfree_skb(oldskb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4673 |
adapter->alloc_rx_buff_failed++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4674 |
break; /* while !buffer_info->skb */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4675 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4676 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4677 |
/* Use new allocation */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4678 |
dev_kfree_skb(oldskb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4679 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4680 |
buffer_info->skb = skb; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4681 |
buffer_info->length = adapter->rx_buffer_len; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4682 |
map_skb: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4683 |
buffer_info->dma = dma_map_single(&pdev->dev, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4684 |
skb->data, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4685 |
buffer_info->length, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4686 |
DMA_FROM_DEVICE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4687 |
if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4688 |
dev_kfree_skb(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4689 |
buffer_info->skb = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4690 |
buffer_info->dma = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4691 |
adapter->alloc_rx_buff_failed++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4692 |
break; /* while !buffer_info->skb */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4693 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4694 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4695 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4696 |
* XXX if it was allocated cleanly it will never map to a |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4697 |
* boundary crossing |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4698 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4699 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4700 |
/* Fix for errata 23, can't cross 64kB boundary */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4701 |
if (!e1000_check_64k_bound(adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4702 |
(void *)(unsigned long)buffer_info->dma, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4703 |
adapter->rx_buffer_len)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4704 |
e_err(rx_err, "dma align check failed: %u bytes at " |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4705 |
"%p\n", adapter->rx_buffer_len, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4706 |
(void *)(unsigned long)buffer_info->dma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4707 |
dev_kfree_skb(skb); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4708 |
buffer_info->skb = NULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4709 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4710 |
dma_unmap_single(&pdev->dev, buffer_info->dma, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4711 |
adapter->rx_buffer_len, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4712 |
DMA_FROM_DEVICE); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4713 |
buffer_info->dma = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4714 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4715 |
adapter->alloc_rx_buff_failed++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4716 |
break; /* while !buffer_info->skb */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4717 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4718 |
rx_desc = E1000_RX_DESC(*rx_ring, i); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4719 |
rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4720 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4721 |
if (unlikely(++i == rx_ring->count)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4722 |
i = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4723 |
buffer_info = &rx_ring->buffer_info[i]; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4724 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4725 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4726 |
if (likely(rx_ring->next_to_use != i)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4727 |
rx_ring->next_to_use = i; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4728 |
if (unlikely(i-- == 0)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4729 |
i = (rx_ring->count - 1); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4730 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4731 |
/* Force memory writes to complete before letting h/w |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4732 |
* know there are new descriptors to fetch. (Only |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4733 |
* applicable for weak-ordered memory model archs, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4734 |
* such as IA-64). */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4735 |
wmb(); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4736 |
writel(i, hw->hw_addr + rx_ring->rdt); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4737 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4738 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4739 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4740 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4741 |
* e1000_smartspeed - Workaround for SmartSpeed on 82541 and 82547 controllers. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4742 |
* @adapter: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4743 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4744 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4745 |
static void e1000_smartspeed(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4746 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4747 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4748 |
u16 phy_status; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4749 |
u16 phy_ctrl; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4750 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4751 |
if ((hw->phy_type != e1000_phy_igp) || !hw->autoneg || |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4752 |
!(hw->autoneg_advertised & ADVERTISE_1000_FULL)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4753 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4754 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4755 |
if (adapter->smartspeed == 0) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4756 |
/* If Master/Slave config fault is asserted twice, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4757 |
* we assume back-to-back */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4758 |
e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_status); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4759 |
if (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4760 |
e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_status); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4761 |
if (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4762 |
e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_ctrl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4763 |
if (phy_ctrl & CR_1000T_MS_ENABLE) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4764 |
phy_ctrl &= ~CR_1000T_MS_ENABLE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4765 |
e1000_write_phy_reg(hw, PHY_1000T_CTRL, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4766 |
phy_ctrl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4767 |
adapter->smartspeed++; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4768 |
if (!e1000_phy_setup_autoneg(hw) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4769 |
!e1000_read_phy_reg(hw, PHY_CTRL, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4770 |
&phy_ctrl)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4771 |
phy_ctrl |= (MII_CR_AUTO_NEG_EN | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4772 |
MII_CR_RESTART_AUTO_NEG); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4773 |
e1000_write_phy_reg(hw, PHY_CTRL, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4774 |
phy_ctrl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4775 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4776 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4777 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4778 |
} else if (adapter->smartspeed == E1000_SMARTSPEED_DOWNSHIFT) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4779 |
/* If still no link, perhaps using 2/3 pair cable */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4780 |
e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_ctrl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4781 |
phy_ctrl |= CR_1000T_MS_ENABLE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4782 |
e1000_write_phy_reg(hw, PHY_1000T_CTRL, phy_ctrl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4783 |
if (!e1000_phy_setup_autoneg(hw) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4784 |
!e1000_read_phy_reg(hw, PHY_CTRL, &phy_ctrl)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4785 |
phy_ctrl |= (MII_CR_AUTO_NEG_EN | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4786 |
MII_CR_RESTART_AUTO_NEG); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4787 |
e1000_write_phy_reg(hw, PHY_CTRL, phy_ctrl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4788 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4789 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4790 |
/* Restart process after E1000_SMARTSPEED_MAX iterations */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4791 |
if (adapter->smartspeed++ == E1000_SMARTSPEED_MAX) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4792 |
adapter->smartspeed = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4793 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4794 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4795 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4796 |
* e1000_ioctl - |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4797 |
* @netdev: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4798 |
* @ifreq: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4799 |
* @cmd: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4800 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4801 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4802 |
static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4803 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4804 |
switch (cmd) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4805 |
case SIOCGMIIPHY: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4806 |
case SIOCGMIIREG: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4807 |
case SIOCSMIIREG: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4808 |
return e1000_mii_ioctl(netdev, ifr, cmd); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4809 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4810 |
return -EOPNOTSUPP; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4811 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4812 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4813 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4814 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4815 |
* e1000_mii_ioctl - |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4816 |
* @netdev: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4817 |
* @ifreq: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4818 |
* @cmd: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4819 |
**/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4820 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4821 |
static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4822 |
int cmd) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4823 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4824 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4825 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4826 |
struct mii_ioctl_data *data = if_mii(ifr); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4827 |
int retval; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4828 |
u16 mii_reg; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4829 |
unsigned long flags; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4830 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4831 |
if (hw->media_type != e1000_media_type_copper) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4832 |
return -EOPNOTSUPP; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4833 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4834 |
switch (cmd) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4835 |
case SIOCGMIIPHY: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4836 |
data->phy_id = hw->phy_addr; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4837 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4838 |
case SIOCGMIIREG: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4839 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4840 |
return -EPERM; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4841 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4842 |
spin_lock_irqsave(&adapter->stats_lock, flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4843 |
if (e1000_read_phy_reg(hw, data->reg_num & 0x1F, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4844 |
&data->val_out)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4845 |
spin_unlock_irqrestore(&adapter->stats_lock, flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4846 |
return -EIO; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4847 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4848 |
spin_unlock_irqrestore(&adapter->stats_lock, flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4849 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4850 |
case SIOCSMIIREG: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4851 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4852 |
return -EPERM; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4853 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4854 |
if (data->reg_num & ~(0x1F)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4855 |
return -EFAULT; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4856 |
mii_reg = data->val_in; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4857 |
spin_lock_irqsave(&adapter->stats_lock, flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4858 |
if (e1000_write_phy_reg(hw, data->reg_num, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4859 |
mii_reg)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4860 |
spin_unlock_irqrestore(&adapter->stats_lock, flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4861 |
return -EIO; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4862 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4863 |
spin_unlock_irqrestore(&adapter->stats_lock, flags); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4864 |
if (hw->media_type == e1000_media_type_copper) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4865 |
switch (data->reg_num) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4866 |
case PHY_CTRL: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4867 |
if (mii_reg & MII_CR_POWER_DOWN) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4868 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4869 |
if (mii_reg & MII_CR_AUTO_NEG_EN) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4870 |
hw->autoneg = 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4871 |
hw->autoneg_advertised = 0x2F; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4872 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4873 |
u32 speed; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4874 |
if (mii_reg & 0x40) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4875 |
speed = SPEED_1000; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4876 |
else if (mii_reg & 0x2000) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4877 |
speed = SPEED_100; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4878 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4879 |
speed = SPEED_10; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4880 |
retval = e1000_set_spd_dplx( |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4881 |
adapter, speed, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4882 |
((mii_reg & 0x100) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4883 |
? DUPLEX_FULL : |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4884 |
DUPLEX_HALF)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4885 |
if (retval) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4886 |
return retval; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4887 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4888 |
if (netif_running(adapter->netdev)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4889 |
e1000_reinit_locked(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4890 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4891 |
e1000_reset(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4892 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4893 |
case M88E1000_PHY_SPEC_CTRL: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4894 |
case M88E1000_EXT_PHY_SPEC_CTRL: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4895 |
if (e1000_phy_reset(hw)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4896 |
return -EIO; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4897 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4898 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4899 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4900 |
switch (data->reg_num) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4901 |
case PHY_CTRL: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4902 |
if (mii_reg & MII_CR_POWER_DOWN) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4903 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4904 |
if (netif_running(adapter->netdev)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4905 |
e1000_reinit_locked(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4906 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4907 |
e1000_reset(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4908 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4909 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4910 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4911 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4912 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4913 |
return -EOPNOTSUPP; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4914 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4915 |
return E1000_SUCCESS; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4916 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4917 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4918 |
void e1000_pci_set_mwi(struct e1000_hw *hw) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4919 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4920 |
struct e1000_adapter *adapter = hw->back; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4921 |
int ret_val = pci_set_mwi(adapter->pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4922 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4923 |
if (ret_val) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4924 |
e_err(probe, "Error in setting MWI\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4925 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4926 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4927 |
void e1000_pci_clear_mwi(struct e1000_hw *hw) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4928 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4929 |
struct e1000_adapter *adapter = hw->back; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4930 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4931 |
pci_clear_mwi(adapter->pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4932 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4933 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4934 |
int e1000_pcix_get_mmrbc(struct e1000_hw *hw) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4935 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4936 |
struct e1000_adapter *adapter = hw->back; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4937 |
return pcix_get_mmrbc(adapter->pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4938 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4939 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4940 |
void e1000_pcix_set_mmrbc(struct e1000_hw *hw, int mmrbc) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4941 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4942 |
struct e1000_adapter *adapter = hw->back; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4943 |
pcix_set_mmrbc(adapter->pdev, mmrbc); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4944 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4945 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4946 |
void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4947 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4948 |
outl(value, port); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4949 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4950 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4951 |
static bool e1000_vlan_used(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4952 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4953 |
u16 vid; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4954 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4955 |
for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4956 |
return true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4957 |
return false; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4958 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4959 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4960 |
static void __e1000_vlan_mode(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4961 |
netdev_features_t features) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4962 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4963 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4964 |
u32 ctrl; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4965 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4966 |
ctrl = er32(CTRL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4967 |
if (features & NETIF_F_HW_VLAN_RX) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4968 |
/* enable VLAN tag insert/strip */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4969 |
ctrl |= E1000_CTRL_VME; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4970 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4971 |
/* disable VLAN tag insert/strip */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4972 |
ctrl &= ~E1000_CTRL_VME; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4973 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4974 |
ew32(CTRL, ctrl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4975 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4976 |
static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4977 |
bool filter_on) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4978 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4979 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4980 |
u32 rctl; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4981 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4982 |
if (!test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4983 |
e1000_irq_disable(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4984 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4985 |
__e1000_vlan_mode(adapter, adapter->netdev->features); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4986 |
if (filter_on) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4987 |
/* enable VLAN receive filtering */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4988 |
rctl = er32(RCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4989 |
rctl &= ~E1000_RCTL_CFIEN; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4990 |
if (!(adapter->netdev->flags & IFF_PROMISC)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4991 |
rctl |= E1000_RCTL_VFE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4992 |
ew32(RCTL, rctl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4993 |
e1000_update_mng_vlan(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4994 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4995 |
/* disable VLAN receive filtering */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4996 |
rctl = er32(RCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4997 |
rctl &= ~E1000_RCTL_VFE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4998 |
ew32(RCTL, rctl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4999 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5000 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5001 |
if (!test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5002 |
e1000_irq_enable(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5003 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5004 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5005 |
static void e1000_vlan_mode(struct net_device *netdev, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5006 |
netdev_features_t features) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5007 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5008 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5009 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5010 |
if (!test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5011 |
e1000_irq_disable(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5012 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5013 |
__e1000_vlan_mode(adapter, features); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5014 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5015 |
if (!test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5016 |
e1000_irq_enable(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5017 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5018 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5019 |
static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5020 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5021 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5022 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5023 |
u32 vfta, index; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5024 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5025 |
if ((hw->mng_cookie.status & |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5026 |
E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5027 |
(vid == adapter->mng_vlan_id)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5028 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5029 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5030 |
if (!e1000_vlan_used(adapter)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5031 |
e1000_vlan_filter_on_off(adapter, true); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5032 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5033 |
/* add VID to filter table */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5034 |
index = (vid >> 5) & 0x7F; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5035 |
vfta = E1000_READ_REG_ARRAY(hw, VFTA, index); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5036 |
vfta |= (1 << (vid & 0x1F)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5037 |
e1000_write_vfta(hw, index, vfta); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5038 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5039 |
set_bit(vid, adapter->active_vlans); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5040 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5041 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5042 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5043 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5044 |
static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5045 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5046 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5047 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5048 |
u32 vfta, index; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5049 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5050 |
if (!test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5051 |
e1000_irq_disable(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5052 |
if (!test_bit(__E1000_DOWN, &adapter->flags)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5053 |
e1000_irq_enable(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5054 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5055 |
/* remove VID from filter table */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5056 |
index = (vid >> 5) & 0x7F; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5057 |
vfta = E1000_READ_REG_ARRAY(hw, VFTA, index); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5058 |
vfta &= ~(1 << (vid & 0x1F)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5059 |
e1000_write_vfta(hw, index, vfta); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5060 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5061 |
clear_bit(vid, adapter->active_vlans); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5062 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5063 |
if (!e1000_vlan_used(adapter)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5064 |
e1000_vlan_filter_on_off(adapter, false); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5065 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5066 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5067 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5068 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5069 |
static void e1000_restore_vlan(struct e1000_adapter *adapter) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5070 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5071 |
u16 vid; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5072 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5073 |
if (!e1000_vlan_used(adapter)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5074 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5075 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5076 |
e1000_vlan_filter_on_off(adapter, true); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5077 |
for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5078 |
e1000_vlan_rx_add_vid(adapter->netdev, vid); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5079 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5080 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5081 |
int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5082 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5083 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5084 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5085 |
hw->autoneg = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5086 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5087 |
/* Make sure dplx is at most 1 bit and lsb of speed is not set |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5088 |
* for the switch() below to work */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5089 |
if ((spd & 1) || (dplx & ~1)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5090 |
goto err_inval; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5091 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5092 |
/* Fiber NICs only allow 1000 gbps Full duplex */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5093 |
if ((hw->media_type == e1000_media_type_fiber) && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5094 |
spd != SPEED_1000 && |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5095 |
dplx != DUPLEX_FULL) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5096 |
goto err_inval; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5097 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5098 |
switch (spd + dplx) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5099 |
case SPEED_10 + DUPLEX_HALF: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5100 |
hw->forced_speed_duplex = e1000_10_half; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5101 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5102 |
case SPEED_10 + DUPLEX_FULL: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5103 |
hw->forced_speed_duplex = e1000_10_full; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5104 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5105 |
case SPEED_100 + DUPLEX_HALF: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5106 |
hw->forced_speed_duplex = e1000_100_half; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5107 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5108 |
case SPEED_100 + DUPLEX_FULL: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5109 |
hw->forced_speed_duplex = e1000_100_full; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5110 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5111 |
case SPEED_1000 + DUPLEX_FULL: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5112 |
hw->autoneg = 1; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5113 |
hw->autoneg_advertised = ADVERTISE_1000_FULL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5114 |
break; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5115 |
case SPEED_1000 + DUPLEX_HALF: /* not supported */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5116 |
default: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5117 |
goto err_inval; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5118 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5119 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5120 |
/* clear MDI, MDI(-X) override is only allowed when autoneg enabled */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5121 |
hw->mdix = AUTO_ALL_MODES; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5122 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5123 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5124 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5125 |
err_inval: |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5126 |
e_err(probe, "Unsupported Speed/Duplex configuration\n"); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5127 |
return -EINVAL; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5128 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5129 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5130 |
static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5131 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5132 |
struct net_device *netdev = pci_get_drvdata(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5133 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5134 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5135 |
u32 ctrl, ctrl_ext, rctl, status; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5136 |
u32 wufc = adapter->wol; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5137 |
#ifdef CONFIG_PM |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5138 |
int retval = 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5139 |
#endif |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5140 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5141 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5142 |
return -EBUSY; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5143 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5144 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5145 |
netif_device_detach(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5146 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5147 |
if (netif_running(netdev)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5148 |
WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags)); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5149 |
e1000_down(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5150 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5151 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5152 |
#ifdef CONFIG_PM |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5153 |
retval = pci_save_state(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5154 |
if (retval) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5155 |
return retval; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5156 |
#endif |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5157 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5158 |
status = er32(STATUS); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5159 |
if (status & E1000_STATUS_LU) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5160 |
wufc &= ~E1000_WUFC_LNKC; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5161 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5162 |
if (wufc) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5163 |
e1000_setup_rctl(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5164 |
e1000_set_rx_mode(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5165 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5166 |
rctl = er32(RCTL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5167 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5168 |
/* turn on all-multi mode if wake on multicast is enabled */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5169 |
if (wufc & E1000_WUFC_MC) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5170 |
rctl |= E1000_RCTL_MPE; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5171 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5172 |
/* enable receives in the hardware */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5173 |
ew32(RCTL, rctl | E1000_RCTL_EN); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5174 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5175 |
if (hw->mac_type >= e1000_82540) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5176 |
ctrl = er32(CTRL); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5177 |
/* advertise wake from D3Cold */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5178 |
#define E1000_CTRL_ADVD3WUC 0x00100000 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5179 |
/* phy power management enable */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5180 |
#define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000 |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5181 |
ctrl |= E1000_CTRL_ADVD3WUC | |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5182 |
E1000_CTRL_EN_PHY_PWR_MGMT; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5183 |
ew32(CTRL, ctrl); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5184 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5185 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5186 |
if (hw->media_type == e1000_media_type_fiber || |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5187 |
hw->media_type == e1000_media_type_internal_serdes) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5188 |
/* keep the laser running in D3 */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5189 |
ctrl_ext = er32(CTRL_EXT); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5190 |
ctrl_ext |= E1000_CTRL_EXT_SDP7_DATA; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5191 |
ew32(CTRL_EXT, ctrl_ext); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5192 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5193 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5194 |
ew32(WUC, E1000_WUC_PME_EN); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5195 |
ew32(WUFC, wufc); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5196 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5197 |
ew32(WUC, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5198 |
ew32(WUFC, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5199 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5200 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5201 |
e1000_release_manageability(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5202 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5203 |
*enable_wake = !!wufc; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5204 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5205 |
/* make sure adapter isn't asleep if manageability is enabled */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5206 |
if (adapter->en_mng_pt) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5207 |
*enable_wake = true; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5208 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5209 |
if (netif_running(netdev)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5210 |
e1000_free_irq(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5211 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5212 |
pci_disable_device(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5213 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5214 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5215 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5216 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5217 |
#ifdef CONFIG_PM |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5218 |
static int e1000_suspend(struct pci_dev *pdev, pm_message_t state) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5219 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5220 |
int retval; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5221 |
bool wake; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5222 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5223 |
retval = __e1000_shutdown(pdev, &wake); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5224 |
if (retval) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5225 |
return retval; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5226 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5227 |
if (wake) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5228 |
pci_prepare_to_sleep(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5229 |
} else {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5230 |
pci_wake_from_d3(pdev, false); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5231 |
pci_set_power_state(pdev, PCI_D3hot); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5232 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5233 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5234 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5235 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5236 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5237 |
static int e1000_resume(struct pci_dev *pdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5238 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5239 |
struct net_device *netdev = pci_get_drvdata(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5240 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5241 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5242 |
u32 err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5243 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5244 |
if (adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5245 |
return -EBUSY; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5246 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5247 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5248 |
pci_set_power_state(pdev, PCI_D0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5249 |
pci_restore_state(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5250 |
pci_save_state(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5251 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5252 |
if (adapter->need_ioport) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5253 |
err = pci_enable_device(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5254 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5255 |
err = pci_enable_device_mem(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5256 |
if (err) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5257 |
pr_err("Cannot enable PCI device from suspend\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5258 |
return err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5259 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5260 |
pci_set_master(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5261 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5262 |
pci_enable_wake(pdev, PCI_D3hot, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5263 |
pci_enable_wake(pdev, PCI_D3cold, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5264 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5265 |
if (netif_running(netdev)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5266 |
err = e1000_request_irq(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5267 |
if (err) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5268 |
return err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5269 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5270 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5271 |
e1000_power_up_phy(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5272 |
e1000_reset(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5273 |
ew32(WUS, ~0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5274 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5275 |
e1000_init_manageability(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5276 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5277 |
if (netif_running(netdev)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5278 |
e1000_up(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5279 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5280 |
if (!adapter->ecdev) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5281 |
netif_device_attach(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5282 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5283 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5284 |
return 0; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5285 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5286 |
#endif |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5287 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5288 |
static void e1000_shutdown(struct pci_dev *pdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5289 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5290 |
bool wake; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5291 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5292 |
__e1000_shutdown(pdev, &wake); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5293 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5294 |
if (system_state == SYSTEM_POWER_OFF) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5295 |
pci_wake_from_d3(pdev, wake); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5296 |
pci_set_power_state(pdev, PCI_D3hot); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5297 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5298 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5299 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5300 |
#ifdef CONFIG_NET_POLL_CONTROLLER |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5301 |
/* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5302 |
* Polling 'interrupt' - used by things like netconsole to send skbs |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5303 |
* without having to re-enable interrupts. It's not called while |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5304 |
* the interrupt routine is executing. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5305 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5306 |
static void e1000_netpoll(struct net_device *netdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5307 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5308 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5309 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5310 |
disable_irq(adapter->pdev->irq); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5311 |
e1000_intr(adapter->pdev->irq, netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5312 |
enable_irq(adapter->pdev->irq); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5313 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5314 |
#endif |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5315 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5316 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5317 |
* e1000_io_error_detected - called when PCI error is detected |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5318 |
* @pdev: Pointer to PCI device |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5319 |
* @state: The current pci connection state |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5320 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5321 |
* This function is called after a PCI bus error affecting |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5322 |
* this device has been detected. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5323 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5324 |
static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev, |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5325 |
pci_channel_state_t state) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5326 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5327 |
struct net_device *netdev = pci_get_drvdata(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5328 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5329 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5330 |
netif_device_detach(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5331 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5332 |
if (state == pci_channel_io_perm_failure) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5333 |
return PCI_ERS_RESULT_DISCONNECT; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5334 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5335 |
if (netif_running(netdev)) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5336 |
e1000_down(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5337 |
pci_disable_device(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5338 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5339 |
/* Request a slot slot reset. */ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5340 |
return PCI_ERS_RESULT_NEED_RESET; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5341 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5342 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5343 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5344 |
* e1000_io_slot_reset - called after the pci bus has been reset. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5345 |
* @pdev: Pointer to PCI device |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5346 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5347 |
* Restart the card from scratch, as if from a cold-boot. Implementation |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5348 |
* resembles the first-half of the e1000_resume routine. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5349 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5350 |
static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5351 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5352 |
struct net_device *netdev = pci_get_drvdata(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5353 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5354 |
struct e1000_hw *hw = &adapter->hw; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5355 |
int err; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5356 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5357 |
if (adapter->need_ioport) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5358 |
err = pci_enable_device(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5359 |
else |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5360 |
err = pci_enable_device_mem(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5361 |
if (err) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5362 |
pr_err("Cannot re-enable PCI device after reset.\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5363 |
return PCI_ERS_RESULT_DISCONNECT; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5364 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5365 |
pci_set_master(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5366 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5367 |
pci_enable_wake(pdev, PCI_D3hot, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5368 |
pci_enable_wake(pdev, PCI_D3cold, 0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5369 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5370 |
e1000_reset(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5371 |
ew32(WUS, ~0); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5372 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5373 |
return PCI_ERS_RESULT_RECOVERED; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5374 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5375 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5376 |
/** |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5377 |
* e1000_io_resume - called when traffic can start flowing again. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5378 |
* @pdev: Pointer to PCI device |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5379 |
* |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5380 |
* This callback is called when the error recovery driver tells us that |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5381 |
* its OK to resume normal operation. Implementation resembles the |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5382 |
* second-half of the e1000_resume routine. |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5383 |
*/ |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5384 |
static void e1000_io_resume(struct pci_dev *pdev) |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5385 |
{
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5386 |
struct net_device *netdev = pci_get_drvdata(pdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5387 |
struct e1000_adapter *adapter = netdev_priv(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5388 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5389 |
e1000_init_manageability(adapter); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5390 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5391 |
if (netif_running(netdev)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5392 |
if (e1000_up(adapter)) {
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5393 |
pr_info("can't bring device back up after reset\n");
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5394 |
return; |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5395 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5396 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5397 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5398 |
netif_device_attach(netdev); |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5399 |
} |
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5400 |
|
|
2b9c78543663
Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5401 |
/* e1000_main.c */ |