xen/arm: gic-v3: Add missing breaks gicv3_read_apr()

[PATCH] xen/arm: gic-v3: Add missing breaks gicv3_read_apr()

Posted by Julien Grall 3 years, 6 months ago

From: Julien Grall <jgrall@amazon.com>

Commit 78e67c99eb3f "arm/gic: Get rid of READ/WRITE_SYSREG32"
mistakenly converted all the cases in gicv3_read_apr() to fall-through.

Rather than re-instating a return per case, add the missing break and
keep a single return at the end of the fucntion.

Fixes: 78e67c99eb3f ("arm/gic: Get rid of READ/WRITE_SYSREG32")
Signed-off-by: Julien Grall <jgrall@amazon.com>
---
 xen/arch/arm/gic-v3.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
index b86f04058947..9a3a175ad7d2 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -1167,12 +1167,15 @@ static unsigned int gicv3_read_apr(int apr_reg)
     case 0:
         ASSERT(gicv3.nr_priorities > 4 && gicv3.nr_priorities < 8);
         apr = READ_SYSREG(ICH_AP1R0_EL2);
+        break;
     case 1:
         ASSERT(gicv3.nr_priorities > 5 && gicv3.nr_priorities < 8);
         apr = READ_SYSREG(ICH_AP1R1_EL2);
+        break;
     case 2:
         ASSERT(gicv3.nr_priorities > 6 && gicv3.nr_priorities < 8);
         apr = READ_SYSREG(ICH_AP1R2_EL2);
+        break;
     default:
         BUG();
     }
-- 
2.17.1

Re: [PATCH] xen/arm: gic-v3: Add missing breaks gicv3_read_apr()

Posted by Stefano Stabellini 3 years, 6 months ago

On Wed, 12 May 2021, Julien Grall wrote:
> From: Julien Grall <jgrall@amazon.com>
> 
> Commit 78e67c99eb3f "arm/gic: Get rid of READ/WRITE_SYSREG32"
> mistakenly converted all the cases in gicv3_read_apr() to fall-through.
> 
> Rather than re-instating a return per case, add the missing break and
> keep a single return at the end of the fucntion.
> 
> Fixes: 78e67c99eb3f ("arm/gic: Get rid of READ/WRITE_SYSREG32")
> Signed-off-by: Julien Grall <jgrall@amazon.com>

reviewed and committed


> ---
>  xen/arch/arm/gic-v3.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
> index b86f04058947..9a3a175ad7d2 100644
> --- a/xen/arch/arm/gic-v3.c
> +++ b/xen/arch/arm/gic-v3.c
> @@ -1167,12 +1167,15 @@ static unsigned int gicv3_read_apr(int apr_reg)
>      case 0:
>          ASSERT(gicv3.nr_priorities > 4 && gicv3.nr_priorities < 8);
>          apr = READ_SYSREG(ICH_AP1R0_EL2);
> +        break;
>      case 1:
>          ASSERT(gicv3.nr_priorities > 5 && gicv3.nr_priorities < 8);
>          apr = READ_SYSREG(ICH_AP1R1_EL2);
> +        break;
>      case 2:
>          ASSERT(gicv3.nr_priorities > 6 && gicv3.nr_priorities < 8);
>          apr = READ_SYSREG(ICH_AP1R2_EL2);
> +        break;
>      default:
>          BUG();
>      }
> -- 
> 2.17.1
>