sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpfs: i2c: Fix reset and interrupt issues

Browse Source 
I2C status register reset value (0xf8) was not handled properly causing unnecessary bus resets.
Added critical section to mpfs_i2c_reset() and removed unnecessary interrupt disabling elsewhere.
This commit is contained in:
Jani Paalijarvi 2021-12-09 11:57:00 +02:00 committed by Xiang Xiao
parent 7d1b733202
commit 0fefc43458
2 changed files with 17 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/risc-v/src/mpfs/hardware/mpfs_i2c.h
View File

@ -43,6 +43,7 @@
#define MPFS_I2C_CTRL_CR1_MASK (1 << 1)
#define MPFS_I2C_CTRL_CR0_MASK (1 << 0)
#define MPFS_I2C_ST_IDLE 0xF8 /* No activity, I2C bus idle */
#define MPFS_I2C_ST_RESET_ACTIVATED 0xD0 /* Master reset is activated */
#define MPFS_I2C_ST_RX_DATA_NACK 0x58 /* Data received, NACK sent */
#define MPFS_I2C_ST_RX_DATA_ACK 0x50 /* Data received, ACK sent */

66
arch/risc-v/src/mpfs/mpfs_i2c.c
View File

@ -205,40 +205,6 @@ static int mpfs_i2c_setfrequency(struct mpfs_i2c_priv_s *priv,
* Private Functions
****************************************************************************/
/****************************************************************************
* Name: mpfs_disable_interrupts
*
* Description:
* Disable all interrupts.
*
* Returned Value:
* primask (current interrupt status)
*
****************************************************************************/
static irqstate_t mpfs_disable_interrupts(void)
{
irqstate_t primask;
primask = up_irq_save();
return primask;
}
/****************************************************************************
* Name: mpfs_restore_interrupts
*
* Description:
* Restore interrupts.
*
* Parameters:
* primask - Earlier stored irqstate
*
****************************************************************************/
static void mpfs_restore_interrupts(irqstate_t primask)
{
up_irq_restore(primask);
}
/****************************************************************************
* Name: mpfs_i2c_init
*
@ -256,12 +222,8 @@ static void mpfs_restore_interrupts(irqstate_t primask)
static int mpfs_i2c_init(struct mpfs_i2c_priv_s *priv)
{
uint32_t primask;
if (!priv->initialized)
{
primask = mpfs_disable_interrupts();
if (priv->id == 0)
{
modifyreg32(MPFS_SYSREG_SOFT_RESET_CR,
@ -299,8 +261,6 @@ static int mpfs_i2c_init(struct mpfs_i2c_priv_s *priv)
MPFS_I2C_CTRL_ENS1_MASK);
priv->initialized = true;
mpfs_restore_interrupts(primask);
}
return OK;
@ -501,6 +461,12 @@ static int mpfs_i2c_irq(int cpuint, void *context, void *arg)
priv->status = MPFS_I2C_SUCCESS;
break;
case MPFS_I2C_ST_IDLE:
/* No activity, bus idle */
break;
case MPFS_I2C_ST_RESET_ACTIVATED:
case MPFS_I2C_ST_BUS_ERROR: /* Bus errors */
default:
@ -549,15 +515,8 @@ static int mpfs_i2c_irq(int cpuint, void *context, void *arg)
static void mpfs_i2c_sendstart(struct mpfs_i2c_priv_s *priv)
{
uint32_t primask;
primask = mpfs_disable_interrupts();
modifyreg32(MPFS_I2C_CTRL, MPFS_I2C_CTRL_STA_MASK, MPFS_I2C_CTRL_STA_MASK);
up_enable_irq(priv->plic_irq);
mpfs_restore_interrupts(primask);
modifyreg32(MPFS_I2C_CTRL, MPFS_I2C_CTRL_STA_MASK, MPFS_I2C_CTRL_STA_MASK);
}
static int mpfs_i2c_transfer(struct i2c_master_s *dev,
@ -677,9 +636,16 @@ static int mpfs_i2c_reset(struct i2c_master_s *dev)
{
struct mpfs_i2c_priv_s *priv = (struct mpfs_i2c_priv_s *)dev;
int ret;
irqstate_t flags;
DEBUGASSERT(priv != NULL);
flags = enter_critical_section();
/* Disabling I2C interrupts.
* NOTE: up_enable_irq() will be called at mpfs_i2c_sendstart()
*/
up_disable_irq(priv->plic_irq);
priv->initialized = false;
@ -687,7 +653,7 @@ static int mpfs_i2c_reset(struct i2c_master_s *dev)
ret = mpfs_i2c_init(priv);
if (ret != OK)
{
up_enable_irq(priv->plic_irq);
leave_critical_section(flags);
return ret;
}
@ -696,7 +662,7 @@ static int mpfs_i2c_reset(struct i2c_master_s *dev)
priv->rx_size = 0;
priv->rx_idx = 0;
/* up_enable_irq() will be called at mpfs_i2c_sendstart() */
leave_critical_section(flags);
return OK;
}