[PATCH 4/7] omap: iommu: PREFETCH_IOTLB cleanup

[Hiroshi DOYU]

Hi Ohad,

From: ext Ohad Ben-Cohen <ohad at wizery.com>
Subject: [PATCH 4/7] omap: iommu: PREFETCH_IOTLB cleanup
Date: Thu, 18 Aug 2011 02:10:05 +0300

> Use PREFETCH_IOTLB to control the content of the called function,
> instead of inlining it in the code.
> 
> This improves readability of the code, and also prevents an "unused
> function" warning to show up when PREFETCH_IOTLB isn't set.

Great, much better.

> While we're at it, rename load_iotlb_entry to prefetch_iotlb_entry
> to better reflect the purpose of that function.

Considering that, originally this function is the counterpart of
"flush_iotlb_page()" among load_iotlb_/flush_iotlb_*() family and
OMAP1 doesn't use H/W page table but only uses TLB(only
prefetch/load_tlb), what about keeping the original function
"load_iotlb_entry()", and make inline function
"prefetch_iotlb_entry()" has it?

Something like below?

static int inline prefetch_iotlb_entry(struct iommu *obj, struct iotlb_entry *e)
{
	return load_iotlb_entry(obj, e);
}

The above may keep a little bit more sense both for TLB only case too,
also for some function name consistency?

> 
> Signed-off-by: Ohad Ben-Cohen <ohad at wizery.com>
> ---
>  drivers/iommu/omap-iommu.c |   18 +++++++++++++-----
>  1 files changed, 13 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
> index ed81977..7280e5b 100644
> --- a/drivers/iommu/omap-iommu.c
> +++ b/drivers/iommu/omap-iommu.c
> @@ -248,11 +248,12 @@ static struct cr_regs __iotlb_read_cr(struct iommu *obj, int n)
>  }
>  
>  /**
> - * load_iotlb_entry - Set an iommu tlb entry
> + * prefetch_iotlb_entry - Set an iommu tlb entry
>   * @obj:	target iommu
>   * @e:		an iommu tlb entry info
>   **/
> -static int load_iotlb_entry(struct iommu *obj, struct iotlb_entry *e)
> +#ifdef PREFETCH_IOTLB
> +static int prefetch_iotlb_entry(struct iommu *obj, struct iotlb_entry *e)
>  {
>  	int err = 0;
>  	struct iotlb_lock l;
> @@ -309,6 +310,15 @@ out:
>  	return err;
>  }
>  
> +#else /* !PREFETCH_IOTLB */
> +
> +static int prefetch_iotlb_entry(struct iommu *obj, struct iotlb_entry *e)
> +{
> +	return 0;
> +}
> +
> +#endif /* !PREFETCH_IOTLB */
> +
>  /**
>   * flush_iotlb_page - Clear an iommu tlb entry
>   * @obj:	target iommu
> @@ -662,10 +672,8 @@ int iopgtable_store_entry(struct iommu *obj, struct iotlb_entry *e)
>  
>  	flush_iotlb_page(obj, e->da);
>  	err = iopgtable_store_entry_core(obj, e);
> -#ifdef PREFETCH_IOTLB
>  	if (!err)
> -		load_iotlb_entry(obj, e);
> -#endif
> +		prefetch_iotlb_entry(obj, e);
>  	return err;
>  }
>  EXPORT_SYMBOL_GPL(iopgtable_store_entry);
> -- 
> 1.7.4.1
>