Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GD32] Fix I2C Hangups #273

Merged
merged 3 commits into from
Apr 16, 2021
+10 −13
Merged

[GD32] Fix I2C Hangups #273

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7642034
Move DMA enable to init code, re-add spurious bus error clearance
KarlK90 Apr 14, 2021
863082a
Remove unnecessary if clause
KarlK90 Apr 15, 2021
e9657f6
Merge branch 'chibios-20.3.x' into gd32vf103-i2c-fix
fpoussin Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions os/hal/ports/GD/GD32VF103/I2C/hal_i2c_lld.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,11 +263,8 @@ static void i2c_lld_serve_event_interrupt(I2CDriver *i2cp) {
case I2C_EV6_MASTER_REC_MODE_SELECTED:
dp->CTL1 &= ~I2C_CTL1_EVIE;
/* Clear address flags before dma enable */
if (event & (I2C_STAT0_ADDSEND | I2C_STAT0_ADD10SEND)){
(void)dp->STAT0;
(void)dp->STAT1;
}
dp->CTL1 |= I2C_CTL1_DMAON;
(void)dp->STAT0;
(void)dp->STAT1;
dmaStreamEnable(i2cp->dmarx);
dp->CTL1 |= I2C_CTL1_DMALST; /* Needed in receiver mode. */
if (dmaStreamGetTransactionSize(i2cp->dmarx) < 2)
Expand All @@ -276,11 +273,8 @@ static void i2c_lld_serve_event_interrupt(I2CDriver *i2cp) {
case I2C_EV6_MASTER_TRA_MODE_SELECTED:
dp->CTL1 &= ~I2C_CTL1_EVIE;
/* Clear address flags before dma enable */
if (event & (I2C_STAT0_ADDSEND | I2C_STAT0_ADD10SEND)){
(void)dp->STAT0;
(void)dp->STAT1;
}
dp->CTL1 |= I2C_CTL1_DMAON;
(void)dp->STAT0;
(void)dp->STAT1;
dmaStreamEnable(i2cp->dmatx);
break;
case I2C_EV8_2_MASTER_BYTE_TRANSMITTED:
Expand All @@ -303,6 +297,11 @@ static void i2c_lld_serve_event_interrupt(I2CDriver *i2cp) {
(void)dp->STAT0;
(void)dp->STAT1;
}

/* Errata 2.4.6 for STM32F40x, Spurious Bus Error detection in Master mode.*/
if (event & I2C_STAT0_BERR) {
dp->STAT0 &= ~I2C_STAT0_BERR;
}
}

/**
Expand Down Expand Up @@ -582,9 +581,7 @@ void i2c_lld_start(I2CDriver *i2cp) {
/* Reset i2c peripheral.*/
dp->CTL0 = I2C_CTL0_SRESET;
dp->CTL0 = 0;
dp->CTL1 = 0;
dp->STAT0 = 0;
dp->CTL1 = I2C_CTL1_ERRIE;
dp->CTL1 = I2C_CTL1_ERRIE | I2C_CTL1_DMAON;
/* Setup I2C parameters.*/
i2c_lld_set_clock(i2cp);
i2c_lld_set_opmode(i2cp);
Expand Down