[haiku-commits] r41908 - in haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev: . fxp mii
- From: zharik@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 4 Jun 2011 16:09:25 +0200 (CEST)
Author: siarzhuk
Date: 2011-06-04 16:09:24 +0200 (Sat, 04 Jun 2011)
New Revision: 41908
Changeset: https://dev.haiku-os.org/changeset/41908
Added:
haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii/
haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii/Jamfile
haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii/inphy.c
haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii/inphyreg.h
Modified:
haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/
haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/Jamfile
haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/Jamfile
haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/glue.c
Log:
An Intel PHYs MII module added to ipro100 driver to fix "No Link" status issues.
Property changes on: haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev
___________________________________________________________________
Added: svn:mergeinfo
+
/haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/ipro100/dev:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/ipro100/dev:39365-39568
/haiku/vendor/freebsd/RELENG_7_BP/dev/mii:23042-41907
Modified: haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/Jamfile
2011-06-04 13:58:57 UTC (rev 41907)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/Jamfile
2011-06-04 14:09:24 UTC (rev 41908)
@@ -1,3 +1,4 @@
SubDir HAIKU_TOP src add-ons kernel drivers network ipro100 dev ;
SubInclude HAIKU_TOP src add-ons kernel drivers network ipro100 dev fxp ;
+SubInclude HAIKU_TOP src add-ons kernel drivers network ipro100 dev mii ;
Modified: haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/Jamfile
2011-06-04 13:58:57 UTC (rev 41907)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/Jamfile
2011-06-04 14:09:24 UTC (rev 41908)
@@ -1,6 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers network ipro100 dev fxp ;
UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
+UseHeaders [ FDirName $(SUBDIR) .. mii ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] :
true ;
UsePrivateHeaders net system ;
@@ -11,6 +12,6 @@
KernelAddon ipro100 :
if_fxp.c
glue.c
- : libfreebsd_network.a
+ : libfreebsd_network.a ipro100_mii.a
;
Modified: haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/glue.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/glue.c
2011-06-04 13:58:57 UTC (rev 41907)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/glue.c
2011-06-04 14:09:24 UTC (rev 41908)
@@ -42,4 +42,4 @@
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
-NO_HAIKU_FBSD_MII_DRIVER();
+HAIKU_FBSD_MII_DRIVER(inphy);
Property changes on:
haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii
___________________________________________________________________
Added: svn:mergeinfo
+ /haiku/vendor/freebsd/RELENG_7_BP/dev/mii:23042-41907
Added: haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii/Jamfile
(rev 0)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii/Jamfile
2011-06-04 14:09:24 UTC (rev 41908)
@@ -0,0 +1,18 @@
+SubDir HAIKU_TOP src add-ons kernel drivers network ipro100 dev mii ;
+
+UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] :
true ;
+
+UsePrivateHeaders net ;
+UsePrivateKernelHeaders ;
+
+SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
+
+KernelStaticLibrary ipro100_mii.a
+ :
+ inphy.c
+ ;
+
+ObjectHdrs [ FGristFiles inphy$(SUFOBJ) ]
+ : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat
freebsd_network ] ;
+Includes [ FGristFiles inphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
Copied: haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii/inphy.c
(from rev 41907, haiku/vendor/freebsd/RELENG_7_BP/dev/mii/inphy.c)
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii/inphy.c
(rev 0)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii/inphy.c
2011-06-04 14:09:24 UTC (rev 41908)
@@ -0,0 +1,215 @@
+/*-
+ * Copyright (c) 2001 Jonathan Lemon
+ * 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.
+ * 3. Neither the name of the author nor the names of any co-contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * 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: src/sys/dev/mii/inphy.c,v 1.17 2007/01/12 22:27:46 marius
Exp $");
+
+/*
+ * driver for Intel 82553 and 82555 PHYs
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/socket.h>
+#include <sys/bus.h>
+
+#include <net/if.h>
+#include <net/if_media.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+#include "miidevs.h"
+
+#include <dev/mii/inphyreg.h>
+
+#include "miibus_if.h"
+
+static int inphy_probe(device_t dev);
+static int inphy_attach(device_t dev);
+
+static device_method_t inphy_methods[] = {
+ /* device interface */
+ DEVMETHOD(device_probe, inphy_probe),
+ DEVMETHOD(device_attach, inphy_attach),
+ DEVMETHOD(device_detach, mii_phy_detach),
+ DEVMETHOD(device_shutdown, bus_generic_shutdown),
+ { 0, 0 }
+};
+
+static devclass_t inphy_devclass;
+
+static driver_t inphy_driver = {
+ "inphy",
+ inphy_methods,
+ sizeof(struct mii_softc)
+};
+
+DRIVER_MODULE(inphy, miibus, inphy_driver, inphy_devclass, 0, 0);
+
+static int inphy_service(struct mii_softc *, struct mii_data *, int);
+static void inphy_status(struct mii_softc *);
+
+static const struct mii_phydesc inphys[] = {
+ MII_PHY_DESC(INTEL, I82553C),
+ MII_PHY_DESC(INTEL, I82555),
+ MII_PHY_DESC(INTEL, I82562EM),
+ MII_PHY_DESC(INTEL, I82562ET),
+ MII_PHY_DESC(xxINTEL, I82553AB),
+ MII_PHY_END
+};
+
+static int
+inphy_probe(device_t dev)
+{
+
+ return (mii_phy_dev_probe(dev, inphys, BUS_PROBE_DEFAULT));
+}
+
+static int
+inphy_attach(device_t dev)
+{
+ struct mii_softc *sc;
+ struct mii_attach_args *ma;
+ struct mii_data *mii;
+
+ sc = device_get_softc(dev);
+ ma = device_get_ivars(dev);
+ sc->mii_dev = device_get_parent(dev);
+ mii = device_get_softc(sc->mii_dev);
+ LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);
+
+ sc->mii_inst = mii->mii_instance;
+ sc->mii_phy = ma->mii_phyno;
+ sc->mii_service = inphy_service;
+ sc->mii_pdata = mii;
+ mii->mii_instance++;
+
+ ifmedia_add(&mii->mii_media,
+ IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, sc->mii_inst),
+ MII_MEDIA_100_TX, NULL);
+
+ mii_phy_reset(sc);
+
+ sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
+ device_printf(dev, " ");
+ mii_phy_add_media(sc);
+ printf("\n");
+
+ MIIBUS_MEDIAINIT(sc->mii_dev);
+
+ return (0);
+}
+
+static int
+inphy_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:
+ if (IFM_INST(ife->ifm_media) != sc->mii_inst)
+ return (0);
+ break;
+
+ case MII_MEDIACHG:
+ if (IFM_INST(ife->ifm_media) != sc->mii_inst) {
+ reg = PHY_READ(sc, MII_BMCR);
+ PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO);
+ return (0);
+ }
+
+ /*
+ * 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:
+ if (IFM_INST(ife->ifm_media) != sc->mii_inst)
+ return (0);
+ if (mii_phy_tick(sc) == EJUSTRETURN)
+ return (0);
+ break;
+ }
+
+ /* Update the media status. */
+ inphy_status(sc);
+
+ /* Callback if something changed. */
+ mii_phy_update(sc, cmd);
+ return (0);
+}
+
+static void
+inphy_status(struct mii_softc *sc)
+{
+ struct mii_data *mii = sc->mii_pdata;
+ struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
+ int bmsr, bmcr, scr;
+
+ mii->mii_media_status = IFM_AVALID;
+ mii->mii_media_active = IFM_ETHER;
+
+ bmsr = PHY_READ(sc, MII_BMSR) | PHY_READ(sc, MII_BMSR);
+ if (bmsr & BMSR_LINK)
+ mii->mii_media_status |= IFM_ACTIVE;
+
+ bmcr = PHY_READ(sc, MII_BMCR);
+ if (bmcr & BMCR_ISO) {
+ mii->mii_media_active |= IFM_NONE;
+ mii->mii_media_status = 0;
+ return;
+ }
+
+ if (bmcr & BMCR_LOOP)
+ mii->mii_media_active |= IFM_LOOP;
+
+ if (bmcr & BMCR_AUTOEN) {
+ if ((bmsr & BMSR_ACOMP) == 0) {
+ mii->mii_media_active |= IFM_NONE;
+ return;
+ }
+
+ scr = PHY_READ(sc, MII_INPHY_SCR);
+ if (scr & SCR_S100)
+ mii->mii_media_active |= IFM_100_TX;
+ else
+ mii->mii_media_active |= IFM_10_T;
+ if (scr & SCR_FDX)
+ mii->mii_media_active |= IFM_FDX;
+ } else
+ mii->mii_media_active = ife->ifm_media;
+}
Copied:
haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii/inphyreg.h (from
rev 41907, haiku/vendor/freebsd/RELENG_7_BP/dev/mii/inphyreg.h)
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii/inphyreg.h
(rev 0)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev/mii/inphyreg.h
2011-06-04 14:09:24 UTC (rev 41908)
@@ -0,0 +1,35 @@
+/*-
+ * Copyright (c) 2001 Jonathan Lemon
+ * 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.
+ * 3. Neither the name of the author nor the names of any co-contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * 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: src/sys/dev/mii/inphyreg.h,v 1.1 2001/03/12 02:41:57 jlemon
Exp $
+ */
+
+#define MII_INPHY_SCR 0x10 /* status and control register */
+#define SCR_FLOWCTL 0x8000
+#define SCR_S100 0x0002 /* autonegotiated speed */
+#define SCR_FDX 0x0001 /* autonegotiated duplex */
Other related posts:
- » [haiku-commits] r41908 - in haiku/trunk/src/add-ons/kernel/drivers/network/ipro100/dev: . fxp mii - zharik
