Merge pull request #15333 from OpenNuvoton/nuvoton_fix_i2c_role_switch

0xc0170 · web-flow · commit 7bb01c1eb3c4 · 2022-09-26T13:09:27.000+01:00
Nuvoton: I2C: Fix potential role switch failure
diff --git a/targets/TARGET_NUVOTON/TARGET_M2354/i2c_api.c b/targets/TARGET_NUVOTON/TARGET_M2354/i2c_api.c
@@ -441,13 +441,13 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         case 0x08:  // Start
         case 0x10:  // Master Repeat Start
             if (i2c_ctl & I2C_CTL0_STA_Msk) {
-                return 0;
+                goto cleanup;
             } else {
                 break;
             }
         case 0xF8:  // Bus Released
             if ((i2c_ctl & (I2C_CTL0_STA_Msk | I2C_CTL0_STO_Msk)) == I2C_CTL0_STO_Msk) {
-                return 0;
+                goto cleanup;
             } else {
                 break;
             }
@@ -458,6 +458,8 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         }
     }
 
+cleanup:
+
     i2c_enable_int(obj);
 
     return err;
diff --git a/targets/TARGET_NUVOTON/TARGET_M251/i2c_api.c b/targets/TARGET_NUVOTON/TARGET_M251/i2c_api.c
@@ -425,13 +425,13 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         case 0x08:  // Start
         case 0x10:  // Master Repeat Start
             if (i2c_ctl & I2C_CTL0_STA_Msk) {
-                return 0;
+                goto cleanup;
             } else {
                 break;
             }
         case 0xF8:  // Bus Released
             if ((i2c_ctl & (I2C_CTL0_STA_Msk | I2C_CTL0_STO_Msk)) == I2C_CTL0_STO_Msk) {
-                return 0;
+                goto cleanup;
             } else {
                 break;
             }
@@ -442,6 +442,8 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         }
     }
 
+cleanup:
+
     i2c_enable_int(obj);
 
     return err;
diff --git a/targets/TARGET_NUVOTON/TARGET_M261/i2c_api.c b/targets/TARGET_NUVOTON/TARGET_M261/i2c_api.c
@@ -430,13 +430,13 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         case 0x08:  // Start
         case 0x10:  // Master Repeat Start
             if (i2c_ctl & I2C_CTL0_STA_Msk) {
-                return 0;
+                goto cleanup;
             } else {
                 break;
             }
         case 0xF8:  // Bus Released
             if ((i2c_ctl & (I2C_CTL0_STA_Msk | I2C_CTL0_STO_Msk)) == I2C_CTL0_STO_Msk) {
-                return 0;
+                goto cleanup;
             } else {
                 break;
             }
@@ -447,6 +447,8 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         }
     }
 
+cleanup:
+
     i2c_enable_int(obj);
 
     return err;
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/i2c_api.c b/targets/TARGET_NUVOTON/TARGET_M451/i2c_api.c
@@ -448,14 +448,14 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         case 0x08:  // Start
         case 0x10:  // Master Repeat Start
             if (i2c_ctl & I2C_CTL_STA_Msk) {
-                return 0;
+                goto cleanup;
             }
             else {
                 break;
             }
         case 0xF8:  // Bus Released
             if (i2c_ctl & (I2C_CTL_STA_Msk | I2C_CTL_STO_Msk) == I2C_CTL_STO_Msk) {
-                return 0;
+                goto cleanup;
             }
             else {
                 break;
@@ -472,8 +472,10 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         }
     }
 
+cleanup:
+
     i2c_enable_int(obj);
-    
+
     return err;
 }
 
diff --git a/targets/TARGET_NUVOTON/TARGET_M480/i2c_api.c b/targets/TARGET_NUVOTON/TARGET_M480/i2c_api.c
@@ -432,13 +432,13 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         case 0x08:  // Start
         case 0x10:  // Master Repeat Start
             if (i2c_ctl & I2C_CTL0_STA_Msk) {
-                return 0;
+                goto cleanup;
             } else {
                 break;
             }
         case 0xF8:  // Bus Released
             if ((i2c_ctl & (I2C_CTL0_STA_Msk | I2C_CTL0_STO_Msk)) == I2C_CTL0_STO_Msk) {
-                return 0;
+                goto cleanup;
             } else {
                 break;
             }
@@ -449,6 +449,8 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         }
     }
 
+cleanup:
+
     i2c_enable_int(obj);
 
     return err;
diff --git a/targets/TARGET_NUVOTON/TARGET_NANO100/i2c_api.c b/targets/TARGET_NUVOTON/TARGET_NANO100/i2c_api.c
@@ -468,14 +468,14 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         case 0x08:  // Start
         case 0x10:  // Master Repeat Start
             if (i2c_ctl & I2C_CON_START_Msk) {
-                return 0;
+                goto cleanup;
             }
             else {
                 break;
             }
         case 0xF8:  // Bus Released
             if ((i2c_ctl & (I2C_CON_START_Msk | I2C_CON_STOP_Msk)) == I2C_CON_STOP_Msk) {
-                return 0;
+                goto cleanup;
             }
             else {
                 break;
@@ -492,8 +492,10 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         }
     }
 
+cleanup:
+
     i2c_enable_int(obj);
-    
+
     return err;
 }
 
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/i2c_api.c b/targets/TARGET_NUVOTON/TARGET_NUC472/i2c_api.c
@@ -465,14 +465,14 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         case 0x08:  // Start
         case 0x10:  // Master Repeat Start
             if (i2c_ctl & I2C_CTL_STA_Msk) {
-                return 0;
+                goto cleanup;
             }
             else {
                 break;
             }
         case 0xF8:  // Bus Released
             if (i2c_ctl & (I2C_CTL_STA_Msk | I2C_CTL_STO_Msk) == I2C_CTL_STO_Msk) {
-                return 0;
+                goto cleanup;
             }
             else {
                 break;
@@ -489,8 +489,10 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)
         }
     }
 
+cleanup:
+
     i2c_enable_int(obj);
-    
+
     return err;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -441,13 +441,13 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`441`	`441`	`case 0x08: // Start`
`442`	`442`	`case 0x10: // Master Repeat Start`
`443`	`443`	`if (i2c_ctl & I2C_CTL0_STA_Msk) {`
`444`		`- return 0;`
	`444`	`+ goto cleanup;`
`445`	`445`	`} else {`
`446`	`446`	`break;`
`447`	`447`	`}`
`448`	`448`	`case 0xF8: // Bus Released`
`449`	`449`	`if ((i2c_ctl & (I2C_CTL0_STA_Msk \| I2C_CTL0_STO_Msk)) == I2C_CTL0_STO_Msk) {`
`450`		`- return 0;`
	`450`	`+ goto cleanup;`
`451`	`451`	`} else {`
`452`	`452`	`break;`
`453`	`453`	`}`
`@@ -458,6 +458,8 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`458`	`458`	`}`
`459`	`459`	`}`
`460`	`460`
	`461`	`+cleanup:`
	`462`	`+`
`461`	`463`	`i2c_enable_int(obj);`
`462`	`464`
`463`	`465`	`return err;`
Original file line number	Diff line number	Diff line change
`@@ -425,13 +425,13 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`425`	`425`	`case 0x08: // Start`
`426`	`426`	`case 0x10: // Master Repeat Start`
`427`	`427`	`if (i2c_ctl & I2C_CTL0_STA_Msk) {`
`428`		`- return 0;`
	`428`	`+ goto cleanup;`
`429`	`429`	`} else {`
`430`	`430`	`break;`
`431`	`431`	`}`
`432`	`432`	`case 0xF8: // Bus Released`
`433`	`433`	`if ((i2c_ctl & (I2C_CTL0_STA_Msk \| I2C_CTL0_STO_Msk)) == I2C_CTL0_STO_Msk) {`
`434`		`- return 0;`
	`434`	`+ goto cleanup;`
`435`	`435`	`} else {`
`436`	`436`	`break;`
`437`	`437`	`}`
`@@ -442,6 +442,8 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`
	`445`	`+cleanup:`
	`446`	`+`
`445`	`447`	`i2c_enable_int(obj);`
`446`	`448`
`447`	`449`	`return err;`
Original file line number	Diff line number	Diff line change
`@@ -430,13 +430,13 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`430`	`430`	`case 0x08: // Start`
`431`	`431`	`case 0x10: // Master Repeat Start`
`432`	`432`	`if (i2c_ctl & I2C_CTL0_STA_Msk) {`
`433`		`- return 0;`
	`433`	`+ goto cleanup;`
`434`	`434`	`} else {`
`435`	`435`	`break;`
`436`	`436`	`}`
`437`	`437`	`case 0xF8: // Bus Released`
`438`	`438`	`if ((i2c_ctl & (I2C_CTL0_STA_Msk \| I2C_CTL0_STO_Msk)) == I2C_CTL0_STO_Msk) {`
`439`		`- return 0;`
	`439`	`+ goto cleanup;`
`440`	`440`	`} else {`
`441`	`441`	`break;`
`442`	`442`	`}`
`@@ -447,6 +447,8 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`447`	`447`	`}`
`448`	`448`	`}`
`449`	`449`
	`450`	`+cleanup:`
	`451`	`+`
`450`	`452`	`i2c_enable_int(obj);`
`451`	`453`
`452`	`454`	`return err;`
Original file line number	Diff line number	Diff line change
`@@ -448,14 +448,14 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`448`	`448`	`case 0x08: // Start`
`449`	`449`	`case 0x10: // Master Repeat Start`
`450`	`450`	`if (i2c_ctl & I2C_CTL_STA_Msk) {`
`451`		`- return 0;`
	`451`	`+ goto cleanup;`
`452`	`452`	`}`
`453`	`453`	`else {`
`454`	`454`	`break;`
`455`	`455`	`}`
`456`	`456`	`case 0xF8: // Bus Released`
`457`	`457`	`if (i2c_ctl & (I2C_CTL_STA_Msk \| I2C_CTL_STO_Msk) == I2C_CTL_STO_Msk) {`
`458`		`- return 0;`
	`458`	`+ goto cleanup;`
`459`	`459`	`}`
`460`	`460`	`else {`
`461`	`461`	`break;`
`@@ -472,8 +472,10 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`472`	`472`	`}`
`473`	`473`	`}`
`474`	`474`
	`475`	`+cleanup:`
	`476`	`+`
`475`	`477`	`i2c_enable_int(obj);`
`476`		`-`
	`478`	`+`
`477`	`479`	`return err;`
`478`	`480`	`}`
`479`	`481`
Original file line number	Diff line number	Diff line change
`@@ -432,13 +432,13 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`432`	`432`	`case 0x08: // Start`
`433`	`433`	`case 0x10: // Master Repeat Start`
`434`	`434`	`if (i2c_ctl & I2C_CTL0_STA_Msk) {`
`435`		`- return 0;`
	`435`	`+ goto cleanup;`
`436`	`436`	`} else {`
`437`	`437`	`break;`
`438`	`438`	`}`
`439`	`439`	`case 0xF8: // Bus Released`
`440`	`440`	`if ((i2c_ctl & (I2C_CTL0_STA_Msk \| I2C_CTL0_STO_Msk)) == I2C_CTL0_STO_Msk) {`
`441`		`- return 0;`
	`441`	`+ goto cleanup;`
`442`	`442`	`} else {`
`443`	`443`	`break;`
`444`	`444`	`}`
`@@ -449,6 +449,8 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`449`	`449`	`}`
`450`	`450`	`}`
`451`	`451`
	`452`	`+cleanup:`
	`453`	`+`
`452`	`454`	`i2c_enable_int(obj);`
`453`	`455`
`454`	`456`	`return err;`
Original file line number	Diff line number	Diff line change
`@@ -468,14 +468,14 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`468`	`468`	`case 0x08: // Start`
`469`	`469`	`case 0x10: // Master Repeat Start`
`470`	`470`	`if (i2c_ctl & I2C_CON_START_Msk) {`
`471`		`- return 0;`
	`471`	`+ goto cleanup;`
`472`	`472`	`}`
`473`	`473`	`else {`
`474`	`474`	`break;`
`475`	`475`	`}`
`476`	`476`	`case 0xF8: // Bus Released`
`477`	`477`	`if ((i2c_ctl & (I2C_CON_START_Msk \| I2C_CON_STOP_Msk)) == I2C_CON_STOP_Msk) {`
`478`		`- return 0;`
	`478`	`+ goto cleanup;`
`479`	`479`	`}`
`480`	`480`	`else {`
`481`	`481`	`break;`
`@@ -492,8 +492,10 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`492`	`492`	`}`
`493`	`493`	`}`
`494`	`494`
	`495`	`+cleanup:`
	`496`	`+`
`495`	`497`	`i2c_enable_int(obj);`
`496`		`-`
	`498`	`+`
`497`	`499`	`return err;`
`498`	`500`	`}`
`499`	`501`
Original file line number	Diff line number	Diff line change
`@@ -465,14 +465,14 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`465`	`465`	`case 0x08: // Start`
`466`	`466`	`case 0x10: // Master Repeat Start`
`467`	`467`	`if (i2c_ctl & I2C_CTL_STA_Msk) {`
`468`		`- return 0;`
	`468`	`+ goto cleanup;`
`469`	`469`	`}`
`470`	`470`	`else {`
`471`	`471`	`break;`
`472`	`472`	`}`
`473`	`473`	`case 0xF8: // Bus Released`
`474`	`474`	`if (i2c_ctl & (I2C_CTL_STA_Msk \| I2C_CTL_STO_Msk) == I2C_CTL_STO_Msk) {`
`475`		`- return 0;`
	`475`	`+ goto cleanup;`
`476`	`476`	`}`
`477`	`477`	`else {`
`478`	`478`	`break;`
`@@ -489,8 +489,10 @@ static int i2c_do_trsn(i2c_t *obj, uint32_t i2c_ctl, int sync)`
`489`	`489`	`}`
`490`	`490`	`}`
`491`	`491`
	`492`	`+cleanup:`
	`493`	`+`
`492`	`494`	`i2c_enable_int(obj);`
`493`		`-`
	`495`	`+`
`494`	`496`	`return err;`
`495`	`497`	`}`
`496`	`498`