nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-12 20:58:44 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

modifyreg16: use small lock in modifyreg16

Browse source 
reason:
We would like to replace the big lock with a small lock.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
This commit is contained in:
hujun5 2024-12-18 16:08:01 +08:00 committed by Xiang Xiao
parent 391aa9b5f3
commit 75ddce6e3a
12 changed files with 78 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/src/common/arm_modifyreg16.c
View file

@ -33,6 +33,12 @@
#include "arm_internal.h"
/****************************************************************************
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Public Functions
****************************************************************************/
@ -50,10 +56,10 @@ void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits)
irqstate_t flags;
uint16_t regval;
flags = spin_lock_irqsave(NULL);
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg16(addr);
regval &= ~clearbits;
regval |= setbits;
putreg16(regval, addr);
spin_unlock_irqrestore(NULL, flags);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}

10
arch/arm64/src/common/arm64_modifyreg16.c
View file

@ -33,6 +33,12 @@
#include "arm64_internal.h"
/****************************************************************************
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Public Functions
****************************************************************************/
@ -50,10 +56,10 @@ void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits)
irqstate_t flags;
uint16_t regval;
flags = spin_lock_irqsave(NULL);
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg16(addr);
regval &= ~clearbits;
regval |= setbits;
putreg16(regval, addr);
spin_unlock_irqrestore(NULL, flags);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}

7
arch/avr/src/common/avr_modifyreg16.c
View file

@ -31,6 +31,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/spinlock.h>
#include "avr_internal.h"
@ -42,6 +43,8 @@
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Private Functions
****************************************************************************/
@ -63,10 +66,10 @@ void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits)
irqstate_t flags;
uint16_t regval;
flags = enter_critical_section();
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg16(addr);
regval &= ~clearbits;
regval |= setbits;
putreg16(regval, addr);
leave_critical_section(flags);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}

10
arch/ceva/src/common/ceva_modifyreg16.c
View file

@ -29,6 +29,12 @@
#include "ceva_internal.h"
/****************************************************************************
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Public Functions
****************************************************************************/
@ -46,10 +52,10 @@ void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits)
irqstate_t flags;
uint16_t regval;
flags = spin_lock_irqsave(NULL);
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg16(addr);
regval &= ~clearbits;
regval |= setbits;
putreg16(regval, addr);
spin_unlock_irqrestore(flags);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}

7
arch/hc/src/common/hc_modifyreg16.c
View file

@ -31,6 +31,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/spinlock.h>
#include "hc_internal.h"
@ -42,6 +43,8 @@
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Private Functions
****************************************************************************/
@ -63,10 +66,10 @@ void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits)
irqstate_t flags;
uint16_t regval;
flags = enter_critical_section();
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg16(addr);
regval &= ~clearbits;
regval |= setbits;
putreg16(regval, addr);
leave_critical_section(flags);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}

7
arch/mips/src/common/mips_modifyreg16.c
View file

@ -31,6 +31,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/spinlock.h>
#include "mips_internal.h"
@ -42,6 +43,8 @@
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Private Functions
****************************************************************************/
@ -63,10 +66,10 @@ void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits)
irqstate_t flags;
uint16_t regval;
flags = enter_critical_section();
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg16(addr);
regval &= ~clearbits;
regval |= setbits;
putreg16(regval, addr);
leave_critical_section(flags);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}

11
arch/misoc/src/common/misoc_modifyreg16.c
View file

@ -31,9 +31,16 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/spinlock.h>
#include "misoc.h"
/****************************************************************************
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Public Functions
****************************************************************************/
@ -51,10 +58,10 @@ void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits)
irqstate_t flags;
uint16_t regval;
flags = enter_critical_section();
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg16(addr);
regval &= ~clearbits;
regval |= setbits;
putreg16(regval, addr);
leave_critical_section(flags);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}

10
arch/or1k/src/common/or1k_modifyreg16.c
View file

@ -33,6 +33,12 @@
#include "or1k_internal.h"
/****************************************************************************
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Public Functions
****************************************************************************/
@ -50,10 +56,10 @@ void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits)
irqstate_t flags;
uint16_t regval;
flags = spin_lock_irqsave(NULL);
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg16(addr);
regval &= ~clearbits;
regval |= setbits;
putreg16(regval, addr);
spin_unlock_irqrestore(NULL, flags);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}

6
arch/sparc/src/common/sparc_modifyreg16.c
View file

@ -42,6 +42,8 @@
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Private Functions
****************************************************************************/
@ -63,11 +65,11 @@ void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits)
irqstate_t flags;
uint16_t regval;
flags = spin_lock_irqsave(NULL);
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg16(addr);
regval &= ~clearbits;
regval |= setbits;
putreg16(regval, addr);
spin_unlock_irqrestore(NULL, flags);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}

7
arch/x86/src/common/x86_modifyreg16.c
View file

@ -31,6 +31,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/spinlock.h>
#include "x86_internal.h"
@ -42,6 +43,8 @@
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Private Functions
****************************************************************************/
@ -63,10 +66,10 @@ void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits)
irqstate_t flags;
uint16_t regval;
flags = enter_critical_section();
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg16((uint16_t)addr);
regval &= ~clearbits;
regval |= setbits;
putreg16(regval, (uint16_t)addr);
leave_critical_section(flags);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}

7
arch/x86_64/src/common/x86_64_modifyreg16.c
View file

@ -31,6 +31,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/spinlock.h>
#include "x86_64_internal.h"
@ -42,6 +43,8 @@
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Private Functions
****************************************************************************/
@ -63,10 +66,10 @@ void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits)
irqstate_t flags;
uint16_t regval;
flags = enter_critical_section();
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg16((uint16_t)addr);
regval &= ~clearbits;
regval |= setbits;
putreg16(regval, (uint16_t)addr);
leave_critical_section(flags);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}

10
arch/xtensa/src/common/xtensa_modifyreg16.c
View file

@ -35,6 +35,12 @@
#include "xtensa.h"
/****************************************************************************
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Public Functions
****************************************************************************/
@ -52,10 +58,10 @@ void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits)
irqstate_t flags;
uint16_t regval;
flags = spin_lock_irqsave(NULL);
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg16(addr);
regval &= ~clearbits;
regval |= setbits;
putreg16(regval, addr);
spin_unlock_irqrestore(NULL, flags);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}