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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 4656CC2BB55 for ; Wed, 15 Apr 2020 11:48:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1539A20732 for ; Wed, 15 Apr 2020 11:48:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586951304; bh=bUXNDQQRGaIuaP5JVoTNgFflarxDr46radtnMT9rNO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CJs+ICtMMj+BAfHUz4bpT/S2COrpg0dtXfbafCMKWcuzD8kQIm3LKZyvn5pjIDymI IYiPwxtiHplzUDxsySxoVIx2yw+PmDV0AFy5Q1Ap/lXzuzyjhQ+F+lrZMkfamnmqQY FJxKa4cnt32EXfjaWuboWp4GXv8+H8cxBujhllTM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2409449AbgDOLsT (ORCPT ); Wed, 15 Apr 2020 07:48:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:43808 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409422AbgDOLsH (ORCPT ); Wed, 15 Apr 2020 07:48:07 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 58F7C20775; Wed, 15 Apr 2020 11:48:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586951287; bh=bUXNDQQRGaIuaP5JVoTNgFflarxDr46radtnMT9rNO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rAejOywbFFLt3IavI5Rxhnb/7UJfIE7+9CFZ2BhwpIdbaa1NaD0S205IEYn6Lrfj3 Zj/0Aqo9Y04YkxEyhPzCv4kxsSVQaWQ3fNIXibI4+8pNZrrpkMp96c7e+V3uDcM+TR p0TPRi1v5o6NRYUU2vrvcTy3KCFHTzUPIO5bFVS4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Florian Fainelli , Vivien Didelot , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 15/21] net: dsa: bcm_sf2: Ensure correct sub-node is parsed Date: Wed, 15 Apr 2020 07:47:42 -0400 Message-Id: <20200415114748.15713-15-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415114748.15713-1-sashal@kernel.org> References: <20200415114748.15713-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Florian Fainelli [ Upstream commit afa3b592953bfaecfb4f2f335ec5f935cff56804 ] When the bcm_sf2 was converted into a proper platform device driver and used the new dsa_register_switch() interface, we would still be parsing the legacy DSA node that contained all the port information since the platform firmware has intentionally maintained backward and forward compatibility to client programs. Ensure that we do parse the correct node, which is "ports" per the revised DSA binding. Fixes: d9338023fb8e ("net: dsa: bcm_sf2: Make it a real platform device driver") Signed-off-by: Florian Fainelli Reviewed-by: Vivien Didelot Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/bcm_sf2.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index a3a8d7b62f3fb..796571fccba70 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -976,6 +976,7 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev) struct device_node *dn = pdev->dev.of_node; struct b53_platform_data *pdata; struct dsa_switch_ops *ops; + struct device_node *ports; struct bcm_sf2_priv *priv; struct b53_device *dev; struct dsa_switch *ds; @@ -1038,7 +1039,11 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev) spin_lock_init(&priv->indir_lock); mutex_init(&priv->stats_mutex); - bcm_sf2_identify_ports(priv, dn->child); + ports = of_find_node_by_name(dn, "ports"); + if (ports) { + bcm_sf2_identify_ports(priv, ports); + of_node_put(ports); + } priv->irq0 = irq_of_parse_and_map(dn, 0); priv->irq1 = irq_of_parse_and_map(dn, 1); -- 2.20.1