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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 867E8C352A3 for ; Mon, 10 Feb 2020 13:10:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51AEF2070A for ; Mon, 10 Feb 2020 13:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581340255; bh=t6b3cf5dVcO7i53kHMkoUtfy5mf7eRqbnoiTklD04cs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BDWdUVSeZlg61Uw7NuTZ5f4b1IyqzzO3c/Uw/8nL6GE9jyyBKO19jqIoLwiYJDsPw 3BzRRK0sWSZKS4WvUpcSdhJz/xewg1b6pc2hz9E57WGWd9n+wD9yJNi982uFmcRMxt hpSvtBNKZQXDn5AYbAVWFQJnqJ60rduzRyhGp9M8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729332AbgBJMjJ (ORCPT ); Mon, 10 Feb 2020 07:39:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:36172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729326AbgBJMjI (ORCPT ); Mon, 10 Feb 2020 07:39:08 -0500 Received: from localhost (unknown [209.37.97.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EE48520842; Mon, 10 Feb 2020 12:39:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338347; bh=t6b3cf5dVcO7i53kHMkoUtfy5mf7eRqbnoiTklD04cs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1yu96l9tUXB1m/MSEHHQ9hSefONuTPLZ7aCg3mLb3odraFYbvLpzoL3hU/wOxPflU 51AwzyQ+xXTlh9UmqPexgCM6cgnwhyx2GJV4tTO+2T2Tes5CgU436tKn3HvS7/atAw QoVeHEQhNgeHrcdoHgKsIOkIt73jQLWCWuFLZpFg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Fainelli , "David S. Miller" Subject: [PATCH 5.4 267/309] net: dsa: bcm_sf2: Only 7278 supports 2Gb/sec IMP port Date: Mon, 10 Feb 2020 04:33:43 -0800 Message-Id: <20200210122432.326228849@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122406.106356946@linuxfoundation.org> References: <20200210122406.106356946@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Florian Fainelli [ Upstream commit de34d7084edd069dac5aa010cfe32bd8c4619fa6 ] The 7445 switch clocking profiles do not allow us to run the IMP port at 2Gb/sec in a way that it is reliable and consistent. Make sure that the setting is only applied to the 7278 family. Fixes: 8f1880cbe8d0 ("net: dsa: bcm_sf2: Configure IMP port for 2Gb/sec") Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/bcm_sf2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -68,7 +68,9 @@ static void bcm_sf2_imp_setup(struct dsa /* Force link status for IMP port */ reg = core_readl(priv, offset); - reg |= (MII_SW_OR | LINK_STS | GMII_SPEED_UP_2G); + reg |= (MII_SW_OR | LINK_STS); + if (priv->type == BCM7278_DEVICE_ID) + reg |= GMII_SPEED_UP_2G; core_writel(priv, reg, offset); /* Enable Broadcast, Multicast, Unicast forwarding to IMP port */