hw/arm/smmuv3: Fix up L1STD_SPAN decoding

[PATCH] hw/arm/smmuv3: Fix up L1STD_SPAN decoding

Posted by Kunkun Jiang 3 years, 5 months ago

Accroding to the SMMUv3 spec, the SPAN field of Level1 Stream Table
Descriptor is 5 bits([4:0]).

Fixes: 9bde7f0674f(hw/arm/smmuv3: Implement translate callback)
Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.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 fa3c088972..b6f7e53b7c 100644
--- a/hw/arm/smmuv3-internal.h
+++ b/hw/arm/smmuv3-internal.h
@@ -633,6 +633,6 @@ static inline uint64_t l1std_l2ptr(STEDesc *desc)
     return hi << 32 | lo;
 }
 
-#define L1STD_SPAN(stm) (extract32((stm)->word[0], 0, 4))
+#define L1STD_SPAN(stm) (extract32((stm)->word[0], 0, 5))
 
 #endif
-- 
2.23.0

Re: [PATCH] hw/arm/smmuv3: Fix up L1STD_SPAN decoding

Posted by Peter Maydell 3 years, 4 months ago

On Tue, 24 Nov 2020 at 02:37, Kunkun Jiang <jiangkunkun@huawei.com> wrote:
>
> Accroding to the SMMUv3 spec, the SPAN field of Level1 Stream Table
> Descriptor is 5 bits([4:0]).
>
> Fixes: 9bde7f0674f(hw/arm/smmuv3: Implement translate callback)
> Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
> ---


Applied to target-arm.next for 6.0, thanks.

-- PMM

Re: [PATCH] hw/arm/smmuv3: Fix up L1STD_SPAN decoding

Posted by Auger Eric 3 years, 4 months ago

Hi Kunkun, Peter,

On 11/30/20 12:29 PM, Peter Maydell wrote:
> On Tue, 24 Nov 2020 at 02:37, Kunkun Jiang <jiangkunkun@huawei.com> wrote:
>>
>> Accroding to the SMMUv3 spec, the SPAN field of Level1 Stream Table
>> Descriptor is 5 bits([4:0]).
>>
>> Fixes: 9bde7f0674f(hw/arm/smmuv3: Implement translate callback)
>> Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
>> ---
Acked-by: Eric Auger <eric.auger@redhat.com>
> 
> 
> Applied to target-arm.next for 6.0, thanks.
thanks and sorry for the delay

Eric
> 
> -- PMM
>

Re: [PATCH] hw/arm/smmuv3: Fix up L1STD_SPAN decoding

Posted by Kunkun Jiang 3 years, 4 months ago

Hi Eric,

Friendly ping... :)

On 2020/11/24 10:37, Kunkun Jiang wrote:
> Accroding to the SMMUv3 spec, the SPAN field of Level1 Stream Table
> Descriptor is 5 bits([4:0]).
>
> Fixes: 9bde7f0674f(hw/arm/smmuv3: Implement translate callback)
> Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.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 fa3c088972..b6f7e53b7c 100644
> --- a/hw/arm/smmuv3-internal.h
> +++ b/hw/arm/smmuv3-internal.h
> @@ -633,6 +633,6 @@ static inline uint64_t l1std_l2ptr(STEDesc *desc)
>       return hi << 32 | lo;
>   }
>   
> -#define L1STD_SPAN(stm) (extract32((stm)->word[0], 0, 4))
> +#define L1STD_SPAN(stm) (extract32((stm)->word[0], 0, 5))
>   
>   #endif

Thanks,

Kunkun Jiang