Changeset 172

Timestamp:

Sep 2, 2010, 11:24:08 AM (14 years ago)

Author:

Rick van der Zwet

Message:

• miibus requires proper locking

• sc copy/paste errors

Location:

freebsd-mos-driver

Files:

• Makefile (modified) (1 diff)
• if_mos.c (modified) (8 diffs)

freebsd-mos-driver/Makefile

@@ -29 +29 @@
 lsmod:
         kldstat
+
+core:
+        kgdb /usr/obj/usr/src/sys/GENERIC/kernel.debug `ls /var/crash/vmcore.* | tail -1`

freebsd-mos-driver/if_mos.c

@@ -421 +421 @@
 mos_miibus_readreg(struct device *dev, int phy, int reg)
 {
-        struct mos_softc        *sc = (void *)dev;
+        struct mos_softc *sc = device_get_softc(dev);
         uWord                   val;
         int                     i,res, locked;
@@ -455 +455 @@
 mos_miibus_writereg(device_t dev, int phy, int reg, int val)
 {
-        struct mos_softc        *sc = (void *)dev;
+        struct mos_softc *sc = device_get_softc(dev);
         int                     i, locked;
 
@@ -535 +535 @@
         struct mii_data         *mii = GET_MII(sc);
 
+        MOS_LOCK_ASSERT(sc, MA_OWNED);
+
         sc->mos_link = 0;
         if (mii->mii_instance) {
-                struct mii_softc        *miisc;
+                struct mii_softc *miisc;
+
                 LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
                         mii_phy_reset(miisc);
         }
         mii_mediachg(mii);
-
         return (0);
 }
@@ -555 +557 @@
         struct mii_data         *mii = GET_MII(sc);
 
+        MOS_LOCK(sc);
         mii_pollstat(mii);
+        MOS_UNLOCK(sc);
+
         ifmr->ifm_active = mii->mii_media_active;
         ifmr->ifm_status = mii->mii_media_status;
@@ -571 +576 @@
         u_int8_t                hashtbl[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
+        MOS_LOCK_ASSERT(sc, MA_OWNED);
 
         rxmode = mos_reg_read_1(sc, MOS_CTL);
@@ -909 +915 @@
                 return;
 
+        MOS_LOCK_ASSERT(sc, MA_OWNED);
         DPRINTFN(0xff,"%s: %s: enter\n", "mos", __func__);
 
@@ -999 +1006 @@
         u_int8_t                rxmode;
 
+        MOS_LOCK_ASSERT(sc, MA_OWNED);
+
         /*
          * Cancel pending I/O and free all RX/TX buffers.
@@ -1071 +1080 @@
         mos_reset(sc);
 
+        MOS_LOCK_ASSERT(sc, MA_OWNED);
         ifp->if_flags &= ~IFF_DRV_RUNNING;