nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

arm/modifyreg: Use common lock to protect the modify address to ensure consistency

Browse source 
Signed-off-by: chao an <anchao@lixiang.com>
This commit is contained in:
chao an 2024-12-20 14:37:57 +08:00 committed by Xiang Xiao
parent 59a849a7cc
commit d36ddb5790
5 changed files with 45 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/src/common/CMakeLists.txt
View file

@ -33,9 +33,7 @@ set(SRCS
arm_getintstack.c arm_getintstack.c
arm_initialize.c arm_initialize.c
arm_lowputs.c arm_lowputs.c
arm_modifyreg8.c arm_modifyreg.c
arm_modifyreg16.c
arm_modifyreg32.c
arm_nputs.c arm_nputs.c
arm_releasestack.c arm_releasestack.c
arm_registerdump.c arm_registerdump.c

3
arch/arm/src/common/Make.defs
View file

@ -24,9 +24,8 @@
CMN_CSRCS += arm_allocateheap.c arm_createstack.c arm_exit.c CMN_CSRCS += arm_allocateheap.c arm_createstack.c arm_exit.c
CMN_CSRCS += arm_getintstack.c arm_initialize.c arm_lowputs.c CMN_CSRCS += arm_getintstack.c arm_initialize.c arm_lowputs.c
CMN_CSRCS += arm_modifyreg8.c arm_modifyreg16.c arm_modifyreg32.c
CMN_CSRCS += arm_nputs.c arm_releasestack.c arm_registerdump.c CMN_CSRCS += arm_nputs.c arm_releasestack.c arm_registerdump.c
CMN_CSRCS += arm_stackframe.c CMN_CSRCS += arm_stackframe.c arm_modifyreg.c
CMN_CSRCS += arm_usestack.c arm_fork.c CMN_CSRCS += arm_usestack.c arm_fork.c
ifneq ($(CONFIG_ALARM_ARCH),y) ifneq ($(CONFIG_ALARM_ARCH),y)

44
arch/arm/src/common/arm_modifyreg16.c → arch/arm/src/common/arm_modifyreg.c
View file

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/common/arm_modifyreg16.c * arch/arm/src/common/arm_modifyreg.c
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *
@ -43,6 +43,27 @@ static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
/****************************************************************************
* Name: modifyreg8
*
* Description:
* Atomically modify the specified bits in a memory mapped register
*
****************************************************************************/
void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits)
{
irqstate_t flags;
uint8_t regval;
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg8(addr);
regval &= ~clearbits;
regval |= setbits;
putreg8(regval, addr);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}
/**************************************************************************** /****************************************************************************
* Name: modifyreg16 * Name: modifyreg16
* *
@ -63,3 +84,24 @@ void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits)
putreg16(regval, addr); putreg16(regval, addr);
spin_unlock_irqrestore(&g_modifyreg_lock, flags); spin_unlock_irqrestore(&g_modifyreg_lock, flags);
} }
/****************************************************************************
* Name: modifyreg32
*
* Description:
* Atomically modify the specified bits in a memory mapped register
*
****************************************************************************/
void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits)
{
irqstate_t flags;
uint32_t regval;
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg32(addr);
regval &= ~clearbits;
regval |= setbits;
putreg32(regval, addr);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}

65
arch/arm/src/common/arm_modifyreg32.c
View file

@ -1,65 +0,0 @@
/****************************************************************************
* arch/arm/src/common/arm_modifyreg32.c
*
* SPDX-License-Identifier: Apache-2.0
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdint.h>
#include <debug.h>
#include <nuttx/spinlock.h>
#include "arm_internal.h"
/****************************************************************************
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: modifyreg32
*
* Description:
* Atomically modify the specified bits in a memory mapped register
*
****************************************************************************/
void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits)
{
irqstate_t flags;
uint32_t regval;
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg32(addr);
regval &= ~clearbits;
regval |= setbits;
putreg32(regval, addr);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}

65
arch/arm/src/common/arm_modifyreg8.c
View file

@ -1,65 +0,0 @@
/****************************************************************************
* arch/arm/src/common/arm_modifyreg8.c
*
* SPDX-License-Identifier: Apache-2.0
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdint.h>
#include <debug.h>
#include <nuttx/spinlock.h>
#include "arm_internal.h"
/****************************************************************************
* Private Data
****************************************************************************/
static spinlock_t g_modifyreg_lock = SP_UNLOCKED;
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: modifyreg8
*
* Description:
* Atomically modify the specified bits in a memory mapped register
*
****************************************************************************/
void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits)
{
irqstate_t flags;
uint8_t regval;
flags = spin_lock_irqsave(&g_modifyreg_lock);
regval = getreg8(addr);
regval &= ~clearbits;
regval |= setbits;
putreg8(regval, addr);
spin_unlock_irqrestore(&g_modifyreg_lock, flags);
}