On Mon, 10 Sep 2012, Konrad Rzeszutek Wilk wrote:
> Moving the function out of the way to prepare for the late
> SWIOTLB init.
>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
Acked-by: Stefano Stabellini <stefano.stabell...@eu.citrix.com>
> drivers/xen/swiotlb-xen.c | 21 +++++++++++----------
> 1 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
> index 1afb4fb..a2aad6e 100644
> --- a/drivers/xen/swiotlb-xen.c
> +++ b/drivers/xen/swiotlb-xen.c
> @@ -144,25 +144,26 @@ xen_swiotlb_fixup(void *buf, size_t size, unsigned long
> nslabs)
> } while (i < nslabs);
> return 0;
> }
> +static unsigned long xen_set_nslabs(unsigned long nr_tbl)
> +{
> + if (!nr_tbl) {
> + xen_io_tlb_nslabs = (64 * 1024 * 1024 >> IO_TLB_SHIFT);
> + xen_io_tlb_nslabs = ALIGN(xen_io_tlb_nslabs, IO_TLB_SEGSIZE);
> + } else
> + xen_io_tlb_nslabs = nr_tbl;
>
> + return xen_io_tlb_nslabs << IO_TLB_SHIFT;
> +}
> void __init xen_swiotlb_init(int verbose)
> {
> unsigned long bytes;
> int rc = -ENOMEM;
> - unsigned long nr_tbl;
> char *m = NULL;
> unsigned int repeat = 3;
>
> - nr_tbl = swiotlb_nr_tbl();
> - if (nr_tbl)
> - xen_io_tlb_nslabs = nr_tbl;
> - else {
> - xen_io_tlb_nslabs = (64 * 1024 * 1024 >> IO_TLB_SHIFT);
> - xen_io_tlb_nslabs = ALIGN(xen_io_tlb_nslabs, IO_TLB_SEGSIZE);
> - }
> + xen_io_tlb_nslabs = swiotlb_nr_tbl();
> retry:
> - bytes = xen_io_tlb_nslabs << IO_TLB_SHIFT;
> -
> + bytes = xen_set_nslabs(xen_io_tlb_nslabs);
> /*
> * Get IO TLB memory from any location.
> */
> --
> 1.7.7.6
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
