[PATCH 0/1] hw/arm/smmuv3: Check 31st bit to see if CD is valid

[PATCH 0/1] hw/arm/smmuv3: Check 31st bit to see if CD is valid

[Joe Komlodi]

Hi all,

This fixes an off-by-1 error when checking to see if a context descriptor is
valid in SMMUv3.

I think it hasn't caused problems yet because Linux will also set the 30th bit,
which is the bit CD_VALID currently checks.

Thanks!
Joe

Joe Komlodi (1):
  hw/arm/smmuv3: Check 31st bit to see if CD is valid

 hw/arm/smmuv3-internal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.7.4

[PATCH 1/1] hw/arm/smmuv3: Check 31st bit to see if CD is valid

[Joe Komlodi]

The bit to see if a CD is valid is the last bit of the first word of the CD.

Signed-off-by: Joe Komlodi <joe.komlodi@xilinx.com>
---
 hw/arm/smmuv3-internal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/arm/smmuv3-internal.h b/hw/arm/smmuv3-internal.h
index 3dac576..d1885ae 100644
--- a/hw/arm/smmuv3-internal.h
+++ b/hw/arm/smmuv3-internal.h
@@ -570,7 +570,7 @@ static inline int pa_range(STE *ste)
 
 /* CD fields */
 
-#define CD_VALID(x)   extract32((x)->word[0], 30, 1)
+#define CD_VALID(x)   extract32((x)->word[0], 31, 1)
 #define CD_ASID(x)    extract32((x)->word[1], 16, 16)
 #define CD_TTB(x, sel)                                      \
     ({                                                      \
-- 
2.7.4

Re: [PATCH 1/1] hw/arm/smmuv3: Check 31st bit to see if CD is valid

[Peter Maydell]

On Mon, 19 Jul 2021 at 22:03, Joe Komlodi <joe.komlodi@xilinx.com> wrote:
>
> The bit to see if a CD is valid is the last bit of the first word of the CD.
>
> Signed-off-by: Joe Komlodi <joe.komlodi@xilinx.com>
> ---
>  hw/arm/smmuv3-internal.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/arm/smmuv3-internal.h b/hw/arm/smmuv3-internal.h
> index 3dac576..d1885ae 100644
> --- a/hw/arm/smmuv3-internal.h
> +++ b/hw/arm/smmuv3-internal.h
> @@ -570,7 +570,7 @@ static inline int pa_range(STE *ste)
>
>  /* CD fields */
>
> -#define CD_VALID(x)   extract32((x)->word[0], 30, 1)
> +#define CD_VALID(x)   extract32((x)->word[0], 31, 1)
>  #define CD_ASID(x)    extract32((x)->word[1], 16, 16)
>  #define CD_TTB(x, sel)                                      \
>      ({                                                      \



Applied to target-arm.next (should get into rc1), thanks.

-- PMM