From patchwork Mon Apr 6 21:35:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 11476643 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5065A92C for ; Mon, 6 Apr 2020 21:35:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F67020753 for ; Mon, 6 Apr 2020 21:35:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hGDva9WH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726996AbgDFVfb (ORCPT ); Mon, 6 Apr 2020 17:35:31 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:49763 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726837AbgDFVfV (ORCPT ); Mon, 6 Apr 2020 17:35:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586208920; 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=1aA96KgFgaIj2U2msrh3/QyeM1jNTu3MJRWpUI5kTTY=; b=hGDva9WHED6EhQFBoI647CpMwFENeeUkrHXOwCdzna1lHbsOrCC37eZN3dLLBCSqZFAGYe MaLWMb5eCtMhINRBtjM7Xc7HSuJ7U91NwwEIiY+D7v83E/sWshEsjifaD2kdPvN+qYLpK3 8Odm5hXGT8wcwKYzmQOwjHXJEHb1x0w= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-171-fepRGPBVOv2fylRjwZdKpQ-1; Mon, 06 Apr 2020 17:35:18 -0400 X-MC-Unique: fepRGPBVOv2fylRjwZdKpQ-1 Received: by mail-wm1-f69.google.com with SMTP id 2so31592wmf.1 for ; Mon, 06 Apr 2020 14:35:18 -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=1aA96KgFgaIj2U2msrh3/QyeM1jNTu3MJRWpUI5kTTY=; b=g/DjME7+1mYqFDI57EF8KYfvP9A+cQX4Zg4W2A22B1pAMSuX3l/Np5qmM0m5ylCFcB DbRRMJqqCfDcCpoZuxsJZHZni1huwsZlrZyFwxYkqh94EYJ3UZSpuQsWP2vRrA1sWoq/ hkZbB4lNOKOtgOMKW1a5E2J4SYrv8ehLQt3tS/ggR4enU0iPomUR9RHaQ0Km50bh95g3 ZP9E/rgRxXTYeZd1aTxBMl29KsFoUYbPH0RM3jAGeQb6U33mpBSTMnYjyU8A3uud0jKm 1IaK629Bwsi49ee0lTmbxwLuAtgOdwZL+RsfqJoipIpemeinQNPPBlrVH/ymVjRJZ1IW hqmA== X-Gm-Message-State: AGi0PuZhMI2LZaxbKuA1utwvqGzWHV4qhFZbyyNEZ8lx+rh8z0a65P9I HMrK69NIx/m5aqJVognPAQseRUWnajRCnfe/16ExvIkJbzizBqaX2kMyZcSgCcOg0p9Hk8Yzucy SLyPElSf3Ez/Z09op2Pklkqq96FNtyg== X-Received: by 2002:a7b:cb45:: with SMTP id v5mr1335909wmj.17.1586208917729; Mon, 06 Apr 2020 14:35:17 -0700 (PDT) X-Google-Smtp-Source: APiQypKHBE9kKX63pgbMP3pjCKoJHM/e8bwVo/gQ4w7SHS7x5DBizLjnjROi7qHhV5To0pZbVsHmIA== X-Received: by 2002:a7b:cb45:: with SMTP id v5mr1335889wmj.17.1586208917509; Mon, 06 Apr 2020 14:35:17 -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 m21sm1071211wmc.6.2020.04.06.14.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 14:35:17 -0700 (PDT) Date: Mon, 6 Apr 2020 17:35:15 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Ohad Ben-Cohen , Bjorn Andersson , linux-remoteproc@vger.kernel.org Subject: [PATCH v5 11/12] remoteproc: switch to virtio_legacy_init/size Message-ID: <20200406213314.248038-12-mst@redhat.com> References: <20200406213314.248038-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200406213314.248038-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org These are used for legacy ring format, switch to APIs that make this explicit. Signed-off-by: Michael S. Tsirkin --- maintainers, pls ack merging this through virtio tree due to dependency on previous patches in the patchset. drivers/remoteproc/remoteproc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 097f33e4f1f3..c350a01e6c4e 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -322,7 +322,7 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i) struct rproc_mem_entry *mem; /* actual size of vring (in bytes) */ - size = PAGE_ALIGN(vring_size(rvring->len, rvring->align)); + size = PAGE_ALIGN(vring_legacy_size(rvring->len, rvring->align)); rsc = (void *)rproc->table_ptr + rvdev->rsc_offset;