From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965068AbeALSea (ORCPT + 1 other); Fri, 12 Jan 2018 13:34:30 -0500 Received: from mail-qt0-f193.google.com ([209.85.216.193]:35152 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964967AbeALSe3 (ORCPT ); Fri, 12 Jan 2018 13:34:29 -0500 X-Google-Smtp-Source: ACJfBot8wQkJM4wze4Vcdmk98upz+3NIfWGyFe049D1Ul5WgONJE9Emxn1ncmwVdpfZ+uTsnM1Y+2g== Subject: Re: [PATCH] soc: brcmstb: Only register SoC device on STB platforms To: Sudeep Holla , Thierry Reding , Brian Norris , Gregory Fong , Florian Fainelli Cc: arm@kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org References: <20180109145409.11612-1-thierry.reding@gmail.com> <973b2445-48ca-87a9-b4c2-21d8bfec76dd@arm.com> From: Florian Fainelli Message-ID: <89ce7223-8ae5-061b-911c-d10f12b9517b@gmail.com> Date: Fri, 12 Jan 2018 10:34:24 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <973b2445-48ca-87a9-b4c2-21d8bfec76dd@arm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On 01/12/2018 04:12 AM, Sudeep Holla wrote: > > > On 12/01/18 11:39, Sudeep Holla wrote: >> >> >> On 09/01/18 14:54, Thierry Reding wrote: >>> From: Thierry Reding >>> >>> After moving the SoC device initialization to an early initcall in >>> commit f780429adfbc ("soc: brcmstb: biuctrl: Move to early_initcall"), >>> the Broadcom STB SoC device is registered on all platforms if support >>> for the device is enabled in the kernel configuration. >>> >>> This causes an additional SoC device to appear on platforms that already >>> register a native one. In case of Tegra the STB SoC device is registered >>> as soc0 (with totally meaningless content in the sysfs attributes) and >>> causes various scripts and programs to fail because they don't know how >>> to parse that data. >>> >>> To fix this, duplicate the check from brcmstb_soc_device_early_init() >>> that already prevents the code from doing anything nonsensical on non- >>> STB platforms. >>> >>> Fixes: f780429adfbc ("soc: brcmstb: biuctrl: Move to early_initcall") >>> Signed-off-by: Thierry Reding >>> --- >>> drivers/soc/bcm/brcmstb/common.c | 5 +++++ >>> 1 file changed, 5 insertions(+) >>> >>> diff --git a/drivers/soc/bcm/brcmstb/common.c b/drivers/soc/bcm/brcmstb/common.c >>> index 781ada62d0a3..4fe1cb73b39a 100644 >>> --- a/drivers/soc/bcm/brcmstb/common.c >>> +++ b/drivers/soc/bcm/brcmstb/common.c >>> @@ -89,8 +89,13 @@ early_initcall(brcmstb_soc_device_early_init); >>> static int __init brcmstb_soc_device_init(void) >>> { >>> struct soc_device_attribute *soc_dev_attr; >>> + struct device_node *sun_top_ctrl; >>> struct soc_device *soc_dev; >>> >>> + sun_top_ctrl = of_find_matching_node(NULL, sun_top_ctrl_match); >>> + if (!sun_top_ctrl) >>> + return -ENODEV; >>> + >> >> missing of_node_put(sun_top_ctrl) ? or am I missing to see that elsewhere ? >> > > Further, I still the error messags on my Juno with this patch applied. I > fail to see how this patch prevents brcmstb_biuctrl_init which is > early_initcall in drivers/soc/bcm/brcmstb/biuctrl.c getting called ? I read your patch too quickly, yours is needed, and so is Thierry's, I will send an incremental fix to Olof shortly, sorry about the mess. -- Florian