Changeset 8974294 in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2017-10-04T18:46:07Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7e20bee

Parents:

36c3139

Message:

Attempt to fix e1000_link_restart().

My understanding of the driver is limited,
so I'm not positive it's entirely correct,
but it's most definitely more correct now
than it had been before.

Fixes #695, probably.

File:

• uspace/drv/nic/e1k/e1k.c (modified) (1 diff)

uspace/drv/nic/e1k/e1k.c

@@ -365 +365 @@
         if (ctrl & CTRL_SLU) {
                 ctrl &= ~(CTRL_SLU);
+                E1000_REG_WRITE(e1000, E1000_CTRL, ctrl);
                 fibril_mutex_unlock(&e1000->ctrl_lock);
+                
                 thread_usleep(10);
+                
                 fibril_mutex_lock(&e1000->ctrl_lock);
+                ctrl = E1000_REG_READ(e1000, E1000_CTRL);
                 ctrl |= CTRL_SLU;
+                E1000_REG_WRITE(e1000, E1000_CTRL, ctrl);
         }
         
         fibril_mutex_unlock(&e1000->ctrl_lock);
-        
-        e1000_link_restart(e1000);
 }