Merge branch 'main' into bugfix/soc/NCSIDB-1773_Handle_extmem

Author: tomchy

doc/releases/migration-guide-4.4.rst

@@ -35,6 +35,15 @@ Device Drivers and Devicetree
 Bluetooth
 *********
 
+Bluetooth Host
+==============
+
+* :kconfig:option:`CONFIG_BT_SIGNING` has been deprecated.
+* :c:macro:`BT_GATT_CHRC_AUTH` has been deprecated.
+* :c:member:`bt_conn_le_info.interval` has been deprecated. Use
+  :c:member:`bt_conn_le_info.interval_us` instead. Note that the units have changed: ``interval``
+  was in units of 1.25 milliseconds, while ``interval_us`` is in microseconds.
+
 Networking
 **********
 

doc/releases/release-notes-4.4.rst

@@ -62,9 +62,21 @@ Deprecated APIs and options
     * The callback :c:member:`output_number` in :c:struct:`bt_mesh_prov` structure was deprecated.
       Applications should use :c:member:`output_numeric` callback instead.
 
+  * Host
+
+    * :c:member:`bt_conn_le_info.interval` has been deprecated. Use
+      :c:member:`bt_conn_le_info.interval_us` instead. Note that the units have changed:
+      ``interval`` was in units of 1.25 milliseconds, while ``interval_us`` is in microseconds.
+
 New APIs and options
 ====================
 
+* Bluetooth
+
+  * Host
+
+    * :c:func:`bt_gatt_cb_unregister` Added an API to unregister GATT callback handlers.
+
 ..
   Link to new APIs here, in a group if you think it's necessary, no need to get
   fancy just list the link, that should contain the documentation. If you feel

drivers/serial/uart_nrfx_uarte.c

@@ -2832,27 +2832,35 @@ static void uarte_nrfx_irq_tx_enable(const struct device *dev)
 {
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	struct uarte_nrfx_data *data = dev->data;
+	bool already_enabled;
 
-	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
-		pm_device_runtime_get(dev);
-	}
+	pm_device_runtime_get(dev);
 
 	unsigned int key = irq_lock();
 
-	data->int_driven->disable_tx_irq = false;
-	data->int_driven->tx_irq_enabled = true;
-	nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
+	already_enabled = data->int_driven->tx_irq_enabled;
+	if (!already_enabled) {
+		data->int_driven->disable_tx_irq = false;
+		data->int_driven->tx_irq_enabled = true;
+		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_TXSTOPPED_MASK);
+	}
 
 	irq_unlock(key);
+
+	if (already_enabled) {
+		pm_device_runtime_put(dev);
+	}
 }
 
 /** Interrupt driven transfer disabling function */
 static void uarte_nrfx_irq_tx_disable(const struct device *dev)
 {
 	struct uarte_nrfx_data *data = dev->data;
-	/* TX IRQ will be disabled after current transmission is finished */
-	data->int_driven->disable_tx_irq = true;
-	data->int_driven->tx_irq_enabled = false;
+	if (data->int_driven->tx_irq_enabled) {
+		/* TX IRQ will be disabled after current transmission is finished */
+		data->int_driven->disable_tx_irq = true;
+		data->int_driven->tx_irq_enabled = false;
+	}
 }
 
 /** Interrupt driven transfer ready function */
@@ -2888,15 +2896,23 @@ static void uarte_nrfx_irq_rx_enable(const struct device *dev)
 {
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-	nrf_uarte_int_enable(uarte, NRF_UARTE_INT_ENDRX_MASK);
+	if (!nrf_uarte_int_enable_check(uarte, NRF_UARTE_INT_ENDRX_MASK)) {
+		pm_device_runtime_get(dev);
+
+		nrf_uarte_int_enable(uarte, NRF_UARTE_INT_ENDRX_MASK);
+	}
 }
 
 /** Interrupt driven receiver disabling function */
 static void uarte_nrfx_irq_rx_disable(const struct device *dev)
 {
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 
-	nrf_uarte_int_disable(uarte, NRF_UARTE_INT_ENDRX_MASK);
+	if (nrf_uarte_int_enable_check(uarte, NRF_UARTE_INT_ENDRX_MASK)) {
+		pm_device_runtime_put_async(dev, K_NO_WAIT);
+
+		nrf_uarte_int_disable(uarte, NRF_UARTE_INT_ENDRX_MASK);
+	}
 }
 
 /** Interrupt driven error enabling function */