Changes in uspace/drv/nic/rtl8139/driver.c [fafb8e5:870841cf] in mainline

File:

• uspace/drv/nic/rtl8139/driver.c (modified) (19 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Jiri Michalec
  * All rights reserved.
@@ -74 +75 @@
  *
  */
-inline static void rtl8139_lock_all(rtl8139_t *rtl8139)
+static void rtl8139_lock_all(rtl8139_t *rtl8139)
 {
         assert(rtl8139);
@@ -86 +87 @@
  *
  */
-inline static void rtl8139_unlock_all(rtl8139_t *rtl8139)
+static void rtl8139_unlock_all(rtl8139_t *rtl8139)
 {
         assert(rtl8139);
@@ -127 +128 @@
  *  @param rtl8139  The card private structure
  */
-inline static void rtl8139_hw_int_set(rtl8139_t *rtl8139)
+static void rtl8139_hw_int_set(rtl8139_t *rtl8139)
 {
         pio_write_16(rtl8139->io_port + IMR, rtl8139->int_mask);
@@ -138 +139 @@
  *  @return Nonzero if empty, zero otherwise
  */
-inline static int rtl8139_hw_buffer_empty(rtl8139_t *rtl8139)
+static int rtl8139_hw_buffer_empty(rtl8139_t *rtl8139)
 {
         return pio_read_16(rtl8139->io_port + CR) & CR_BUFE;
@@ -166 +167 @@
  *  @param mask     The mask to set
  */
-inline static void rtl8139_hw_set_mcast_mask(rtl8139_t *rtl8139,
+static void rtl8139_hw_set_mcast_mask(rtl8139_t *rtl8139,
     uint64_t mask)
 {
@@ -180 +181 @@
  *  @param bit_val  If bit_val is zero pmen is set to 0, otherwise pmen is set to 1
  */
-inline static void rtl8139_hw_pmen_set(rtl8139_t *rtl8139, uint8_t bit_val)
+static void rtl8139_hw_pmen_set(rtl8139_t *rtl8139, uint8_t bit_val)
 {
         uint8_t config1 = pio_read_8(rtl8139->io_port + CONFIG1);
@@ -222 +223 @@
  *  @return EOK if succeed, error code otherwise
  */
-inline static void rtl8139_hw_get_addr(rtl8139_t *rtl8139,
+static void rtl8139_hw_get_addr(rtl8139_t *rtl8139,
     nic_address_t *addr)
 {
@@ -261 +262 @@
  *   @param bits_add    The value to or
  */
-inline static void rtl8139_hw_reg_add_8(rtl8139_t *rtl8139, size_t reg_offset,
+static void rtl8139_hw_reg_add_8(rtl8139_t *rtl8139, size_t reg_offset,
     uint8_t bits_add)
 {
@@ -275 +276 @@
  *   @param bits_add    The mask of bits to remove
  */
-inline static void rtl8139_hw_reg_rem_8(rtl8139_t *rtl8139, size_t reg_offset,
+static void rtl8139_hw_reg_rem_8(rtl8139_t *rtl8139, size_t reg_offset,
     uint8_t bits_add)
 {
@@ -338 +339 @@
 
 static errno_t rtl8139_dev_add(ddf_dev_t *dev);
+static errno_t rtl8139_dev_quiesce(ddf_dev_t *dev);
 
 /** Basic driver operations for RTL8139 driver */
 static driver_ops_t rtl8139_driver_ops = {
         .dev_add = &rtl8139_dev_add,
+        .dev_quiesce = &rtl8139_dev_quiesce
 };
 
@@ -432 +435 @@
  *  @param io_base  The address of the i/o port mapping start
  */
-inline static void rtl8139_hw_soft_reset(void *io_base)
+static void rtl8139_hw_soft_reset(void *io_base)
 {
         pio_write_8(io_base + CR, CR_RST);
@@ -819 +822 @@
  *
  * @param icall  The IPC call structure
- * @param dev    The rtl8139 device
- *
- */
-static void rtl8139_interrupt_handler(ipc_call_t *icall, ddf_dev_t *dev)
-{
-        assert(dev);
-        assert(icall);
-
+ * @param arg    Argument (nic_t *)
+ *
+ */
+static void rtl8139_interrupt_handler(ipc_call_t *icall, void *arg)
+{
         uint16_t isr = (uint16_t) ipc_get_arg2(icall);
-        nic_t *nic_data = nic_get_from_ddf_dev(dev);
+        nic_t *nic_data = (nic_t *)arg;
         rtl8139_t *rtl8139 = nic_get_specific(nic_data);
 
@@ -848 +848 @@
  *  @return An error code otherwise.
  */
-inline static errno_t rtl8139_register_int_handler(nic_t *nic_data,
+static errno_t rtl8139_register_int_handler(nic_t *nic_data,
     cap_irq_handle_t *handle)
 {
@@ -861 +861 @@
         rtl8139_irq_code.cmds[3].addr = rtl8139->io_addr + IMR;
         errno_t rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
-            rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code, handle);
+            rtl8139->irq, rtl8139_interrupt_handler, (void *)nic_data,
+            &rtl8139_irq_code, handle);
 
         RTL8139_IRQ_STRUCT_UNLOCK();
@@ -874 +875 @@
  * @param rtl8139  The card private data
  */
-inline static void rtl8139_card_up(rtl8139_t *rtl8139)
+static void rtl8139_card_up(rtl8139_t *rtl8139)
 {
         void *io_base = rtl8139->io_port;
@@ -1247 +1248 @@
                 }
         }
+}
+
+static void rtl8139_quiesce(rtl8139_t *rtl8139)
+{
+        rtl8139_hw_soft_reset(rtl8139->io_port);
 }
 
@@ -1330 +1336 @@
         rtl8139_dev_cleanup(dev);
         return rc;
+}
+
+/** Quiesce RTL8139.
+ *
+ * @param dev RTL8139 device.
+ * @return EOK on sucess, or an error code.
+ */
+errno_t rtl8139_dev_quiesce(ddf_dev_t *dev)
+{
+        nic_t *nic;
+        rtl8139_t *rtl8139;
+
+        ddf_msg(LVL_NOTE, "RTL8139_dev_quiesce %s (handle = %zu)",
+            ddf_dev_get_name(dev), ddf_dev_get_handle(dev));
+
+        nic = nic_get_from_ddf_dev(dev);
+        rtl8139 = nic_get_specific(nic);
+
+        rtl8139_quiesce(rtl8139);
+        return EOK;
 }
 
@@ -1768 +1794 @@
  *  @param was_promisc  Sign if the promiscuous mode was active before disabling
  */
-inline static void rtl8139_rcx_promics_rem(nic_t *nic_data,
+static void rtl8139_rcx_promics_rem(nic_t *nic_data,
     nic_multicast_mode_t mcast_mode, uint8_t was_promisc)
 {