On Mon, 17 Sep 2012, Konrad Rzeszutek Wilk wrote:
> On Mon, Sep 17, 2012 at 10:23:15AM -0400, Konrad Rzeszutek Wilk wrote:
> > > > start_dma_addr = xen_virt_to_bus(xen_io_tlb_start);
> > > > - if (!after_bootmem)
> > > > + rc = 0;
> > > ^
> > > why does this change belong to this patch?
> > >
> > >
> >
> > I took that out of the this patch, so it is now:
> >
>
> ..and spun out another patch to address the rc=0:
>
> >From f85175ce01ba722cd4612230e7331dc0d4c8666f Mon Sep 17 00:00:00 2001
> From: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
> Date: Mon, 17 Sep 2012 10:20:09 -0400
> Subject: [PATCH 2/2] xen/swiotlb: For early initialization, return zero on
> success.
>
> If everything is setup properly we would return -ENOMEM since
> rc by default is set to that value. Lets not do that and return
> a proper return code.
>
> Note: The reason the early code needs this special treatment
> is that it SWIOTLB library call does not return anything (and
> had it failed it would call panic()) - but our function does.
>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
Acked-by: Stefano Stabellini <stefano.stabell...@eu.citrix.com>
> drivers/xen/swiotlb-xen.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
> index 02a52f3..ab4c66c 100644
> --- a/drivers/xen/swiotlb-xen.c
> +++ b/drivers/xen/swiotlb-xen.c
> @@ -230,9 +230,10 @@ retry:
> goto error;
> }
> start_dma_addr = xen_virt_to_bus(xen_io_tlb_start);
> - if (early)
> + if (early) {
> swiotlb_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs,
> verbose);
> - else
> + rc = 0;
> + } else
> rc = swiotlb_late_init_with_tbl(xen_io_tlb_start,
> xen_io_tlb_nslabs);
> return rc;
> error:
> --
> 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/
