Deleted Added
sdiff udiff text old ( 213893 ) new ( 221407 )
full compact
acphy.c (213893) acphy.c (221407)
1/*-
2 * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to The NetBSD Foundation
6 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
7 * NASA Ames Research Center.
8 *

--- 39 unchanged lines hidden (view full) ---

48 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
49 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
50 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
51 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
52 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
53 */
54
55#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to The NetBSD Foundation
6 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
7 * NASA Ames Research Center.
8 *

--- 39 unchanged lines hidden (view full) ---

48 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
49 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
50 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
51 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
52 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
53 */
54
55#include <sys/cdefs.h>
56__FBSDID("$FreeBSD: head/sys/dev/mii/acphy.c 213893 2010-10-15 14:52:11Z marius $");
56__FBSDID("$FreeBSD: head/sys/dev/mii/acphy.c 221407 2011-05-03 19:51:29Z marius $");
57
58/*
59 * Driver for Altima AC101 10/100 PHY
60 */
61
62#include <sys/param.h>
63#include <sys/systm.h>
64#include <sys/kernel.h>

--- 35 unchanged lines hidden (view full) ---

100
101DRIVER_MODULE(acphy, miibus, acphy_driver, acphy_devclass, 0, 0);
102
103static int acphy_service(struct mii_softc *, struct mii_data *, int);
104static void acphy_reset(struct mii_softc *);
105static void acphy_status(struct mii_softc *);
106
107static const struct mii_phydesc acphys[] = {
57
58/*
59 * Driver for Altima AC101 10/100 PHY
60 */
61
62#include <sys/param.h>
63#include <sys/systm.h>
64#include <sys/kernel.h>

--- 35 unchanged lines hidden (view full) ---

100
101DRIVER_MODULE(acphy, miibus, acphy_driver, acphy_devclass, 0, 0);
102
103static int acphy_service(struct mii_softc *, struct mii_data *, int);
104static void acphy_reset(struct mii_softc *);
105static void acphy_status(struct mii_softc *);
106
107static const struct mii_phydesc acphys[] = {
108 MII_PHY_DESC(xxALTIMA, AC101),
109 MII_PHY_DESC(xxALTIMA, AC101L),
108 MII_PHY_DESC(ALTIMA, AC101),
109 MII_PHY_DESC(ALTIMA, AC101L),
110 /* XXX This is reported to work, but it's not from any data sheet. */
110 /* XXX This is reported to work, but it's not from any data sheet. */
111 MII_PHY_DESC(xxALTIMA, ACXXX),
111 MII_PHY_DESC(ALTIMA, ACXXX),
112 MII_PHY_END
113};
114
112 MII_PHY_END
113};
114
115static const struct mii_phy_funcs acphy_funcs = {
116 acphy_service,
117 acphy_status,
118 acphy_reset
119};
120
115static int
116acphy_probe(device_t dev)
117{
118
119 return (mii_phy_dev_probe(dev, acphys, BUS_PROBE_DEFAULT));
120}
121
122static int
123acphy_attach(device_t dev)
124{
125 struct mii_softc *sc;
121static int
122acphy_probe(device_t dev)
123{
124
125 return (mii_phy_dev_probe(dev, acphys, BUS_PROBE_DEFAULT));
126}
127
128static int
129acphy_attach(device_t dev)
130{
131 struct mii_softc *sc;
126 struct mii_attach_args *ma;
127 struct mii_data *mii;
128
129 sc = device_get_softc(dev);
132
133 sc = device_get_softc(dev);
130 ma = device_get_ivars(dev);
131 sc->mii_dev = device_get_parent(dev);
132 mii = ma->mii_data;
133 LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);
134
134
135 sc->mii_flags = miibus_get_flags(dev);
136 sc->mii_inst = mii->mii_instance++;
137 sc->mii_phy = ma->mii_phyno;
138 sc->mii_service = acphy_service;
139 sc->mii_pdata = mii;
135 mii_phy_dev_attach(dev, MIIF_NOMANPAUSE, &acphy_funcs, 0);
140
136
141 acphy_reset(sc);
137 PHY_RESET(sc);
142
138
143 sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
139 sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & sc->mii_capmask;
144 device_printf(dev, " ");
145
140 device_printf(dev, " ");
141
146#define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL)
142#define ADD(m, c) ifmedia_add(&sc->mii_pdata->mii_media, (m), (c), NULL)
147 if ((PHY_READ(sc, MII_ACPHY_MCTL) & AC_MCTL_FX_SEL) != 0) {
148 sc->mii_flags |= MIIF_HAVEFIBER;
149 ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_FX, 0, sc->mii_inst),
150 MII_MEDIA_100_TX);
151 printf("100baseFX, ");
152 ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_FX, IFM_FDX, sc->mii_inst),
153 MII_MEDIA_100_TX_FDX);
154 printf("100baseFX-FDX, ");

--- 40 unchanged lines hidden (view full) ---

195
196 /*
197 * This PHY's autonegotiation doesn't need to be kicked.
198 */
199 break;
200 }
201
202 /* Update the media status. */
143 if ((PHY_READ(sc, MII_ACPHY_MCTL) & AC_MCTL_FX_SEL) != 0) {
144 sc->mii_flags |= MIIF_HAVEFIBER;
145 ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_FX, 0, sc->mii_inst),
146 MII_MEDIA_100_TX);
147 printf("100baseFX, ");
148 ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_FX, IFM_FDX, sc->mii_inst),
149 MII_MEDIA_100_TX_FDX);
150 printf("100baseFX-FDX, ");

--- 40 unchanged lines hidden (view full) ---

191
192 /*
193 * This PHY's autonegotiation doesn't need to be kicked.
194 */
195 break;
196 }
197
198 /* Update the media status. */
203 acphy_status(sc);
199 PHY_STATUS(sc);
204
205 /* Callback if something changed. */
206 mii_phy_update(sc, cmd);
207 return (0);
208}
209
210static void
211acphy_status(struct mii_softc *sc)

--- 28 unchanged lines hidden (view full) ---

240 }
241 diag = PHY_READ(sc, MII_ACPHY_DIAG);
242 if (diag & AC_DIAG_SPEED)
243 mii->mii_media_active |= IFM_100_TX;
244 else
245 mii->mii_media_active |= IFM_10_T;
246
247 if (diag & AC_DIAG_DUPLEX)
200
201 /* Callback if something changed. */
202 mii_phy_update(sc, cmd);
203 return (0);
204}
205
206static void
207acphy_status(struct mii_softc *sc)

--- 28 unchanged lines hidden (view full) ---

236 }
237 diag = PHY_READ(sc, MII_ACPHY_DIAG);
238 if (diag & AC_DIAG_SPEED)
239 mii->mii_media_active |= IFM_100_TX;
240 else
241 mii->mii_media_active |= IFM_10_T;
242
243 if (diag & AC_DIAG_DUPLEX)
248 mii->mii_media_active |= IFM_FDX;
244 mii->mii_media_active |=
245 IFM_FDX | mii_phy_flowstatus(sc);
249 else
250 mii->mii_media_active |= IFM_HDX;
251 } else
252 mii->mii_media_active = ife->ifm_media;
253}
254
255static void
256acphy_reset(struct mii_softc *sc)
257{
258
259 mii_phy_reset(sc);
260 PHY_WRITE(sc, MII_ACPHY_INT, 0);
261}
246 else
247 mii->mii_media_active |= IFM_HDX;
248 } else
249 mii->mii_media_active = ife->ifm_media;
250}
251
252static void
253acphy_reset(struct mii_softc *sc)
254{
255
256 mii_phy_reset(sc);
257 PHY_WRITE(sc, MII_ACPHY_INT, 0);
258}