1 files changed, 1 insertions, 136 deletions
diff --git a/drivers/net/sfc/gmii.h b/drivers/net/sfc/gmii.h
index d25bbd1297f4..dfccaa7b573e 100644
--- a/drivers/net/sfc/gmii.h
+++ b/drivers/net/sfc/gmii.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 * Driver for Solarflare Solarstorm network controllers and boards
 * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006 Solarflare Communications Inc.
+ * Copyright 2006-2008 Solarflare Communications Inc.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 as published
@@ -57,139 +57,4 @@
 #define ISR_POLARITY_CHG        0x0002  /* Bit 1 - polarity changed */
 #define ISR_JABBER              0x0001  /* Bit 0 - jabber */
-/* Logically extended advertisement register */
-#define GM_ADVERTISE_SLCT               ADVERTISE_SLCT
-#define GM_ADVERTISE_CSMA               ADVERTISE_CSMA
-#define GM_ADVERTISE_10HALF             ADVERTISE_10HALF
-#define GM_ADVERTISE_1000XFULL          ADVERTISE_1000XFULL
-#define GM_ADVERTISE_10FULL             ADVERTISE_10FULL
-#define GM_ADVERTISE_1000XHALF          ADVERTISE_1000XHALF
-#define GM_ADVERTISE_100HALF            ADVERTISE_100HALF
-#define GM_ADVERTISE_1000XPAUSE         ADVERTISE_1000XPAUSE
-#define GM_ADVERTISE_100FULL            ADVERTISE_100FULL
-#define GM_ADVERTISE_1000XPSE_ASYM      ADVERTISE_1000XPSE_ASYM
-#define GM_ADVERTISE_100BASE4           ADVERTISE_100BASE4
-#define GM_ADVERTISE_PAUSE_CAP          ADVERTISE_PAUSE_CAP
-#define GM_ADVERTISE_PAUSE_ASYM         ADVERTISE_PAUSE_ASYM
-#define GM_ADVERTISE_RESV               ADVERTISE_RESV
-#define GM_ADVERTISE_RFAULT             ADVERTISE_RFAULT
-#define GM_ADVERTISE_LPACK              ADVERTISE_LPACK
-#define GM_ADVERTISE_NPAGE              ADVERTISE_NPAGE
-#define GM_ADVERTISE_1000FULL           (ADVERTISE_1000FULL << 8)
-#define GM_ADVERTISE_1000HALF           (ADVERTISE_1000HALF << 8)
-#define GM_ADVERTISE_1000               (GM_ADVERTISE_1000FULL | \
-                                         GM_ADVERTISE_1000HALF)
-#define GM_ADVERTISE_FULL               (GM_ADVERTISE_1000FULL | \
-                                         ADVERTISE_FULL)
-#define GM_ADVERTISE_ALL                (GM_ADVERTISE_1000FULL | \
-                                         GM_ADVERTISE_1000HALF | \
-                                         ADVERTISE_ALL)
-/* Logically extended link partner ability register */
-#define GM_LPA_SLCT                     LPA_SLCT
-#define GM_LPA_10HALF                   LPA_10HALF
-#define GM_LPA_1000XFULL                LPA_1000XFULL
-#define GM_LPA_10FULL                   LPA_10FULL
-#define GM_LPA_1000XHALF                LPA_1000XHALF
-#define GM_LPA_100HALF                  LPA_100HALF
-#define GM_LPA_1000XPAUSE               LPA_1000XPAUSE
-#define GM_LPA_100FULL                  LPA_100FULL
-#define GM_LPA_1000XPAUSE_ASYM          LPA_1000XPAUSE_ASYM
-#define GM_LPA_100BASE4                 LPA_100BASE4
-#define GM_LPA_PAUSE_CAP                LPA_PAUSE_CAP
-#define GM_LPA_PAUSE_ASYM               LPA_PAUSE_ASYM
-#define GM_LPA_RESV                     LPA_RESV
-#define GM_LPA_RFAULT                   LPA_RFAULT
-#define GM_LPA_LPACK                    LPA_LPACK
-#define GM_LPA_NPAGE                    LPA_NPAGE
-#define GM_LPA_1000FULL                 (LPA_1000FULL << 6)
-#define GM_LPA_1000HALF                 (LPA_1000HALF << 6)
-#define GM_LPA_10000FULL                0x00040000
-#define GM_LPA_10000HALF                0x00080000
-#define GM_LPA_DUPLEX                   (GM_LPA_1000FULL | GM_LPA_10000FULL \
-                                         | LPA_DUPLEX)
-#define GM_LPA_10                       (LPA_10FULL | LPA_10HALF)
-#define GM_LPA_100                      LPA_100
-#define GM_LPA_1000                     (GM_LPA_1000FULL | GM_LPA_1000HALF)
-#define GM_LPA_10000                    (GM_LPA_10000FULL | GM_LPA_10000HALF)
-/* Retrieve GMII autonegotiation advertised abilities
- *
- * The MII advertisment register (MII_ADVERTISE) is logically extended
- * to include advertisement bits ADVERTISE_1000FULL and
- * ADVERTISE_1000HALF from MII_CTRL1000.  The result can be tested
- * against the GM_ADVERTISE_xxx constants.
- */
-static inline unsigned int gmii_advertised(struct mii_if_info *gmii)
-{
-        unsigned int advertise;
-        unsigned int ctrl1000;
-        advertise = gmii->mdio_read(gmii->dev, gmii->phy_id, MII_ADVERTISE);
-        ctrl1000 = gmii->mdio_read(gmii->dev, gmii->phy_id, MII_CTRL1000);
-        return (((ctrl1000 << 8) & GM_ADVERTISE_1000) | advertise);
-}
-/* Retrieve GMII autonegotiation link partner abilities
- *
- * The MII link partner ability register (MII_LPA) is logically
- * extended by adding bits LPA_1000HALF and LPA_1000FULL from
- * MII_STAT1000.  The result can be tested against the GM_LPA_xxx
- * constants.
- */
-static inline unsigned int gmii_lpa(struct mii_if_info *gmii)
-{
-        unsigned int lpa;
-        unsigned int stat1000;
-        lpa = gmii->mdio_read(gmii->dev, gmii->phy_id, MII_LPA);
-        stat1000 = gmii->mdio_read(gmii->dev, gmii->phy_id, MII_STAT1000);
-        return (((stat1000 << 6) & GM_LPA_1000) | lpa);
-}
-/* Calculate GMII autonegotiated link technology
- *
- * "negotiated" should be the result of gmii_advertised() logically
- * ANDed with the result of gmii_lpa().
- *
- * "tech" will be negotiated with the unused bits masked out.  For
- * example, if both ends of the link are capable of both
- * GM_LPA_1000FULL and GM_LPA_100FULL, GM_LPA_100FULL will be masked
- * out.
- */
-static inline unsigned int gmii_nway_result(unsigned int negotiated)
-{
-        unsigned int other_bits;
-        /* Mask out the speed and duplexity bits */
-        other_bits = negotiated & ~(GM_LPA_10 | GM_LPA_100 | GM_LPA_1000);
-        if (negotiated & GM_LPA_1000FULL)
-                return (other_bits | GM_LPA_1000FULL);
-        else if (negotiated & GM_LPA_1000HALF)
-                return (other_bits | GM_LPA_1000HALF);
-        else
-                return (other_bits | mii_nway_result(negotiated));
-}
-/* Calculate GMII non-autonegotiated link technology
- *
- * This provides an equivalent to gmii_nway_result for the case when
- * autonegotiation is disabled.
- */
-static inline unsigned int gmii_forced_result(unsigned int bmcr)
-{
-        unsigned int result;
-        int full_duplex;
-        full_duplex = bmcr & BMCR_FULLDPLX;
-        if (bmcr & BMCR_SPEED1000)
-                result = full_duplex ? GM_LPA_1000FULL : GM_LPA_1000HALF;
-        else if (bmcr & BMCR_SPEED100)
-                result = full_duplex ? GM_LPA_100FULL : GM_LPA_100HALF;
-        else
-                result = full_duplex ? GM_LPA_10FULL : GM_LPA_10HALF;
-        return result;
-}
 #endif /* EFX_GMII_H */

diff --git a/drivers/net/sfc/gmii.h b/drivers/net/sfc/gmii.h index d25bbd1297f4..dfccaa7b573e 100644 --- a/drivers/net/sfc/gmii.h +++ b/drivers/net/sfc/gmii.h
@@ -1,7 +1,7 @@
1	/****************************************************************************	1	/****************************************************************************
2	* Driver for Solarflare Solarstorm network controllers and boards	2	* Driver for Solarflare Solarstorm network controllers and boards
3	* Copyright 2005-2006 Fen Systems Ltd.	3	* Copyright 2005-2006 Fen Systems Ltd.
4	* Copyright 2006 Solarflare Communications Inc.	4	* Copyright 2006-2008 Solarflare Communications Inc.
5	*	5	*
6	* This program is free software; you can redistribute it and/or modify it	6	* This program is free software; you can redistribute it and/or modify it
7	* under the terms of the GNU General Public License version 2 as published	7	* under the terms of the GNU General Public License version 2 as published
@@ -57,139 +57,4 @@
57	#define ISR_POLARITY_CHG 0x0002 /* Bit 1 - polarity changed */	57	#define ISR_POLARITY_CHG 0x0002 /* Bit 1 - polarity changed */
58	#define ISR_JABBER 0x0001 /* Bit 0 - jabber */	58	#define ISR_JABBER 0x0001 /* Bit 0 - jabber */
59		59
60	/* Logically extended advertisement register */
61	#define GM_ADVERTISE_SLCT ADVERTISE_SLCT
62	#define GM_ADVERTISE_CSMA ADVERTISE_CSMA
63	#define GM_ADVERTISE_10HALF ADVERTISE_10HALF
64	#define GM_ADVERTISE_1000XFULL ADVERTISE_1000XFULL
65	#define GM_ADVERTISE_10FULL ADVERTISE_10FULL
66	#define GM_ADVERTISE_1000XHALF ADVERTISE_1000XHALF
67	#define GM_ADVERTISE_100HALF ADVERTISE_100HALF
68	#define GM_ADVERTISE_1000XPAUSE ADVERTISE_1000XPAUSE
69	#define GM_ADVERTISE_100FULL ADVERTISE_100FULL
70	#define GM_ADVERTISE_1000XPSE_ASYM ADVERTISE_1000XPSE_ASYM
71	#define GM_ADVERTISE_100BASE4 ADVERTISE_100BASE4
72	#define GM_ADVERTISE_PAUSE_CAP ADVERTISE_PAUSE_CAP
73	#define GM_ADVERTISE_PAUSE_ASYM ADVERTISE_PAUSE_ASYM
74	#define GM_ADVERTISE_RESV ADVERTISE_RESV
75	#define GM_ADVERTISE_RFAULT ADVERTISE_RFAULT
76	#define GM_ADVERTISE_LPACK ADVERTISE_LPACK
77	#define GM_ADVERTISE_NPAGE ADVERTISE_NPAGE
78	#define GM_ADVERTISE_1000FULL (ADVERTISE_1000FULL << 8)
79	#define GM_ADVERTISE_1000HALF (ADVERTISE_1000HALF << 8)
80	#define GM_ADVERTISE_1000 (GM_ADVERTISE_1000FULL \| \
81	GM_ADVERTISE_1000HALF)
82	#define GM_ADVERTISE_FULL (GM_ADVERTISE_1000FULL \| \
83	ADVERTISE_FULL)
84	#define GM_ADVERTISE_ALL (GM_ADVERTISE_1000FULL \| \
85	GM_ADVERTISE_1000HALF \| \
86	ADVERTISE_ALL)
87
88	/* Logically extended link partner ability register */
89	#define GM_LPA_SLCT LPA_SLCT
90	#define GM_LPA_10HALF LPA_10HALF
91	#define GM_LPA_1000XFULL LPA_1000XFULL
92	#define GM_LPA_10FULL LPA_10FULL
93	#define GM_LPA_1000XHALF LPA_1000XHALF
94	#define GM_LPA_100HALF LPA_100HALF
95	#define GM_LPA_1000XPAUSE LPA_1000XPAUSE
96	#define GM_LPA_100FULL LPA_100FULL
97	#define GM_LPA_1000XPAUSE_ASYM LPA_1000XPAUSE_ASYM
98	#define GM_LPA_100BASE4 LPA_100BASE4
99	#define GM_LPA_PAUSE_CAP LPA_PAUSE_CAP
100	#define GM_LPA_PAUSE_ASYM LPA_PAUSE_ASYM
101	#define GM_LPA_RESV LPA_RESV
102	#define GM_LPA_RFAULT LPA_RFAULT
103	#define GM_LPA_LPACK LPA_LPACK
104	#define GM_LPA_NPAGE LPA_NPAGE
105	#define GM_LPA_1000FULL (LPA_1000FULL << 6)
106	#define GM_LPA_1000HALF (LPA_1000HALF << 6)
107	#define GM_LPA_10000FULL 0x00040000
108	#define GM_LPA_10000HALF 0x00080000
109	#define GM_LPA_DUPLEX (GM_LPA_1000FULL \| GM_LPA_10000FULL \
110	\| LPA_DUPLEX)
111	#define GM_LPA_10 (LPA_10FULL \| LPA_10HALF)
112	#define GM_LPA_100 LPA_100
113	#define GM_LPA_1000 (GM_LPA_1000FULL \| GM_LPA_1000HALF)
114	#define GM_LPA_10000 (GM_LPA_10000FULL \| GM_LPA_10000HALF)
115
116	/* Retrieve GMII autonegotiation advertised abilities
117	*
118	* The MII advertisment register (MII_ADVERTISE) is logically extended
119	* to include advertisement bits ADVERTISE_1000FULL and
120	* ADVERTISE_1000HALF from MII_CTRL1000. The result can be tested
121	* against the GM_ADVERTISE_xxx constants.
122	*/
123	static inline unsigned int gmii_advertised(struct mii_if_info *gmii)
124	{
125	unsigned int advertise;
126	unsigned int ctrl1000;
127
128	advertise = gmii->mdio_read(gmii->dev, gmii->phy_id, MII_ADVERTISE);
129	ctrl1000 = gmii->mdio_read(gmii->dev, gmii->phy_id, MII_CTRL1000);
130	return (((ctrl1000 << 8) & GM_ADVERTISE_1000) \| advertise);
131	}
132
133	/* Retrieve GMII autonegotiation link partner abilities
134	*
135	* The MII link partner ability register (MII_LPA) is logically
136	* extended by adding bits LPA_1000HALF and LPA_1000FULL from
137	* MII_STAT1000. The result can be tested against the GM_LPA_xxx
138	* constants.
139	*/
140	static inline unsigned int gmii_lpa(struct mii_if_info *gmii)
141	{
142	unsigned int lpa;
143	unsigned int stat1000;
144
145	lpa = gmii->mdio_read(gmii->dev, gmii->phy_id, MII_LPA);
146	stat1000 = gmii->mdio_read(gmii->dev, gmii->phy_id, MII_STAT1000);
147	return (((stat1000 << 6) & GM_LPA_1000) \| lpa);
148	}
149
150	/* Calculate GMII autonegotiated link technology
151	*
152	* "negotiated" should be the result of gmii_advertised() logically
153	* ANDed with the result of gmii_lpa().
154	*
155	* "tech" will be negotiated with the unused bits masked out. For
156	* example, if both ends of the link are capable of both
157	* GM_LPA_1000FULL and GM_LPA_100FULL, GM_LPA_100FULL will be masked
158	* out.
159	*/
160	static inline unsigned int gmii_nway_result(unsigned int negotiated)
161	{
162	unsigned int other_bits;
163
164	/* Mask out the speed and duplexity bits */
165	other_bits = negotiated & ~(GM_LPA_10 \| GM_LPA_100 \| GM_LPA_1000);
166
167	if (negotiated & GM_LPA_1000FULL)
168	return (other_bits \| GM_LPA_1000FULL);
169	else if (negotiated & GM_LPA_1000HALF)
170	return (other_bits \| GM_LPA_1000HALF);
171	else
172	return (other_bits \| mii_nway_result(negotiated));
173	}
174
175	/* Calculate GMII non-autonegotiated link technology
176	*
177	* This provides an equivalent to gmii_nway_result for the case when
178	* autonegotiation is disabled.
179	*/
180	static inline unsigned int gmii_forced_result(unsigned int bmcr)
181	{
182	unsigned int result;
183	int full_duplex;
184
185	full_duplex = bmcr & BMCR_FULLDPLX;
186	if (bmcr & BMCR_SPEED1000)
187	result = full_duplex ? GM_LPA_1000FULL : GM_LPA_1000HALF;
188	else if (bmcr & BMCR_SPEED100)
189	result = full_duplex ? GM_LPA_100FULL : GM_LPA_100HALF;
190	else
191	result = full_duplex ? GM_LPA_10FULL : GM_LPA_10HALF;
192	return result;
193	}
194
195	#endif /* EFX_GMII_H */	60	#endif /* EFX_GMII_H */