From patchwork Tue Sep 19 17:46:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 815750 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mhYfEEte"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xxVgm3jQkz9sBZ for ; Wed, 20 Sep 2017 03:47:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751803AbdISRrN (ORCPT ); Tue, 19 Sep 2017 13:47:13 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:35492 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751365AbdISRrL (ORCPT ); Tue, 19 Sep 2017 13:47:11 -0400 Received: by mail-wr0-f195.google.com with SMTP id n64so184160wrb.2 for ; Tue, 19 Sep 2017 10:47:11 -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; bh=LzQkd2eWrREQGByv9+TQrFIlf65/ypkN9GUzfC/nFP0=; b=mhYfEEteH/LQyrpQ/YeuIs4tFtXbPwshegIQFn5aAcpK9kSoHC9uDEh3mVdlRY+7iC pH67x/8A8ZyldI81vZjlxOivBuXQnsLtMgvHWfoBrUkX3kPL0vQ8vv96EjmyjwTQlxet PUIS44k9GGpqj5OVLRiSai9DNCCRSyZ4cAM7OlB50V0jI89W06XVUGXcno0MGHXsAwCI eGjUHJEQaiUI7NlO9uB/fE2F3S+NGTRKTz78nuc24PE5LdaQ4DG/4GTGVof/3IPa6+m1 z3mwUcUvMoCEutYgQu7cER+0gBD56xw8u9Fbq5bmT0I1ZID9HiJKAaGMQ59GlFMrkB99 qPaA== 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; bh=LzQkd2eWrREQGByv9+TQrFIlf65/ypkN9GUzfC/nFP0=; b=uQ8vE6PE6HuGcWK/2hPXwPxxl2zZ3xOJQ8/zkCQEpB1707FeyTG1VeM79P+OImf/NV xMIYp7l+Sk4i+YIjfXBV+XuL5rHClUhYkL6svvpAIHTTfcJsUkFDipwL7j4bM9kazk/z Cp8Fsgd0f7VbtJlGp/H3zCSeC4EF837Re9usXdJs+hz1demFHABU/dzhJ9L2Jw4cnO2V l7hy9fxmZKSJ8kTqeMT/JlvLhIi2EodL4RX+T2ZRlx9Txeh4y+btIw1q/Qwh4J09Q9hF tfzdho9bHFk4L1eY5U2Yp57Xmvp5SxAA56hn9ee9jYhxyvbSQ7Jdea9fqHEqMCUoaZRT dRlA== X-Gm-Message-State: AHPjjUiuWTAdMC1ZRDMf3DKyXVcdf4BOpQY/12KnoNbxCav/BDzLBUF9 evUQa+TOB6Km+SFDD7OA8u32mx1I X-Google-Smtp-Source: AOwi7QAB0fV+xV4XX4WZYKFMY2fpYT5noX4VvTYiXkYEyDvShc2fgcusGTff0oy2MDoHFcyvHBbyKA== X-Received: by 10.223.150.171 with SMTP id u40mr2232761wrb.201.1505843230080; Tue, 19 Sep 2017 10:47:10 -0700 (PDT) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id q19sm11543124wrb.17.2017.09.19.10.47.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Sep 2017 10:47:09 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, Florian Fainelli Subject: [PATCH net-next v3 03/12] net: dsa: b53: Defer port enabling to calling port_enable Date: Tue, 19 Sep 2017 10:46:45 -0700 Message-Id: <20170919174654.2122-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170919174654.2122-1-f.fainelli@gmail.com> References: <20170919174654.2122-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is no need to configure the enabled ports once in b53_setup() and then a second time around when dsa_switch_ops::port_enable is called, just do it when port_enable is called which is better in terms of power consumption and correctness. Reviewed-by: Vivien Didelot Signed-off-by: Florian Fainelli --- drivers/net/dsa/b53/b53_common.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index d8bc54cfcfbe..3297af6aab8a 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -815,12 +815,13 @@ static int b53_setup(struct dsa_switch *ds) if (ret) dev_err(ds->dev, "failed to apply configuration\n"); + /* Configure IMP/CPU port, disable unused ports. Enabled + * ports will be configured with .port_enable + */ for (port = 0; port < dev->num_ports; port++) { - if (BIT(port) & ds->enabled_port_mask) - b53_enable_port(ds, port, NULL); - else if (dsa_is_cpu_port(ds, port)) + if (dsa_is_cpu_port(ds, port)) b53_enable_cpu_port(dev, port); - else + else if (!(BIT(port) & ds->enabled_port_mask)) b53_disable_port(ds, port, NULL); }