diff mbox series

[v3,8/8] xen/arm: smmuv3: Remove linux compatibility functions.

Message ID c38df3122a9e74e2324936c8bd36d372cdc3009a.1607617848.git.rahul.singh@arm.com (mailing list archive)
State Superseded
Headers show
Series xen/arm: Add support for SMMUv3 driver | expand

Commit Message

Rahul Singh Dec. 10, 2020, 4:57 p.m. UTC 
Replace all Linux compatible device tree handling function with the XEN
functions.

Replace all Linux ktime function with the XEN time functions.

Signed-off-by: Rahul Singh <rahul.singh@arm.com>
---
Changes in v3:
 - This patch is introduce in this version.

---
 xen/drivers/passthrough/arm/smmu-v3.c | 32 +++++++--------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

Comments

Stefano Stabellini Dec. 11, 2020, 1:29 a.m. UTC | #1 
On Thu, 10 Dec 2020, Rahul Singh wrote:
> Replace all Linux compatible device tree handling function with the XEN
> functions.
> 
> Replace all Linux ktime function with the XEN time functions.
> 
> Signed-off-by: Rahul Singh <rahul.singh@arm.com>

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>


> ---
> Changes in v3:
>  - This patch is introduce in this version.
> 
> ---
>  xen/drivers/passthrough/arm/smmu-v3.c | 32 +++++++--------------------
>  1 file changed, 8 insertions(+), 24 deletions(-)
> 
> diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c
> index 65b3db94ad..c19c56ebc8 100644
> --- a/xen/drivers/passthrough/arm/smmu-v3.c
> +++ b/xen/drivers/passthrough/arm/smmu-v3.c
> @@ -101,22 +101,6 @@ typedef unsigned int		gfp_t;
>  
>  #define GFP_KERNEL		0
>  
> -/* Alias to Xen device tree helpers */
> -#define device_node			dt_device_node
> -#define of_phandle_args		dt_phandle_args
> -#define of_device_id		dt_device_match
> -#define of_match_node		dt_match_node
> -#define of_property_read_u32(np, pname, out)	\
> -		(!dt_property_read_u32(np, pname, out))
> -#define of_property_read_bool		dt_property_read_bool
> -#define of_parse_phandle_with_args	dt_parse_phandle_with_args
> -
> -/* Alias to Xen time functions */
> -#define ktime_t s_time_t
> -#define ktime_get()			(NOW())
> -#define ktime_add_us(t, i)		(t + MICROSECS(i))
> -#define ktime_compare(t, i)		(t > (i))
> -
>  /* Alias to Xen allocation helpers */
>  #define kzalloc(size, flags)	_xzalloc(size, sizeof(void *))
>  #define kfree	xfree
> @@ -922,7 +906,7 @@ static void parse_driver_options(struct arm_smmu_device *smmu)
>  	int i = 0;
>  
>  	do {
> -		if (of_property_read_bool(smmu->dev->of_node,
> +		if (dt_property_read_bool(smmu->dev->of_node,
>  						arm_smmu_options[i].prop)) {
>  			smmu->options |= arm_smmu_options[i].opt;
>  			dev_notice(smmu->dev, "option %s\n",
> @@ -994,17 +978,17 @@ static void queue_inc_prod(struct arm_smmu_ll_queue *q)
>   */
>  static int queue_poll_cons(struct arm_smmu_queue *q, bool sync, bool wfe)
>  {
> -	ktime_t timeout;
> +	s_time_t timeout;
>  	unsigned int delay = 1, spin_cnt = 0;
>  
>  	/* Wait longer if it's a CMD_SYNC */
> -	timeout = ktime_add_us(ktime_get(), sync ?
> +	timeout = NOW() + MICROSECS(sync ?
>  					    ARM_SMMU_CMDQ_SYNC_TIMEOUT_US :
>  					    ARM_SMMU_POLL_TIMEOUT_US);
>  
>  	while (queue_sync_cons_in(q),
>  	      (sync ? !queue_empty(&q->llq) : queue_full(&q->llq))) {
> -		if (ktime_compare(ktime_get(), timeout) > 0)
> +		if ((NOW() > timeout) > 0)
>  			return -ETIMEDOUT;
>  
>  		if (wfe) {
> @@ -1232,13 +1216,13 @@ static void arm_smmu_cmdq_issue_cmd(struct arm_smmu_device *smmu,
>   */
>  static int __arm_smmu_sync_poll_msi(struct arm_smmu_device *smmu, u32 sync_idx)
>  {
> -	ktime_t timeout;
> +	s_time_t timeout;
>  	u32 val;
>  
> -	timeout = ktime_add_us(ktime_get(), ARM_SMMU_CMDQ_SYNC_TIMEOUT_US);
> +	timeout = NOW() + MICROSECS(ARM_SMMU_CMDQ_SYNC_TIMEOUT_US);
>  	val = smp_cond_load_acquire(&smmu->sync_count,
>  				    (int)(VAL - sync_idx) >= 0 ||
> -				    !ktime_before(ktime_get(), timeout));
> +				    !(NOW() < timeout));
>  
>  	return (int)(val - sync_idx) < 0 ? -ETIMEDOUT : 0;
>  }
> @@ -2969,7 +2953,7 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev,
>  	u32 cells;
>  	int ret = -EINVAL;
>  
> -	if (of_property_read_u32(dev->of_node, "#iommu-cells", &cells))
> +	if (!dt_property_read_u32(dev->of_node, "#iommu-cells", &cells))
>  		dev_err(dev, "missing #iommu-cells property\n");
>  	else if (cells != 1)
>  		dev_err(dev, "invalid #iommu-cells value (%d)\n", cells);
> -- 
> 2.17.1
>
Bertrand Marquis Dec. 11, 2020, 1:15 p.m. UTC | #2 
Hi Rahul,

> On 10 Dec 2020, at 16:57, Rahul Singh <Rahul.Singh@arm.com> wrote:
> 
> Replace all Linux compatible device tree handling function with the XEN
> functions.
> 
> Replace all Linux ktime function with the XEN time functions.
> 
> Signed-off-by: Rahul Singh <rahul.singh@arm.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

Cheers
Bertrand

> ---
> Changes in v3:
> - This patch is introduce in this version.
> 
> ---
> xen/drivers/passthrough/arm/smmu-v3.c | 32 +++++++--------------------
> 1 file changed, 8 insertions(+), 24 deletions(-)
> 
> diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c
> index 65b3db94ad..c19c56ebc8 100644
> --- a/xen/drivers/passthrough/arm/smmu-v3.c
> +++ b/xen/drivers/passthrough/arm/smmu-v3.c
> @@ -101,22 +101,6 @@ typedef unsigned int		gfp_t;
> 
> #define GFP_KERNEL		0
> 
> -/* Alias to Xen device tree helpers */
> -#define device_node			dt_device_node
> -#define of_phandle_args		dt_phandle_args
> -#define of_device_id		dt_device_match
> -#define of_match_node		dt_match_node
> -#define of_property_read_u32(np, pname, out)	\
> -		(!dt_property_read_u32(np, pname, out))
> -#define of_property_read_bool		dt_property_read_bool
> -#define of_parse_phandle_with_args	dt_parse_phandle_with_args
> -
> -/* Alias to Xen time functions */
> -#define ktime_t s_time_t
> -#define ktime_get()			(NOW())
> -#define ktime_add_us(t, i)		(t + MICROSECS(i))
> -#define ktime_compare(t, i)		(t > (i))
> -
> /* Alias to Xen allocation helpers */
> #define kzalloc(size, flags)	_xzalloc(size, sizeof(void *))
> #define kfree	xfree
> @@ -922,7 +906,7 @@ static void parse_driver_options(struct arm_smmu_device *smmu)
> 	int i = 0;
> 
> 	do {
> -		if (of_property_read_bool(smmu->dev->of_node,
> +		if (dt_property_read_bool(smmu->dev->of_node,
> 						arm_smmu_options[i].prop)) {
> 			smmu->options |= arm_smmu_options[i].opt;
> 			dev_notice(smmu->dev, "option %s\n",
> @@ -994,17 +978,17 @@ static void queue_inc_prod(struct arm_smmu_ll_queue *q)
>  */
> static int queue_poll_cons(struct arm_smmu_queue *q, bool sync, bool wfe)
> {
> -	ktime_t timeout;
> +	s_time_t timeout;
> 	unsigned int delay = 1, spin_cnt = 0;
> 
> 	/* Wait longer if it's a CMD_SYNC */
> -	timeout = ktime_add_us(ktime_get(), sync ?
> +	timeout = NOW() + MICROSECS(sync ?
> 					    ARM_SMMU_CMDQ_SYNC_TIMEOUT_US :
> 					    ARM_SMMU_POLL_TIMEOUT_US);
> 
> 	while (queue_sync_cons_in(q),
> 	      (sync ? !queue_empty(&q->llq) : queue_full(&q->llq))) {
> -		if (ktime_compare(ktime_get(), timeout) > 0)
> +		if ((NOW() > timeout) > 0)
> 			return -ETIMEDOUT;
> 
> 		if (wfe) {
> @@ -1232,13 +1216,13 @@ static void arm_smmu_cmdq_issue_cmd(struct arm_smmu_device *smmu,
>  */
> static int __arm_smmu_sync_poll_msi(struct arm_smmu_device *smmu, u32 sync_idx)
> {
> -	ktime_t timeout;
> +	s_time_t timeout;
> 	u32 val;
> 
> -	timeout = ktime_add_us(ktime_get(), ARM_SMMU_CMDQ_SYNC_TIMEOUT_US);
> +	timeout = NOW() + MICROSECS(ARM_SMMU_CMDQ_SYNC_TIMEOUT_US);
> 	val = smp_cond_load_acquire(&smmu->sync_count,
> 				    (int)(VAL - sync_idx) >= 0 ||
> -				    !ktime_before(ktime_get(), timeout));
> +				    !(NOW() < timeout));
> 
> 	return (int)(val - sync_idx) < 0 ? -ETIMEDOUT : 0;
> }
> @@ -2969,7 +2953,7 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev,
> 	u32 cells;
> 	int ret = -EINVAL;
> 
> -	if (of_property_read_u32(dev->of_node, "#iommu-cells", &cells))
> +	if (!dt_property_read_u32(dev->of_node, "#iommu-cells", &cells))
> 		dev_err(dev, "missing #iommu-cells property\n");
> 	else if (cells != 1)
> 		dev_err(dev, "invalid #iommu-cells value (%d)\n", cells);
> -- 
> 2.17.1
>
Julien Grall Dec. 11, 2020, 1:57 p.m. UTC | #3 
Hi Rahul,

On 10/12/2020 16:57, Rahul Singh wrote:
> Replace all Linux compatible device tree handling function with the XEN
> functions.

Right, but they were introduced in the previous patch. I dislike the 
idea to add code for removing afterwards (in some cases you actually do 
the renaming directly...).

So I would rather move this patch before patch #7 so we don't undo what 
we just did.

Cheers,
diff mbox series

Patch

diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c
index 65b3db94ad..c19c56ebc8 100644
--- a/xen/drivers/passthrough/arm/smmu-v3.c
+++ b/xen/drivers/passthrough/arm/smmu-v3.c
@@ -101,22 +101,6 @@  typedef unsigned int		gfp_t;
 
 #define GFP_KERNEL		0
 
-/* Alias to Xen device tree helpers */
-#define device_node			dt_device_node
-#define of_phandle_args		dt_phandle_args
-#define of_device_id		dt_device_match
-#define of_match_node		dt_match_node
-#define of_property_read_u32(np, pname, out)	\
-		(!dt_property_read_u32(np, pname, out))
-#define of_property_read_bool		dt_property_read_bool
-#define of_parse_phandle_with_args	dt_parse_phandle_with_args
-
-/* Alias to Xen time functions */
-#define ktime_t s_time_t
-#define ktime_get()			(NOW())
-#define ktime_add_us(t, i)		(t + MICROSECS(i))
-#define ktime_compare(t, i)		(t > (i))
-
 /* Alias to Xen allocation helpers */
 #define kzalloc(size, flags)	_xzalloc(size, sizeof(void *))
 #define kfree	xfree
@@ -922,7 +906,7 @@  static void parse_driver_options(struct arm_smmu_device *smmu)
 	int i = 0;
 
 	do {
-		if (of_property_read_bool(smmu->dev->of_node,
+		if (dt_property_read_bool(smmu->dev->of_node,
 						arm_smmu_options[i].prop)) {
 			smmu->options |= arm_smmu_options[i].opt;
 			dev_notice(smmu->dev, "option %s\n",
@@ -994,17 +978,17 @@  static void queue_inc_prod(struct arm_smmu_ll_queue *q)
  */
 static int queue_poll_cons(struct arm_smmu_queue *q, bool sync, bool wfe)
 {
-	ktime_t timeout;
+	s_time_t timeout;
 	unsigned int delay = 1, spin_cnt = 0;
 
 	/* Wait longer if it's a CMD_SYNC */
-	timeout = ktime_add_us(ktime_get(), sync ?
+	timeout = NOW() + MICROSECS(sync ?
 					    ARM_SMMU_CMDQ_SYNC_TIMEOUT_US :
 					    ARM_SMMU_POLL_TIMEOUT_US);
 
 	while (queue_sync_cons_in(q),
 	      (sync ? !queue_empty(&q->llq) : queue_full(&q->llq))) {
-		if (ktime_compare(ktime_get(), timeout) > 0)
+		if ((NOW() > timeout) > 0)
 			return -ETIMEDOUT;
 
 		if (wfe) {
@@ -1232,13 +1216,13 @@  static void arm_smmu_cmdq_issue_cmd(struct arm_smmu_device *smmu,
  */
 static int __arm_smmu_sync_poll_msi(struct arm_smmu_device *smmu, u32 sync_idx)
 {
-	ktime_t timeout;
+	s_time_t timeout;
 	u32 val;
 
-	timeout = ktime_add_us(ktime_get(), ARM_SMMU_CMDQ_SYNC_TIMEOUT_US);
+	timeout = NOW() + MICROSECS(ARM_SMMU_CMDQ_SYNC_TIMEOUT_US);
 	val = smp_cond_load_acquire(&smmu->sync_count,
 				    (int)(VAL - sync_idx) >= 0 ||
-				    !ktime_before(ktime_get(), timeout));
+				    !(NOW() < timeout));
 
 	return (int)(val - sync_idx) < 0 ? -ETIMEDOUT : 0;
 }
@@ -2969,7 +2953,7 @@  static int arm_smmu_device_dt_probe(struct platform_device *pdev,
 	u32 cells;
 	int ret = -EINVAL;
 
-	if (of_property_read_u32(dev->of_node, "#iommu-cells", &cells))
+	if (!dt_property_read_u32(dev->of_node, "#iommu-cells", &cells))
 		dev_err(dev, "missing #iommu-cells property\n");
 	else if (cells != 1)
 		dev_err(dev, "invalid #iommu-cells value (%d)\n", cells);