From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38DCDC2BA1B for ; Tue, 7 Apr 2020 01:17:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0C14920801 for ; Tue, 7 Apr 2020 01:17:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="daNLyZgn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727136AbgDGBRg (ORCPT ); Mon, 6 Apr 2020 21:17:36 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:31759 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726722AbgDGBRC (ORCPT ); Mon, 6 Apr 2020 21:17:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586222221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/M9T/d7F7GNQ12ZgHWGcHvn2ujMc8mdiW+Qm6YeUJhk=; b=daNLyZgnSQrzh7mCFDcRdubIg/Bs7p2/XK7kiTBqOpr8CWkyWIUcbVGJm/0HOmDnL1llb5 tja1VHGysTXWoPVTRh89aR8vn7K1FTxBilUV6A4i/4QQ/pOPs3IS9XMPdN8pYowckjHFNw pjSIG2sQtwzCSoW+/dXJmkxpPcrYMzA= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-509-bIbH9egYMsO-dFXfhTPNFg-1; Mon, 06 Apr 2020 21:16:59 -0400 X-MC-Unique: bIbH9egYMsO-dFXfhTPNFg-1 Received: by mail-wr1-f70.google.com with SMTP id j12so849308wrr.18 for ; Mon, 06 Apr 2020 18:16:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=/M9T/d7F7GNQ12ZgHWGcHvn2ujMc8mdiW+Qm6YeUJhk=; b=EOTaJ1F2fOAWpf0O8E+DpOPDNMxSq8IxLJTEwk8toyJjZEL4qUdToRcJyfYW65qY6O K2qkUFphRlI/o3jayujZD+7qNJBekh8sdHGtF6WPOSWYGlhbl5uXaPgrDttn1bpMKEgI g5if6gGp3bYJOb5q5mH/vE4iY9geTyOtw6T5HiZjK0iFRXi6xgVz0FKkJjuCzbERaKsu Y5syuu5GKeMXy/P2pzO6gE6inhjMvCO6lfDfKwfhVXYKRVUsoPL6E1je+j0Tcpecw9WH t8pMrInXxgC5xTfhqX24FKNx5HiOSFo148/tcU5G+HmnVqpTboJTAli0g/bOLb+CrfFy vqHQ== X-Gm-Message-State: AGi0PuZmcWR114VxY2BBr5r5x4UmtRJKFGsZLTW15394ojYeaRUf5wIR 7KVzz+6GifySVTAKNyi0WedXb9Nfu1uy/oiY7wYG8PfQAj3vSoXMMV5OXK6GfrUiSGV1dcLjb4Q 55rzM+LbxknLfonhWgS0r4RR/ X-Received: by 2002:adf:aac5:: with SMTP id i5mr1896849wrc.285.1586222218642; Mon, 06 Apr 2020 18:16:58 -0700 (PDT) X-Google-Smtp-Source: APiQypIFZbU8275LwvUBhU+qeQ9FKSE47g+0DJ08lLBrYOds5GUB93QinHgGAJegsP4D5IeJbqxnyA== X-Received: by 2002:adf:aac5:: with SMTP id i5mr1896831wrc.285.1586222218441; Mon, 06 Apr 2020 18:16:58 -0700 (PDT) Received: from redhat.com (bzq-79-176-51-222.red.bezeqint.net. [79.176.51.222]) by smtp.gmail.com with ESMTPSA id h81sm100071wme.42.2020.04.06.18.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 18:16:58 -0700 (PDT) Date: Mon, 6 Apr 2020 21:16:56 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Ashutosh Dixit , Sudeep Dutt , Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH v8 14/19] vop: switch to virtio_legacy_init/size Message-ID: <20200407011612.478226-15-mst@redhat.com> References: <20200407011612.478226-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200407011612.478226-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These are used for legacy ring format, switch to APIs that make this explicit. Acked-by: Ashutosh Dixit Signed-off-by: Michael S. Tsirkin --- drivers/misc/mic/vop/vop_main.c | 5 +++-- drivers/misc/mic/vop/vop_vringh.c | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/misc/mic/vop/vop_main.c b/drivers/misc/mic/vop/vop_main.c index 85942f6717c5..829b3b14b1d7 100644 --- a/drivers/misc/mic/vop/vop_main.c +++ b/drivers/misc/mic/vop/vop_main.c @@ -283,7 +283,7 @@ static struct virtqueue *vop_new_virtqueue(unsigned int index, bool weak_barriers = false; struct vring vring; - vring_init(&vring, num, pages, MIC_VIRTIO_RING_ALIGN); + vring_legacy_init(&vring, num, pages, MIC_VIRTIO_RING_ALIGN); vring.used = used; return __vring_new_virtqueue(index, vring, vdev, weak_barriers, context, @@ -320,7 +320,8 @@ static struct virtqueue *vop_find_vq(struct virtio_device *dev, /* First assign the vring's allocated in host memory */ vqconfig = _vop_vq_config(vdev->desc) + index; memcpy_fromio(&config, vqconfig, sizeof(config)); - _vr_size = vring_size(le16_to_cpu(config.num), MIC_VIRTIO_RING_ALIGN); + _vr_size = vring_legacy_size(le16_to_cpu(config.num), + MIC_VIRTIO_RING_ALIGN); vr_size = PAGE_ALIGN(_vr_size + sizeof(struct _mic_vring_info)); va = vpdev->hw_ops->remap(vpdev, le64_to_cpu(config.address), vr_size); if (!va) diff --git a/drivers/misc/mic/vop/vop_vringh.c b/drivers/misc/mic/vop/vop_vringh.c index 30eac172f017..0535c02d637d 100644 --- a/drivers/misc/mic/vop/vop_vringh.c +++ b/drivers/misc/mic/vop/vop_vringh.c @@ -296,7 +296,8 @@ static int vop_virtio_add_device(struct vop_vdev *vdev, num = le16_to_cpu(vqconfig[i].num); mutex_init(&vvr->vr_mutex); - vr_size = PAGE_ALIGN(vring_size(num, MIC_VIRTIO_RING_ALIGN) + + vr_size = PAGE_ALIGN(vring_legacy_size(num, + MIC_VIRTIO_RING_ALIGN) + sizeof(struct _mic_vring_info)); vr->va = (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO, @@ -308,7 +309,8 @@ static int vop_virtio_add_device(struct vop_vdev *vdev, goto err; } vr->len = vr_size; - vr->info = vr->va + vring_size(num, MIC_VIRTIO_RING_ALIGN); + vr->info = vr->va + vring_legacy_size(num, + MIC_VIRTIO_RING_ALIGN); vr->info->magic = cpu_to_le32(MIC_MAGIC + vdev->virtio_id + i); vr_addr = dma_map_single(&vpdev->dev, vr->va, vr_size, DMA_BIDIRECTIONAL); @@ -321,7 +323,7 @@ static int vop_virtio_add_device(struct vop_vdev *vdev, } vqconfig[i].address = cpu_to_le64(vr_addr); - vring_init(&vr->vr, num, vr->va, MIC_VIRTIO_RING_ALIGN); + vring_legacy_init(&vr->vr, num, vr->va, MIC_VIRTIO_RING_ALIGN); ret = vringh_init_kern(&vvr->vrh, *(u32 *)mic_vq_features(vdev->dd), num, false, vr->vr.desc, vr->vr.avail, -- MST