From patchwork Tue Sep 22 20:03:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1369243 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=PkHtiOl2; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bwshc4hh3z9sS8 for ; Wed, 23 Sep 2020 06:04:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726716AbgIVUEH (ORCPT ); Tue, 22 Sep 2020 16:04:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726448AbgIVUEF (ORCPT ); Tue, 22 Sep 2020 16:04:05 -0400 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FD63C061755; Tue, 22 Sep 2020 13:04:05 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id g29so12880169pgl.2; Tue, 22 Sep 2020 13:04:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LwGfBBJgKBgS+jH5gAWH5iyNNIi2yF8tjn973S871XE=; b=PkHtiOl2ot+0gTm8DKL57C5y/kdd6slabBkOc7ONiG2tGgFYI0n2JXUlf70+jhwFjt yMfa8NiRx47Xm9Zo//VsFEymtlSE0oxV6LOOP8NSqEzV0iDl2YeW/mD4TCx9nngUsnDE Yg/ZNep1MFTzS1GTUS0+DwlT/P7b/n70uEvT/YfrSje5IF4QQtlF4xrEotLBsOuce/my rSBq3bAES1lFAvHn3kNejA3Pio+Qq0AeMEf8vZsuV/3lnrE5mtYESkulS1hXWbuuhlrr Ar9NvWK1kz9uJ6FYgt8A+QlV64s5xei6mLfbsWfgRLhHgk6XYrVwkrNnnoDh2WIcBkI6 +U1w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=LwGfBBJgKBgS+jH5gAWH5iyNNIi2yF8tjn973S871XE=; b=jXy5qNsVx0UkPtSPOfm3igynObug3qE9A1eqzH/apCA+n+KWfn0t+X6siQCnnZB7PC b35eHlY4MR25rd3+R5UGIl80Yf2nXVze3gnzlnf1VWQfSEf1xiuomu35nFFeAjlz/Qer wPraLcL0tO5HjlCZrC+TgIQJDq2L6Ue5xg5IIyxyUcQAR6GSTOF4YUV8KXTanSFmfLCj 2AgbTKRPc8g/n4wMlDIwBTbEH5ey3OYYaP/ZybdrmktUOemi0exIQycSAVf0kkfPAnzs oM8xwO7toO660f6T0FZhf0I5eDqzCF7pGqxci7LTzK6YZK5uFwDuYIaIOUbOetw5Vu5N 4DUA== X-Gm-Message-State: AOAM532d96rdrEQqf4tIKTqeZKdmoykEBVlS4gnK5RTRrJrvzYmJ9vrk qA+NejbmoS3VNsQDg8ROfHqfWYsitVd33w== X-Google-Smtp-Source: ABdhPJxo9ee7nJ75PiAQfaEMyEqIXNWtMONQK4wsZCoOr1C4P3OrSlHZqcu721YdUNJkRhl4Xpmanw== X-Received: by 2002:aa7:92c8:0:b029:13e:d13d:a12b with SMTP id k8-20020aa792c80000b029013ed13da12bmr5359950pfa.19.1600805044485; Tue, 22 Sep 2020 13:04:04 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id q18sm15562700pfg.158.2020.09.22.13.04.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2020 13:04:03 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , "David S. Miller" , Jakub Kicinski , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next 1/2] net: dsa: bcm_sf2: Disallow port 5 to be a DSA CPU port Date: Tue, 22 Sep 2020 13:03:55 -0700 Message-Id: <20200922200356.2611257-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200922200356.2611257-1-f.fainelli@gmail.com> References: <20200922200356.2611257-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org While the switch driver is written such that port 5 or 8 could be CPU ports, the use case on Broadcom STB chips is to use port 8 exclusively. The platform firmware does make port 5 comply to a proper DSA CPU port binding by specifiying an "ethernet" phandle. This is undesirable for now until we have an user-space configuration mechanism (such as devlink) which could support dynamically changing the port flavor at run time. Signed-off-by: Florian Fainelli --- drivers/net/dsa/bcm_sf2.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 723820603107..2bd52b03de38 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -457,6 +457,7 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv, { struct device_node *port; unsigned int port_num; + struct property *prop; phy_interface_t mode; int err; @@ -483,6 +484,16 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv, if (of_property_read_bool(port, "brcm,use-bcm-hdr")) priv->brcm_tag_mask |= 1 << port_num; + + /* Ensure that port 5 is not picked up as a DSA CPU port + * flavour but a regular port instead. We should be using + * devlink to be able to set the port flavour. + */ + if (port_num == 5 && priv->type == BCM7278_DEVICE_ID) { + prop = of_find_property(port, "ethernet", NULL); + if (prop) + of_remove_property(port, prop); + } } } From patchwork Tue Sep 22 20:03:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1369242 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=r6sy8YWI; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BwshW4mf6z9sTg for ; Wed, 23 Sep 2020 06:04:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726748AbgIVUEJ (ORCPT ); Tue, 22 Sep 2020 16:04:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726714AbgIVUEH (ORCPT ); Tue, 22 Sep 2020 16:04:07 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25461C061755; Tue, 22 Sep 2020 13:04:07 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id y14so2795542pgf.12; Tue, 22 Sep 2020 13:04:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SuV+yJBGSoAtpEbxONX5yGGmxZPrDGQ8MAV9fK25O7U=; b=r6sy8YWIHD434X4QCttQdlj3mKj5epCo7+RVNQVPT9+eTXZIS/Y2VBCRwmPSQuUze5 ru3ClwDDdlAAHqZwoy555VaRpW0RaAcOOBCcjjaYNI3CnGQFzo7fbLsY/6jy4fUXuiGH 1udnYN4cMoKoJEKDbM08SOr3MUGQo2rccX5nYRvfw9+fGpV3eLJFP1poiatD+1T5N4Lm LyJ5eVWey8F9gohSB62ssgyAciyDyiNahYWHYCy+ZYHZhZV4TC8e30WSJuUiNo1Oavya jnF9BArCPceHO3Vj6Moddm1QDvxnRO9CJujrIImXOjgmK6RGxXrgoLZ5ruBGWXvs7OhE eRAw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=SuV+yJBGSoAtpEbxONX5yGGmxZPrDGQ8MAV9fK25O7U=; b=Jr1E+1A9XQLaXl2MlM8SYgy317CkvJjy+z3h8u+5Q4edRvw9FUQWnLZ8Ddnx0I7a2U mZLOmTGly7rnqWZ9+YXUbWe9o8gVnLO6AdocTJqBCwVCKnNRVttONaZSdTNuaH3/ximZ 1I1iV/EbBiY7RPhWMwVgq3CMJPq2jWy60IDiQT/u47Uud6ldL0MGrWOuBZXSOYj+tzjP +5mm6iApvngE5oaLZiSYBIoFzR81qoo9/C3IRdCp+3Qvr6tfBhZt/D9sKPbZv8XPV0oR rqYC8Jb2MbKnYTzdp2V41Z6hcu3MYqAIg3K/gEMhZeHQjFOIBe9WChpy0hcxuNyof2Cr acyg== X-Gm-Message-State: AOAM533pxkHVLqFfgMWvdYb4o/EHeI8ShpSci+b8oVibE5AgDb/Z/kQS fTNxGwdM7OQ/PoQqmP6JndMemjGaUSLG4A== X-Google-Smtp-Source: ABdhPJy6pZDfRe0oHFfjxTkT1uXFPWChxskyJdswDvPi/fBxO0Jc9bewMlmRO5R2Ib6Qw/ECFdeZHA== X-Received: by 2002:a17:902:7089:b029:d1:e5e7:be13 with SMTP id z9-20020a1709027089b02900d1e5e7be13mr272332plk.70.1600805046243; Tue, 22 Sep 2020 13:04:06 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id q18sm15562700pfg.158.2020.09.22.13.04.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2020 13:04:05 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , "David S. Miller" , Jakub Kicinski , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next 2/2] net: dsa: bcm_sf2: Include address 0 for MDIO diversion Date: Tue, 22 Sep 2020 13:03:56 -0700 Message-Id: <20200922200356.2611257-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200922200356.2611257-1-f.fainelli@gmail.com> References: <20200922200356.2611257-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We need to include MDIO address 0, which is how our Device Tree blobs indicate where to find the external BCM53125 switches. Signed-off-by: Florian Fainelli --- drivers/net/dsa/bcm_sf2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 2bd52b03de38..0b5b2b33b3b6 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -538,7 +538,7 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds) * driver. */ if (of_machine_is_compatible("brcm,bcm7445d0")) - priv->indir_phy_mask |= (1 << BRCM_PSEUDO_PHY_ADDR); + priv->indir_phy_mask |= (1 << BRCM_PSEUDO_PHY_ADDR) | (1 << 0); else priv->indir_phy_mask = 0;