From patchwork Tue Nov 24 16:18:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Poulain X-Patchwork-Id: 331402 Delivered-To: patch@linaro.org Received: by 2002:a17:907:2110:0:0:0:0 with SMTP id qn16csp4497702ejb; Tue, 24 Nov 2020 08:12:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJzhE8YEkEn0ddyTbZiwYzoo4KSuW9U7ucp8Vj8SG7Yq3CIogoO0MhEuf4D4BV0UUvYVTmM8 X-Received: by 2002:a17:906:8d6:: with SMTP id o22mr5002345eje.71.1606234369529; Tue, 24 Nov 2020 08:12:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606234369; cv=none; d=google.com; s=arc-20160816; b=gJQUcWvAkBs2FHBa29CErxW5EzTe+l15aM5GzOHOL1rT4bg7c4bhP+jTBbRTTlJiLn Xd8N16dQmOiNA2+4WL/05JSEexyq9RnadsCVmgXBg1J391k6x9d48xcgWP0MR1NiNL3q AV2frBMwuTaJ8hiBEke4hlfbhTha7PguOPyW50DPfdXe94uFmoO0m5JlyO8iWiRGBBwv sZB+U3XMDb+2tnMYefjdEKGkfF6dM1jKGHUaOWike15LDvEedNdAedoywIDrkMshSAPt H9T+kEhgt3LVWXnQ5lbbkkYQeAtpeNw4l/IsZIJS9cpqMNOeIRJgj4u8ZiACYj+BKRji A3ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=ic3iTTgQ5gaJNsBaoVYvbWzmRaSCtHiMPtCO7uAhv5w=; b=Kg6BF1p4Y61p7xXOy7DyKB0itSD/5cDD81SUzMIe94r8KkIF1MjUqDu9Dc7B5hUZLM WziANI4pK1PSifJqNx14P73Y/Ajp80orwX+sD7dfFw/pfCu3kFpSkXMk0NQiKsrPTwUP PZK7VCC2vRaKy1aKf7kxKiSx9obbRUy/n91bRgIbnyt7dOOY+9Yg2ZD/l3MnZ0hq6qmQ JnuQq7rCpR+aVMmim9qyf0iI2w7i5iwdY15OqK7I2IwQfZNGrMldnftTqGU+Mhoj/BVB nr1mNK3GqJYolf7YWxclKPBkfR80M5nTQNe+NPl114AvPBj3Pq12iDS2kcp+OIE1YIqh FHEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Av0qbJWT; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lr24si8561542ejb.482.2020.11.24.08.12.48; Tue, 24 Nov 2020 08:12:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-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=@linaro.org header.s=google header.b=Av0qbJWT; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390216AbgKXQLn (ORCPT + 15 others); Tue, 24 Nov 2020 11:11:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390191AbgKXQLn (ORCPT ); Tue, 24 Nov 2020 11:11:43 -0500 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B995C0613D6 for ; Tue, 24 Nov 2020 08:11:43 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id m6so22864487wrg.7 for ; Tue, 24 Nov 2020 08:11:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=ic3iTTgQ5gaJNsBaoVYvbWzmRaSCtHiMPtCO7uAhv5w=; b=Av0qbJWT/JnaSJ1a8sP06+PDTjs8O6FcoowlcbqAMjyLiCnMGXb0o325aTc/vq/taQ uRBcp6g78PKzkaPkILAjDnCvNuWUQE8yIjuStl0Rid4g+9Ly1Q9vXbueCdszxgkVdNBj nf8j/r2De3oGcortzfCW2If81NjWURuxbBs5vT0Iqp2X2rhdR0RUhT9kMUdIPjLLITfU st7aOsxZ21F8L9vHyB+vNfNvwbouTHeQ5KmiPXekC4Vod4kGEzEwwyl/KPue7CZXKU2T 3yMrWB53hQ4ndIsFAD7bY9HPbDTuJJeqXQhmfZD3f5FjyOYxcqCHu9XMhpAUy2i+bYlJ jdvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ic3iTTgQ5gaJNsBaoVYvbWzmRaSCtHiMPtCO7uAhv5w=; b=g08GBLvP+iza3fHEzFah+GpgL3MNOA/6okE4/W58nM1q1gQvIZkI1qisYZjgWnotx7 9GZ6k4hlobmQNoHccW1urQkGiSoIHk+wp01J+lpp4LBj2LAD3oZCkGiZr4WZhiCAICOx Hf7Nsiy4tZS0FsxBSEriqtm7VkuGpiw/81ffJ9Hl37Gi+gXJskJqIEOM6pLKxZzLMf6s 0tD7Mao6KFYLReTsz54YBdz6i66J10KorpHCwhghyKzXmRmzA85QIvhIoTV5eIfoIFmW b5alNWtpOdfhkW87gAYLpr/tcdlnNonrNSI/WpnBz4Ax9KckZftG8GgM2LcvcuoDwSfl uQ2w== X-Gm-Message-State: AOAM533CDHNGneV72SEvnyXNNwfeZ/l3FMfhbKEWBv0IF2Jczp8o6Ucb gf79YtxhkMNOAmkS0XQ5IvS2PA== X-Received: by 2002:adf:b64f:: with SMTP id i15mr5998238wre.125.1606234301909; Tue, 24 Nov 2020 08:11:41 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:490:8730:f5cd:e791:e88b:e3b7]) by smtp.gmail.com with ESMTPSA id c9sm16666653wrp.73.2020.11.24.08.11.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Nov 2020 08:11:41 -0800 (PST) From: Loic Poulain To: manivannan.sadhasivam@linaro.org, hemantk@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, bbhatt@codeaurora.org, Loic Poulain Subject: [PATCH v2] bus: mhi: core: Fix device hierarchy issue Date: Tue, 24 Nov 2020 17:18:31 +0100 Message-Id: <1606234711-20125-1-git-send-email-loic.poulain@linaro.org> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org A MHI client device should be child of the MHI controller device. Today both MHI controller and its MHI clients are direct children of the same bus device. This patch fixes the hierarchy. Signed-off-by: Loic Poulain --- v2: fix commit message drivers/bus/mhi/core/init.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.7.4 Reviewed-by: Bjorn Andersson diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c index 436221c..c7a7354 100644 --- a/drivers/bus/mhi/core/init.c +++ b/drivers/bus/mhi/core/init.c @@ -1137,7 +1137,15 @@ struct mhi_device *mhi_alloc_device(struct mhi_controller *mhi_cntrl) device_initialize(dev); dev->bus = &mhi_bus_type; dev->release = mhi_release_device; - dev->parent = mhi_cntrl->cntrl_dev; + + if (mhi_cntrl->mhi_dev) { + /* for MHI client devices, parent is the MHI controller device */ + dev->parent = &mhi_cntrl->mhi_dev->dev; + } else { + /* for MHI controller device, parent is the bus device (e.g. pci device) */ + dev->parent = mhi_cntrl->cntrl_dev; + } + mhi_dev->mhi_cntrl = mhi_cntrl; mhi_dev->dev_wake = 0;