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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 08398C0650F for ; Mon, 5 Aug 2019 13:29:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA26420644 for ; Mon, 5 Aug 2019 13:29:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565011798; bh=OUchpcph8IrsC8U9tkPTe++gVhGSdryN2ABH6yW4kwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JzZTg99Ykm5CYn0Oe8F92SjlyFLJi2F2Q92NKdNAxqtQzShrMulWO337kpfkLHl8t /siqscWit57TOBJLzhGjuqLULkw7sCxPVFIDVmksspkA8GjqaiaY8LgZBuO3Xr6N0+ qw9lDlfmyZs+U22C4eEvUdYWMBrfJDDUJba2gLiI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728830AbfHENVQ (ORCPT ); Mon, 5 Aug 2019 09:21:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:57380 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729962AbfHENVM (ORCPT ); Mon, 5 Aug 2019 09:21:12 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5D58120657; Mon, 5 Aug 2019 13:21:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565011271; bh=OUchpcph8IrsC8U9tkPTe++gVhGSdryN2ABH6yW4kwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MjcyGNz84VSorhH+/ZllPk7rr7zkQvS9wOSi9sqUYx0VcflK7QUHUk17yRNba22O2 SbMAN4enyCpim1495RRt+OQAosamrRjM9NnuITGTxt382WTVHY3iIITBQFmjkyS0V/ yxT9mGwXqoeGZGGzI6mxzzxtc7bLqvlhfXltqGk8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Clement Leger , Loic Pallardy , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.2 029/131] remoteproc: copy parent dma_pfn_offset for vdev Date: Mon, 5 Aug 2019 15:01:56 +0200 Message-Id: <20190805124953.388746982@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190805124951.453337465@linuxfoundation.org> References: <20190805124951.453337465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 72f64cabc4bd6985c7355f5547bd3637c82762ac ] When preparing the subdevice for the vdev, also copy dma_pfn_offset since this is used for sub device dma allocations. Without that, there is incoherency between the parent dma settings and the childs one, potentially leading to dma_alloc_coherent failure (due to phys_to_dma using dma_pfn_offset for translation). Fixes: 086d08725d34 ("remoteproc: create vdev subdevice with specific dma memory pool") Signed-off-by: Clement Leger Acked-by: Loic Pallardy Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/remoteproc/remoteproc_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 8b5363223eaab..5031c68069083 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -512,6 +512,7 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc, /* Initialise vdev subdevice */ snprintf(name, sizeof(name), "vdev%dbuffer", rvdev->index); rvdev->dev.parent = rproc->dev.parent; + rvdev->dev.dma_pfn_offset = rproc->dev.parent->dma_pfn_offset; rvdev->dev.release = rproc_rvdev_release; dev_set_name(&rvdev->dev, "%s#%s", dev_name(rvdev->dev.parent), name); dev_set_drvdata(&rvdev->dev, rvdev); -- 2.20.1