Re: [PATCHv2 vringh 3/3] caif_virtio: Introduce caif over virtio

From: Rusty Russell
Date: Tue Feb 19 2013 - 03:02:53 EST


sjur.brandeland@xxxxxxxxxxxxxx writes:
> From: Vikram ARV <vikram.arv@xxxxxxxxxxxxxx>
>
> Add the the Virtio shared memory driver for STE Modems.
> caif_virtio is implemented utilizing the virtio framework
> for data transport and is managed with the remoteproc frameworks.
>
> The Virtio queue is used for transmitting data to the modem, and
> the new vringh implementation is receiving data over the vring.
>
> Signed-off-by: Vikram ARV <vikram.arv@xxxxxxxxxxxxxx>
> Signed-off-by: Sjur BrÃndeland <sjur.brandeland@xxxxxxxxxxxxxx>

I have applied 1 and 3 (2 is already in virtio-next); they're in my
pending-rebases branch behind the vringh patches which are pending
a final review.

Here's the warning fix patch I applied:

diff --git a/drivers/net/caif/caif_virtio.c b/drivers/net/caif/caif_virtio.c
index d4f339c..df832e7 100644
--- a/drivers/net/caif/caif_virtio.c
+++ b/drivers/net/caif/caif_virtio.c
@@ -483,7 +483,7 @@ static int cfv_probe(struct virtio_device *vdev)

vdev->priv = cfv;

- vringh_iov_init(&cfv->ctx.riov, NULL, 0);
+ vringh_kiov_init(&cfv->ctx.riov, NULL, 0);
cfv->ctx.head = USHRT_MAX;

netif_napi_add(netdev, &cfv->napi, cfv_rx_poll, CFV_DEFAULT_QUOTA);
@@ -517,7 +517,7 @@ static void cfv_remove(struct virtio_device *vdev)
struct cfv_info *cfv = vdev->priv;

tasklet_kill(&cfv->tx_release_tasklet);
- vringh_iov_cleanup(&cfv->ctx.riov);
+ vringh_kiov_cleanup(&cfv->ctx.riov);
vdev->config->reset(vdev);
rproc_virtio_del_vringh(vdev, RX_RING_INDEX);
cfv->vr_rx = NULL;

Cheers,
Rusty.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/