atomic: multi-backend framework + builtin + API rename

arch/arm/Kconfig

@@ -843,7 +843,6 @@ config ARCH_CHIP_CXD56XX
 	select ARCH_HAVE_MATH_H
 	select ARCH_HAVE_I2CRESET
 	select ARCH_HAVE_CUSTOM_TESTSET
-	select LIBC_ARCH_ATOMIC if SMP
 	---help---
 		Sony CXD56XX (ARM Cortex-M4) architectures
 
@@ -935,15 +934,14 @@ config ARCH_CHIP_CXD32XX
 	bool "Sony CXD32xx"
 	select ARCH_CORTEXM4
 	select ARCH_HAVE_FPU
-	select LIBC_ARCH_ATOMIC
+	select LIBC_ATOMIC_IRQ
 	---help---
 		Sony CXD32XX (ARM Cortex-M4) architectures
 
 config ARCH_CHIP_HT32F491X3
 	bool "Holtek HT32F491x3"
 	select ARCH_CORTEXM4
 	select ARCH_HAVE_FPU
-	select LIBC_ARCH_ATOMIC
 	---help---
 		Holtek HT32F491x3 (ARM Cortex-M4) architectures
 
@@ -967,6 +965,7 @@ config ARCH_ARM7TDMI
 	default n
 	select ARCH_DCACHE
 	select ARCH_ICACHE
+	select LIBC_ATOMIC_IRQ
 	---help---
 		The Arm7TDMI-S is an excellent workhorse processor capable of a wide
 		array of applications. Traditionally used in mobile handsets, the
@@ -996,6 +995,7 @@ config ARCH_ARM926EJS
 	select ARCH_ICACHE
 	select ARCH_HAVE_MMU
 	select ARCH_USE_MMU
+	select LIBC_ATOMIC_IRQ
 	---help---
 		Arm926EJ-S is the entry point processor capable of supporting full
 		Operating Systems including Linux, WindowsCE, and Symbian.
@@ -1051,6 +1051,7 @@ config ARCH_ARMV6M
 	bool
 	default n
 	select ARCH_HAVE_CPUINFO
+	select LIBC_ATOMIC_IRQ
 
 config ARCH_CORTEXM0
 	bool

arch/arm/src/armv7-a/arm_gicv2.c

@@ -72,7 +72,7 @@ static atomic_t g_gic_init_done;
 #if defined(CONFIG_SMP) && CONFIG_SMP_NCPUS > 1
 static void arm_gic_init_done(void)
 {
-  atomic_fetch_or(&g_gic_init_done, 1 << this_cpu());
+  atomic_or(&g_gic_init_done, 1 << this_cpu());
 }
 
 static void arm_gic_wait_done(cpu_set_t cpuset)

arch/arm/src/rtl8720c/amebaz_depend.c

@@ -876,7 +876,7 @@ static void *device_mutex[5];
 static void device_mutex_init(uint32_t device)
 {
   irqstate_t status;
-  if (atomic_fetch_or(&mutex_init, (1 << device)) & (1 << device) == 0)
+  if (atomic_or(&mutex_init, (1 << device)) & (1 << device) == 0)
     {
       rtw_mutex_init(&device_mutex[device]);
     }

arch/arm/src/s32k1xx/Kconfig

@@ -75,6 +75,7 @@ config ARCH_CHIP_S32K11X
 	bool
 	select ARCH_CORTEXM0
 	select S32K1XX_HAVE_FIRC_CMU
+	select LIBC_ATOMIC_IRQ
 
 config ARCH_CHIP_S32K14X
 	bool

arch/arm64/src/imx9/imx9_scmi.c

@@ -476,7 +476,7 @@ static int imx9_scmi_tx(uint32_t channel, uint32_t protocol_id,
       *header = SCMI_HEADER_MSG(message_id)
                 | SCMI_HEADER_PROTOCOL(protocol_id)
                 | SCMI_HEADER_TYPE(0UL)
-                | SCMI_HEADER_TOKEN(atomic_fetch_add(&g_token, 1));
+                | SCMI_HEADER_TOKEN(atomic_add(&g_token, 1));
       msg->header = *header;
 
       /* Send message via transport */

arch/avr/Kconfig

@@ -13,12 +13,14 @@ config ARCH_CHIP_ATMEGA
 	bool "ATMega family"
 	select ARCH_FAMILY_AVR
 	select MM_SMALL
+	select LIBC_ATOMIC_IRQ
 	---help---
 		Atmel ATMega family of 8-bit AVRs.
 
 config ARCH_CHIP_AT90USB
 	bool "AT90USB family"
 	select ARCH_FAMILY_AVR
+	select LIBC_ATOMIC_IRQ
 	select MM_SMALL
 	---help---
 		Atmel AT90USB family of 8-bit AVRs.
@@ -35,12 +37,14 @@ config ARCH_CHIP_AVRDX
 config ARCH_CHIP_AT32UC3
 	bool "AVR32 AT32UC3* family"
 	select ARCH_FAMILY_AVR32
+	select LIBC_ATOMIC_IRQ
 	---help---
 		Atmel AT32UC3A/B/C family of 32-bit AVR32s.
 
 config ARCH_CHIP_AVR_CUSTOM
 	bool "Custom AVR chip"
 	select ARCH_CHIP_CUSTOM
+	select LIBC_ATOMIC_IRQ
 	---help---
 		Select this option if there is no directory for the chip under arch/avr/src/.
 

arch/renesas/Kconfig

@@ -62,6 +62,7 @@ config ARCH_RENESAS_RX
 	default n
 	select ARCH_HAVE_SETJMP
 	select CYGWIN_WINTOOL if WINDOWS_CYGWIN
+	select LIBC_ATOMIC_IRQ
 
 config ARCH_RX65N
 	bool

arch/risc-v/Kconfig

@@ -82,6 +82,7 @@ config ARCH_CHIP_BL602
 	select ONESHOT_COUNT
 	select ONESHOT_FAST_DIVISION
 	select ALARM_ARCH
+	select LIBC_ATOMIC_IRQ
 	---help---
 		BouffaloLab BL602(rv32imfc)
 
@@ -112,6 +113,7 @@ config ARCH_CHIP_ESP32C3_LEGACY
 	select ARCH_HAVE_RAMFUNCS
 	select ONESHOT_COUNT if ONESHOT
 	select ONESHOT_FAST_DIVISION if ONESHOT
+	select LIBC_ATOMIC_IRQ
 	---help---
 		Espressif ESP32-C3 (RV32IMC). Legacy implementation.
 
@@ -145,6 +147,7 @@ config ARCH_CHIP_ESP32C3
 	select ONESHOT_COUNT if ONESHOT
 	select ONESHOT_FAST_DIVISION if ONESHOT
 	select ARCH_MINIMAL_VECTORTABLE
+	select LIBC_ATOMIC_IRQ
 	---help---
 		ESP32-C3 chip with a single RISC-V IMC core, no embedded Flash memory
 
@@ -210,6 +213,7 @@ config ARCH_CHIP_ESP32H2
 	select ONESHOT_COUNT if ONESHOT
 	select ONESHOT_FAST_DIVISION if ONESHOT
 	select ARCH_MINIMAL_VECTORTABLE
+	select LIBC_ATOMIC_IRQ
 	---help---
 		Espressif ESP32-H2 (RV32IMC).
 
@@ -296,6 +300,7 @@ config ARCH_CHIP_RV32M1
 	select ONESHOT_COUNT
 	select ONESHOT_FAST_DIVISION
 	select ALARM_ARCH
+	select LIBC_ATOMIC_IRQ
 	---help---
 		NXP RV32M1 processor (RISC-V Core with PULP extensions).
 

arch/sim/src/sim/sim_ummheap.c

@@ -174,8 +174,8 @@ static void update_stats(struct mm_heap_s *heap, void *mem, size_t size,
       list_add_tail(&heap->alloclist, &node->node);
       spin_unlock_irqrestore(&heap->lock, flags);
 
-      atomic_fetch_add(&heap->aordblks, 1);
-      atomic_fetch_add(&heap->uordblks, size);
+      atomic_add(&heap->aordblks, 1);
+      atomic_add(&heap->uordblks, size);
       usmblks = atomic_read(&heap->usmblks);
       do
         {
@@ -189,8 +189,8 @@ static void update_stats(struct mm_heap_s *heap, void *mem, size_t size,
       list_delete(&node->node);
       spin_unlock_irqrestore(&heap->lock, flags);
 
-      atomic_fetch_sub(&heap->aordblks, 1);
-      atomic_fetch_sub(&heap->uordblks, size);
+      atomic_sub(&heap->aordblks, 1);
+      atomic_sub(&heap->uordblks, size);
     }
 }
 

arch/sparc/Kconfig

@@ -18,6 +18,7 @@ config ARCH_CHIP_BM3803
 	select ARCH_HAVE_RAMFUNCS
 	select ARCH_HAVE_TICKLESS
 	select ARCH_HAVE_SERIAL_TERMIOS
+	select LIBC_ATOMIC_IRQ
 	---help---
 		Microchip BM3803 (ARCH_SPARC_V8)
 
@@ -29,6 +30,7 @@ config ARCH_CHIP_BM3823
 	select ARCH_VECNOTIRQ
 	select ARCH_HAVE_RAMFUNCS
 	select ARCH_HAVE_SERIAL_TERMIOS
+	select LIBC_ATOMIC_IRQ
 	---help---
 		Microchip BM3823 (ARCH_SPARC_V8)
 

arch/xtensa/Kconfig

@@ -70,6 +70,7 @@ config ARCH_CHIP_ESP32S2
 	select LIBC_ARCH_STRNCPY
 	select LIBC_ARCH_STRLEN
 	select LIBC_ARCH_STRNLEN
+	select LIBC_ATOMIC_IRQ
 	---help---
 		ESP32-S2 is a truly secure, highly integrated, low-power, 2.4 GHz Wi-Fi
 		Microcontroller SoC supporting Wi-Fi HT40 and having 43 GPIOs.

arch/xtensa/src/esp32/Kconfig

@@ -893,7 +893,7 @@ config ESP32_RTC_HEAP
 config ESP32_IRAM_HEAP
 	bool "Use the rest of IRAM as a separate heap"
 	select ARCH_HAVE_EXTRA_HEAPS
-	select LIBC_ARCH_ATOMIC
+	select LIBC_ATOMIC_IRQ
 	select ARCH_USE_TEXT_HEAP
 	default n
 

boards/arm/am67/t3-gem-o1/configs/nsh/defconfig

@@ -30,7 +30,6 @@ CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INIT_ENTRYPOINT="nsh_main"
-CONFIG_LIBC_ARCH_ATOMIC=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y

drivers/i3c/master.c

@@ -1180,7 +1180,7 @@ static void i3c_master_handle_ibi(FAR void *arg)
     }
 
   master->ops->recycle_ibi_slot(dev, slot);
-  atomic_fetch_sub(&dev->ibi->pending_ibis, 1);
+  atomic_sub(&dev->ibi->pending_ibis, 1);
   if (!atomic_read(&dev->ibi->pending_ibis))
     {
       sem_post(&dev->ibi->all_ibis_handled);
@@ -1800,7 +1800,7 @@ int i3c_master_add_i3c_dev_locked(FAR struct i3c_master_controller *master,
 void i3c_master_queue_ibi(FAR struct i3c_dev_desc *dev,
                           FAR struct i3c_ibi_slot *slot)
 {
-  atomic_fetch_add(&dev->ibi->pending_ibis, 1);
+  atomic_add(&dev->ibi->pending_ibis, 1);
   work_queue(HPWORK, &slot->work, i3c_master_handle_ibi, slot, 0);
 }
 

drivers/net/netdev_upperhalf.c

@@ -169,7 +169,7 @@ static FAR netpkt_t *netpkt_get(FAR struct net_driver_s *dev,
    * cases will be limited by netdev_upper_can_tx and seldom reaches here.
    */
 
-  if (atomic_fetch_sub(&upper->lower->quota_ptr[type], 1) <= 0)
+  if (atomic_sub(&upper->lower->quota_ptr[type], 1) <= 0)
     {
       nwarn("WARNING: Allowing temporarily exceeding quota of %s.\n",
             dev->d_ifname);
@@ -196,7 +196,7 @@ static void netpkt_put(FAR struct net_driver_s *dev, FAR netpkt_t *pkt,
 
   DEBUGASSERT(dev && pkt);
 
-  atomic_fetch_add(&upper->lower->quota_ptr[type], 1);
+  atomic_add(&upper->lower->quota_ptr[type], 1);
   netdev_iob_replace_l2(dev, pkt);
 }
 
@@ -1723,9 +1723,9 @@ FAR netpkt_t *netpkt_alloc(FAR struct netdev_lowerhalf_s *dev,
 {
   FAR netpkt_t *pkt;
 
-  if (atomic_fetch_sub(&dev->quota_ptr[type], 1) <= 0)
+  if (atomic_sub(&dev->quota_ptr[type], 1) <= 0)
     {
-      atomic_fetch_add(&dev->quota_ptr[type], 1);
+      atomic_add(&dev->quota_ptr[type], 1);
       return NULL;
     }
 
@@ -1742,7 +1742,7 @@ FAR netpkt_t *netpkt_alloc(FAR struct netdev_lowerhalf_s *dev,
 
   if (pkt == NULL)
     {
-      atomic_fetch_add(&dev->quota_ptr[type], 1);
+      atomic_add(&dev->quota_ptr[type], 1);
       return NULL;
     }
 
@@ -1766,7 +1766,7 @@ FAR netpkt_t *netpkt_alloc(FAR struct netdev_lowerhalf_s *dev,
 void netpkt_free(FAR struct netdev_lowerhalf_s *dev, FAR netpkt_t *pkt,
                  enum netpkt_type_e type)
 {
-  atomic_fetch_add(&dev->quota_ptr[type], 1);
+  atomic_add(&dev->quota_ptr[type], 1);
   iob_free_chain(pkt);
 }
 

drivers/note/notesnap_driver.c

@@ -219,7 +219,7 @@ static inline void notesnap_common(FAR struct note_driver_s *drv,
 
   /* Atomic operation, equivalent to snap.index++; */
 
-  index = atomic_fetch_add(&snap->index, 1);
+  index = atomic_add(&snap->index, 1);
   note = &snap->buffer[index % CONFIG_DRIVERS_NOTESNAP_NBUFFERS];
 
   note->type = type;

drivers/reset/core.c

@@ -280,7 +280,7 @@ reset_control_get_internal(FAR struct reset_controller_dev *rcdev,
               return NULL;
             }
 
-          atomic_fetch_add(&rstc->refcnt, 1);
+          atomic_add(&rstc->refcnt, 1);
           return rstc;
         }
     }
@@ -332,7 +332,7 @@ static void reset_control_put_internal(FAR struct reset_control *rstc)
 {
   DEBUGASSERT(nxmutex_is_locked(&g_reset_list_mutex));
 
-  if (atomic_fetch_sub(&rstc->refcnt, 1) == 1)
+  if (atomic_sub(&rstc->refcnt, 1) == 1)
     {
       DEBUGASSERT(nxmutex_is_locked(&g_reset_list_mutex));
       list_delete(&rstc->list);
@@ -533,7 +533,7 @@ int reset_control_reset(FAR struct reset_control *rstc)
           return -EINVAL;
         }
 
-      if (atomic_fetch_add(&rstc->triggered_count, 1) != 0)
+      if (atomic_add(&rstc->triggered_count, 1) != 0)
         {
           return 0;
         }
@@ -552,7 +552,7 @@ int reset_control_reset(FAR struct reset_control *rstc)
 
   if (rstc->shared && ret < 0)
     {
-      atomic_fetch_sub(&rstc->triggered_count, 1);
+      atomic_sub(&rstc->triggered_count, 1);
     }
 
   return ret;
@@ -609,7 +609,7 @@ int reset_control_assert(FAR struct reset_control *rstc)
           return -EINVAL;
         }
 
-      if (atomic_fetch_sub(&rstc->deassert_count, 1) != 1)
+      if (atomic_sub(&rstc->deassert_count, 1) != 1)
         {
           return 0;
         }
@@ -688,7 +688,7 @@ int reset_control_deassert(FAR struct reset_control *rstc)
           return -EINVAL;
         }
 
-      if (atomic_fetch_add(&rstc->deassert_count, 1) != 0)
+      if (atomic_add(&rstc->deassert_count, 1) != 0)
         {
           return 0;
         }

drivers/rpmsg/rpmsg.c

@@ -605,8 +605,8 @@ void rpmsg_modify_signals(FAR struct rpmsg_s *rpmsg,
   FAR struct metal_list *node;
   bool needlock;
 
-  atomic_fetch_and_acquire(&rpmsg->signals, ~clrflags);
-  atomic_fetch_or_acquire(&rpmsg->signals, setflags);
+  atomic_and_acquire(&rpmsg->signals, ~clrflags);
+  atomic_or_acquire(&rpmsg->signals, setflags);
 
   /* Send signal to Router Hub */
 

drivers/rpmsg/rpmsg_port.c

@@ -329,7 +329,7 @@ static void rpmsg_port_hold_rx_buffer(FAR struct rpmsg_device *rdev,
 {
   FAR struct rpmsg_hdr *rphdr = RPMSG_LOCATE_HDR(rxbuf);
 
-  atomic_fetch_add(&rphdr->reserved, 1 << RPMSG_BUF_HELD_SHIFT);
+  atomic_add(&rphdr->reserved, 1 << RPMSG_BUF_HELD_SHIFT);
 }
 
 /****************************************************************************
@@ -345,7 +345,7 @@ static void rpmsg_port_release_rx_buffer(FAR struct rpmsg_device *rdev,
   FAR struct rpmsg_port_header_s *hdr =
     metal_container_of(rphdr, struct rpmsg_port_header_s, buf);
   uint32_t reserved =
-    atomic_fetch_sub(&rphdr->reserved, 1 << RPMSG_BUF_HELD_SHIFT);
+    atomic_sub(&rphdr->reserved, 1 << RPMSG_BUF_HELD_SHIFT);
 
   if ((reserved & RPMSG_BUF_HELD_MASK) == (1 << RPMSG_BUF_HELD_SHIFT))
     {