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=-11.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 autolearn=ham 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 8F7F1C388F9 for ; Thu, 12 Nov 2020 02:42:33 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EF0B1207F7 for ; Thu, 12 Nov 2020 02:42:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="B7i1qKrU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF0B1207F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 717D486D22; Thu, 12 Nov 2020 02:42:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6OP9yZPlcvKb; Thu, 12 Nov 2020 02:42:31 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5C09C86CEF; Thu, 12 Nov 2020 02:42:31 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 49001C0889; Thu, 12 Nov 2020 02:42:31 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id B1A01C016F for ; Thu, 12 Nov 2020 02:42:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AC8D087541 for ; Thu, 12 Nov 2020 02:42:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6FPTlk739yds for ; Thu, 12 Nov 2020 02:42:28 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mailgw02.mediatek.com (unknown [1.203.163.81]) by hemlock.osuosl.org (Postfix) with ESMTP id 17E108753C for ; Thu, 12 Nov 2020 02:42:27 +0000 (UTC) X-UUID: 9be016932b0b47b695a8a04d0e8f8134-20201112 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=2akmVV9MmjilHzebTF46wwbdEe3nnOXuaGxT3mDFxZs=; b=B7i1qKrUtHcI/SrwT5pZORy4ir14B95DBrTr40zBuN/emudAM9UljPzdzwIxIU/KipAoPdnBqq69O4YtWo0SayqRd9mCp/cVg8pqHfY55ZKSB3xDznpBQJzrWb2xopkGnj2phZeALos97dcKsTy7u7el/w3Lg5rwWjTpp2N/hDw=; X-UUID: 9be016932b0b47b695a8a04d0e8f8134-20201112 Received: from mtkcas35.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1625091449; Thu, 12 Nov 2020 10:42:21 +0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 12 Nov 2020 10:42:19 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 12 Nov 2020 10:42:19 +0800 Message-ID: <1605148938.26323.127.camel@mhfsdcap03> Subject: Re: [PATCH v4 13/24] iommu/mediatek: Add device link for smi-common and m4u From: Yong Wu To: Nicolas Boichat Date: Thu, 12 Nov 2020 10:42:18 +0800 In-Reply-To: References: <20201111123838.15682-1-yong.wu@mediatek.com> <20201111123838.15682-14-yong.wu@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 9DD61C76332B6A687D16ACA0116BA587755327AA8BAE00AF0ECEE2DBB83A02B42000:8 X-MTK: N Cc: youlin.pei@mediatek.com, Devicetree List , srv_heupstream , Tomasz Figa , kernel-team@android.com, lkml , Krzysztof Kozlowski , chao.hao@mediatek.com, iommu@lists.linux-foundation.org, Rob Herring , "moderated list:ARM/Mediatek SoC support" , Evan Green , Matthias Brugger , anan.sun@mediatek.com, Greg Kroah-Hartman , Will Deacon , linux-arm Mailing List , Robin Murphy X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On Thu, 2020-11-12 at 09:10 +0800, Nicolas Boichat wrote: > On Wed, Nov 11, 2020 at 8:40 PM Yong Wu wrote: > > > > In the lastest SoC, M4U has its special power domain. thus, If the engine > > begin to work, it should help enable the power for M4U firstly. > > Currently if the engine work, it always enable the power/clocks for > > smi-larbs/smi-common. This patch adds device_link for smi-common and M4U. > > then, if smi-common power is enabled, the M4U power also is powered on > > automatically. > > > > Normally M4U connect with several smi-larbs and their smi-common always > > are the same, In this patch it get smi-common dev from the first smi-larb > > device(i==0), then add the device_link only while m4u has power-domain. > > > > Signed-off-by: Yong Wu > > --- > > drivers/iommu/mtk_iommu.c | 36 +++++++++++++++++++++++++++++++++--- > > drivers/iommu/mtk_iommu.h | 1 + > > 2 files changed, 34 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > index cfdf5ce696fd..4ce7e0883e4d 100644 > > --- a/drivers/iommu/mtk_iommu.c > > +++ b/drivers/iommu/mtk_iommu.c > > @@ -20,6 +20,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -705,7 +706,7 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > return larb_nr; > > > > for (i = 0; i < larb_nr; i++) { > > - struct device_node *larbnode; > > + struct device_node *larbnode, *smicomm_node; > > struct platform_device *plarbdev; > > u32 id; > > > > @@ -731,6 +732,26 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > > > component_match_add_release(dev, &match, release_of, > > compare_of, larbnode); > > + if (!i) { > > Maybe more of a style preference, but since you are actually comparing > an integer, I prefer seeing i == 0. > > Also, might be nicer to do > > if (i != 0) > continue; > > And de-indent the rest. Thanks. will fix. > > > + smicomm_node = of_parse_phandle(larbnode, "mediatek,smi", 0); > > + if (!smicomm_node) > > + return -EINVAL; > > + > > + plarbdev = of_find_device_by_node(smicomm_node); > > + of_node_put(smicomm_node); > > + data->smicomm_dev = &plarbdev->dev; > > + } > > + } > > + > > + if (dev->pm_domain) { > > + struct device_link *link; > > + > > + link = device_link_add(data->smicomm_dev, dev, > > + DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME); > > + if (!link) { > > + dev_err(dev, "Unable link %s.\n", dev_name(data->smicomm_dev)); > > + return -EINVAL; > > + } > > } > > > > platform_set_drvdata(pdev, data); > > @@ -738,14 +759,14 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > ret = iommu_device_sysfs_add(&data->iommu, dev, NULL, > > "mtk-iommu.%pa", &ioaddr); > > if (ret) > > - return ret; > > + goto out_link_remove; > > > > iommu_device_set_ops(&data->iommu, &mtk_iommu_ops); > > iommu_device_set_fwnode(&data->iommu, &pdev->dev.of_node->fwnode); > > > > ret = iommu_device_register(&data->iommu); > > if (ret) > > - return ret; > > + goto out_sysfs_remove; > > Technically, this change is unrelated. Sharp eye. Right. I thought it was small enough to squash here. I will use a new patch to fix this(add fixes tag, and no need add cc-stable I think.). > > > > > spin_lock_init(&data->tlb_lock); > > list_add_tail(&data->list, &m4ulist); > > @@ -754,6 +775,13 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > bus_set_iommu(&platform_bus_type, &mtk_iommu_ops); > > > > return component_master_add_with_match(dev, &mtk_iommu_com_ops, match); > > + > > +out_sysfs_remove: > > + iommu_device_sysfs_remove(&data->iommu); > > +out_link_remove: > > + if (dev->pm_domain) > > + device_link_remove(data->smicomm_dev, dev); > > + return ret; > > } > > > > static int mtk_iommu_remove(struct platform_device *pdev) > > @@ -767,6 +795,8 @@ static int mtk_iommu_remove(struct platform_device *pdev) > > bus_set_iommu(&platform_bus_type, NULL); > > > > clk_disable_unprepare(data->bclk); > > + if (pdev->dev.pm_domain) > > + device_link_remove(data->smicomm_dev, &pdev->dev); > > devm_free_irq(&pdev->dev, data->irq, data); > > component_master_del(&pdev->dev, &mtk_iommu_com_ops); > > return 0; > > diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h > > index d0c93652bdbe..5e03a029c4dc 100644 > > --- a/drivers/iommu/mtk_iommu.h > > +++ b/drivers/iommu/mtk_iommu.h > > @@ -68,6 +68,7 @@ struct mtk_iommu_data { > > > > struct iommu_device iommu; > > const struct mtk_iommu_plat_data *plat_data; > > + struct device *smicomm_dev; > > > > struct dma_iommu_mapping *mapping; /* For mtk_iommu_v1.c */ > > > > -- > > 2.18.0 > > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu 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=-11.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 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 35035C388F9 for ; Thu, 12 Nov 2020 02:42:51 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4F4A12074B for ; Thu, 12 Nov 2020 02:42:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="MWMXZw4Q"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="t3aUQwDK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F4A12074B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date:To:From: Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Y7LvwPPdwruEaBFNZ6m5C935TipcUfDFqMlqy6Nx6rQ=; b=MWMXZw4Q9QK+sL9V6CMq9OPOW 7qPt1w9/xLKjf9/0LYttRGLgEzAsBua1ipUJCYIiLI+jP1iMnwLcV20f6K2iAH1cPtrqz1WvCNrty Lj9mTxGmTFerSw3EXpwqu1t5+DSK3fw5EcTdzwMG+Sp/wkJocM8ZtxzZV3uKt90IrCEuU7fReJW29 UhU0Uj71IZ8y/5KjJdhxPpzBRUrTjIHLrEFSHk9dtMvuRiSRlYEftkmtAEeP4gIl8UXyG2slGMO2q 0EyYYITotdWk7h7WEXYTXnTq3LpTPpOzPkHzzrQWe0G4K5tP0ckWPxkqZPuU1TJWy/TsVwRyxZjOm elSy5DKTQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kd2ZJ-0005Nx-Ms; Thu, 12 Nov 2020 02:42:39 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kd2ZB-0005Mn-OY; Thu, 12 Nov 2020 02:42:32 +0000 X-UUID: ae62663088a047c595a611b7f8fb7d99-20201111 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=2akmVV9MmjilHzebTF46wwbdEe3nnOXuaGxT3mDFxZs=; b=t3aUQwDKGMat90RixAm1dLbb2W+cMm/tbIrsGUguqvmO/EF1OVmINQ0Ljf7tzMUyiT6khzRgclZB9AwgYWj/tfa6hJ0osLbYeTW2lK00oGkmLOU3gD/kMPeCAXeg4F6x0Psdq4kAmFLvMIj0Hl5jsj3gQE2mDqL2zMhzRtXm+4M=; X-UUID: ae62663088a047c595a611b7f8fb7d99-20201111 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1288387812; Wed, 11 Nov 2020 18:42:23 -0800 Received: from MTKMBS31N1.mediatek.inc (172.27.4.69) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 11 Nov 2020 18:42:22 -0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 12 Nov 2020 10:42:19 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 12 Nov 2020 10:42:19 +0800 Message-ID: <1605148938.26323.127.camel@mhfsdcap03> Subject: Re: [PATCH v4 13/24] iommu/mediatek: Add device link for smi-common and m4u From: Yong Wu To: Nicolas Boichat Date: Thu, 12 Nov 2020 10:42:18 +0800 In-Reply-To: References: <20201111123838.15682-1-yong.wu@mediatek.com> <20201111123838.15682-14-yong.wu@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 9DD61C76332B6A687D16ACA0116BA587755327AA8BAE00AF0ECEE2DBB83A02B42000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201111_214231_337169_9B9824AD X-CRM114-Status: GOOD ( 33.00 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: youlin.pei@mediatek.com, Devicetree List , srv_heupstream , Tomasz Figa , kernel-team@android.com, Joerg Roedel , lkml , Krzysztof Kozlowski , chao.hao@mediatek.com, iommu@lists.linux-foundation.org, Rob Herring , "moderated list:ARM/Mediatek SoC support" , Evan Green , Matthias Brugger , anan.sun@mediatek.com, Greg Kroah-Hartman , Will Deacon , linux-arm Mailing List , Robin Murphy Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Thu, 2020-11-12 at 09:10 +0800, Nicolas Boichat wrote: > On Wed, Nov 11, 2020 at 8:40 PM Yong Wu wrote: > > > > In the lastest SoC, M4U has its special power domain. thus, If the engine > > begin to work, it should help enable the power for M4U firstly. > > Currently if the engine work, it always enable the power/clocks for > > smi-larbs/smi-common. This patch adds device_link for smi-common and M4U. > > then, if smi-common power is enabled, the M4U power also is powered on > > automatically. > > > > Normally M4U connect with several smi-larbs and their smi-common always > > are the same, In this patch it get smi-common dev from the first smi-larb > > device(i==0), then add the device_link only while m4u has power-domain. > > > > Signed-off-by: Yong Wu > > --- > > drivers/iommu/mtk_iommu.c | 36 +++++++++++++++++++++++++++++++++--- > > drivers/iommu/mtk_iommu.h | 1 + > > 2 files changed, 34 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > index cfdf5ce696fd..4ce7e0883e4d 100644 > > --- a/drivers/iommu/mtk_iommu.c > > +++ b/drivers/iommu/mtk_iommu.c > > @@ -20,6 +20,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -705,7 +706,7 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > return larb_nr; > > > > for (i = 0; i < larb_nr; i++) { > > - struct device_node *larbnode; > > + struct device_node *larbnode, *smicomm_node; > > struct platform_device *plarbdev; > > u32 id; > > > > @@ -731,6 +732,26 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > > > component_match_add_release(dev, &match, release_of, > > compare_of, larbnode); > > + if (!i) { > > Maybe more of a style preference, but since you are actually comparing > an integer, I prefer seeing i == 0. > > Also, might be nicer to do > > if (i != 0) > continue; > > And de-indent the rest. Thanks. will fix. > > > + smicomm_node = of_parse_phandle(larbnode, "mediatek,smi", 0); > > + if (!smicomm_node) > > + return -EINVAL; > > + > > + plarbdev = of_find_device_by_node(smicomm_node); > > + of_node_put(smicomm_node); > > + data->smicomm_dev = &plarbdev->dev; > > + } > > + } > > + > > + if (dev->pm_domain) { > > + struct device_link *link; > > + > > + link = device_link_add(data->smicomm_dev, dev, > > + DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME); > > + if (!link) { > > + dev_err(dev, "Unable link %s.\n", dev_name(data->smicomm_dev)); > > + return -EINVAL; > > + } > > } > > > > platform_set_drvdata(pdev, data); > > @@ -738,14 +759,14 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > ret = iommu_device_sysfs_add(&data->iommu, dev, NULL, > > "mtk-iommu.%pa", &ioaddr); > > if (ret) > > - return ret; > > + goto out_link_remove; > > > > iommu_device_set_ops(&data->iommu, &mtk_iommu_ops); > > iommu_device_set_fwnode(&data->iommu, &pdev->dev.of_node->fwnode); > > > > ret = iommu_device_register(&data->iommu); > > if (ret) > > - return ret; > > + goto out_sysfs_remove; > > Technically, this change is unrelated. Sharp eye. Right. I thought it was small enough to squash here. I will use a new patch to fix this(add fixes tag, and no need add cc-stable I think.). > > > > > spin_lock_init(&data->tlb_lock); > > list_add_tail(&data->list, &m4ulist); > > @@ -754,6 +775,13 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > bus_set_iommu(&platform_bus_type, &mtk_iommu_ops); > > > > return component_master_add_with_match(dev, &mtk_iommu_com_ops, match); > > + > > +out_sysfs_remove: > > + iommu_device_sysfs_remove(&data->iommu); > > +out_link_remove: > > + if (dev->pm_domain) > > + device_link_remove(data->smicomm_dev, dev); > > + return ret; > > } > > > > static int mtk_iommu_remove(struct platform_device *pdev) > > @@ -767,6 +795,8 @@ static int mtk_iommu_remove(struct platform_device *pdev) > > bus_set_iommu(&platform_bus_type, NULL); > > > > clk_disable_unprepare(data->bclk); > > + if (pdev->dev.pm_domain) > > + device_link_remove(data->smicomm_dev, &pdev->dev); > > devm_free_irq(&pdev->dev, data->irq, data); > > component_master_del(&pdev->dev, &mtk_iommu_com_ops); > > return 0; > > diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h > > index d0c93652bdbe..5e03a029c4dc 100644 > > --- a/drivers/iommu/mtk_iommu.h > > +++ b/drivers/iommu/mtk_iommu.h > > @@ -68,6 +68,7 @@ struct mtk_iommu_data { > > > > struct iommu_device iommu; > > const struct mtk_iommu_plat_data *plat_data; > > + struct device *smicomm_dev; > > > > struct dma_iommu_mapping *mapping; /* For mtk_iommu_v1.c */ > > > > -- > > 2.18.0 > > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-11.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 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 2BD58C388F9 for ; Thu, 12 Nov 2020 02:43:30 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8DC3F2074B for ; Thu, 12 Nov 2020 02:43:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="O/u6zK81"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="t3aUQwDK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8DC3F2074B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date:To:From: Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=AidoVPnK3Js+v6Pe6auoTkmEi58idpUPGp52XwCbkNQ=; b=O/u6zK81D2IG8QxiusuvgWU6i MFbE9uCkrpQN+ddqHoewwQdQeDfn7CrSovQfJUkVP8CNnp+52glXO3wDnahaw2pppHBXP+Wfoynkk KNqENoU2j9nIFj4vKVpy283cYxhoVkxbMT8fP0jhX/ddVeOLgt7oqFtR17Lnw+Ur5gVerrhckDsbE 66e9vmtTNjoL3WKlz71XsmTmlJMCp1QKWMwryHLYeYBSCwjfkqjLIMBoq66O+KnPqvRIHWUCpC3F8 G3gRB7Cjto/U126Kwfixc1G0jIhh3AtsRtbPhjS845z7rL9jedLfynIpdeeCXrJn8UA4k8LdrAuCS fBkfb/jMw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kd2ZM-0005O7-FA; Thu, 12 Nov 2020 02:42:40 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kd2ZB-0005Mn-OY; Thu, 12 Nov 2020 02:42:32 +0000 X-UUID: ae62663088a047c595a611b7f8fb7d99-20201111 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=2akmVV9MmjilHzebTF46wwbdEe3nnOXuaGxT3mDFxZs=; b=t3aUQwDKGMat90RixAm1dLbb2W+cMm/tbIrsGUguqvmO/EF1OVmINQ0Ljf7tzMUyiT6khzRgclZB9AwgYWj/tfa6hJ0osLbYeTW2lK00oGkmLOU3gD/kMPeCAXeg4F6x0Psdq4kAmFLvMIj0Hl5jsj3gQE2mDqL2zMhzRtXm+4M=; X-UUID: ae62663088a047c595a611b7f8fb7d99-20201111 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1288387812; Wed, 11 Nov 2020 18:42:23 -0800 Received: from MTKMBS31N1.mediatek.inc (172.27.4.69) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 11 Nov 2020 18:42:22 -0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 12 Nov 2020 10:42:19 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 12 Nov 2020 10:42:19 +0800 Message-ID: <1605148938.26323.127.camel@mhfsdcap03> Subject: Re: [PATCH v4 13/24] iommu/mediatek: Add device link for smi-common and m4u From: Yong Wu To: Nicolas Boichat Date: Thu, 12 Nov 2020 10:42:18 +0800 In-Reply-To: References: <20201111123838.15682-1-yong.wu@mediatek.com> <20201111123838.15682-14-yong.wu@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 9DD61C76332B6A687D16ACA0116BA587755327AA8BAE00AF0ECEE2DBB83A02B42000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201111_214231_337169_9B9824AD X-CRM114-Status: GOOD ( 33.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: youlin.pei@mediatek.com, Devicetree List , srv_heupstream , Tomasz Figa , kernel-team@android.com, Joerg Roedel , lkml , Krzysztof Kozlowski , chao.hao@mediatek.com, iommu@lists.linux-foundation.org, Rob Herring , "moderated list:ARM/Mediatek SoC support" , Evan Green , Matthias Brugger , anan.sun@mediatek.com, Greg Kroah-Hartman , Will Deacon , linux-arm Mailing List , Robin Murphy Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, 2020-11-12 at 09:10 +0800, Nicolas Boichat wrote: > On Wed, Nov 11, 2020 at 8:40 PM Yong Wu wrote: > > > > In the lastest SoC, M4U has its special power domain. thus, If the engine > > begin to work, it should help enable the power for M4U firstly. > > Currently if the engine work, it always enable the power/clocks for > > smi-larbs/smi-common. This patch adds device_link for smi-common and M4U. > > then, if smi-common power is enabled, the M4U power also is powered on > > automatically. > > > > Normally M4U connect with several smi-larbs and their smi-common always > > are the same, In this patch it get smi-common dev from the first smi-larb > > device(i==0), then add the device_link only while m4u has power-domain. > > > > Signed-off-by: Yong Wu > > --- > > drivers/iommu/mtk_iommu.c | 36 +++++++++++++++++++++++++++++++++--- > > drivers/iommu/mtk_iommu.h | 1 + > > 2 files changed, 34 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > index cfdf5ce696fd..4ce7e0883e4d 100644 > > --- a/drivers/iommu/mtk_iommu.c > > +++ b/drivers/iommu/mtk_iommu.c > > @@ -20,6 +20,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -705,7 +706,7 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > return larb_nr; > > > > for (i = 0; i < larb_nr; i++) { > > - struct device_node *larbnode; > > + struct device_node *larbnode, *smicomm_node; > > struct platform_device *plarbdev; > > u32 id; > > > > @@ -731,6 +732,26 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > > > component_match_add_release(dev, &match, release_of, > > compare_of, larbnode); > > + if (!i) { > > Maybe more of a style preference, but since you are actually comparing > an integer, I prefer seeing i == 0. > > Also, might be nicer to do > > if (i != 0) > continue; > > And de-indent the rest. Thanks. will fix. > > > + smicomm_node = of_parse_phandle(larbnode, "mediatek,smi", 0); > > + if (!smicomm_node) > > + return -EINVAL; > > + > > + plarbdev = of_find_device_by_node(smicomm_node); > > + of_node_put(smicomm_node); > > + data->smicomm_dev = &plarbdev->dev; > > + } > > + } > > + > > + if (dev->pm_domain) { > > + struct device_link *link; > > + > > + link = device_link_add(data->smicomm_dev, dev, > > + DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME); > > + if (!link) { > > + dev_err(dev, "Unable link %s.\n", dev_name(data->smicomm_dev)); > > + return -EINVAL; > > + } > > } > > > > platform_set_drvdata(pdev, data); > > @@ -738,14 +759,14 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > ret = iommu_device_sysfs_add(&data->iommu, dev, NULL, > > "mtk-iommu.%pa", &ioaddr); > > if (ret) > > - return ret; > > + goto out_link_remove; > > > > iommu_device_set_ops(&data->iommu, &mtk_iommu_ops); > > iommu_device_set_fwnode(&data->iommu, &pdev->dev.of_node->fwnode); > > > > ret = iommu_device_register(&data->iommu); > > if (ret) > > - return ret; > > + goto out_sysfs_remove; > > Technically, this change is unrelated. Sharp eye. Right. I thought it was small enough to squash here. I will use a new patch to fix this(add fixes tag, and no need add cc-stable I think.). > > > > > spin_lock_init(&data->tlb_lock); > > list_add_tail(&data->list, &m4ulist); > > @@ -754,6 +775,13 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > bus_set_iommu(&platform_bus_type, &mtk_iommu_ops); > > > > return component_master_add_with_match(dev, &mtk_iommu_com_ops, match); > > + > > +out_sysfs_remove: > > + iommu_device_sysfs_remove(&data->iommu); > > +out_link_remove: > > + if (dev->pm_domain) > > + device_link_remove(data->smicomm_dev, dev); > > + return ret; > > } > > > > static int mtk_iommu_remove(struct platform_device *pdev) > > @@ -767,6 +795,8 @@ static int mtk_iommu_remove(struct platform_device *pdev) > > bus_set_iommu(&platform_bus_type, NULL); > > > > clk_disable_unprepare(data->bclk); > > + if (pdev->dev.pm_domain) > > + device_link_remove(data->smicomm_dev, &pdev->dev); > > devm_free_irq(&pdev->dev, data->irq, data); > > component_master_del(&pdev->dev, &mtk_iommu_com_ops); > > return 0; > > diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h > > index d0c93652bdbe..5e03a029c4dc 100644 > > --- a/drivers/iommu/mtk_iommu.h > > +++ b/drivers/iommu/mtk_iommu.h > > @@ -68,6 +68,7 @@ struct mtk_iommu_data { > > > > struct iommu_device iommu; > > const struct mtk_iommu_plat_data *plat_data; > > + struct device *smicomm_dev; > > > > struct dma_iommu_mapping *mapping; /* For mtk_iommu_v1.c */ > > > > -- > > 2.18.0 > > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-11.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham 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 F0214C56202 for ; Thu, 12 Nov 2020 05:32:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 68E1020825 for ; Thu, 12 Nov 2020 05:32:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="B7i1qKrU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727877AbgKLFcv (ORCPT ); Thu, 12 Nov 2020 00:32:51 -0500 Received: from mailgw02.mediatek.com ([1.203.163.81]:11035 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727936AbgKLCm2 (ORCPT ); Wed, 11 Nov 2020 21:42:28 -0500 X-UUID: 9be016932b0b47b695a8a04d0e8f8134-20201112 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=2akmVV9MmjilHzebTF46wwbdEe3nnOXuaGxT3mDFxZs=; b=B7i1qKrUtHcI/SrwT5pZORy4ir14B95DBrTr40zBuN/emudAM9UljPzdzwIxIU/KipAoPdnBqq69O4YtWo0SayqRd9mCp/cVg8pqHfY55ZKSB3xDznpBQJzrWb2xopkGnj2phZeALos97dcKsTy7u7el/w3Lg5rwWjTpp2N/hDw=; X-UUID: 9be016932b0b47b695a8a04d0e8f8134-20201112 Received: from mtkcas35.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1625091449; Thu, 12 Nov 2020 10:42:21 +0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 12 Nov 2020 10:42:19 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 12 Nov 2020 10:42:19 +0800 Message-ID: <1605148938.26323.127.camel@mhfsdcap03> Subject: Re: [PATCH v4 13/24] iommu/mediatek: Add device link for smi-common and m4u From: Yong Wu To: Nicolas Boichat CC: , Devicetree List , Greg Kroah-Hartman , srv_heupstream , , Will Deacon , Joerg Roedel , lkml , Krzysztof Kozlowski , Tomasz Figa , , "Rob Herring" , "moderated list:ARM/Mediatek SoC support" , Evan Green , Matthias Brugger , , , Robin Murphy , "linux-arm Mailing List" Date: Thu, 12 Nov 2020 10:42:18 +0800 In-Reply-To: References: <20201111123838.15682-1-yong.wu@mediatek.com> <20201111123838.15682-14-yong.wu@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 9DD61C76332B6A687D16ACA0116BA587755327AA8BAE00AF0ECEE2DBB83A02B42000:8 X-MTK: N Content-Transfer-Encoding: base64 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org T24gVGh1LCAyMDIwLTExLTEyIGF0IDA5OjEwICswODAwLCBOaWNvbGFzIEJvaWNoYXQgd3JvdGU6 DQo+IE9uIFdlZCwgTm92IDExLCAyMDIwIGF0IDg6NDAgUE0gWW9uZyBXdSA8eW9uZy53dUBtZWRp YXRlay5jb20+IHdyb3RlOg0KPiA+DQo+ID4gSW4gdGhlIGxhc3Rlc3QgU29DLCBNNFUgaGFzIGl0 cyBzcGVjaWFsIHBvd2VyIGRvbWFpbi4gdGh1cywgSWYgdGhlIGVuZ2luZQ0KPiA+IGJlZ2luIHRv IHdvcmssIGl0IHNob3VsZCBoZWxwIGVuYWJsZSB0aGUgcG93ZXIgZm9yIE00VSBmaXJzdGx5Lg0K PiA+IEN1cnJlbnRseSBpZiB0aGUgZW5naW5lIHdvcmssIGl0IGFsd2F5cyBlbmFibGUgdGhlIHBv d2VyL2Nsb2NrcyBmb3INCj4gPiBzbWktbGFyYnMvc21pLWNvbW1vbi4gVGhpcyBwYXRjaCBhZGRz IGRldmljZV9saW5rIGZvciBzbWktY29tbW9uIGFuZCBNNFUuDQo+ID4gdGhlbiwgaWYgc21pLWNv bW1vbiBwb3dlciBpcyBlbmFibGVkLCB0aGUgTTRVIHBvd2VyIGFsc28gaXMgcG93ZXJlZCBvbg0K PiA+IGF1dG9tYXRpY2FsbHkuDQo+ID4NCj4gPiBOb3JtYWxseSBNNFUgY29ubmVjdCB3aXRoIHNl dmVyYWwgc21pLWxhcmJzIGFuZCB0aGVpciBzbWktY29tbW9uIGFsd2F5cw0KPiA+IGFyZSB0aGUg c2FtZSwgSW4gdGhpcyBwYXRjaCBpdCBnZXQgc21pLWNvbW1vbiBkZXYgZnJvbSB0aGUgZmlyc3Qg c21pLWxhcmINCj4gPiBkZXZpY2UoaT09MCksIHRoZW4gYWRkIHRoZSBkZXZpY2VfbGluayBvbmx5 IHdoaWxlIG00dSBoYXMgcG93ZXItZG9tYWluLg0KPiA+DQo+ID4gU2lnbmVkLW9mZi1ieTogWW9u ZyBXdSA8eW9uZy53dUBtZWRpYXRlay5jb20+DQo+ID4gLS0tDQo+ID4gIGRyaXZlcnMvaW9tbXUv bXRrX2lvbW11LmMgfCAzNiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0NCj4g PiAgZHJpdmVycy9pb21tdS9tdGtfaW9tbXUuaCB8ICAxICsNCj4gPiAgMiBmaWxlcyBjaGFuZ2Vk LCAzNCBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQ0KPiA+DQo+ID4gZGlmZiAtLWdpdCBh L2RyaXZlcnMvaW9tbXUvbXRrX2lvbW11LmMgYi9kcml2ZXJzL2lvbW11L210a19pb21tdS5jDQo+ ID4gaW5kZXggY2ZkZjVjZTY5NmZkLi40Y2U3ZTA4ODNlNGQgMTAwNjQ0DQo+ID4gLS0tIGEvZHJp dmVycy9pb21tdS9tdGtfaW9tbXUuYw0KPiA+ICsrKyBiL2RyaXZlcnMvaW9tbXUvbXRrX2lvbW11 LmMNCj4gPiBAQCAtMjAsNiArMjAsNyBAQA0KPiA+ICAjaW5jbHVkZSA8bGludXgvb2ZfaXJxLmg+ DQo+ID4gICNpbmNsdWRlIDxsaW51eC9vZl9wbGF0Zm9ybS5oPg0KPiA+ICAjaW5jbHVkZSA8bGlu dXgvcGxhdGZvcm1fZGV2aWNlLmg+DQo+ID4gKyNpbmNsdWRlIDxsaW51eC9wbV9ydW50aW1lLmg+ DQo+ID4gICNpbmNsdWRlIDxsaW51eC9yZWdtYXAuaD4NCj4gPiAgI2luY2x1ZGUgPGxpbnV4L3Ns YWIuaD4NCj4gPiAgI2luY2x1ZGUgPGxpbnV4L3NwaW5sb2NrLmg+DQo+ID4gQEAgLTcwNSw3ICs3 MDYsNyBAQCBzdGF0aWMgaW50IG10a19pb21tdV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNl ICpwZGV2KQ0KPiA+ICAgICAgICAgICAgICAgICByZXR1cm4gbGFyYl9ucjsNCj4gPg0KPiA+ICAg ICAgICAgZm9yIChpID0gMDsgaSA8IGxhcmJfbnI7IGkrKykgew0KPiA+IC0gICAgICAgICAgICAg ICBzdHJ1Y3QgZGV2aWNlX25vZGUgKmxhcmJub2RlOw0KPiA+ICsgICAgICAgICAgICAgICBzdHJ1 Y3QgZGV2aWNlX25vZGUgKmxhcmJub2RlLCAqc21pY29tbV9ub2RlOw0KPiA+ICAgICAgICAgICAg ICAgICBzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwbGFyYmRldjsNCj4gPiAgICAgICAgICAgICAg ICAgdTMyIGlkOw0KPiA+DQo+ID4gQEAgLTczMSw2ICs3MzIsMjYgQEAgc3RhdGljIGludCBtdGtf aW9tbXVfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikNCj4gPg0KPiA+ICAgICAg ICAgICAgICAgICBjb21wb25lbnRfbWF0Y2hfYWRkX3JlbGVhc2UoZGV2LCAmbWF0Y2gsIHJlbGVh c2Vfb2YsDQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b21wYXJlX29mLCBsYXJibm9kZSk7DQo+ID4gKyAgICAgICAgICAgICAgIGlmICghaSkgew0KPiAN Cj4gTWF5YmUgbW9yZSBvZiBhIHN0eWxlIHByZWZlcmVuY2UsIGJ1dCBzaW5jZSB5b3UgYXJlIGFj dHVhbGx5IGNvbXBhcmluZw0KPiBhbiBpbnRlZ2VyLCBJIHByZWZlciBzZWVpbmcgaSA9PSAwLg0K PiANCj4gQWxzbywgbWlnaHQgYmUgbmljZXIgdG8gZG8NCj4gDQo+IGlmIChpICE9IDApDQo+ICAg IGNvbnRpbnVlOw0KPiANCj4gQW5kIGRlLWluZGVudCB0aGUgcmVzdC4NCg0KVGhhbmtzLiB3aWxs IGZpeC4NCg0KPiANCj4gPiArICAgICAgICAgICAgICAgICAgICAgICBzbWljb21tX25vZGUgPSBv Zl9wYXJzZV9waGFuZGxlKGxhcmJub2RlLCAibWVkaWF0ZWssc21pIiwgMCk7DQo+ID4gKyAgICAg ICAgICAgICAgICAgICAgICAgaWYgKCFzbWljb21tX25vZGUpDQo+ID4gKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICByZXR1cm4gLUVJTlZBTDsNCj4gPiArDQo+ID4gKyAgICAgICAgICAg ICAgICAgICAgICAgcGxhcmJkZXYgPSBvZl9maW5kX2RldmljZV9ieV9ub2RlKHNtaWNvbW1fbm9k ZSk7DQo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgb2Zfbm9kZV9wdXQoc21pY29tbV9ub2Rl KTsNCj4gPiArICAgICAgICAgICAgICAgICAgICAgICBkYXRhLT5zbWljb21tX2RldiA9ICZwbGFy YmRldi0+ZGV2Ow0KPiA+ICsgICAgICAgICAgICAgICB9DQo+ID4gKyAgICAgICB9DQo+ID4gKw0K PiA+ICsgICAgICAgaWYgKGRldi0+cG1fZG9tYWluKSB7DQo+ID4gKyAgICAgICAgICAgICAgIHN0 cnVjdCBkZXZpY2VfbGluayAqbGluazsNCj4gPiArDQo+ID4gKyAgICAgICAgICAgICAgIGxpbmsg PSBkZXZpY2VfbGlua19hZGQoZGF0YS0+c21pY29tbV9kZXYsIGRldiwNCj4gPiArICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBETF9GTEFHX1NUQVRFTEVTUyB8IERMX0ZMQUdf UE1fUlVOVElNRSk7DQo+ID4gKyAgICAgICAgICAgICAgIGlmICghbGluaykgew0KPiA+ICsgICAg ICAgICAgICAgICAgICAgICAgIGRldl9lcnIoZGV2LCAiVW5hYmxlIGxpbmsgJXMuXG4iLCBkZXZf bmFtZShkYXRhLT5zbWljb21tX2RldikpOw0KPiA+ICsgICAgICAgICAgICAgICAgICAgICAgIHJl dHVybiAtRUlOVkFMOw0KPiA+ICsgICAgICAgICAgICAgICB9DQo+ID4gICAgICAgICB9DQo+ID4N Cj4gPiAgICAgICAgIHBsYXRmb3JtX3NldF9kcnZkYXRhKHBkZXYsIGRhdGEpOw0KPiA+IEBAIC03 MzgsMTQgKzc1OSwxNCBAQCBzdGF0aWMgaW50IG10a19pb21tdV9wcm9iZShzdHJ1Y3QgcGxhdGZv cm1fZGV2aWNlICpwZGV2KQ0KPiA+ICAgICAgICAgcmV0ID0gaW9tbXVfZGV2aWNlX3N5c2ZzX2Fk ZCgmZGF0YS0+aW9tbXUsIGRldiwgTlVMTCwNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIm10ay1pb21tdS4lcGEiLCAmaW9hZGRyKTsNCj4gPiAgICAgICAgIGlmIChy ZXQpDQo+ID4gLSAgICAgICAgICAgICAgIHJldHVybiByZXQ7DQo+ID4gKyAgICAgICAgICAgICAg IGdvdG8gb3V0X2xpbmtfcmVtb3ZlOw0KPiA+DQo+ID4gICAgICAgICBpb21tdV9kZXZpY2Vfc2V0 X29wcygmZGF0YS0+aW9tbXUsICZtdGtfaW9tbXVfb3BzKTsNCj4gPiAgICAgICAgIGlvbW11X2Rl dmljZV9zZXRfZndub2RlKCZkYXRhLT5pb21tdSwgJnBkZXYtPmRldi5vZl9ub2RlLT5md25vZGUp Ow0KPiA+DQo+ID4gICAgICAgICByZXQgPSBpb21tdV9kZXZpY2VfcmVnaXN0ZXIoJmRhdGEtPmlv bW11KTsNCj4gPiAgICAgICAgIGlmIChyZXQpDQo+ID4gLSAgICAgICAgICAgICAgIHJldHVybiBy ZXQ7DQo+ID4gKyAgICAgICAgICAgICAgIGdvdG8gb3V0X3N5c2ZzX3JlbW92ZTsNCj4gDQo+IFRl Y2huaWNhbGx5LCB0aGlzIGNoYW5nZSBpcyB1bnJlbGF0ZWQuDQoNClNoYXJwIGV5ZS4gUmlnaHQu IEkgdGhvdWdodCBpdCB3YXMgc21hbGwgZW5vdWdoIHRvIHNxdWFzaCBoZXJlLg0KDQpJIHdpbGwg dXNlIGEgbmV3IHBhdGNoIHRvIGZpeCB0aGlzKGFkZCBmaXhlcyB0YWcsIGFuZCBubyBuZWVkIGFk ZA0KY2Mtc3RhYmxlIEkgdGhpbmsuKS4NCg0KPiANCj4gPg0KPiA+ICAgICAgICAgc3Bpbl9sb2Nr X2luaXQoJmRhdGEtPnRsYl9sb2NrKTsNCj4gPiAgICAgICAgIGxpc3RfYWRkX3RhaWwoJmRhdGEt Pmxpc3QsICZtNHVsaXN0KTsNCj4gPiBAQCAtNzU0LDYgKzc3NSwxMyBAQCBzdGF0aWMgaW50IG10 a19pb21tdV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQ0KPiA+ICAgICAgICAg ICAgICAgICBidXNfc2V0X2lvbW11KCZwbGF0Zm9ybV9idXNfdHlwZSwgJm10a19pb21tdV9vcHMp Ow0KPiA+DQo+ID4gICAgICAgICByZXR1cm4gY29tcG9uZW50X21hc3Rlcl9hZGRfd2l0aF9tYXRj aChkZXYsICZtdGtfaW9tbXVfY29tX29wcywgbWF0Y2gpOw0KPiA+ICsNCj4gPiArb3V0X3N5c2Zz X3JlbW92ZToNCj4gPiArICAgICAgIGlvbW11X2RldmljZV9zeXNmc19yZW1vdmUoJmRhdGEtPmlv bW11KTsNCj4gPiArb3V0X2xpbmtfcmVtb3ZlOg0KPiA+ICsgICAgICAgaWYgKGRldi0+cG1fZG9t YWluKQ0KPiA+ICsgICAgICAgICAgICAgICBkZXZpY2VfbGlua19yZW1vdmUoZGF0YS0+c21pY29t bV9kZXYsIGRldik7DQo+ID4gKyAgICAgICByZXR1cm4gcmV0Ow0KPiA+ICB9DQo+ID4NCj4gPiAg c3RhdGljIGludCBtdGtfaW9tbXVfcmVtb3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYp DQo+ID4gQEAgLTc2Nyw2ICs3OTUsOCBAQCBzdGF0aWMgaW50IG10a19pb21tdV9yZW1vdmUoc3Ry dWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikNCj4gPiAgICAgICAgICAgICAgICAgYnVzX3NldF9p b21tdSgmcGxhdGZvcm1fYnVzX3R5cGUsIE5VTEwpOw0KPiA+DQo+ID4gICAgICAgICBjbGtfZGlz YWJsZV91bnByZXBhcmUoZGF0YS0+YmNsayk7DQo+ID4gKyAgICAgICBpZiAocGRldi0+ZGV2LnBt X2RvbWFpbikNCj4gPiArICAgICAgICAgICAgICAgZGV2aWNlX2xpbmtfcmVtb3ZlKGRhdGEtPnNt aWNvbW1fZGV2LCAmcGRldi0+ZGV2KTsNCj4gPiAgICAgICAgIGRldm1fZnJlZV9pcnEoJnBkZXYt PmRldiwgZGF0YS0+aXJxLCBkYXRhKTsNCj4gPiAgICAgICAgIGNvbXBvbmVudF9tYXN0ZXJfZGVs KCZwZGV2LT5kZXYsICZtdGtfaW9tbXVfY29tX29wcyk7DQo+ID4gICAgICAgICByZXR1cm4gMDsN Cj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9pb21tdS9tdGtfaW9tbXUuaCBiL2RyaXZlcnMvaW9t bXUvbXRrX2lvbW11LmgNCj4gPiBpbmRleCBkMGM5MzY1MmJkYmUuLjVlMDNhMDI5YzRkYyAxMDA2 NDQNCj4gPiAtLS0gYS9kcml2ZXJzL2lvbW11L210a19pb21tdS5oDQo+ID4gKysrIGIvZHJpdmVy cy9pb21tdS9tdGtfaW9tbXUuaA0KPiA+IEBAIC02OCw2ICs2OCw3IEBAIHN0cnVjdCBtdGtfaW9t bXVfZGF0YSB7DQo+ID4NCj4gPiAgICAgICAgIHN0cnVjdCBpb21tdV9kZXZpY2UgICAgICAgICAg ICAgaW9tbXU7DQo+ID4gICAgICAgICBjb25zdCBzdHJ1Y3QgbXRrX2lvbW11X3BsYXRfZGF0YSAq cGxhdF9kYXRhOw0KPiA+ICsgICAgICAgc3RydWN0IGRldmljZSAgICAgICAgICAgICAgICAgICAq c21pY29tbV9kZXY7DQo+ID4NCj4gPiAgICAgICAgIHN0cnVjdCBkbWFfaW9tbXVfbWFwcGluZyAg ICAgICAgKm1hcHBpbmc7IC8qIEZvciBtdGtfaW9tbXVfdjEuYyAqLw0KPiA+DQo+ID4gLS0NCj4g PiAyLjE4LjANCj4gPg0KPiANCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18NCj4gTGludXgtbWVkaWF0ZWsgbWFpbGluZyBsaXN0DQo+IExpbnV4LW1lZGlh dGVrQGxpc3RzLmluZnJhZGVhZC5vcmcNCj4gaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFp bG1hbi9saXN0aW5mby9saW51eC1tZWRpYXRlaw0KDQo=