From patchwork Mon Feb 18 23:37:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rusty Russell X-Patchwork-Id: 221648 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 16EC02C0091 for ; Tue, 19 Feb 2013 19:09:20 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758200Ab3BSICp (ORCPT ); Tue, 19 Feb 2013 03:02:45 -0500 Received: from ozlabs.org ([203.10.76.45]:58877 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758091Ab3BSICm convert rfc822-to-8bit (ORCPT ); Tue, 19 Feb 2013 03:02:42 -0500 Received: by ozlabs.org (Postfix, from userid 1011) id B3A662C0294; Tue, 19 Feb 2013 19:02:41 +1100 (EST) From: Rusty Russell To: sjur.brandeland@stericsson.com, "David S. Miller" , Ohad Ben-Cohen Cc: sjur@brendeland.net, netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Dmitry Tarnyagin , Linus Walleij , Erwan Yvin , Vikram ARV , Sjur =?utf-8?Q?Br=C3=A6ndeland?= , Ido Yariv Subject: Re: [PATCHv2 vringh 3/3] caif_virtio: Introduce caif over virtio In-Reply-To: <1360669793-6921-4-git-send-email-sjur.brandeland@stericsson.com> References: <1360669793-6921-1-git-send-email-sjur.brandeland@stericsson.com> <1360669793-6921-4-git-send-email-sjur.brandeland@stericsson.com> User-Agent: Notmuch/0.14 (http://notmuchmail.org) Emacs/23.4.1 (i686-pc-linux-gnu) Date: Tue, 19 Feb 2013 10:07:18 +1030 Message-ID: <87k3q5i47l.fsf@rustcorp.com.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org sjur.brandeland@stericsson.com writes: > From: Vikram ARV > > 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 > Signed-off-by: Sjur Brændeland 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: Cheers, Rusty. --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;