* [PATCH] xen/iommu: smmu: Use 1UL << 31 rather than 1 << 31
@ 2020-12-24 15:24 Julien Grall
2020-12-24 19:48 ` Hans van Kranenburg
2021-01-04 14:21 ` Jan Beulich
0 siblings, 2 replies; 4+ messages in thread
From: Julien Grall @ 2020-12-24 15:24 UTC (permalink / raw)
To: xen-devel
Cc: bertrand.marquis, Rahul.Singh, Julien Grall, Stefano Stabellini,
Julien Grall, Volodymyr Babchuk
From: Julien Grall <jgrall@amazon.com>
Replace all the use of 1 << 31 with 1UL << 31 to prevent undefined
behavior in the SMMU driver.
Signed-off-by: Julien Grall <jgrall@amazon.com>
---
xen/drivers/passthrough/arm/smmu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c
index ed04d85e05e9..3e8aa378669b 100644
--- a/xen/drivers/passthrough/arm/smmu.c
+++ b/xen/drivers/passthrough/arm/smmu.c
@@ -405,7 +405,7 @@ static struct iommu_group *iommu_group_get(struct device *dev)
#define ID0_NUMSMRG_SHIFT 0
#define ID0_NUMSMRG_MASK 0xff
-#define ID1_PAGESIZE (1 << 31)
+#define ID1_PAGESIZE (1U << 31)
#define ID1_NUMPAGENDXB_SHIFT 28
#define ID1_NUMPAGENDXB_MASK 7
#define ID1_NUMS2CB_SHIFT 16
@@ -438,7 +438,7 @@ static struct iommu_group *iommu_group_get(struct device *dev)
/* Stream mapping registers */
#define ARM_SMMU_GR0_SMR(n) (0x800 + ((n) << 2))
-#define SMR_VALID (1 << 31)
+#define SMR_VALID (1U << 31)
#define SMR_MASK_SHIFT 16
#define SMR_MASK_MASK 0x7fff
#define SMR_ID_SHIFT 0
@@ -506,7 +506,7 @@ static struct iommu_group *iommu_group_get(struct device *dev)
#define RESUME_RETRY (0 << 0)
#define RESUME_TERMINATE (1 << 0)
-#define TTBCR_EAE (1 << 31)
+#define TTBCR_EAE (1U << 31)
#define TTBCR_PASIZE_SHIFT 16
#define TTBCR_PASIZE_MASK 0x7
@@ -562,7 +562,7 @@ static struct iommu_group *iommu_group_get(struct device *dev)
#define MAIR_ATTR_IDX_CACHE 1
#define MAIR_ATTR_IDX_DEV 2
-#define FSR_MULTI (1 << 31)
+#define FSR_MULTI (1U << 31)
#define FSR_SS (1 << 30)
#define FSR_UUT (1 << 8)
#define FSR_ASF (1 << 7)
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] xen/iommu: smmu: Use 1UL << 31 rather than 1 << 31
2020-12-24 15:24 [PATCH] xen/iommu: smmu: Use 1UL << 31 rather than 1 << 31 Julien Grall
@ 2020-12-24 19:48 ` Hans van Kranenburg
2021-01-13 17:50 ` Julien Grall
2021-01-04 14:21 ` Jan Beulich
1 sibling, 1 reply; 4+ messages in thread
From: Hans van Kranenburg @ 2020-12-24 19:48 UTC (permalink / raw)
To: Julien Grall, xen-devel
Cc: bertrand.marquis, Rahul.Singh, Julien Grall, Stefano Stabellini,
Volodymyr Babchuk
On 12/24/20 4:24 PM, Julien Grall wrote:
> From: Julien Grall <jgrall@amazon.com>
>
> Replace all the use of 1 << 31 with 1UL << 31 to prevent undefined
> behavior in the SMMU driver.
You're replacing it by 1U, not 1UL, in the patch below.
Hans
> Signed-off-by: Julien Grall <jgrall@amazon.com>
> ---
> xen/drivers/passthrough/arm/smmu.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c
> index ed04d85e05e9..3e8aa378669b 100644
> --- a/xen/drivers/passthrough/arm/smmu.c
> +++ b/xen/drivers/passthrough/arm/smmu.c
> @@ -405,7 +405,7 @@ static struct iommu_group *iommu_group_get(struct device *dev)
> #define ID0_NUMSMRG_SHIFT 0
> #define ID0_NUMSMRG_MASK 0xff
>
> -#define ID1_PAGESIZE (1 << 31)
> +#define ID1_PAGESIZE (1U << 31)
> #define ID1_NUMPAGENDXB_SHIFT 28
> #define ID1_NUMPAGENDXB_MASK 7
> #define ID1_NUMS2CB_SHIFT 16
> @@ -438,7 +438,7 @@ static struct iommu_group *iommu_group_get(struct device *dev)
>
> /* Stream mapping registers */
> #define ARM_SMMU_GR0_SMR(n) (0x800 + ((n) << 2))
> -#define SMR_VALID (1 << 31)
> +#define SMR_VALID (1U << 31)
> #define SMR_MASK_SHIFT 16
> #define SMR_MASK_MASK 0x7fff
> #define SMR_ID_SHIFT 0
> @@ -506,7 +506,7 @@ static struct iommu_group *iommu_group_get(struct device *dev)
> #define RESUME_RETRY (0 << 0)
> #define RESUME_TERMINATE (1 << 0)
>
> -#define TTBCR_EAE (1 << 31)
> +#define TTBCR_EAE (1U << 31)
>
> #define TTBCR_PASIZE_SHIFT 16
> #define TTBCR_PASIZE_MASK 0x7
> @@ -562,7 +562,7 @@ static struct iommu_group *iommu_group_get(struct device *dev)
> #define MAIR_ATTR_IDX_CACHE 1
> #define MAIR_ATTR_IDX_DEV 2
>
> -#define FSR_MULTI (1 << 31)
> +#define FSR_MULTI (1U << 31)
> #define FSR_SS (1 << 30)
> #define FSR_UUT (1 << 8)
> #define FSR_ASF (1 << 7)
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] xen/iommu: smmu: Use 1UL << 31 rather than 1 << 31
2020-12-24 19:48 ` Hans van Kranenburg
@ 2021-01-13 17:50 ` Julien Grall
0 siblings, 0 replies; 4+ messages in thread
From: Julien Grall @ 2021-01-13 17:50 UTC (permalink / raw)
To: Hans van Kranenburg, xen-devel
Cc: bertrand.marquis, Rahul.Singh, Julien Grall, Stefano Stabellini,
Volodymyr Babchuk
Hi Hans,
Sorry for the late reply.
On 24/12/2020 19:48, Hans van Kranenburg wrote:
> On 12/24/20 4:24 PM, Julien Grall wrote:
>> From: Julien Grall <jgrall@amazon.com>
>>
>> Replace all the use of 1 << 31 with 1UL << 31 to prevent undefined
>> behavior in the SMMU driver.
>
> You're replacing it by 1U, not 1UL, in the patch below.
Thank you for pointing that out! Stefano fixed it on commit.
Cheers,
--
Julien Grall
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] xen/iommu: smmu: Use 1UL << 31 rather than 1 << 31
2020-12-24 15:24 [PATCH] xen/iommu: smmu: Use 1UL << 31 rather than 1 << 31 Julien Grall
2020-12-24 19:48 ` Hans van Kranenburg
@ 2021-01-04 14:21 ` Jan Beulich
1 sibling, 0 replies; 4+ messages in thread
From: Jan Beulich @ 2021-01-04 14:21 UTC (permalink / raw)
To: Julien Grall
Cc: bertrand.marquis, Rahul.Singh, Julien Grall, Stefano Stabellini,
Volodymyr Babchuk, xen-devel
On 24.12.2020 16:24, Julien Grall wrote:
> From: Julien Grall <jgrall@amazon.com>
>
> Replace all the use of 1 << 31 with 1UL << 31 to prevent undefined
> behavior in the SMMU driver.
>
> Signed-off-by: Julien Grall <jgrall@amazon.com>
With, as already pointed out by Hans, 1UL replaced by 1U in
title and description
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Jan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-13 17:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-24 15:24 [PATCH] xen/iommu: smmu: Use 1UL << 31 rather than 1 << 31 Julien Grall
2020-12-24 19:48 ` Hans van Kranenburg
2021-01-13 17:50 ` Julien Grall
2021-01-04 14:21 ` Jan Beulich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.