linux-kernel - Re: [PATCH v4 3/3] media: mtk-mdp: Fix mdp device tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 7 Jun 2017 10:56:10 +0200
From:   Hans Verkuil <hverkuil@...all.nl>
To:     Matthias Brugger <matthias.bgg@...il.com>,
        Minghsiu Tsai <minghsiu.tsai@...iatek.com>,
        Hans Verkuil <hans.verkuil@...co.com>,
        daniel.thompson@...aro.org, Rob Herring <robh+dt@...nel.org>,
        Mauro Carvalho Chehab <mchehab@....samsung.com>,
        Daniel Kurtz <djkurtz@...omium.org>,
        Pawel Osciak <posciak@...omium.org>,
        Houlong Wei <houlong.wei@...iatek.com>
Cc:     srv_heupstream@...iatek.com,
        Eddie Huang <eddie.huang@...iatek.com>,
        Yingjoe Chen <yingjoe.chen@...iatek.com>,
        Wu-Cheng Li <wuchengli@...gle.com>, devicetree@...r.kernel.org,
        linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
        linux-media@...r.kernel.org, linux-mediatek@...ts.infradead.org
Subject: Re: [PATCH v4 3/3] media: mtk-mdp: Fix mdp device tree

On 07/06/17 10:44, Matthias Brugger wrote:
> Hi Hans, hi Mauro,
> 
> On 23/05/17 05:24, Minghsiu Tsai wrote:
>> From: Daniel Kurtz <djkurtz@...omium.org>
>>
>> If the mdp_* nodes are under an mdp sub-node, their corresponding
>> platform device does not automatically get its iommu assigned properly.
>>
>> Fix this by moving the mdp component nodes up a level such that they are
>> siblings of mdp and all other SoC subsystems.  This also simplifies the
>> device tree.
>>
>> Although it fixes iommu assignment issue, it also break compatibility
>> with old device tree. So, the patch in driver is needed to iterate over
>> sibling mdp device nodes, not child ones, to keep driver work properly.
>>
>> Signed-off-by: Daniel Kurtz <djkurtz@...omium.org>
>> Signed-off-by: Minghsiu Tsai <minghsiu.tsai@...iatek.com>
>> Signed-off-by: Matthias Brugger <matthias.bgg@...il.com>
>>
> 
> Are you OK to take this patch, or do you have any further comments?

Nope, it's all good. Queued for 4.13.

Regards,

	Hans

> 
> Regards,
> Matthias
> 
>> ---
>>   drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 12 ++++++++++--
>>   1 file changed, 10 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
>> index 9e4eb7d..8134755 100644
>> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
>> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
>> @@ -103,7 +103,7 @@ static int mtk_mdp_probe(struct platform_device *pdev)
>>   {
>>       struct mtk_mdp_dev *mdp;
>>       struct device *dev = &pdev->dev;
>> -    struct device_node *node;
>> +    struct device_node *node, *parent;
>>       int i, ret = 0;
>>         mdp = devm_kzalloc(dev, sizeof(*mdp), GFP_KERNEL);
>> @@ -117,8 +117,16 @@ static int mtk_mdp_probe(struct platform_device *pdev)
>>       mutex_init(&mdp->lock);
>>       mutex_init(&mdp->vpulock);
>>   +    /* Old dts had the components as child nodes */
>> +    if (of_get_next_child(dev->of_node, NULL)) {
>> +        parent = dev->of_node;
>> +        dev_warn(dev, "device tree is out of date\n");
>> +    } else {
>> +        parent = dev->of_node->parent;
>> +    }
>> +
>>       /* Iterate over sibling MDP function blocks */
>> -    for_each_child_of_node(dev->of_node, node) {
>> +    for_each_child_of_node(parent, node) {
>>           const struct of_device_id *of_id;
>>           enum mtk_mdp_comp_type comp_type;
>>           int comp_id;
>>