From patchwork Tue Jun 16 15:34:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 188071 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp3783483ilo; Tue, 16 Jun 2020 09:07:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAOzAeoXwQZuW3x434PQBTmuumvVj7MNYkWccfi2D66ThZhBkfC0h+HrY0SIMWYJUbAo60 X-Received: by 2002:a50:9b42:: with SMTP id a2mr3295190edj.57.1592323635441; Tue, 16 Jun 2020 09:07:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592323635; cv=none; d=google.com; s=arc-20160816; b=ukG3JIIoJHIlHhS+e4l588AkancpIIhg4qe+fdzjgF0xkIc/6yAeVW0vyVKgJuQILo W1jUi/2IumfL2mItGoRVswNEigTaUO4fiz/hRnKA5STeyjFq3RH7Xf33AC+TldLeCWiU wZ8x2zbFLfbxedKVHvkKs+KNhkOLzuiEzG0Hp24lhUZBVObzu8m0lcte6Jv4oXm3y5Td y9SWQgyQz5Q9qtlOmY/cv0FMYdLq4+NgoneRWsNfzZ+j+uQyx2b+ZUlGxgIi7ZqrzjEh 0BE4A0X/zXXER34tnrQjNItMNCspImsukIBOUJ2knZFtFhkO0hCG2J1D064WvOyqyNB/ N7Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TsgsAP1j/kujo4Henh7IzJG6jnj1X+gXmQb73/4F0Js=; b=A27RNx/MupMh2+Ao1sku4jXgwVgJNI1667BPHjWWIWObjfzDCdyDsQvzAmAi1K5AiI 8i+GlSK+2c1hGZYyB7CrCBLbEPqHag0wcUXVlpApfhWrBeaXQG0Vpdo/ItfM2saZX6uY Viw6r6V+SZu+XrkYWG+A2kSxybAstu6/Geg/kyDadv+um5/kPMPMFiSPM6fx99cg0bGa NTKgd1xbHgWtmDFMVk+58VYbAPcjRHfCwNzyjQ7IXE2xhrvjZyogXZdq3hEhkAt9nP4Z nABk63ZdLp0RUaTea6FaYC74KegPHKkkXLulh6WIVP3BWNDjrAv0Hu0JxFsfxF4MQTbi /E+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=N7YOepvP; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f3si10693694edw.282.2020.06.16.09.07.14; Tue, 16 Jun 2020 09:07:15 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=N7YOepvP; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732298AbgFPPrL (ORCPT + 15 others); Tue, 16 Jun 2020 11:47:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:40084 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732294AbgFPPrL (ORCPT ); Tue, 16 Jun 2020 11:47:11 -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 224BE21475; Tue, 16 Jun 2020 15:47:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592322430; bh=Ww/3zxU6fbSSh6OUodW4LyHhRVCSyKXuqOzIlIhcuJs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N7YOepvPI6Cz7Uk7/oWLgovUDCIXOE45tXh7BC5tQtHFUgTYABpPrq+6V/5LDO7gm vqX72KNbfuLoF4Z2rSdH95bi3fGvrE+hukeRrjyJ+Gcz6X4i9Jq7wniH2WKebyVp4p kJfaf+X2W1bv4wHgVjNZ+/NOKWWq3qiPDq7R/eEI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Suman Anna , Mathieu Poirier , Arnaud Pouliquen , Bjorn Andersson Subject: [PATCH 5.7 121/163] remoteproc: Fix and restore the parenting hierarchy for vdev Date: Tue, 16 Jun 2020 17:34:55 +0200 Message-Id: <20200616153112.607448077@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200616153106.849127260@linuxfoundation.org> References: <20200616153106.849127260@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Suman Anna commit c774ad010873bb89dcc0cdcb1e96aef6664d8caf upstream. The commit 086d08725d34 ("remoteproc: create vdev subdevice with specific dma memory pool") has introduced a new vdev subdevice for each vdev declared in the firmware resource table and made it as the parent for the created virtio rpmsg devices instead of the previous remoteproc device. This changed the overall parenting hierarchy for the rpmsg devices, which were children of virtio devices, and does not allow the corresponding rpmsg drivers to retrieve the parent rproc device through the rproc_get_by_child() API. Fix this by restoring the remoteproc device as the parent. The new vdev subdevice can continue to inherit the DMA attributes from the remoteproc's parent device (actual platform device). Cc: stable@vger.kernel.org Fixes: 086d08725d34 ("remoteproc: create vdev subdevice with specific dma memory pool") Signed-off-by: Suman Anna Reviewed-by: Mathieu Poirier Acked-by: Arnaud Pouliquen Link: https://lore.kernel.org/r/20200420160600.10467-3-s-anna@ti.com Signed-off-by: Bjorn Andersson Signed-off-by: Greg Kroah-Hartman --- drivers/remoteproc/remoteproc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -517,7 +517,7 @@ static int rproc_handle_vdev(struct rpro /* Initialise vdev subdevice */ snprintf(name, sizeof(name), "vdev%dbuffer", rvdev->index); - rvdev->dev.parent = rproc->dev.parent; + rvdev->dev.parent = &rproc->dev; 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);