DF-5606 / fix.diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 | diff --git a/sys/bus/u4b/net/ruephy.c b/sys/bus/u4b/net/ruephy.c deleted file mode 100644 index a5f944d6..00000000 --- a/sys/bus/u4b/net/ruephy.c +++ /dev/null @@ -1,232 +0,0 @@ -/*- - * Copyright (c) 2001-2003, Shunsuke Akiyama <akiyama@FreeBSD.org>. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -/* - * driver for RealTek RTL8150 internal PHY - */ - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/malloc.h> -#include <sys/module.h> -#include <sys/socket.h> -#include <sys/bus.h> - -#include <net/if.h> -#include <net/if_arp.h> -#include <net/if_media.h> - -#include <dev/mii/mii.h> -#include <dev/mii/miivar.h> -#include "miidevs.h" - -#include <dev/usb/net/ruephyreg.h> - -#include "miibus_if.h" - -static int ruephy_probe(device_t); -static int ruephy_attach(device_t); - -static device_method_t ruephy_methods[] = { - /* device interface */ - DEVMETHOD(device_probe, ruephy_probe), - DEVMETHOD(device_attach, ruephy_attach), - DEVMETHOD(device_detach, mii_phy_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD_END -}; - -static devclass_t ruephy_devclass; - -static driver_t ruephy_driver = { - "ruephy", - ruephy_methods, - sizeof(struct mii_softc) -}; - -DRIVER_MODULE(ruephy, miibus, ruephy_driver, ruephy_devclass, NULL, NULL); - -static int ruephy_service(struct mii_softc *, struct mii_data *, int); -static void ruephy_reset(struct mii_softc *); -static void ruephy_status(struct mii_softc *); - -/* - * The RealTek RTL8150 internal PHY doesn't have vendor/device ID - * registers; rue(4) fakes up a return value of all zeros. - */ -static const struct mii_phydesc ruephys[] = { - { 0, 0, "RealTek RTL8150 internal media interface" }, - MII_PHY_END -}; - -static const struct mii_phy_funcs ruephy_funcs = { - ruephy_service, - ruephy_status, - ruephy_reset -}; - -static int -ruephy_probe(device_t dev) -{ - - if (strcmp(device_get_name(device_get_parent(device_get_parent(dev))), - "rue") == 0) - return (mii_phy_dev_probe(dev, ruephys, BUS_PROBE_DEFAULT)); - return (ENXIO); -} - -static int -ruephy_attach(device_t dev) -{ - - mii_phy_dev_attach(dev, MIIF_NOISOLATE | MIIF_NOMANPAUSE, - &ruephy_funcs, 1); - return (0); -} - -static int -ruephy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) -{ - struct ifmedia_entry *ife = mii->mii_media.ifm_cur; - int reg; - - switch (cmd) { - case MII_POLLSTAT: - break; - - case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - - mii_phy_setmedia(sc); - break; - - case MII_TICK: - /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* - * Only used for autonegotiation. - */ - if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) - break; - - /* - * Check to see if we have link. If we do, we don't - * need to restart the autonegotiation process. Read - * the MSR twice in case it's latched. - */ - reg = PHY_READ(sc, RUEPHY_MII_MSR) | - PHY_READ(sc, RUEPHY_MII_MSR); - if (reg & RUEPHY_MSR_LINK) - break; - - /* Only retry autonegotiation every mii_anegticks seconds. */ - if (sc->mii_ticks <= sc->mii_anegticks) - break; - - sc->mii_ticks = 0; - PHY_RESET(sc); - if (mii_phy_auto(sc) == EJUSTRETURN) - return (0); - break; - } - - /* Update the media status. */ - PHY_STATUS(sc); - - /* Callback if something changed. */ - mii_phy_update(sc, cmd); - - return (0); -} - -static void -ruephy_reset(struct mii_softc *sc) -{ - - mii_phy_reset(sc); - - /* - * XXX RealTek RTL8150 PHY doesn't set the BMCR properly after - * XXX reset, which breaks autonegotiation. - */ - PHY_WRITE(sc, MII_BMCR, (BMCR_S100 | BMCR_AUTOEN | BMCR_FDX)); -} - -static void -ruephy_status(struct mii_softc *phy) -{ - struct mii_data *mii = phy->mii_pdata; - struct ifmedia_entry *ife = mii->mii_media.ifm_cur; - int bmsr, bmcr, msr; - - mii->mii_media_status = IFM_AVALID; - mii->mii_media_active = IFM_ETHER; - - msr = PHY_READ(phy, RUEPHY_MII_MSR) | PHY_READ(phy, RUEPHY_MII_MSR); - if (msr & RUEPHY_MSR_LINK) - mii->mii_media_status |= IFM_ACTIVE; - - bmcr = PHY_READ(phy, MII_BMCR); - if (bmcr & BMCR_ISO) { - mii->mii_media_active |= IFM_NONE; - mii->mii_media_status = 0; - return; - } - - bmsr = PHY_READ(phy, MII_BMSR) | PHY_READ(phy, MII_BMSR); - if (bmcr & BMCR_AUTOEN) { - if ((bmsr & BMSR_ACOMP) == 0) { - /* Erg, still trying, I guess... */ - mii->mii_media_active |= IFM_NONE; - return; - } - - if (msr & RUEPHY_MSR_SPEED100) - mii->mii_media_active |= IFM_100_TX; - else - mii->mii_media_active |= IFM_10_T; - - if (msr & RUEPHY_MSR_DUPLEX) - mii->mii_media_active |= - IFM_FDX | mii_phy_flowstatus(phy); - else - mii->mii_media_active |= IFM_HDX; - } else - mii->mii_media_active = ife->ifm_media; -} diff --git a/sys/bus/u4b/net/ruephyreg.h b/sys/bus/u4b/net/ruephyreg.h deleted file mode 100644 index 01d3cc17..00000000 --- a/sys/bus/u4b/net/ruephyreg.h +++ /dev/null @@ -1,38 +0,0 @@ -/*- - * Copyright (c) 2001-2003, Shunsuke Akiyama <akiyama@FreeBSD.org>. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _RUEPHYREG_H_ -#define _RUEPHYREG_H_ - -#define RUEPHY_MII_MSR 0x0137 /* B, R/W */ -#define RUEPHY_MSR_RXFCE 0x40 -#define RUEPHY_MSR_DUPLEX 0x10 -#define RUEPHY_MSR_SPEED100 0x08 -#define RUEPHY_MSR_LINK 0x04 - -#endif /* _RUEPHYREG_H_ */ |