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

Timestamp:

2025-03-13T18:30:36Z (12 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e3e53cc

Parents:

e494d7b (diff), da54714 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge upstream/master into helenraid

File:

• uspace/drv/nic/e1k/e1k.c (modified) (5 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Zdenek Bouska
  * All rights reserved.
@@ -220 +221 @@
 
 static errno_t e1000_dev_add(ddf_dev_t *);
+static errno_t e1000_dev_quiesce(ddf_dev_t *);
 
 /** Basic driver operations for E1000 driver */
 static driver_ops_t e1000_driver_ops = {
-        .dev_add = e1000_dev_add
+        .dev_add = e1000_dev_add,
+        .dev_quiesce = e1000_dev_quiesce
 };
 
@@ -1269 +1272 @@
  *
  */
-inline static errno_t e1000_register_int_handler(nic_t *nic,
+static errno_t e1000_register_int_handler(nic_t *nic,
     cap_irq_handle_t *handle)
 {
@@ -1918 +1921 @@
  *
  */
-inline static void e1000_delete_dev_data(ddf_dev_t *dev)
+static void e1000_delete_dev_data(ddf_dev_t *dev)
 {
         assert(dev);
@@ -2223 +2226 @@
 }
 
+/** Quiesce E1000 device.
+ *
+ * @param dev E1000 device.
+ *
+ */
+errno_t e1000_dev_quiesce(ddf_dev_t *dev)
+{
+        nic_t *nic = ddf_dev_data_get(dev);
+        e1000_t *e1000 = DRIVER_DATA_NIC(nic);
+        errno_t rc;
+
+        ddf_msg(LVL_DEBUG, "e1000_dev_quiesce()");
+
+        e1000_disable_interrupts(e1000);
+        rc = e1000_reset(nic);
+        if (rc != EOK)
+                ddf_msg(LVL_ERROR, "e1000_dev_quiesce failed");
+        return rc;
+}
+
 /** Read 16-bit value from EEPROM of E1000 adapter
  *