From patchwork Tue Apr 7 01:07:40 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: 11477117 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 9BF31159A for ; Tue, 7 Apr 2020 01:08:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7A4A12072A for ; Tue, 7 Apr 2020 01:08:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HTU0yNaM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726587AbgDGBHr (ORCPT ); Mon, 6 Apr 2020 21:07:47 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:55779 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726552AbgDGBHq (ORCPT ); Mon, 6 Apr 2020 21:07:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586221665; 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=5TH7w/JfrvK6PO93eOn/asqSkXlWjc9e7s1Mrzet5kE=; b=HTU0yNaMAGcK2lPvKssnI/NFrI342ixHfXQrfWXTpjpzzZeW1vtgklwxdlm6FneHSe/IUP tyyI1pF+0QfVhhz2jGA8Fz1CiuF99K8ASMoyf4bwY8QjekvY/N6oqPMFSe4T9O33xZvW6n LYYnUFJBV8HrPP3t860m5qKIWrapj3Q= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-427-aVkn_MMIOi-S9yV9xkOFEQ-1; Mon, 06 Apr 2020 21:07:44 -0400 X-MC-Unique: aVkn_MMIOi-S9yV9xkOFEQ-1 Received: by mail-wr1-f71.google.com with SMTP id g6so853128wru.8 for ; Mon, 06 Apr 2020 18:07:43 -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=5TH7w/JfrvK6PO93eOn/asqSkXlWjc9e7s1Mrzet5kE=; b=Z7kr8dn4NKYskwpLCE/maeFcOP7tnQ1mRjoP/TH2GdLB2o+hJZOSO2MaYdXmPcSF+F 5J0cvt0qDZ02RkDTtbbxjv44QqBaKdY8uIalGoT7Oz8j5VQZrs8GRP/MLwXcOBlDviQ3 OkjAfl0YUoExlizeUFBqZzZvPmQNuEiS2e1W/h4xssMpqv1CPMWvx5X7rHVPqRXI8W7V MgKGYscuqYr2PLcQTzKYxyeiHW6TeiGodiXKn1GbJxTAjlb+I77l1TCoTjvaJU0kGtDj abe3ef5CU7s8x3OJRA1TEu1/HMPIya1l8hya2GRpBjumaF5c3FhLRLJi2xDCQ6lOLVmp CUqQ== X-Gm-Message-State: AGi0PuY5NjVLWNcGItetLMZjTJAAkR6WhpoakLx6cUGF+7f6NgqGmoZd llwtoZSrrZ9WPuKCCn83bMm9bhqxMIEoL4PQl7I7bm+5NxsT+ms3iAxmObXrWLtpNbTPMdQEEae Es7vekIDCnfBBut3c1Wvd/EGcxfXnCA== X-Received: by 2002:a7b:cb45:: with SMTP id v5mr1992023wmj.17.1586221662967; Mon, 06 Apr 2020 18:07:42 -0700 (PDT) X-Google-Smtp-Source: APiQypKi5SDLXVoxB05X0Fa1g9oKsnmtj3oVbQGLHfVW+Qb94Vy8QZNx7bP9RNsJ+Ug6e0rfRynbiA== X-Received: by 2002:a7b:cb45:: with SMTP id v5mr1992013wmj.17.1586221662773; Mon, 06 Apr 2020 18:07:42 -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 o16sm28751497wrw.75.2020.04.06.18.07.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 18:07:42 -0700 (PDT) Date: Mon, 6 Apr 2020 21:07:40 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Ohad Ben-Cohen , Bjorn Andersson , linux-remoteproc@vger.kernel.org Subject: [PATCH v7 07/19] remoteproc: pull in slab.h Message-ID: <20200407010700.446571-8-mst@redhat.com> References: <20200407010700.446571-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200407010700.446571-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 In preparation to virtio header changes, include slab.h directly as this module is using it. Signed-off-by: Michael S. Tsirkin --- drivers/remoteproc/remoteproc_sysfs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/remoteproc/remoteproc_sysfs.c b/drivers/remoteproc/remoteproc_sysfs.c index 7f8536b73295..52b871327b55 100644 --- a/drivers/remoteproc/remoteproc_sysfs.c +++ b/drivers/remoteproc/remoteproc_sysfs.c @@ -4,6 +4,7 @@ */ #include +#include #include "remoteproc_internal.h" From patchwork Tue Apr 7 01:08:01 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: 11477113 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 5EFD2913 for ; Tue, 7 Apr 2020 01:08:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CC2D2076E for ; Tue, 7 Apr 2020 01:08:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cXxH43w5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726729AbgDGBIJ (ORCPT ); Mon, 6 Apr 2020 21:08:09 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:38683 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726712AbgDGBIG (ORCPT ); Mon, 6 Apr 2020 21:08:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586221686; 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=TEc48I7L40swgY91SNpoqqlFJs2YDtsi09a3nE4rzt0=; b=cXxH43w5Cc6pFr9t2lsNkaU+Z8dR64slAdziCM3MmrEgzi9owsZJSsa7zLVuGNIU1rDauu eESvXKBZ6/HHdm1kLcNyOBXN37R6jGLycVyNwxoEg6/oKvsq2PNxb+8Ky8inSosO5uItA3 X/QNHIeqGh5mCympd2tUngoyuS+OYJs= 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-283-X1a4RQrDP0qaG-TNue7TXQ-1; Mon, 06 Apr 2020 21:08:04 -0400 X-MC-Unique: X1a4RQrDP0qaG-TNue7TXQ-1 Received: by mail-wr1-f70.google.com with SMTP id j12so840433wrr.18 for ; Mon, 06 Apr 2020 18:08:04 -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=TEc48I7L40swgY91SNpoqqlFJs2YDtsi09a3nE4rzt0=; b=kK0c3HSGxS0eU+lVW4MAVsweX2xzw/5IIiU9W3lFkWAPuH8zOFq9unJ7VNaPBYWr6Y Ux9PSo1EpFgKkE3zB3js+P0IpDvgKE5zbaPSqBnBk2h0DzOYRHvECCsXw0PFCU71Aq+t rCI2EMVQAmuNLk8A6rOhXSIfWugQzsP6toXbICqi3v7lVAweSAKZa5QsmPHAKgv2yRTB ET5PYbIvd4M4xTyHAAFDfVbHxBICfKrApER0or2Hq2+A4qNH4MlJLUPwLdhcUrD4WFI/ K+usISZqWTB0GCnyx+oBoHdqiYOsV7gU0vEBFSXMZj7BIkfgi843D+PlKZR51sVqXVhv 6Q4w== X-Gm-Message-State: AGi0PubDAljmgnb07UI1fByCEpZqVWxuQkfo7UJkF33kfHz3vNmXJu6b 4QuGn9Oltpmhn4IJE5f4+mgDPCl8Eh8O+bAa6jyVwKB4vzq2XWNo/tDTNpMMx3ryMBxgcPRGtSn uZnEj3I1Jfd/4jFdKCj9M+uHw3ip9AQ== X-Received: by 2002:a5d:4602:: with SMTP id t2mr2198720wrq.347.1586221683275; Mon, 06 Apr 2020 18:08:03 -0700 (PDT) X-Google-Smtp-Source: APiQypLjsZp3Jur6V5gr6xde4lqll9z+2UAisG1khAzGUcGAVVebzXO8Lvset44/DEyvZePjCpSAJg== X-Received: by 2002:a5d:4602:: with SMTP id t2mr2198705wrq.347.1586221683081; Mon, 06 Apr 2020 18:08:03 -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 r14sm118800wmg.0.2020.04.06.18.08.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 18:08:02 -0700 (PDT) Date: Mon, 6 Apr 2020 21:08:01 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Ohad Ben-Cohen , Bjorn Andersson , linux-remoteproc@vger.kernel.org Subject: [PATCH v7 15/19] remoteproc: switch to virtio_legacy_init/size Message-ID: <20200407010700.446571-16-mst@redhat.com> References: <20200407010700.446571-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200407010700.446571-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 --- drivers/remoteproc/remoteproc_core.c | 2 +- drivers/remoteproc/remoteproc_virtio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c index 8c07cb2ca8ba..35b02468197a 100644 --- a/drivers/remoteproc/remoteproc_virtio.c +++ b/drivers/remoteproc/remoteproc_virtio.c @@ -95,7 +95,7 @@ static struct virtqueue *rp_find_vq(struct virtio_device *vdev, len = rvring->len; /* zero vring */ - size = vring_size(len, rvring->align); + size = vring_legacy_size(len, rvring->align); memset(addr, 0, size); dev_dbg(dev, "vring%d: va %pK qsz %d notifyid %d\n",